feat(keycloak-service): reject instead of forcing login

Add forceLogin flag to KeycloakService.getToken

Closes #178

Author: jann-cc

projects/keycloak-angular/src/lib/core/interceptors/keycloak-bearer.interceptor.spec.ts

@@ -26,7 +26,7 @@ describe('KeycloakBearerInterceptor', () => {
     });
   });
 
-  it('Should be created', inject(
+  it('should be created', inject(
     [KeycloakBearerInterceptor],
     (service: KeycloakBearerInterceptor) => {
       expect(service).toBeTruthy();

projects/keycloak-angular/src/lib/core/services/keycloak.service.spec.ts

@@ -17,15 +17,15 @@ describe('KeycloakService', () => {
     });
   });
 
-  it('Should be created', inject(
+  it('should be created', inject(
     [KeycloakService],
     (service: KeycloakService) => {
       expect(service).toBeTruthy();
     }
   ));
 
   describe('#loadExcludedUrls', () => {
-    it('Should create the ExcludedUrlRegex objects if the bearerExcludedUrls arg is a string array', inject(
+    it('should create the ExcludedUrlRegex objects if the bearerExcludedUrls arg is a string array', inject(
       [KeycloakService],
       (service: KeycloakService) => {
         const loadExcludedUrls = service['loadExcludedUrls'];
@@ -39,7 +39,7 @@ describe('KeycloakService', () => {
       }
     ));
 
-    it('Should create the ExcludedUrlRegex objects if the bearerExcludedUrls arg is an mixed array of strings and ExcludedUrl objects', inject(
+    it('should create the ExcludedUrlRegex objects if the bearerExcludedUrls arg is an mixed array of strings and ExcludedUrl objects', inject(
       [KeycloakService],
       (service: KeycloakService) => {
         const loadExcludedUrls = service['loadExcludedUrls'];
@@ -63,5 +63,33 @@ describe('KeycloakService', () => {
         expect(excludedRegex2.httpMethods[0]).toBe('GET');
       }
     ));
+
+    it('should not call login in error case if getToken is called with forceLogin false', inject(
+      [KeycloakService],
+      async (service: KeycloakService) => {
+        service.updateToken = async () => Promise.reject(new Error('test'));
+        spyOn(service, 'login');
+
+        let error: Error;
+        await service.getToken(false).catch(e => error = e);
+
+        expect(error).toBeDefined();
+        expect(service.login).not.toHaveBeenCalled();
+      }
+    ));
+
+    it('should return correct token in success case if getToken is called with forceLogin false', inject(
+      [KeycloakService],
+      async (service: KeycloakService) => {
+        service.updateToken = async () => Promise.resolve(true);
+        (service['_instance'] as any) = {
+          token: 'testToken'
+        };
+
+        const token = await service.getToken(false);
+
+        expect(token).toEqual('testToken');
+      }
+    ));
   });
 });

projects/keycloak-angular/src/lib/core/services/keycloak.service.ts

@@ -455,20 +455,25 @@ export class KeycloakService {
 
   /**
    * Returns the authenticated token, calling updateToken to get a refreshed one if
-   * necessary. If the session is expired this method calls the login method for a new login.
+   * necessary. If the session is expired and the forceLogin flag is set to true,
+   * this method calls the login method for a new login, otherwise rejects.
    *
+   * @param forceLogin
+   * Flag whether a login should be enforced if the session is expired.
    * @returns
    * Promise with the generated token.
    */
-  getToken(): Promise<string> {
-    return new Promise(async (resolve, reject) => {
-      try {
-        await this.updateToken(10);
-        resolve(this._instance.token);
-      } catch (error) {
+  async getToken(forceLogin = true): Promise<string> {
+    try {
+      await this.updateToken(10);
+      return this._instance.token;
+    } catch (error) {
+      if (forceLogin) {
         this.login();
+      } else {
+        throw error;
       }
-    });
+    }
   }
 
   /**