Angular upgrade

[osm/NG-UI.git] / src / services / AuthGuardService.ts

diff --git a/src/services/AuthGuardService.ts b/src/services/AuthGuardService.ts
index 2effeca..3e0ef8f 100644 (file)
--- a/src/services/AuthGuardService.ts
+++ b/src/services/AuthGuardService.ts
@@ -30,6 +30,7 @@ import { map } from 'rxjs/operators';
  * @Injectable takes a metadata object that tells Angular how to compile and run module code
  */
 @Injectable()
+// eslint-disable-next-line deprecation/deprecation
 export class AuthGuardService implements CanActivate {
     /** Holds teh instance of AuthService class of type AuthService @private */
     private router: Router;
@@ -45,6 +46,7 @@ export class AuthGuardService implements CanActivate {
      * Returns Observable<boolean> if authorized @public
      */
     public canActivate(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
+        // eslint-disable-next-line deprecation/deprecation
         return combineLatest(
             this.authService.isLoggedIn,
             this.authService.isChangePassword
@@ -53,7 +55,9 @@ export class AuthGuardService implements CanActivate {
                 if (changePassword || isLoggedIn) {
                     return true;
                 } else {
-                    this.router.navigate(['/login']).catch();
+                    this.router.navigate(['/login']).catch((): void => {
+                        // Catch Navigation Error
+                    });
                     this.authService.destoryToken();
                     return false;
                 }