Cleanup around clear token (#743)

Author: ygrik

src/authentication/IAuthenticator.ts

@@ -28,7 +28,7 @@ export interface IAuthenticator {
     /**
      * Clears access token from current session.
      */
-    clearAccessToken(cleanOnlyClient?: boolean): Promise<void>;
+    clearAccessToken(cleanOnlyClient?: boolean): void;
 
     /**
      * Checks if current user is signed in.

src/components/app/app.ts

@@ -39,7 +39,7 @@ export class App {
             if (!token) {
                 const managementApiAccessToken = settings["managementApiAccessToken"];
                 if (!managementApiAccessToken) {
-                    await this.authenticator.clearAccessToken();
+                    this.authenticator.clearAccessToken();
                     window.location.assign("/");
                     return;
                 }
@@ -49,7 +49,7 @@ export class App {
 
                 if (now >= accessToken.expires) {
                     this.viewManager.addToast(startupError, `Management API access token has expired. See setting <i>managementApiAccessToken</i> in the configuration file <i>config.design.json</i>`);
-                    await this.authenticator.clearAccessToken();
+                    this.authenticator.clearAccessToken();
                     return;
                 }
 

src/components/defaultAuthenticator.ts

@@ -42,7 +42,7 @@ export class DefaultAuthenticator implements IAuthenticator {
         });
     }
 
-    public async clearAccessToken(): Promise<void> {
+    public clearAccessToken(): void {
         sessionStorage.removeItem("accessToken");
     }
 

src/components/staticAuthenticator.ts

@@ -32,7 +32,7 @@ export class StaticAuthenticator implements IAuthenticator {
         return undefined;
     }
 
-    public async clearAccessToken(): Promise<void> {
+    public clearAccessToken(): void {
         this.accessToken = undefined;
     }
 

src/routing/signOutRouteGuard.ts

@@ -8,7 +8,7 @@ export class SignOutRouteGuard implements RouteGuard {
 
     public async canActivate(route: Route): Promise<boolean> {
         if (route.hash === hashSignOut) {
-            await this.authenticator.clearAccessToken();
+            this.authenticator.clearAccessToken();
             location.assign(pageUrlHome);
         }
         return true;

src/services/usersService.ts

@@ -36,7 +36,7 @@ export class UsersService {
             return userId;
         }
         else {
-            await this.authenticator.clearAccessToken(true);
+            this.authenticator.clearAccessToken(true);
             return undefined;
         }
     }
@@ -93,8 +93,8 @@ export class UsersService {
      * Initiates signing-out with Basic identity provider.
      * @param withRedirect 
      */
-    public async signOut(withRedirect: boolean = true): Promise<void> {
-        await this.authenticator.clearAccessToken();
+    public signOut(withRedirect: boolean = true): void {
+        this.authenticator.clearAccessToken();
 
         if (withRedirect) {
             this.navigateToSignin();
@@ -194,7 +194,7 @@ export class UsersService {
 
             await this.mapiClient.delete<string>(query, [header]);
 
-            await this.signOut();
+            this.signOut();
         }
         catch (error) {
             this.navigateToSignin();