@osovitny/anatoly 3.21.35 → 3.21.37

package/fesm2022/osovitny-anatoly.mjs

@@ -316,8 +316,20 @@ class LoggingService {
     static { this.packagePrefix = '@osovitny/anatoly'; }
     constructor() {
     }
-    static getEventName(eventName) {
-        return `${LoggingService.packagePrefix}.${eventName}`;
+    static getMessage(info) {
+        if (typeof info !== 'string') {
+            return LoggingService.packagePrefix;
+        }
+        if (info.indexOf(LoggingService.packagePrefix) === 0) {
+            return info;
+        }
+        return `${LoggingService.packagePrefix}: ${info}`;
+    }
+    static getOptionalParams(info, optionalParams) {
+        if (typeof info === 'string') {
+            return optionalParams;
+        }
+        return [info, ...optionalParams];
     }
     static getConfiguredLogLevel() {
         const appCoreSettings = AppCoreSettings;
@@ -327,18 +339,17 @@ class LoggingService {
             ?? appCoreSettings?.logging?.default
             ?? appCoreSettings?.logging?.Default
             ?? appCoreSettings?.diagnostics?.logLevel
-            ?? appCoreSettings?.logLevel
-            ?? LoggingService.getMsalLogLevel();
-        return LoggingService.toLogLevel(configuredValue);
-    }
-    static getMsalLogLevel() {
-        try {
-            const json = sessionStorage.getItem(SessionStorageKeys.appMSALSettings);
-            return json ? JSON.parse(json)?.app?.system?.loggerOptions?.logLevel : null;
-        }
-        catch {
-            return null;
+            ?? appCoreSettings?.logLevel;
+        if (configuredValue !== null && typeof configuredValue !== 'undefined') {
+            return LoggingService.toLogLevel(configuredValue);
         }
+        return LoggingService.isDevMode(appCoreSettings)
+            ? AnatolyLogLevel.Verbose
+            : AnatolyLogLevel.Off;
+    }
+    static isDevMode(appCoreSettings) {
+        const value = appCoreSettings?.isDevMode ?? appCoreSettings?.IsDevMode;
+        return value === true || `${value}`.toLowerCase() === 'true';
     }
     static toLogLevel(value) {
         if (value === null || typeof value === 'undefined') {
@@ -374,22 +385,22 @@ class LoggingService {
     }
     static debug(info, ...optionalParams) {
         if (LoggingService.shouldLog(AnatolyLogLevel.Verbose)) {
-            console.debug(info, ...optionalParams);
+            console.debug(LoggingService.getMessage(info), ...LoggingService.getOptionalParams(info, optionalParams));
         }
     }
     static info(info, ...optionalParams) {
         if (LoggingService.shouldLog(AnatolyLogLevel.Info)) {
-            console.info(info, ...optionalParams);
+            console.info(LoggingService.getMessage(info), ...LoggingService.getOptionalParams(info, optionalParams));
         }
     }
     static warn(info, ...optionalParams) {
         if (LoggingService.shouldLog(AnatolyLogLevel.Warning)) {
-            console.warn(info, ...optionalParams);
+            console.warn(LoggingService.getMessage(info), ...LoggingService.getOptionalParams(info, optionalParams));
         }
     }
     static error(error, ...optionalParams) {
         if (LoggingService.shouldLog(AnatolyLogLevel.Error)) {
-            console.error(error, ...optionalParams);
+            console.error(LoggingService.getMessage(error), ...LoggingService.getOptionalParams(error, optionalParams));
         }
     }
     debug(info, ...optionalParams) {
@@ -404,9 +415,6 @@ class LoggingService {
     error(error, ...optionalParams) {
         LoggingService.error(error, ...optionalParams);
     }
-    getEventName(eventName) {
-        return LoggingService.getEventName(eventName);
-    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.15", ngImport: i0, type: LoggingService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.15", ngImport: i0, type: LoggingService, providedIn: "root" }); }
 }
@@ -2679,7 +2687,6 @@ class AnatolyHttpInterceptor {
         }
         //4. getCurrentContext
         if (lowerCaseUrl.indexOf('getcurrentcontext') > -1) {
-            // Only checks MSAL's current active account. It does not start login or token acquisition by itself; it only decides whether this request should call getAccessToken() at all.
             authorizationTokenRequired = this.authService.isUserAuthenticated();
         }
         // Change Url if need it -------------------------------------------->
@@ -2740,13 +2747,13 @@ class AnatolyHttpInterceptor {
     //Events
     onRequestStart(loadingRequired, url) {
         if (loadingRequired) {
-            this.logger.info(this.logger.getEventName('loading.show'), url);
+            this.logger.info('Loading show', url);
             this.loadingService.show();
         }
     }
     onRequestEnd(loadingRequired, url) {
         if (loadingRequired) {
-            this.logger.info(this.logger.getEventName('loading.hide'), url);
+            this.logger.info('Loading hide', url);
             this.loadingService.hide();
         }
     }