From 407a3a282a21782c3c89147d999941fa542524be Mon Sep 17 00:00:00 2001 From: JWittmeyer Date: Mon, 25 Jul 2022 12:23:51 +0200 Subject: [PATCH 1/5] Removes retry from http failure --- src/app/base/interceptors/exception.interceptor.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/app/base/interceptors/exception.interceptor.ts b/src/app/base/interceptors/exception.interceptor.ts index 023973e0..9719b3c0 100644 --- a/src/app/base/interceptors/exception.interceptor.ts +++ b/src/app/base/interceptors/exception.interceptor.ts @@ -9,17 +9,15 @@ import { import { Observable, throwError } from 'rxjs'; import { catchError, retry } from 'rxjs/operators'; import { NotificationService } from '../services/notification.service'; - @Injectable() export class ExceptionInterceptor implements HttpInterceptor { - constructor(private notificationService: NotificationService) {} + constructor(private notificationService: NotificationService) { } intercept( request: HttpRequest, next: HttpHandler ): Observable> { return next.handle(request).pipe( - retry(1), catchError((error: HttpErrorResponse) => { let message = ''; if (error.error instanceof ErrorEvent) { From 66bfa53ebe079c810da0e130527aa9db9acba6e1 Mon Sep 17 00:00:00 2001 From: JWittmeyer Date: Mon, 25 Jul 2022 16:03:15 +0200 Subject: [PATCH 2/5] Adds check for demo application --- src/app/app.component.ts | 11 +++++- src/app/app.module.ts | 4 ++- .../components/header/header.component.html | 2 +- .../components/header/header.component.ts | 4 ++- src/app/base/interceptors/DemoError.ts | 15 ++++++++ .../global-exception.interceptor.ts | 14 ++++++++ src/app/base/services/base/apollo-checker.ts | 36 +++++++++++++++++++ src/app/base/services/config-service.ts | 35 ++++++++++++++++++ .../services/config/config-apollo.service.ts | 32 ++++++++++++++++- .../base/services/config/config-queries.ts | 15 ++++++++ .../knowledge-bases-apollo.service.ts | 4 ++- .../notification-apollo.service.ts | 4 ++- .../organization-apollo.service.ts | 4 ++- .../project/project-apollo.service.ts | 4 ++- .../services/record/record-apollo.service.ts | 4 ++- .../weak-source/weak-source-apollo.service.ts | 4 ++- 16 files changed, 181 insertions(+), 11 deletions(-) create mode 100644 src/app/base/interceptors/DemoError.ts create mode 100644 src/app/base/interceptors/global-exception.interceptor.ts create mode 100644 src/app/base/services/base/apollo-checker.ts diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 237978d0..9a41aa8f 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -38,7 +38,7 @@ export class AppComponent implements OnDestroy, OnInit { ) { } ngOnInit(): void { - this.configService.isManaged().pipe(first()).subscribe((v) => ConfigManager.initConfigManager(this.http, this.configService, v)); + this.initalRequests(); NotificationService.subscribeToNotification(this, { whitelist: ['notification_created', 'project_deleted', 'config_updated'], func: this.handleWebsocketNotification @@ -46,6 +46,15 @@ export class AppComponent implements OnDestroy, OnInit { this.initializeNotificationService(); this.initWithConfigManager(); } + + initalRequests() { + this.configService.isManaged().pipe(first()).subscribe((v) => ConfigManager.initConfigManager(this.http, this.configService, v)); + this.configService.isDemo().pipe(first()).subscribe((v) => ConfigManager.setIsDemo(v)); + this.configService.isAdmin().pipe(first()).subscribe((v) => ConfigManager.setIsAdmin(v)); + this.configService.getBlackWhiteDemo().pipe(first()).subscribe((v) => ConfigManager.setBlackWhiteListDemo(v)); + } + + initWithConfigManager() { if (!ConfigManager.isInit()) { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 9a00f549..87573ec5 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,10 +1,11 @@ import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http'; -import { NgModule } from '@angular/core'; +import { ErrorHandler, NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { BaseModule } from './base/base.module'; import { ExceptionInterceptor } from './base/interceptors/exception.interceptor'; +import { GlobalErrorHandler } from './base/interceptors/global-exception.interceptor'; import { NotificationService } from './base/services/notification.service'; import { DataModule } from './data/data.module'; import { ProjectsModule } from './projects/projects.module'; @@ -50,6 +51,7 @@ import { RecordIDEModule } from './record-ide/record-ide.module'; ], providers: [ { provide: HTTP_INTERCEPTORS, useClass: ExceptionInterceptor, multi: true }, + { provide: ErrorHandler, useClass: GlobalErrorHandler }, NotificationService, ], bootstrap: [AppComponent], diff --git a/src/app/base/components/header/header.component.html b/src/app/base/components/header/header.component.html index cca0133f..fef9fddd 100644 --- a/src/app/base/components/header/header.component.html +++ b/src/app/base/components/header/header.component.html @@ -59,7 +59,7 @@
-
+
diff --git a/src/app/base/components/header/header.component.ts b/src/app/base/components/header/header.component.ts index b55a4f05..10ac12a1 100644 --- a/src/app/base/components/header/header.component.ts +++ b/src/app/base/components/header/header.component.ts @@ -21,6 +21,7 @@ export class HeaderComponent implements OnInit, OnDestroy { subscriptions$: Subscription[] = []; showConfigSettings: boolean = false; + isDemo: boolean; constructor(private auth: AuthApiService, private router: Router) { } @@ -33,7 +34,8 @@ export class HeaderComponent implements OnInit, OnDestroy { timer(250).subscribe(() => this.setShowConfig()); return; } - this.showConfigSettings = !ConfigManager.getIsManaged() + this.isDemo = ConfigManager.getIsDemo(); + this.showConfigSettings = !ConfigManager.getIsManaged(); } ngOnDestroy(): void { diff --git a/src/app/base/interceptors/DemoError.ts b/src/app/base/interceptors/DemoError.ts new file mode 100644 index 00000000..3e78f7e4 --- /dev/null +++ b/src/app/base/interceptors/DemoError.ts @@ -0,0 +1,15 @@ +export class DemoError extends Error { + errorQueryType: string; + errorQueryText: string; + constructor(type: string, queryText: string, msg?: string) { + super(msg); + Object.setPrototypeOf(this, DemoError.prototype); + this.errorQueryType = type; + this.errorQueryText = queryText; + } + + errorMessage(): string { + if (this.message) return this.message + return "This function isn't part of the demo application"; + } +} \ No newline at end of file diff --git a/src/app/base/interceptors/global-exception.interceptor.ts b/src/app/base/interceptors/global-exception.interceptor.ts new file mode 100644 index 00000000..f6c217a8 --- /dev/null +++ b/src/app/base/interceptors/global-exception.interceptor.ts @@ -0,0 +1,14 @@ +import { ErrorHandler, Injectable } from '@angular/core'; +import { DemoError } from './DemoError'; +@Injectable() +export class GlobalErrorHandler implements ErrorHandler { + constructor() { } + + handleError(error: any) { + if (error instanceof DemoError) { + alert(error.errorMessage()); + } else { + console.error(error); + } + } +} \ No newline at end of file diff --git a/src/app/base/services/base/apollo-checker.ts b/src/app/base/services/base/apollo-checker.ts new file mode 100644 index 00000000..f5c5a45c --- /dev/null +++ b/src/app/base/services/base/apollo-checker.ts @@ -0,0 +1,36 @@ + + +import { Apollo } from 'apollo-angular'; +import { QueryOptions, MutationOptions, ApolloQueryResult, FetchResult } from '@apollo/client/core'; +import { EmptyObject, WatchQueryOptions } from 'apollo-angular/types'; +import { Observable } from 'rxjs'; +import { QueryRef } from 'apollo-angular/query-ref'; +import { DemoError } from '../../interceptors/DemoError'; +import { ConfigManager } from '../config-service'; + +export class ApolloChecker { + + public apollo: Apollo; + constructor(apollo: Apollo) { + this.apollo = apollo; + } + + mutate(options: MutationOptions): Observable> { + ApolloChecker.checkBlackWhiteList("mutation", options.mutation.loc?.source.body); + return this.apollo.mutate(options) + } + watchQuery(options: WatchQueryOptions): QueryRef { + ApolloChecker.checkBlackWhiteList("query", options.query.loc?.source.body); + return this.apollo.watchQuery(options); + } + query(options: QueryOptions): Observable> { + ApolloChecker.checkBlackWhiteList("query", options.query.loc?.source.body); + return this.apollo.query(options); + } + + private static checkBlackWhiteList(type: string, queryText: string) { + if (!ConfigManager.getIsDemo()) return; + if (!queryText) throw new Error("Can't find query text"); + if (!ConfigManager.checkBlackWhiteList(type, queryText)) throw new DemoError(type, queryText); + } +} \ No newline at end of file diff --git a/src/app/base/services/config-service.ts b/src/app/base/services/config-service.ts index 1176e601..a2cf3217 100644 --- a/src/app/base/services/config-service.ts +++ b/src/app/base/services/config-service.ts @@ -9,6 +9,9 @@ export class ConfigManager { private static http: HttpClient; private static configApolloService: ConfigApolloService; private static isManaged: boolean = true;//differentation between propriatary or not + private static isAdmin: boolean = false; + private static isDemo: boolean = false; + private static blackWhiteListDemo: any; private static registedUpdateListeners: Map void> = new Map void>(); private static justUpdated = false; @@ -80,5 +83,37 @@ export class ConfigManager { ConfigManager.registedUpdateListeners.delete(caller); } + public static setIsAdmin(value: boolean) { + ConfigManager.isAdmin = value; + } + public static getIsAdmin() { + return ConfigManager.isAdmin; + } + + public static setIsDemo(value: boolean) { + ConfigManager.isDemo = value; + } + public static getIsDemo() { + return ConfigManager.isDemo; + } + + public static setBlackWhiteListDemo(value: any) { + ConfigManager.blackWhiteListDemo = value; + } + + public static checkBlackWhiteList(type: string, queryText: string): boolean { + if (!ConfigManager.blackWhiteListDemo) return false; + if (type == "query") { + for (const blacklisted of ConfigManager.blackWhiteListDemo["queries"]) { + if (queryText.indexOf(blacklisted) != -1) return false; + } + return true; + } else { + for (const whitelisted of ConfigManager.blackWhiteListDemo["mutations"]) { + if (queryText.indexOf(whitelisted) != -1) return true; + } + return false; + } + } } diff --git a/src/app/base/services/config/config-apollo.service.ts b/src/app/base/services/config/config-apollo.service.ts index a4856425..bc4b8f59 100644 --- a/src/app/base/services/config/config-apollo.service.ts +++ b/src/app/base/services/config/config-apollo.service.ts @@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'; import { Apollo } from 'apollo-angular'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; +import { ApolloChecker } from '../base/apollo-checker'; import { mutations } from './config-mutations'; import { queries } from './config-queries'; @@ -11,7 +12,8 @@ import { queries } from './config-queries'; }) export class ConfigApolloService { - constructor(private apollo: Apollo) { } + private apollo: ApolloChecker; + constructor(private apolloBase: Apollo) { this.apollo = new ApolloChecker(this.apolloBase); } isManaged() { return this.apollo @@ -30,4 +32,32 @@ export class ConfigApolloService { } }); } + + isDemo() { + return this.apollo + .query({ + query: queries.IS_DEMO, + fetchPolicy: 'cache-first', + }) + .pipe(map((result) => result['data']['isDemo'] != false)); + } + + isAdmin() { + return this.apollo + .query({ + query: queries.IS_AMDIN, + fetchPolicy: 'no-cache', + }) + .pipe(map((result) => result['data']['isAdmin'] != false)); + } + + getBlackWhiteDemo() { + return this.apollo + .query({ + query: queries.GET_BLACK_WHITE_DEMO, + fetchPolicy: 'cache-first', + }) + .pipe(map((result) => JSON.parse(result['data']['getBlackWhiteDemo']))); + } + } diff --git a/src/app/base/services/config/config-queries.ts b/src/app/base/services/config/config-queries.ts index 98507f05..6cb9cda7 100644 --- a/src/app/base/services/config/config-queries.ts +++ b/src/app/base/services/config/config-queries.ts @@ -47,5 +47,20 @@ export const queries = { query{ isManaged } + `, + IS_DEMO: gql` + query{ + isDemo + } + `, + IS_AMDIN: gql` + query{ + isAdmin + } + `, + GET_BLACK_WHITE_DEMO: gql` + { + getBlackWhiteDemo + } ` }; diff --git a/src/app/base/services/knowledge-bases/knowledge-bases-apollo.service.ts b/src/app/base/services/knowledge-bases/knowledge-bases-apollo.service.ts index 5be7088e..735d9fda 100644 --- a/src/app/base/services/knowledge-bases/knowledge-bases-apollo.service.ts +++ b/src/app/base/services/knowledge-bases/knowledge-bases-apollo.service.ts @@ -3,12 +3,14 @@ import { Injectable } from '@angular/core'; import { mutations } from './knowledge-bases-mutations'; import { queries } from './knowledge-bases-queries'; import { map } from 'rxjs/operators'; +import { ApolloChecker } from '../base/apollo-checker'; @Injectable({ providedIn: 'root', }) export class KnowledgeBasesApolloService { - constructor(private apollo: Apollo) { } + private apollo: ApolloChecker; + constructor(private apolloBase: Apollo) { this.apollo = new ApolloChecker(this.apolloBase); } createKnowledgeBase(projectId: string) { return this.apollo.mutate({ diff --git a/src/app/base/services/notification/notification-apollo.service.ts b/src/app/base/services/notification/notification-apollo.service.ts index e3195710..d37c6494 100644 --- a/src/app/base/services/notification/notification-apollo.service.ts +++ b/src/app/base/services/notification/notification-apollo.service.ts @@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'; import { Apollo } from 'apollo-angular'; import { NotificationType } from 'aws-sdk/clients/budgets'; import { map } from 'rxjs/operators'; +import { ApolloChecker } from '../base/apollo-checker'; import { mutations } from './notification-mutations'; import { queries } from './notification-queries'; @@ -9,7 +10,8 @@ import { queries } from './notification-queries'; providedIn: 'root', }) export class NotificationApolloService { - constructor(private apollo: Apollo) { } + private apollo: ApolloChecker; + constructor(private apolloBase: Apollo) { this.apollo = new ApolloChecker(this.apolloBase); } getNotificationsByUser() { const query = this.apollo diff --git a/src/app/base/services/organization/organization-apollo.service.ts b/src/app/base/services/organization/organization-apollo.service.ts index 5b2cdb93..5b37fd27 100644 --- a/src/app/base/services/organization/organization-apollo.service.ts +++ b/src/app/base/services/organization/organization-apollo.service.ts @@ -3,6 +3,7 @@ import { Apollo } from 'apollo-angular'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { Organization } from '../../entities/organization'; +import { ApolloChecker } from '../base/apollo-checker'; import { mutations } from './organization-mutations'; import { queries } from './organization-queries'; @@ -12,7 +13,8 @@ import { queries } from './organization-queries'; }) export class OrganizationApolloService { - constructor(private apollo: Apollo) { } + private apollo: ApolloChecker; + constructor(private apolloBase: Apollo) { this.apollo = new ApolloChecker(this.apolloBase); } createOrganization(name: string) { return this.apollo diff --git a/src/app/base/services/project/project-apollo.service.ts b/src/app/base/services/project/project-apollo.service.ts index 193eb219..76890779 100644 --- a/src/app/base/services/project/project-apollo.service.ts +++ b/src/app/base/services/project/project-apollo.service.ts @@ -3,6 +3,7 @@ import { Apollo } from 'apollo-angular'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { Project } from '../../entities/project'; +import { ApolloChecker } from '../base/apollo-checker'; import { mutations } from './project-mutations'; import { queries } from './project-queries'; @@ -10,7 +11,8 @@ import { queries } from './project-queries'; providedIn: 'root', }) export class ProjectApolloService { - constructor(private apollo: Apollo) { } + private apollo: ApolloChecker; + constructor(private apolloBase: Apollo) { this.apollo = new ApolloChecker(this.apolloBase) } createProject(projectName: string, description: string) { return this.apollo diff --git a/src/app/base/services/record/record-apollo.service.ts b/src/app/base/services/record/record-apollo.service.ts index 0ef851e1..9b0ac4e5 100644 --- a/src/app/base/services/record/record-apollo.service.ts +++ b/src/app/base/services/record/record-apollo.service.ts @@ -6,13 +6,15 @@ import { queries } from './record-queries'; import { mutations } from './record-mutations'; import { queries as projectQueries } from '../project/project-queries'; import { labelSourceToString } from '../../enum/graphql-enums'; +import { ApolloChecker } from '../base/apollo-checker'; @Injectable({ providedIn: 'root', }) export class RecordApolloService { topN: number = 1; - constructor(private apollo: Apollo) { } + private apollo: ApolloChecker; + constructor(private apolloBase: Apollo) { this.apollo = new ApolloChecker(this.apolloBase); } recordsListQuery: QueryRef; static recordsCursor: string; diff --git a/src/app/base/services/weak-source/weak-source-apollo.service.ts b/src/app/base/services/weak-source/weak-source-apollo.service.ts index fab042b0..1f2b8db1 100644 --- a/src/app/base/services/weak-source/weak-source-apollo.service.ts +++ b/src/app/base/services/weak-source/weak-source-apollo.service.ts @@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'; import { Apollo } from 'apollo-angular'; import { map } from 'rxjs/operators'; import { InformationSourceType, informationSourceTypeToString, LabelSource } from '../../enum/graphql-enums'; +import { ApolloChecker } from '../base/apollo-checker'; import { mutations } from './weak-source-mutations'; import { queries } from './weak-source-queries'; @@ -9,7 +10,8 @@ import { queries } from './weak-source-queries'; providedIn: 'root', }) export class WeakSourceApolloService { - constructor(private apollo: Apollo) { } + private apollo: ApolloChecker; + constructor(private apolloBase: Apollo) { this.apollo = new ApolloChecker(this.apolloBase); } createTask(projectId: string, informationSourceId: string) { return this.apollo.mutate({ From 90550b249448f67236c4bc373b8dfdd446c18b1d Mon Sep 17 00:00:00 2001 From: JWittmeyer Date: Mon, 25 Jul 2022 17:35:45 +0200 Subject: [PATCH 3/5] Changes logic slightly admins --- src/app/base/components/header/header.component.html | 2 +- src/app/base/components/header/header.component.ts | 4 ++-- src/app/base/services/base/apollo-checker.ts | 1 + src/app/base/services/project/project-mutations.ts | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app/base/components/header/header.component.html b/src/app/base/components/header/header.component.html index fef9fddd..a19decc2 100644 --- a/src/app/base/components/header/header.component.html +++ b/src/app/base/components/header/header.component.html @@ -59,7 +59,7 @@
-
+
diff --git a/src/app/base/components/header/header.component.ts b/src/app/base/components/header/header.component.ts index 10ac12a1..0cfd38eb 100644 --- a/src/app/base/components/header/header.component.ts +++ b/src/app/base/components/header/header.component.ts @@ -21,7 +21,7 @@ export class HeaderComponent implements OnInit, OnDestroy { subscriptions$: Subscription[] = []; showConfigSettings: boolean = false; - isDemo: boolean; + hideLogout: boolean; constructor(private auth: AuthApiService, private router: Router) { } @@ -34,7 +34,7 @@ export class HeaderComponent implements OnInit, OnDestroy { timer(250).subscribe(() => this.setShowConfig()); return; } - this.isDemo = ConfigManager.getIsDemo(); + this.hideLogout = ConfigManager.getIsDemo() && !ConfigManager.getIsAdmin(); this.showConfigSettings = !ConfigManager.getIsManaged(); } diff --git a/src/app/base/services/base/apollo-checker.ts b/src/app/base/services/base/apollo-checker.ts index f5c5a45c..f59cc7e8 100644 --- a/src/app/base/services/base/apollo-checker.ts +++ b/src/app/base/services/base/apollo-checker.ts @@ -30,6 +30,7 @@ export class ApolloChecker { private static checkBlackWhiteList(type: string, queryText: string) { if (!ConfigManager.getIsDemo()) return; + if (ConfigManager.getIsAdmin()) return; if (!queryText) throw new Error("Can't find query text"); if (!ConfigManager.checkBlackWhiteList(type, queryText)) throw new DemoError(type, queryText); } diff --git a/src/app/base/services/project/project-mutations.ts b/src/app/base/services/project/project-mutations.ts index 3bc42fc7..2cd8829d 100644 --- a/src/app/base/services/project/project-mutations.ts +++ b/src/app/base/services/project/project-mutations.ts @@ -185,7 +185,7 @@ export const mutations = { `, CREATE_OUTLIER_SLICE: gql` mutation($projectId: ID!, $embeddingId: ID!){ - createOulierSlice(projectId: $projectId, embeddingId: $embeddingId) { + createOutlierSlice(projectId: $projectId, embeddingId: $embeddingId) { ok } } From d633632ba35ba826bc0fa1338dfb678442d97eef Mon Sep 17 00:00:00 2001 From: JWittmeyer Date: Mon, 25 Jul 2022 18:34:10 +0200 Subject: [PATCH 4/5] Adds demo banner --- src/app/base/components/header/header.component.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/base/components/header/header.component.html b/src/app/base/components/header/header.component.html index a19decc2..9ab77d44 100644 --- a/src/app/base/components/header/header.component.html +++ b/src/app/base/components/header/header.component.html @@ -1,6 +1,9 @@
+
+
Demo - Everything will be reset on the hour
+
From f79add5b7512ab503f62689ae62c8805432bba84 Mon Sep 17 00:00:00 2001 From: JWittmeyer Date: Mon, 1 Aug 2022 17:29:55 +0200 Subject: [PATCH 5/5] Adds badge & call to action --- .../components/header/header.component.html | 31 +++++++++++++++++-- src/app/base/interceptors/DemoError.ts | 2 +- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/app/base/components/header/header.component.html b/src/app/base/components/header/header.component.html index 9ab77d44..b9b7ffdb 100644 --- a/src/app/base/components/header/header.component.html +++ b/src/app/base/components/header/header.component.html @@ -1,8 +1,21 @@
-
-
Demo - Everything will be reset on the hour
+
+ + + + + + + + + Demo Playground - Everything will be reset on the hour + +
@@ -61,6 +74,20 @@
+
+ + + + + + + + +
diff --git a/src/app/base/interceptors/DemoError.ts b/src/app/base/interceptors/DemoError.ts index 3e78f7e4..2e7e59db 100644 --- a/src/app/base/interceptors/DemoError.ts +++ b/src/app/base/interceptors/DemoError.ts @@ -10,6 +10,6 @@ export class DemoError extends Error { errorMessage(): string { if (this.message) return this.message - return "This function isn't part of the demo application"; + return "This function isn't part of the demo application.\nIf you want to test this function, don't hesitate to check out our open-source or hosted versions!"; } } \ No newline at end of file