Merge pull request #778 from damienbod/fabiangosebrink/adding-logleve…

…l-disable

adding loglevel none

projects/angular-auth-oidc-client/src/lib/logging/log-level.ts

@@ -1,4 +1,5 @@
 export enum LogLevel {
+    None,
     Debug,
     Warn,
     Error,

projects/angular-auth-oidc-client/src/lib/logging/logger.service.spec.ts

@@ -25,7 +25,15 @@ describe('Logger Service', () => {
     });
 
     describe('logError', () => {
-        it('should always log error', () => {
+        it('should not log error if loglevel is None', () => {
+            const spy = spyOn(console, 'error');
+
+            configProvider.setConfig({ logLevel: LogLevel.None });
+            loggerService.logError('some message');
+            expect(spy).not.toHaveBeenCalled();
+        });
+
+        it('should log error as default', () => {
             const spy = spyOn(console, 'error');
 
             loggerService.logError('some message');
@@ -41,6 +49,21 @@ describe('Logger Service', () => {
     });
 
     describe('logWarn', () => {
+        it('should not log if no log level is set', () => {
+            const spy = spyOn(console, 'warn');
+
+            loggerService.logWarning('some message');
+            expect(spy).not.toHaveBeenCalled();
+        });
+
+        it('should not log if log level is turned off', () => {
+            const spy = spyOn(console, 'warn');
+
+            configProvider.setConfig({ logLevel: LogLevel.None });
+            loggerService.logWarning('some message');
+            expect(spy).not.toHaveBeenCalled();
+        });
+
         it('should log warning when loglevel is Warn', () => {
             const spy = spyOn(console, 'warn');
 
@@ -75,6 +98,21 @@ describe('Logger Service', () => {
     });
 
     describe('logDebug', () => {
+        it('should not log if no log level is set', () => {
+            const spy = spyOn(console, 'log');
+
+            loggerService.logDebug('some message');
+            expect(spy).not.toHaveBeenCalled();
+        });
+
+        it('should not log if log level is turned off', () => {
+            const spy = spyOn(console, 'log');
+
+            configProvider.setConfig({ logLevel: LogLevel.None });
+            loggerService.logDebug('some message');
+            expect(spy).not.toHaveBeenCalled();
+        });
+
         it('should log when loglevel is Debug', () => {
             const spy = spyOn(console, 'log');
 

projects/angular-auth-oidc-client/src/lib/logging/logger.service.ts

@@ -7,19 +7,43 @@ export class LoggerService {
     constructor(private configurationProvider: ConfigurationProvider) {}
 
     logError(message: any, ...args: any[]) {
+        if (this.loggingIsTurnedOff()) {
+            return;
+        }
+
         args.length ? console.error(message, args) : console.error(message);
     }
 
     logWarning(message: any, ...args: string[]) {
-        if (this.currentLogLevelIsEqualOrSmallerThan(LogLevel.Warn)) {
-            args.length ? console.warn(message, args) : console.warn(message);
+        if (!this.logLevelIsSet()) {
+            return;
+        }
+
+        if (this.loggingIsTurnedOff()) {
+            return;
         }
+
+        if (!this.currentLogLevelIsEqualOrSmallerThan(LogLevel.Warn)) {
+            return;
+        }
+
+        args.length ? console.warn(message, args) : console.warn(message);
     }
 
     logDebug(message: any, ...args: string[]) {
-        if (this.currentLogLevelIsEqualOrSmallerThan(LogLevel.Debug)) {
-            args.length ? console.log(message, args) : console.log(message);
+        if (!this.logLevelIsSet()) {
+            return;
         }
+
+        if (this.loggingIsTurnedOff()) {
+            return;
+        }
+
+        if (!this.currentLogLevelIsEqualOrSmallerThan(LogLevel.Debug)) {
+            return;
+        }
+
+        args.length ? console.log(message, args) : console.log(message);
     }
 
     private currentLogLevelIsEqualOrSmallerThan(logLevel: LogLevel) {
@@ -33,4 +57,8 @@ export class LoggerService {
     private logLevelIsSet() {
         return !!this.configurationProvider.openIDConfiguration?.logLevel;
     }
+
+    private loggingIsTurnedOff() {
+        return this.configurationProvider.openIDConfiguration?.logLevel === LogLevel.None;
+    }
 }

projects/sample-code-flow/src/app/app.module.ts

@@ -3,6 +3,7 @@ import { BrowserModule } from '@angular/platform-browser';
 import { RouterModule } from '@angular/router';
 import { AuthModule, EventTypes, LogLevel, OidcConfigService, PublicEventsService } from 'angular-auth-oidc-client';
 import { filter } from 'rxjs/operators';
+import { environment } from '../environments/environment';
 import { AppComponent } from './app.component';
 import { HomeComponent } from './home/home.component';
 import { UnauthorizedComponent } from './unauthorized/unauthorized.component';
@@ -19,7 +20,7 @@ export function configureAuth(oidcConfigService: OidcConfigService) {
             silentRenew: true,
             silentRenewUrl: `${window.location.origin}/silent-renew.html`,
             renewTimeBeforeTokenExpiresInSeconds: 10,
-            logLevel: LogLevel.Debug,
+            logLevel: environment.production ? LogLevel.None : LogLevel.Debug,
         });
 }