attlaz-client 1.5.5 → 1.5.6

package/dist/Http/OAuthClient.d.ts

@@ -5,6 +5,7 @@ export declare class OAuthClient {
     private debug;
     private oauthClient;
     private oauthToken;
+    private oathClientToken;
     constructor(options: OAuthClientOptions);
     authenticate(username: string, password: string): Promise<boolean>;
     authenticate(): Promise<boolean>;
@@ -23,6 +24,7 @@ export declare class OAuthClient {
             [key: string]: string | string[];
         };
     } | null): string;
+    private tokenToOauthClientToken;
     private getUri;
     private createRequestData;
     private signRequest;

package/dist/Http/OAuthClient.js

@@ -11,6 +11,7 @@ class OAuthClient {
     constructor(options) {
         this.debug = false;
         this.oauthToken = null;
+        this.oathClientToken = null;
         this.options = options;
         //
         this.oauthClient = new ClientOAuth2({
@@ -50,6 +51,7 @@ class OAuthClient {
         if (this.oauthToken.refreshToken !== undefined && this.oauthToken.refreshToken !== null && this.oauthToken.refreshToken !== '') {
             try {
                 this.oauthToken = await this.oauthToken.refresh();
+                this.oathClientToken = this.tokenToOauthClientToken(this.oauthToken);
             }
             catch (e) {
                 const error = ClientError_1.ClientError.fromError(e);
@@ -94,26 +96,16 @@ class OAuthClient {
     }
     isAuthenticated() {
         //TODO: other ways to determine if the client is authenticated?
-        return this.oauthToken !== null && this.oauthToken !== undefined;
+        return this.oathClientToken !== null && this.oathClientToken !== undefined;
     }
     getToken() {
         if (this.oauthToken === null) {
             return null;
         }
-        console.log('Oauth token', this.oauthToken);
-        const token = new OAuthClientToken_1.OAuthClientToken(this.oauthToken.accessToken, this.oauthToken.tokenType, this.oauthToken.refreshToken, this.oauthToken.data.scopes);
-        const rawTokenExpires = this.oauthToken.expires;
-        if (rawTokenExpires !== null && rawTokenExpires !== undefined) {
-            token.expires = rawTokenExpires;
+        if (this.oathClientToken === null) {
+            this.oathClientToken = this.tokenToOauthClientToken(this.oauthToken);
         }
-        // return {
-        //     access_token: this.oauthToken.accessToken,
-        //     token_type: this.oauthToken.tokenType,
-        //     refresh_token: this.oauthToken.refreshToken,
-        //     expires: (this.oauthToken as any as { expires: Date }).expires,
-        //     scope: this.oauthToken.data.scope
-        // };
-        return token;
+        return this.oathClientToken;
     }
     setToken(token) {
         const data = {
@@ -127,9 +119,11 @@ class OAuthClient {
             oauthToken.expiresIn(token.expires);
         }
         this.oauthToken = oauthToken;
+        this.oathClientToken = token;
     }
     unsetToken() {
         this.oauthToken = null;
+        this.oathClientToken = null;
     }
     enableDebug() {
         this.debug = true;
@@ -143,6 +137,14 @@ class OAuthClient {
     getTokenFlowUrl(options = null) {
         return this.oauthClient.token.getUri(options === null ? undefined : options);
     }
+    tokenToOauthClientToken(oauthToken) {
+        const token = new OAuthClientToken_1.OAuthClientToken(oauthToken.accessToken, oauthToken.tokenType, oauthToken.refreshToken, oauthToken.data.scopes);
+        const rawTokenExpires = oauthToken.expires;
+        if (rawTokenExpires !== null && rawTokenExpires !== undefined) {
+            token.expires = rawTokenExpires;
+        }
+        return token;
+    }
     getUri(uri) {
         if (uri.indexOf("http://") == 0 || uri.indexOf("https://") == 0) {
             return uri;
@@ -184,11 +186,11 @@ class OAuthClient {
         return requestData;
     }
     signRequest(requestObject) {
-        if (this.oauthToken === null) {
+        if (this.oathClientToken === null) {
             throw new ClientError_1.ClientError('Unable to sign request, access token not provided');
         }
-        const tokenType = this.oauthToken.tokenType;
-        const accessToken = this.oauthToken.accessToken;
+        const tokenType = this.oathClientToken.token_type;
+        const accessToken = this.oathClientToken.access_token;
         if (tokenType !== undefined && tokenType.toLowerCase() === 'bearer') {
             requestObject.setHeader('Authorization', 'Bearer ' + accessToken);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "attlaz-client",
-  "version": "1.5.5",
+  "version": "1.5.6",
   "description": "Javascript Client to access Attlaz API",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",