@osovitny/anatoly 3.21.27 → 3.21.29

package/fesm2022/osovitny-anatoly.mjs

@@ -3,14 +3,14 @@ import { inject, Injectable, Inject, EventEmitter, Output, Pipe, NgModule, Input
 import { BehaviorSubject, forkJoin, Subject, filter, takeUntil, map as map$1, catchError, of, merge, timer, fromEvent, firstValueFrom } from 'rxjs';
 import { map, tap, mergeMap, finalize } from 'rxjs/operators';
 import * as i1 from '@angular/common/http';
-import { HttpClient, HttpBackend, HTTP_INTERCEPTORS, provideHttpClient } from '@angular/common/http';
+import { HttpClient, HttpBackend, provideHttpClient } from '@angular/common/http';
 import { format, formatDistance, formatDistanceToNow } from 'date-fns';
 import js_beautify from 'js-beautify';
 import * as i1$1 from '@angular/router';
 import { NavigationEnd, NavigationStart, NavigationCancel, NavigationError, RouterModule } from '@angular/router';
 import { v4 } from 'uuid';
 import * as i4 from '@azure/msal-angular';
-import { MSAL_GUARD_CONFIG, MsalGuard, MsalService, MsalBroadcastService, MsalInterceptor, MSAL_INSTANCE, MSAL_INTERCEPTOR_CONFIG, MsalModule } from '@azure/msal-angular';
+import { MSAL_GUARD_CONFIG, MsalGuard, MsalService, MsalBroadcastService, MSAL_INSTANCE, MsalModule } from '@azure/msal-angular';
 import { BrowserUtils, EventType, InteractionStatus, InteractionType, InteractionRequiredAuthError, PromptValue, PublicClientApplication, LogLevel } from '@azure/msal-browser';
 import * as i1$2 from '@angular/common';
 import { DOCUMENT, CommonModule } from '@angular/common';
@@ -2568,7 +2568,7 @@ class AnatolyHttpInterceptor {
         }
         //2. Check is site External?
         for (const i of this.externalSiteUrls) {
-            if (url.indexOf(this.externalSiteUrls[i]) >= 0) {
+            if (url.indexOf(i.toLowerCase()) >= 0) {
                 isExternalSite = true;
                 break;
             }
@@ -2595,7 +2595,7 @@ class AnatolyHttpInterceptor {
         //5. Check should we add CDN SAS tokens
         if (isCDNEnabled) {
             for (const i of this.autoCDNSASTokenUrls) {
-                if (url.indexOf(this.autoCDNSASTokenUrls[i]) >= 0) {
+                if (url.indexOf(i.toLowerCase()) >= 0) {
                     newUrl = newUrl + cdnSasToken;
                     break;
                 }
@@ -2616,21 +2616,28 @@ class AnatolyHttpInterceptor {
         req = req.clone({ headers: req.headers.set('Accept', 'application/json') });
         req = req.clone({ headers: req.headers.set('Accept', 'application/text') });
         try {
-            this.onRequestStart(loadingRequired);
             let request$;
+            let requestStarted = false;
+            let handleRequest = () => {
+                requestStarted = true;
+                this.onRequestStart(loadingRequired);
+                return this.handleHttpRequest(req, next);
+            };
             if (authorizationTokenRequired) {
                 request$ = this.authService.getAccessToken().pipe(mergeMap((token) => {
                     if (token) {
                         req = req.clone({ headers: req.headers.set('Authorization', 'Bearer ' + token) });
                     }
-                    return this.handleHttpRequest(req, next);
+                    return handleRequest();
                 }));
             }
             else {
-                request$ = this.handleHttpRequest(req, next);
+                request$ = handleRequest();
             }
             return request$.pipe(finalize(() => {
-                this.onRequestEnd(loadingRequired);
+                if (requestStarted) {
+                    this.onRequestEnd(loadingRequired);
+                }
             }));
         }
         catch (err) {
@@ -9262,11 +9269,6 @@ function loggerCallback(logLevel, message, containsPii) {
 const MSALProviders = [
     MsalService,
     MsalBroadcastService,
-    {
-        provide: HTTP_INTERCEPTORS,
-        useClass: MsalInterceptor,
-        multi: true
-    },
     {
         provide: MSAL_INSTANCE,
         useFactory: MSALInstanceFactory
@@ -9275,10 +9277,6 @@ const MSALProviders = [
         provide: MSAL_GUARD_CONFIG,
         useFactory: MSALGuardConfigFactory
     },
-    {
-        provide: MSAL_INTERCEPTOR_CONFIG,
-        useFactory: MSALInterceptorConfigFactory
-    },
     //App
     AuthService,
     AuthenticationGuard,