Feature/authentication callback (#28)

tuxtux59 · web-flow · commit 2e43e68cfabd · 2021-03-30T16:25:08.000+02:00
* update environment client id

* remove useless commented code

* allow custom callback on process

* lintfixing
diff --git a/projects/cryptr/cryptr-angular/src/lib/auth.service.ts b/projects/cryptr/cryptr-angular/src/lib/auth.service.ts
@@ -226,40 +226,39 @@ export class AuthService implements OnDestroy {
       }).finally(() => {
         this.isLoading$.next(false);
       });
-      // this.cryptrClient.handleRefreshTokens().then((res) => {
-      //   console.log(`handlerefreshTokens ${res === true}`);
-      //   console.log(res);
-      //   this.updateCurrentAuthState(res === true);
-      // }).catch((error) => {
-      //   this.updateCurrentAuthState(false);
-      // }).finally(() => {
-      //   this.isLoading$.next(false);
-      // });
     }
   }
 
-  fullAuthenticateProcess(stateUrl?: string): Observable<boolean | UrlTree> {
+  private defaultAuthenticationCallback(isAuthenticated: boolean, stateUrl?: string): boolean {
     const { audience, default_locale } = this.config();
     const redirectUri = audience.concat(stateUrl || '');
-    // const tree = this.router.parseUrl(stateUrl)
-    // const newTree = this.cleanUrlTree(tree, stateUrl)
+    if (isAuthenticated) {
+      return true;
+    } else {
+      if (this.configFactory.get().has_ssr) {
+        this.signInWithRedirect(DEFAULT_SCOPE, default_locale, redirectUri);
+      } else {
+        this.signInWithRedirect();
+      }
+      return false;
+    }
+  }
+
+  fullAuthenticateProcess(
+    stateUrl?: string,
+    callback?: (isAuthenticated: boolean, stateUrl?: string) => boolean
+  ): Observable<boolean | UrlTree> {
     return combineLatest(
       [this.isLoading$, this.authenticated$]
     ).pipe(
       filter(([isLoading, isAuthenticated]) => {
         return !isLoading;
       }),
       map(([isLoading, isAuthenticated]) => {
-        if (isAuthenticated) {
-          this.cleanRouteState();
-          return true;
+        if (callback) {
+          return callback(isAuthenticated, stateUrl);
         } else {
-          if (this.configFactory.get().has_ssr) {
-            this.signInWithRedirect(DEFAULT_SCOPE, default_locale, redirectUri);
-          } else {
-            this.signInWithRedirect();
-          }
-          return false;
+          return this.defaultAuthenticationCallback(isAuthenticated, stateUrl);
         }
       })
     );
diff --git a/projects/playground/src/environments/environment.ts b/projects/playground/src/environments/environment.ts
@@ -8,7 +8,7 @@ export const environment = {
   cryptrConfig: {
     audience: 'http://localhost:4200',
     tenant_domain: 'shark-academy',
-    client_id: '79742198-b3d6-4565-bca2-276f63162129',
+    client_id: 'fea92afe-3bf5-4f55-b772-1d0fa14d325f',
     default_redirect_uri: 'http://localhost:4200/',
     // region: 'us',
     cryptr_base_url: 'http://localhost:4000',
