feat(oauth-service): revokeTokenAndLogout with cust params

manfredsteyer · Jun 30, 2020 · 026dcb3 · 026dcb3
1 parent 4607d55
commit 026dcb3
Showing 1 changed file with 27 additions and 6 deletions.
diff --git a/projects/lib/src/oauth-service.ts b/projects/lib/src/oauth-service.ts
@@ -1,13 +1,14 @@
 import { Injectable, NgZone, Optional, OnDestroy, Inject } from '@angular/core';
-import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
+import { HttpClient, HttpHeaders, HttpParams, HttpErrorResponse } from '@angular/common/http';
 import {
   Observable,
   Subject,
   Subscription,
   of,
   race,
   from,
-  combineLatest
+  combineLatest,
+  throwError
 } from 'rxjs';
 import {
   filter,
@@ -16,7 +17,8 @@ import {
   tap,
   map,
   switchMap,
-  debounceTime
+  debounceTime,
+  catchError
 } from 'rxjs/operators';
 import { DOCUMENT } from '@angular/common';
 
@@ -2296,9 +2298,10 @@ export class OAuthService extends AuthConfig implements OnDestroy {
    * @param noRedirectToLogoutUrl
    * @param state
    */
+  public logOut(): void;
   public logOut(customParameters: object): void;
   public logOut(noRedirectToLogoutUrl: boolean, state: string): void;
-  public logOut(customParameters: boolean | object, state = ''): void {
+  public logOut(customParameters: boolean | object = {}, state = ''): void {
     let noRedirectToLogoutUrl = false;
     if (typeof customParameters === 'boolean') {
       noRedirectToLogoutUrl = customParameters;
@@ -2576,7 +2579,7 @@ export class OAuthService extends AuthConfig implements OnDestroy {
    * of the token issued allowing the authorization server to clean
    * up any security credentials associated with the authorization
    */
-  public revokeTokenAndLogout(): Promise<any> {
+  public revokeTokenAndLogout(customParameters: object = {}, ignoreCorsIssues = false): Promise<any> {
     let revokeEndpoint = this.revocationEndpoint;
     let accessToken = this.getAccessToken();
     let refreshToken = this.getRefreshToken();
@@ -2641,9 +2644,27 @@ export class OAuthService extends AuthConfig implements OnDestroy {
         revokeRefreshToken = of(null);
       }
 
+      if (ignoreCorsIssues) {
+        revokeAccessToken = revokeAccessToken
+          .pipe(catchError((err: HttpErrorResponse) => {
+            if (err.status === 0) {
+              return of<void>();
+            }
+            return throwError(err);
+          }));
+
+        revokeRefreshToken = revokeRefreshToken
+          .pipe(catchError((err: HttpErrorResponse) => {
+            if (err.status === 0) {
+              return of<void>();
+            }
+            return throwError(err);
+          }));
+      }
+
       combineLatest([revokeAccessToken, revokeRefreshToken]).subscribe(
         res => {
-          this.logOut();
+          this.logOut()
           resolve(res);
           this.logger.info('Token successfully revoked');
         },