@osovitny/anatoly 3.19.5 → 3.19.7

package/fesm2022/osovitny-anatoly.mjs

@@ -1911,10 +1911,15 @@ class AuthService extends ApiServiceBase {
         });
     }
     checkAndSetActiveAccount() {
-        let activeAccount = this.msalService.instance.getActiveAccount();
-        let accounts = this.msalService.instance.getAllAccounts();
-        if (!activeAccount && accounts.length > 0) {
-            this.msalService.instance.setActiveAccount(accounts[0]);
+        try {
+            let activeAccount = this.msalService.instance.getActiveAccount();
+            let accounts = this.msalService.instance.getAllAccounts();
+            if (!activeAccount && accounts.length > 0) {
+                this.msalService.instance.setActiveAccount(accounts[0]);
+            }
+        }
+        catch (error) {
+            console.error("An error occurred: ", error);
         }
     }
     isPopup(popup) {
@@ -1940,8 +1945,13 @@ class AuthService extends ApiServiceBase {
     }
     // Public funcs
     getActiveAccount() {
-        this.checkAndSetActiveAccount();
-        return this.msalService.instance.getActiveAccount();
+        try {
+            this.checkAndSetActiveAccount();
+            return this.msalService.instance.getActiveAccount();
+        }
+        catch (error) {
+            console.error("An error occurred: ", error);
+        }
     }
     getUserEmail() {
         let user = this.appContext.user;
@@ -2003,21 +2013,26 @@ class AuthService extends ApiServiceBase {
             }));
         }
         //2. if isUserAuthenticated
-        let activeAccount = this.getActiveAccount();
-        if (activeAccount) {
-            let silentRequest = {
-                scopes: MSALUtils.getApiScopes(),
-                account: activeAccount
-            };
-            return this.msalService.acquireTokenSilent(silentRequest).pipe(map$1(response => {
-                return response.accessToken;
-            }), catchError(error => {
-                console.log("Silent token acquisition fails.");
-                if (error instanceof InteractionRequiredAuthError) {
-                    return this.acquireToken();
-                }
-                return of(null);
-            }));
+        try {
+            let activeAccount = this.getActiveAccount();
+            if (activeAccount) {
+                let silentRequest = {
+                    scopes: MSALUtils.getApiScopes(),
+                    account: activeAccount
+                };
+                return this.msalService.acquireTokenSilent(silentRequest).pipe(map$1(response => {
+                    return response.accessToken;
+                }), catchError(error => {
+                    console.log("Silent token acquisition fails.");
+                    if (error instanceof InteractionRequiredAuthError) {
+                        return this.acquireToken();
+                    }
+                    return of(null);
+                }));
+            }
+        }
+        catch (error) {
+            console.error("An error occurred: ", error);
         }
         return of(null);
     }
@@ -2091,7 +2106,13 @@ class AuthService extends ApiServiceBase {
     }
     //MSAL check
     isUserAuthenticated() {
-        return this.msalService.instance.getActiveAccount() != null;
+        try {
+            return this.msalService.instance.getActiveAccount() != null;
+        }
+        catch (error) {
+            console.error("An error occurred: ", error);
+        }
+        return false;
     }
     //MSAL + appContext check
     isUserSignedIn() {
@@ -2475,8 +2496,8 @@ class AnatolyHttpInterceptor {
                 }
             },
             error: (err) => {
-                this.onRequestEnd(loadingRequired);
                 this.logger.error(err);
+                this.onRequestEnd(loadingRequired);
             }
         }));
     }
@@ -2550,17 +2571,23 @@ class AnatolyHttpInterceptor {
         req = req.clone({ url: newUrl });
         req = req.clone({ headers: req.headers.set('Accept', 'application/json') });
         req = req.clone({ headers: req.headers.set('Accept', 'application/text') });
-        this.onRequestStart(loadingRequired);
-        if (authorizationTokenRequired) {
-            return this.authService.getAccessToken().pipe(mergeMap((token) => {
-                if (token) {
-                    req = req.clone({ headers: req.headers.set('Authorization', 'Bearer ' + token) });
-                }
+        try {
+            this.onRequestStart(loadingRequired);
+            if (authorizationTokenRequired) {
+                return this.authService.getAccessToken().pipe(mergeMap((token) => {
+                    if (token) {
+                        req = req.clone({ headers: req.headers.set('Authorization', 'Bearer ' + token) });
+                    }
+                    return this.handleHttpRequest(req, next, loadingRequired);
+                }));
+            }
+            else {
                 return this.handleHttpRequest(req, next, loadingRequired);
-            }));
+            }
         }
-        else {
-            return this.handleHttpRequest(req, next, loadingRequired);
+        catch (err) {
+            this.logger.error("An error occurred: " + err);
+            this.onRequestEnd(loadingRequired);
         }
     }
     //Events