[Hotfix] LogOut Process (#66)

* remove callback from logout, spa will handle

* simplify logout process and reduce line length

Author: tuxtux59

projects/cryptr/cryptr-angular/src/lib/auth.service.spec.ts

@@ -45,7 +45,7 @@ describe('AuthConfig', () => {
         expect(error).not.toBe(undefined);
       }
       expect(authService.ngOnDestroy()).not.toBe(null);
-      expect(authService.logOut(null, window.location)).not.toBe(null);
+      expect(authService.logOut(window.location)).not.toBe(null);
     });
   });
 });

projects/cryptr/cryptr-angular/src/lib/auth.service.ts

@@ -39,10 +39,10 @@ export class AuthService implements OnDestroy {
   ) {
     this.checkAuthentication();
     window.addEventListener(CryptrSpa.events.REFRESH_INVALID_GRANT, (RigError) => {
-      this.logOut(null);
+      this.logOut();
     });
     window.addEventListener(CryptrSpa.events.REFRESH_EXPIRED, (ReError) => {
-      this.logOut(null);
+      this.logOut();
     });
   }
 
@@ -101,10 +101,11 @@ export class AuthService implements OnDestroy {
    * @param targetUrl - Optional | **Default:** `window.location.href`. Where to redirect after SLO process
    * @returns process logout of session with callback call
    */
-  logOut(callback: () => void, location: undefined | globalThis.Location = window.location, targetUrl?: string, sloAfterRevoke?: boolean): Observable<any> {
+  logOut(location: undefined | globalThis.Location = window.location, targetUrl?: string, sloAfterRevoke?: boolean): Observable<any> {
     let target = targetUrl === undefined || targetUrl === 'undefined' ? window.location.href : targetUrl;
     target = this.sanitizeUrl(target, ['request_id'])
-    return from(this.cryptrClient.logOut(this.preLogOutCallBack(callback), location, target, sloAfterRevoke || this.cryptrClient.config.default_slo_after_revoke));
+    const executeSlo = sloAfterRevoke || this.cryptrClient.config.default_slo_after_revoke
+    return from(this.cryptrClient.logOut(this.preLogOutCallBack(), location, target, executeSlo));
   }
 
   /** @ignore */
@@ -284,10 +285,10 @@ export class AuthService implements OnDestroy {
   }
 
   /** @ignore */
-  private preLogOutCallBack(callback: () => void): () => void {
+  private preLogOutCallBack(): () => void {
     this.updateCurrentAuthState(false);
     this.setUser(null);
-    return callback;
+    return null;
   }
 
   /** @ignore */

projects/playground/src/app/components/nav/nav.component.ts

@@ -37,8 +37,8 @@ export class NavComponent implements OnInit {
   }
 
 
-  logOut(popupStyle = 0): void {
-    this.auth.logOut(() => alert('logged out'), window.location, this.redirectUri);
+  logOut(_popupStyle = 0): void {
+    this.auth.logOut(window.location, this.redirectUri);
   }
 
   greetings(): string {

projects/playground/src/app/components/sidebar-nav/sidebar-nav.component.ts

@@ -14,10 +14,8 @@ export class SidebarNavComponent implements OnInit {
   }
 
 
-  logOut(popupStyle = 0): void {
-    this.auth.logOut(() => {
-      alert('logged out')
-    });
+  logOut(): void {
+    this.auth.logOut();
   }
 
 }

projects/playground/src/app/pages/home/home.component.ts

@@ -17,7 +17,6 @@ export class HomeComponent implements OnInit {
   constructor(public auth: AuthService, public http: HttpClient) { }
 
   ngOnInit(): void {
-    this.cryptrListeners();
     this.auth.currentAuthenticationObservable().subscribe((isAuthenticated: boolean) => {
       this.authenticated = isAuthenticated;
     });
@@ -29,18 +28,8 @@ export class HomeComponent implements OnInit {
     }
   }
 
-  cryptrListeners(): void {
-    window.addEventListener(CryptrSpa.events.REFRESH_INVALID_GRANT, (e) => {
-      this.logOut();
-    });
-    window.addEventListener(CryptrSpa.events.REFRESH_EXPIRED, (e) => {
-      console.error(e);
-      this.logOut();
-    });
-  }
-
   logOut(): void {
-    this.auth.logOut(() => alert('logged out'));
+    this.auth.logOut();
   }
 
   securedRoute(): string {