attlaz-client 1.17.0 → 1.17.1

package/dist/Http/Data/QueryString.d.ts

@@ -1,9 +1,10 @@
 import { CursorPagination } from '../../Model/Pagination/CursorPagination.js';
 import { State } from '../../Model/State.js';
 export declare class QueryString {
-    private readonly command;
+    private command;
     private parameters;
-    constructor(command: string);
+    constructor(command?: string);
+    setCommand(command: string): void;
     set(parameter: string, value: string | number | boolean | string[]): void;
     addPagination(pagination: CursorPagination | null): void;
     addStateFilter(states: State[] | null): void;

package/dist/Http/Data/QueryString.js

@@ -1,7 +1,10 @@
 export class QueryString {
     command;
     parameters = [];
-    constructor(command) {
+    constructor(command = '') {
+        this.command = command;
+    }
+    setCommand(command) {
         this.command = command;
     }
     set(parameter, value) {

package/dist/Http/OAuthClient.d.ts

@@ -2,6 +2,7 @@ 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;
@@ -22,10 +23,11 @@ export declare class OAuthClient {
     enableDebug(): void;
     disableDebug(): void;
     isDebugEnabled(): boolean;
+    getTokenFlowUrl(options?: QueryString | null): string;
     getDefaultHeaders(): Headers;
     private isNodeEnvironment;
     private tokenToOauthClientToken;
-    private getUri;
+    private getApiEndpointUrl;
     private createRequestData;
     private signRequest;
 }

package/dist/Http/OAuthClient.js

@@ -7,6 +7,7 @@ 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;
@@ -33,14 +34,14 @@ export class OAuthClient {
         try {
             if (username !== null && username !== undefined && password !== null && password !== undefined) {
                 // Password flow / Owner Credentials grant
-                const getOwnerCredentials = ownerCredentials(this.getAxiosInstance(), this.getUri(this.options.accessTokenUri), this.options.clientId === null ? undefined : this.options.clientId, this.options.clientSecret === null ? undefined : this.options.clientSecret);
+                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');
                 this.oathClientToken = this.tokenToOauthClientToken(rawAuthToken);
                 // accessToken = await this.oauthClient.owner.getToken(username, password);
                 return true;
             }
             // Client credentials flow
-            const getClientCredentials = clientCredentials(this.getAxiosInstance(), this.getUri(this.options.accessTokenUri), this.options.clientId === null ? undefined : this.options.clientId, this.options.clientSecret === null ? undefined : this.options.clientSecret);
+            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');
             this.oathClientToken = this.tokenToOauthClientToken(rawAuthToken);
             // accessToken = await this.oauthClient.credentials.getToken();
@@ -67,7 +68,7 @@ export class OAuthClient {
             throw new Error('unable to refresh token, refresh token not set');
         }
         try {
-            const getRefreshToken = refreshToken(this.getAxiosInstance(), this.getUri(this.options.accessTokenUri), this.options.clientId === null ? undefined : this.options.clientId, this.options.clientSecret === null ? undefined : this.options.clientSecret);
+            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();
             this.oathClientToken = this.tokenToOauthClientToken(auth);
@@ -170,9 +171,13 @@ export class OAuthClient {
     isDebugEnabled() {
         return this.debug;
     }
-    // public getTokenFlowUrl(options: { query?: { [key: string]: string | string[] } } | null = null): string {
-    //     return this.oauthClient.token.getUri(options === null ? undefined : options);
-    // }
+    getTokenFlowUrl(options = null) {
+        if (options === null) {
+            options = new QueryString();
+        }
+        options.setCommand(this.getApiEndpointUrl(this.options.accessTokenUri));
+        return options.build();
+    }
     getDefaultHeaders() {
         const userAgentInfo = {
             version: VERSION,
@@ -204,14 +209,14 @@ export class OAuthClient {
         token.expires = t;
         return token;
     }
-    getUri(uri) {
+    getApiEndpointUrl(uri) {
         if (uri.indexOf('http://') === 0 || uri.indexOf('https://') === 0) {
             return uri;
         }
         return this.options.apiEndpoint.replace(/\/+$/, '') + '/' + uri.replace(/^\/+/g, '');
     }
     createRequestData(action, parameters = null, method = 'GET', signWithOauthToken = true) {
-        const url = this.getUri(action);
+        const url = this.getApiEndpointUrl(action);
         let requestData = new HttpClientRequest(url, method);
         requestData.headers = this.getDefaultHeaders();
         if ((method === 'POST' || method === 'DELETE' || method === 'PUT') && parameters !== null && parameters !== undefined) {

package/package.json

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