attlaz-client 1.17.3 → 1.17.4

package/dist/Http/OAuthClient.d.ts

@@ -2,7 +2,6 @@ import { OAuthClientOptions } from './OAuthClientOptions.js';
 import { OAuthClientToken } from './OAuthClientToken.js';
 import { Parameters } from './Data/Parameters.js';
 import { Headers } from './Data/Headers.js';
-import { QueryString } from './Data/QueryString.js';
 export declare class OAuthClient {
     private readonly options;
     private debug;
@@ -23,7 +22,6 @@ export declare class OAuthClient {
     enableDebug(): void;
     disableDebug(): void;
     isDebugEnabled(): boolean;
-    getAuthorizationUrl(options?: QueryString | null): string;
     getDefaultHeaders(): Headers;
     private isNodeEnvironment;
     private tokenToOauthClientToken;

package/dist/Http/OAuthClient.js

@@ -1,4 +1,3 @@
-// import ClientOAuth2, {Token} from 'client-oauth2';
 import { clientCredentials, ownerCredentials, refreshToken } from 'axios-oauth-client';
 import axios from 'axios';
 import { ClientError } from './ClientError.js';
@@ -7,27 +6,14 @@ import { HttpClientRequest } from './HttpClientRequest.js';
 import { OAuthClientToken } from './OAuthClientToken.js';
 import { JsonSerializable } from '../Model/JsonSerializable.js';
 import { VERSION } from '../version.js';
-import { QueryString } from './Data/QueryString.js';
 export class OAuthClient {
     options;
     debug = false;
     axiosInstance = null;
-    // private oauthClient: ClientOAuth2;
-    // private oauthToken: Token | null = null;
     oathClientToken = null;
     refreshTokenPromise = null;
     constructor(options) {
         this.options = options;
-        // this.oauthClient = new ClientOAuth2({
-        //     clientId: options.clientId === null ? undefined : options.clientId,
-        //     clientSecret: options.clientSecret === null ? undefined : options.clientSecret,
-        //     accessTokenUri: this.getUri(options.accessTokenUri),
-        //     authorizationUri: this.getUri(options.authorizationUri),
-        //     redirectUri: options.redirectUri,
-        //     scopes: options.scopes,
-        //     state: options.state,
-        //     headers: this.getDefaultHeaders(),
-        // });
     }
     async authenticate(username = null, password = null) {
         // TODO: should we encrypt the password in the client (or is https save enough)?
@@ -35,20 +21,15 @@ export class OAuthClient {
             if (username !== null && username !== undefined && password !== null && password !== undefined) {
                 // Password flow / Owner Credentials grant
                 const getOwnerCredentials = ownerCredentials(this.getAxiosInstance(), this.getApiEndpointUrl(this.options.accessTokenUri), this.options.clientId === null ? undefined : this.options.clientId, this.options.clientSecret === null ? undefined : this.options.clientSecret);
-                const rawAuthToken = await getOwnerCredentials(username, password, 'OPTIONAL_SCOPES');
+                const rawAuthToken = await getOwnerCredentials(username, password, this.options.scopes.join(' '));
                 this.oathClientToken = this.tokenToOauthClientToken(rawAuthToken);
-                // accessToken = await this.oauthClient.owner.getToken(username, password);
                 return true;
             }
             // Client credentials flow
             const getClientCredentials = clientCredentials(this.getAxiosInstance(), this.getApiEndpointUrl(this.options.accessTokenUri), this.options.clientId === null ? undefined : this.options.clientId, this.options.clientSecret === null ? undefined : this.options.clientSecret);
-            const rawAuthToken = await getClientCredentials('OPTIONAL_SCOPES');
+            const rawAuthToken = await getClientCredentials(this.options.scopes.join(' '));
             this.oathClientToken = this.tokenToOauthClientToken(rawAuthToken);
-            // accessToken = await this.oauthClient.credentials.getToken();
             return true;
-            // this.oauthToken = accessToken;
-            // this.oathClientToken = this.tokenToOauthClientToken(rawAuthToken);
-            // return true;
         }
         catch (e) {
             if (this.debug) {
@@ -69,8 +50,7 @@ export class OAuthClient {
         }
         try {
             const getRefreshToken = refreshToken(this.getAxiosInstance(), this.getApiEndpointUrl(this.options.accessTokenUri), this.options.clientId === null ? undefined : this.options.clientId, this.options.clientSecret === null ? undefined : this.options.clientSecret);
-            const auth = await getRefreshToken(this.oathClientToken.refresh_token, 'OPTIONAL_SCOPES');
-            // this.oauthToken = await this.oauthToken.refresh();
+            const auth = await getRefreshToken(this.oathClientToken.refresh_token, this.options.scopes.join(' '));
             this.oathClientToken = this.tokenToOauthClientToken(auth);
         }
         catch (e) {
@@ -144,22 +124,9 @@ export class OAuthClient {
         return this.oathClientToken;
     }
     setToken(token) {
-        // const data: {} = {
-        //     access_token: token.access_token,
-        //     token_type: token.token_type,
-        //     refresh_token: token.refresh_token,
-        //     scope: token.scope,
-        //
-        // };
-        // const oauthToken: Token = this.oauthClient.createToken(data);
-        // if (token.expires !== null && token.expires !== undefined) {
-        //     oauthToken.expiresIn(token.expires);
-        // }
-        // this.oauthToken = oauthToken;
         this.oathClientToken = token;
     }
     unsetToken() {
-        // this.oauthToken = null;
         this.oathClientToken = null;
     }
     enableDebug() {
@@ -171,13 +138,6 @@ export class OAuthClient {
     isDebugEnabled() {
         return this.debug;
     }
-    getAuthorizationUrl(options = null) {
-        if (options === null) {
-            options = new QueryString();
-        }
-        options.setCommand(this.getApiEndpointUrl(this.options.authorizationUri));
-        return options.build();
-    }
     getDefaultHeaders() {
         const userAgentInfo = {
             version: VERSION,

package/package.json

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