feat(token-manager): Introduce accessToken

Store token in accessToken and move varying token property names into subclass JWT.
Update tests to use accessToken field.

auth/token-managers/jwt-token-manager.ts

@@ -29,6 +29,8 @@ export type JwtTokenManagerOptions = TokenManagerOptions;
  * to retrieve the bearer token from intended sources.
  */
 export class JwtTokenManager extends TokenManager {
+  protected tokenName: string;
+  protected tokenInfo: any;
 
   /**
    * Create a new [[JwtTokenManager]] instance.
@@ -47,6 +49,7 @@ export class JwtTokenManager extends TokenManager {
     super(options);
 
     this.tokenName = 'access_token';
+    this.tokenInfo = {};
   }
 
   /**
@@ -70,17 +73,17 @@ export class JwtTokenManager extends TokenManager {
    */
   protected saveTokenInfo(tokenResponse): void {
     const responseBody = tokenResponse.result || {};
-    const accessToken = responseBody[this.tokenName];
+    this.accessToken = responseBody[this.tokenName];
 
-    if (!accessToken) {
+    if (!this.accessToken) {
       const err = 'Access token not present in response';
       logger.error(err);
       throw new Error(err);
     }
 
     // the time of expiration is found by decoding the JWT access token
     // exp is the time of expire and iat is the time of token retrieval
-    const decodedResponse = jwt.decode(accessToken);
+    const decodedResponse = jwt.decode(this.accessToken);
     if (!decodedResponse) {
       const err = 'Access token recieved is not a valid JWT';
       logger.error(err);

auth/token-managers/token-manager.ts

@@ -43,11 +43,10 @@ export type TokenManagerOptions = {
  */
 export class TokenManager {
   protected url: string;
-  protected tokenName: string;
   protected disableSslVerification: boolean;
   protected headers: OutgoingHttpHeaders;
   protected requestWrapperInstance: RequestWrapper;
-  protected tokenInfo: any;
+  protected accessToken: string;
   protected expireTime: number;
   protected refreshTime: number;
   private requestTime: number;
@@ -68,8 +67,6 @@ export class TokenManager {
     // all parameters are optional
     options = options || {} as TokenManagerOptions;
 
-    this.tokenInfo = {};
-
     if (options.url) {
       // remove '/' from the end of the url
       if (options.url.slice(-1) === '/') {
@@ -96,10 +93,10 @@ export class TokenManager {
    *   has expired.
    */
   public getToken(): Promise<any> {
-    if (!this.tokenInfo[this.tokenName] || this.isTokenExpired()) {
+    if (!this.accessToken || this.isTokenExpired()) {
       // 1. request a new token
       return this.pacedRequestToken().then(() => {
-        return this.tokenInfo[this.tokenName];
+        return this.accessToken;
       });
     } else {
       // If refresh needed, kick one off
@@ -109,7 +106,7 @@ export class TokenManager {
         });
       }
       // 2. use valid, managed token
-      return Promise.resolve(this.tokenInfo[this.tokenName]);
+      return Promise.resolve(this.accessToken);
     }
   }
 
@@ -190,9 +187,9 @@ export class TokenManager {
 
   /**
    * Parse and save token information from the response.
-   * Save all token information into field `tokenInfo`.
+   * Save the requested token into field `accessToken`.
    * Calculate expiration and refresh time from the received info
-   * and store them in object's fields`expireTime` and `refreshTime`.
+   * and store them in fields `expireTime` and `refreshTime`.
    *
    * @param tokenResponse - Response object from a token service request
    * @protected

test/unit/iam-token-manager.test.js

@@ -86,6 +86,7 @@ describe('iam_token_manager_v1', function() {
     };
 
     instance.tokenInfo = currentTokenInfo;
+    instance.accessToken = CURRENT_ACCESS_TOKEN;
     instance.expireTime = Math.floor(Date.now() / 1000) + 60;
     instance.refreshTime = Math.floor(Date.now() / 1000) - 1;
 
@@ -113,6 +114,7 @@ describe('iam_token_manager_v1', function() {
     };
 
     instance.tokenInfo = currentTokenInfo;
+    instance.accessToken = ACCESS_TOKEN;
     instance.expireTime = Math.floor(Date.now() / 1000) + 60 * 60;
     instance.refreshTime = Math.floor(Date.now() / 1000) + 48 * 60;
 

test/unit/jwt-token-manager.test.js

@@ -195,6 +195,7 @@ describe('JWT Token Manager', () => {
     it('should use an sdk-managed token if present and not expired', async done => {
       const instance = new JwtTokenManager();
       instance.tokenInfo.access_token = ACCESS_TOKEN;
+      instance.accessToken = ACCESS_TOKEN;
       instance.expireTime = getCurrentTime() + 1000;
       instance.refreshTime = getCurrentTime() + 800;
       const token = await instance.getToken();