refactor: use strong types in authentication module

src/modules/authentication/AuthenticationWrapper.ts

@@ -1,6 +1,7 @@
 import {
   AccountInfo,
   AuthenticationResult,
+  BrowserAuthError,
   InteractionRequiredAuthError,
   PopupRequest,
   SilentRequest
@@ -45,8 +46,8 @@ export class AuthenticationWrapper implements IAuthenticationWrapper {
   public getSessionId(): string | null {
     const account = this.getAccount();
     if (account) {
-      const idTokenClaims: any = account?.idTokenClaims;
-      return idTokenClaims?.sid;
+      const idTokenClaims = account?.idTokenClaims;
+      return idTokenClaims?.sid ?? null;
     }
     return null;
   }
@@ -81,10 +82,12 @@ export class AuthenticationWrapper implements IAuthenticationWrapper {
       const result = await msalApplication.loginPopup(popUpRequest);
       this.storeHomeAccountId(result.account!);
       return result;
-    } catch (error: any) {
-      const { errorCode } = error;
-      if (errorCode === 'interaction_in_progress') {
-        this.eraseInteractionInProgressCookie();
+    } catch (error: unknown) {
+      if (error instanceof BrowserAuthError){
+        const { errorCode } = error;
+        if (errorCode === 'interaction_in_progress') {
+          this.eraseInteractionInProgressCookie();
+        }
       }
       throw error;
     }
@@ -166,17 +169,14 @@ export class AuthenticationWrapper implements IAuthenticationWrapper {
       const result = await msalApplication.acquireTokenSilent(silentRequest);
       this.storeHomeAccountId(result.account!);
       return result;
-    } catch (error: any) {
+    } catch (error: unknown) {
       if (error instanceof InteractionRequiredAuthError || !this.getAccount()) {
         return this.loginWithInteraction(scopes.length > 0 ? scopes : defaultScopes, sessionId);
-
-      } else if (signInAuthError(error)) {
-        this.deleteHomeAccountId();
-        throw error;
       }
-      else {
-        throw error;
+      if (typeof error === 'string' && signInAuthError(error as string)) {
+        this.deleteHomeAccountId();
       }
+      throw error;
     }
   }
 
@@ -225,22 +225,20 @@ export class AuthenticationWrapper implements IAuthenticationWrapper {
       const result = await msalApplication.loginPopup(popUpRequest);
       this.storeHomeAccountId(result.account!);
       return result;
-    } catch (error: any) {
-      const { errorCode } = error;
-      if (signInAuthError(errorCode) && !this.consentingToNewScopes && (errorCode && errorCode !== 'user_cancelled')) {
-        this.clearSession();
-        if (errorCode === 'interaction_in_progress') {
-          this.eraseInteractionInProgressCookie();
+    } catch (error: unknown) {
+      if(error instanceof BrowserAuthError){
+        const { errorCode } = error;
+        const valid = !this.consentingToNewScopes && errorCode !== 'user_cancelled';
+        if (signInAuthError(errorCode) && valid) {
+          this.clearSession();
+          if (errorCode === 'interaction_in_progress') {
+            this.eraseInteractionInProgressCookie();
+          }
         }
-        throw error;
-      }
-      else {
-        throw error;
       }
-
+      throw error;
     }
   }
-
   private storeHomeAccountId(account: AccountInfo): void {
     localStorage.setItem(HOME_ACCOUNT_KEY, account.homeAccountId);
   }

src/modules/authentication/msal-app.ts

@@ -1,12 +1,13 @@
+/* eslint-disable no-console */
 import { Configuration, LogLevel, PublicClientApplication } from '@azure/msal-browser';
 import { eventTypes, telemetry } from '../../telemetry';
 
 function getClientIdFromWindow() {
-  return (window as any).ClientId;
+  return window?.ClientId ?? '';
 }
 
 function getClientIdFromEnv() {
-  return process.env.REACT_APP_CLIENT_ID;
+  return process.env?.REACT_APP_CLIENT_ID ?? '';
 }
 
 const windowHasClientId = getClientIdFromWindow();

src/types/index.d.ts

@@ -0,0 +1,8 @@
+export {};
+declare global {
+  interface Window {
+    ClientId: string | undefined
+  }
+}
+
+window.ClientId = window.ClientId || undefined;