Refactor authconfig

2019-12-19 13:32:51 +01:00
parent e1fef2d7f3
commit 560c426bc0
4 changed files with 181 additions and 167 deletions
--- a/projects/common/src/fm/shared/app.config.factory.ts
+++ b/projects/common/src/fm/shared/app.config.factory.ts
@@ -1,61 +1,49 @@
-import { Injector } from '@angular/core';
-import { Router,UrlSerializer } from '@angular/router';
-import { AuthConfig, OAuthService, JwksValidationHandler, OAuthErrorEvent  } from 'angular-oauth2-oidc';
-import { AppConfig } from "./app.config";
-
-function getAuthConfig(appConfig: AppConfig): AuthConfig {
-  let authConfig: AuthConfig = new AuthConfig();
-  authConfig.issuer = appConfig.getConfig("issuer");
-  authConfig.redirectUri = window.location.origin + "/cb";
-  authConfig.silentRefreshRedirectUri = window.location.origin + "/silent-refresh.html";
-  authConfig.clientId = appConfig.getConfig("clientId");
-  authConfig.customQueryParams = { audience: appConfig.getConfig("audience") };
-  authConfig.scope = "openid profile email";
-  authConfig.oidc = true;
-  authConfig.disableAtHashCheck = true;
-  authConfig.requireHttps = appConfig.getConfig("requireHttps");
-  return authConfig;
-}
-
-export function appConfigFactory(injector:Injector, appConfig: AppConfig, oauthService: OAuthService): () => Promise<any> {
-  return (): Promise<any> => {
-    return appConfig.load().then(() => {     
-      oauthService.events.subscribe((event) => {
-        console.debug(event.type);
-        if (event.type == 'token_error' || event.type == 'silent_refresh_timeout') {
-          let e = event as OAuthErrorEvent;
-          let p = e.params as any;
-          if (event.type == 'silent_refresh_timeout' || (p.error && p.error == 'login_required')) {
-            let router = injector.get(Router);
-            console.debug("Session expired");
-            router.navigate(['loggedout'], { queryParams: { redirectTo: router.url } });
-          }          
-        }
-      });
-      oauthService.configure(getAuthConfig(appConfig));
-      oauthService.tokenValidationHandler = new JwksValidationHandler();
-      oauthService.tokenValidationHandler.validateAtHash = function () {
-        return new Promise<boolean>((res) => { res(true); })
-      };
-      oauthService.setupAutomaticSilentRefresh();
-      let router = injector.get(Router);
-      var urlTree = router.parseUrl(window.location.href);
-      var urlPath = window.location.pathname;
-      oauthService.loadDiscoveryDocument().then(() => {
-        oauthService.tryLogin({
-          onTokenReceived: (info) => {
-            urlPath = info.state;
-          }
-        }).then(() => {
-          let router = injector.get(Router);
-          if (!oauthService.hasValidAccessToken()) {
-            oauthService.initImplicitFlow(urlPath);
-          } else {
-            router.navigateByUrl(urlPath);
-          }
-        });       
-      })
-    });
-  }
-}
-
+import { Injector } from '@angular/core';
+import { Router,UrlSerializer } from '@angular/router';
+import { AuthConfig, OAuthService, JwksValidationHandler, OAuthErrorEvent  } from 'angular-oauth2-oidc';
+import { AppConfig } from "./app.config";
+import { IAuthconfigFactory } from './authconfigFactory';
+
+
+export function appConfigFactory(injector:Injector, appConfig: AppConfig, oauthService: OAuthService, authconfigFactory:IAuthconfigFactory): () => Promise<any> {
+  return (): Promise<any> => {
+    return appConfig.load().then(() => {     
+      oauthService.events.subscribe((event) => {
+        console.debug(event.type);
+        if (event.type == 'token_error' || event.type == 'silent_refresh_timeout') {
+          let e = event as OAuthErrorEvent;
+          let p = e.params as any;
+          if (event.type == 'silent_refresh_timeout' || (p.error && p.error == 'login_required')) {
+            let router = injector.get(Router);
+            console.debug("Session expired");
+            router.navigate(['loggedout'], { queryParams: { redirectTo: router.url } });
+          }          
+        }
+      });
+      oauthService.configure(authconfigFactory.getAuthConfig(appConfig));
+      oauthService.tokenValidationHandler = new JwksValidationHandler();
+      oauthService.tokenValidationHandler.validateAtHash = function () {
+        return new Promise<boolean>((res) => { res(true); })
+      };
+      oauthService.setupAutomaticSilentRefresh();
+      let router = injector.get(Router);
+      var urlTree = router.parseUrl(window.location.href);
+      var urlPath = window.location.pathname;
+      oauthService.loadDiscoveryDocument().then(() => {
+        oauthService.tryLogin({
+          onTokenReceived: (info) => {
+            urlPath = info.state;
+          }
+        }).then(() => {
+          let router = injector.get(Router);
+          if (!oauthService.hasValidAccessToken()) {
+            oauthService.initImplicitFlow(urlPath);
+          } else {
+            router.navigateByUrl(urlPath);
+          }
+        });       
+      })
+    });
+  }
+}
+
--- a/projects/common/src/fm/shared/authconfigFactory.ts
+++ b/projects/common/src/fm/shared/authconfigFactory.ts
@@ -0,0 +1,22 @@
+import { AuthConfig } from 'angular-oauth2-oidc';
+import {AppConfig} from './app.config';
+
+export interface IAuthconfigFactory {
+    getAuthConfig(appConfig: AppConfig): AuthConfig;
+}
+
+export class AuthConfigFactory implements IAuthconfigFactory {
+    getAuthConfig(appConfig: AppConfig): AuthConfig {
+      let authConfig: AuthConfig = new AuthConfig();
+      authConfig.issuer = appConfig.getConfig("issuer");
+      authConfig.redirectUri = window.location.origin + "/cb";
+      authConfig.silentRefreshRedirectUri = window.location.origin + "/silent-refresh.html";
+      authConfig.clientId = appConfig.getConfig("clientId");
+      authConfig.customQueryParams = { audience: appConfig.getConfig("audience") };
+      authConfig.scope = "openid profile email";
+      authConfig.oidc = true;
+      authConfig.disableAtHashCheck = true;
+      authConfig.requireHttps = appConfig.getConfig("requireHttps");
+      return authConfig;
+    }
+  }