Merge branch 'master' into master

akveo · nnixaa · Aug 14, 2018 · Jun 29, 2018 · Jun 29, 2018 · Jun 29, 2018
commit b2843771b7bb48d82ec99b6dcaa9fba98d4e0253
diff --git a/src/framework/auth/services/token/token-parceler.spec.ts b/src/framework/auth/services/token/token-parceler.spec.ts
@@ -13,6 +13,7 @@ import { NB_AUTH_TOKENS } from '../../auth.options';
 describe('token-parceler', () => {
 
   let tokenParceler: NbAuthTokenParceler;
+
   const createdAt = new Date(1532350800000);
   const simpleToken = nbAuthCreateToken(NbAuthSimpleToken, 'test value', 'strategy', createdAt);
   // tslint:disable-next-line

diff --git a/src/framework/auth/services/token/token-parceler.ts b/src/framework/auth/services/token/token-parceler.ts
@@ -36,6 +36,7 @@ export class NbAuthTokenParceler {
     let tokenValue = '';
     let tokenOwnerStrategyName = '';
     let tokenCreatedAt: Date = null;
+
     const tokenPack: NbTokenPack = this.parseTokenPack(value);
     if (tokenPack) {
       tokenClass = this.getClassByName(tokenPack.name) || this.fallbackClass;
@@ -45,6 +46,7 @@ export class NbAuthTokenParceler {
     }
 
     return nbAuthCreateToken(tokenClass, tokenValue, tokenOwnerStrategyName, tokenCreatedAt);
+    }
   }
 
   // TODO: this could be moved to a separate token registry

diff --git a/src/framework/auth/services/token/token.spec.ts b/src/framework/auth/services/token/token.spec.ts
@@ -95,6 +95,7 @@ describe('auth token', () => {
       // without token
       expect(new NbAuthJWTToken('', 'strategy', new Date()).isValid()).toBeFalsy();
 
+
       // expired date
       expect(expiredJWTToken.isValid()).toBeFalsy();
     });
@@ -146,7 +147,9 @@ describe('auth token', () => {
       example_parameter: 'example_value',
     };
 
+
     let validToken = new NbAuthOAuth2Token(token, 'strategy');
+
     const emptyToken = new NbAuthOAuth2Token({}, 'strategy');
 
     const noExpToken = new NbAuthOAuth2Token({

diff --git a/src/framework/auth/services/token/token.ts b/src/framework/auth/services/token/token.ts
@@ -38,10 +38,10 @@ export class NbAuthSimpleToken extends NbAuthToken {
   static NAME = 'nb:auth:simple:token';
 
   constructor(protected readonly token: any,
+
               protected readonly ownerStrategyName: string,
               protected createdAt?: Date) {
     super();
-    // If not coming back from local storage, simple token get 'now' for createdAt
     if (!this.createdAt) {
       this.buildCreatedAt();
     }
@@ -184,6 +184,7 @@ export class NbAuthOAuth2Token extends NbAuthSimpleToken {
   constructor(protected data: { [key: string]: string|number }|string = {},
               protected ownerStrategyName: string,
               protected createdAd?: Date) {
+
     // we may get it as string when retrieving from a storage
     super(prepareOAuth2Token(data), ownerStrategyName);
   }