From f39b2cb03875693bdf93b898118a7717a2e0a62f Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo@devplant.ro>
Date: Tue, 20 Oct 2020 11:23:06 +0300
Subject: [PATCH] fixed guards

---
 apps/red-ui/src/app/auth/auth.module.ts                        | 2 +-
 apps/red-ui/src/app/auth/red-role.guard.ts                     | 2 +-
 .../file/file-preview-screen/file-preview-screen.component.ts  | 1 -
 .../src/app/screens/file/pdf-viewer/pdf-viewer.component.ts    | 3 ---
 .../project-overview-screen.component.ts                       | 1 -
 5 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/apps/red-ui/src/app/auth/auth.module.ts b/apps/red-ui/src/app/auth/auth.module.ts
index b8fd8b71e..2b7055b35 100644
--- a/apps/red-ui/src/app/auth/auth.module.ts
+++ b/apps/red-ui/src/app/auth/auth.module.ts
@@ -14,7 +14,7 @@ export function keycloakInitializer(keycloak: KeycloakService, appConfigService:
 
       let url = appConfigService.getConfig(AppConfigKey.OAUTH_URL);
       url = url.replace(/\/$/, ""); // remove trailing slash
-      let realm = url.substring(url.lastIndexOf("/") + 1, url.length);
+      const realm = url.substring(url.lastIndexOf("/") + 1, url.length);
       url = url.substr(0, url.lastIndexOf("/realms"));
       return keycloak.init({
         config: {
diff --git a/apps/red-ui/src/app/auth/red-role.guard.ts b/apps/red-ui/src/app/auth/red-role.guard.ts
index eb784e3ed..8795075ca 100644
--- a/apps/red-ui/src/app/auth/red-role.guard.ts
+++ b/apps/red-ui/src/app/auth/red-role.guard.ts
@@ -20,7 +20,7 @@ export class RedRoleGuard implements CanActivate {
   ) {
   }
 
-  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
+  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
     return new Observable(obs => {
       if (!this._userService.user.hasAnyREDRoles) {
         this._router.navigate(['/auth-error']);
diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts
index cd7b047d2..b3ecea653 100644
--- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts
@@ -112,7 +112,6 @@ export class FilePreviewScreenComponent implements OnInit {
   }
 
   public fileReady(viewer: string) {
-    console.log('ready' , viewer);
     this._readyViewers.push(viewer);
     this._changeDetectorRef.detectChanges();
   }
diff --git a/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts b/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts
index d8d5dbe5c..2b6b99b17 100644
--- a/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts
+++ b/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts
@@ -49,12 +49,10 @@ export class PdfViewerComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   ngOnInit() {
-    console.log('init viewer');
     this.wvDocumentLoadedHandler = this.wvDocumentLoadedHandler.bind(this);
   }
 
   wvDocumentLoadedHandler(): void {
-    console.log('loaded');
     this.wvInstance.setFitMode('FitPage');
     this.fileReady.emit();
   }
@@ -63,7 +61,6 @@ export class PdfViewerComponent implements OnInit, AfterViewInit, OnDestroy {
     this._fileDownloadService.loadFile(this.fileType, this.fileId, (data) => {
       this._fileData = data
     }, () => this._fileData).subscribe(() => {
-      console.log('load viewer');
       this._loadViewer(this._fileData);
     })
   }
diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts
index 674ad8dfc..f4e50010a 100644
--- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts
+++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts
@@ -184,7 +184,6 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy {
         this.appStateService.deleteProject(this.appStateService.activeProject.project);
         this.ngOnDestroy();
         this._router.navigate(['/ui/projects']);
-        console.log('navigate?');
       }
     });
   }