CU-8688ucrbp minor auth tweaks

.vscode/settings.json

@@ -28,5 +28,8 @@
         "latex",
         "plaintext",
         "typescript"
+    ],
+    "cSpell.words": [
+        "Resgrid"
     ]
 }

angular.json

@@ -174,5 +174,8 @@
       }
     }
   },
-  "defaultProject": "ResgridAppShared"
+  "defaultProject": "ResgridAppShared",
+  "cli": {
+    "analytics": false
+  }
 }

projects/ngx-resgrid-apps-shared/src/lib/interceptors/http.auth.interceptor.ts

@@ -65,7 +65,9 @@ export class HttpsRequestInterceptor implements HttpInterceptor {
         return next.handle(dupReq);
       }),
       catchError((err) => {
-        this.authService.logout();
+        this.authService.logout().then(() => {
+          this.logger.logDebug('User logged out due to 401 error');
+        });
         return throwError(() => err);
       })
     );

projects/ngx-resgrid-apps-shared/src/lib/services/v4/auth.service.ts

@@ -78,12 +78,13 @@ export class AuthService {
     return this.getTokens(user, 'password');
   }
 
-  public logout(): void {
+  public async logout(): Promise<void> {
     this.updateState({ profile: undefined, tokens: undefined });
     if (this.refreshSubscription$) {
       this.refreshSubscription$.unsubscribe();
+      this.refreshSubscription$ = undefined;
     }
-    this.removeToken();
+    return await this.removeToken();
   }
 
   public refreshTokens(): Observable<ProfileModel | null> {
@@ -143,8 +144,8 @@ export class AuthService {
     return null;
   }
 
-  private removeToken(): void {
-    this.storageService.remove('auth-tokens');
+  private async removeToken(): Promise<void> {
+    await this.storageService.remove('auth-tokens');
   }
 
   private updateState(newState: AuthStateModel): void {
@@ -230,8 +231,8 @@ export class AuthService {
         return this.refreshTokens();
       }),
       catchError((error: any) => {
-        this.logout();
-        this.updateState({ authReady: true });
+        //await this.logout();
+        //this.updateState({ authReady: true });
         return of(error);
       })
     );