Refactor authentication flow

projects/common/src/fm/services/auth-guard.service.ts

@@ -1,60 +1,67 @@
-import { Injectable } from '@angular/core';
-import {
-  CanActivate, Router, CanLoad, Route, CanActivateChild ,
-  ActivatedRouteSnapshot,
-  RouterStateSnapshot
-} from '@angular/router';
-
-import { Store } from '@ngrx/store';
-import { OAuthService } from 'angular-oauth2-oidc';
-
-
-import * as appCommonReducer from '../reducers/app-common.reducer'
-import * as appCommonActions from '../actions/app-common.actions';
-
-
-@Injectable({
-  providedIn: 'root',
-})
-export class AuthGuard implements CanActivate, CanLoad, CanActivateChild  { 
- 
-  private loginDispatched = false;
-  private initialized = false;
-  constructor(private oauthService: OAuthService, private router: Router, private store: Store<appCommonReducer.State> ) { }
-
-  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
-    let url: string = state.url;
-
-    return this.checkLogin(url);
-  }
-
-  canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
-    let url: string = state.url;
-
-    return this.checkLogin(url);
-  }
-
-  canLoad(route: Route): boolean {
-    return this.checkLogin(route.path);
-  }
-
-  checkLogin(url: string): boolean {
-    if (!this.oauthService.hasValidAccessToken()) {
-      if (!this.loginDispatched) {
-        this.oauthService.silentRefresh().then(info => {
-          this.router.navigateByUrl(url);
-        }).catch(error => {
-          this.loginDispatched = true;
-          this.store.dispatch(new appCommonActions.Login(url));
-        })
-      }     
-      return false;
-    } else {
-      if (!this.initialized) {
-        this.initialized = true;
-        this.store.dispatch(new appCommonActions.InitUser());
-      }
-      return true;
-    }
-  }
-}
+import { Injectable } from '@angular/core';
+import {
+  CanActivate, Router, CanLoad, Route, CanActivateChild ,
+  ActivatedRouteSnapshot,
+  RouterStateSnapshot
+} from '@angular/router';
+
+import { Store } from '@ngrx/store';
+import { OAuthService } from 'angular-oauth2-oidc';
+
+
+import * as appCommonReducer from '../reducers/app-common.reducer'
+import * as appCommonActions from '../actions/app-common.actions';
+
+
+@Injectable({
+  providedIn: 'root',
+})
+export class AuthGuard implements CanActivate, CanLoad, CanActivateChild  { 
+ 
+  private loginDispatched = false;
+  private initialized = false;
+  constructor(private oauthService: OAuthService, private router: Router, private store: Store<appCommonReducer.State> ) { }
+
+  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
+    let url: string = state.url;
+
+    return this.checkLogin(url);
+  }
+
+  canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
+    let url: string = state.url;
+
+    return this.checkLogin(url);
+  }
+
+  canLoad(route: Route): boolean {
+    return this.checkLogin(route.path);
+  }
+
+  checkLogin(url: string): boolean {
+    if (!this.oauthService.hasValidAccessToken()) {
+      debugger;
+      this.oauthService.responseType
+      if(this.oauthService.responseType == "code")
+        if(this.oauthService.getRefreshToken() != null ) {
+          this.oauthService.refreshToken().then(() => {
+            this.store.dispatch(new appCommonActions.InitUser());
+            return true;
+          }).catch(() => {
+            this.oauthService.initCodeFlow(url);
+            return false;
+          }                
+          )
+        } else {
+          this.oauthService.initCodeFlow(url);
+          return false;
+        }              
+      else 
+        this.oauthService.initImplicitFlow(url);
+        return false;
+    } else {
+      this.store.dispatch(new appCommonActions.InitUser());
+      return true;
+    }
+  }
+}