attlaz-client 1.12.2 → 1.12.5

package/dist/Client.d.ts

@@ -36,7 +36,6 @@ export declare class Client {
     private parseConfig;
     constructor(token?: string | null, config?: Record<string, unknown>);
     setClientCredentials(clientId: string, clientSecret?: string): void;
-    private getHeaders;
     getHttpClient(): OAuthClient;
     authenticate(): Promise<boolean>;
     authenticate(username: string, password: string): Promise<boolean>;

package/dist/Client.js

@@ -27,7 +27,6 @@ import { TriggerEndpoint } from './Service/TriggerEndpoint.js';
 import { PlatformEndpoint } from './Service/PlatformEndpoint.js';
 import { FlowRunStatsEndpoint } from './Service/FlowRunStatsEndpoint.js';
 import { FirewallEndpoint } from './Service/FirewallEndpoint.js';
-import { VERSION } from './version.js';
 import { CodeSourceStrategiesEndpoint } from './Service/CodeSourceStrategiesEndpoint.js';
 import { SearchEndpoint } from './Service/SearchEndpoint.js';
 export class Client {
@@ -72,7 +71,7 @@ export class Client {
         if (parsedConfig.apiEndpoint !== undefined) {
             this.apiEndpoint = parsedConfig.apiEndpoint;
         }
-        const options = new OAuthClientOptions(this.apiEndpoint, null, null, this.getHeaders());
+        const options = new OAuthClientOptions(this.apiEndpoint);
         this.httpClient = new OAuthClient(options);
         if (token !== null) {
             const clientToken = new OAuthClientToken(token, 'Bearer', '', '');
@@ -81,21 +80,9 @@ export class Client {
         this.endpoints = new Map();
     }
     setClientCredentials(clientId, clientSecret = '') {
-        const options = new OAuthClientOptions(this.apiEndpoint, clientId, clientSecret, this.getHeaders());
+        const options = new OAuthClientOptions(this.apiEndpoint, clientId, clientSecret);
         this.httpClient = new OAuthClient(options);
     }
-    getHeaders() {
-        const userAgentInfo = {
-            version: VERSION,
-            language: 'Javascript',
-            language_version: '',
-            publisher: 'Attlaz',
-        };
-        return {
-            'User-Agent': 'Attlaz Javascript Client/' + VERSION,
-            'X-Attlaz-Client-User-Agent': JSON.stringify(userAgentInfo),
-        };
-    }
     getHttpClient() {
         return this.httpClient;
     }
@@ -115,10 +102,6 @@ export class Client {
     setToken(token) {
         this.httpClient.setToken(token);
     }
-    //
-    // public x(accessToken: string, refreshToken: string): Promise<Token> {
-    //     return this.httpClient.refreshToken(accessToken, refreshToken);
-    // }
     unsetAccessToken() {
         this.httpClient.unsetToken();
     }

package/dist/{Model/Error → Http}/ClientError.js

@@ -1,4 +1,4 @@
-import { HttpClient } from '../../Http/HttpClient.js';
+import { HttpClient } from './HttpClient.js';
 export class ClientError {
     code;
     name;
@@ -12,7 +12,6 @@ export class ClientError {
         this.code = code;
     }
     static fromError(error) {
-        console.log(error);
         if (error.body !== undefined && error.body !== null && error.body.error !== undefined && error.body.error !== null) {
             error = error.body.error;
         }
@@ -31,17 +30,21 @@ export class ClientError {
             }
         }
         else if (error.code !== null && error.code !== undefined) {
-            if (error.code === 'EUNAVAILABLE') {
-                clientError.code = HttpClient.HTTP_UNAVAILABLE;
-            }
-            if (error.code === 'EAUTH') {
-                clientError.code = HttpClient.HTTP_UNAUTHORIZED;
-            }
-            // if (error.code === 'ESTATUS' && error.message === 'HTTP status 503') {
-            //     clientError.code = HttpClient.HTTP_UNAVAILABLE;
-            // }
-            else {
-                clientError.code = error.code;
+            switch (error.code) {
+                case 'EUNAVAILABLE':
+                    clientError.code = HttpClient.HTTP_UNAVAILABLE;
+                    break;
+                case 'EAUTH':
+                    clientError.code = HttpClient.HTTP_UNAUTHORIZED;
+                    break;
+                case 'ESTATUS':
+                    if (error.message === 'HTTP status 503') {
+                        clientError.code = HttpClient.HTTP_UNAVAILABLE;
+                    }
+                    break;
+                default:
+                    console.warn('[Client error] Error code `' + error.code + '` not recognised');
+                    clientError.code = error.code;
             }
         }
         clientError.name = error.name;

package/dist/Http/HttpClient.d.ts

@@ -11,7 +11,7 @@ export declare class HttpClient {
     static HTTP_BAD_GATEWAY: number;
     static HTTP_UNAVAILABLE: number;
     static HTTP_TIMEOUT: number;
-    static request2(request: HttpClientRequest): Promise<HttpClientResponse>;
+    static request(request: HttpClientRequest): Promise<HttpClientResponse>;
     private static getContentType;
     private static formatContentType;
 }

package/dist/Http/HttpClient.js

@@ -1,7 +1,6 @@
 import { fetch } from 'popsicle';
 import { HttpClientResponse } from './HttpClientResponse.js';
-import { ClientError } from '../Model/Error/ClientError.js';
-import { VERSION } from '../version.js';
+import { ClientError } from './ClientError.js';
 export class HttpClient {
     static HTTP_BAD_REQUEST = 400;
     static HTTP_UNAUTHORIZED = 401;
@@ -13,26 +12,7 @@ export class HttpClient {
     static HTTP_BAD_GATEWAY = 502;
     static HTTP_UNAVAILABLE = 503;
     static HTTP_TIMEOUT = 504;
-    // public static async get(url: string, requestData: any = {}): Promise<any> {
-    //     if (Utils.isNullOrUndefined(requestData)) {
-    //         requestData = {};
-    //     }
-    //     const response: Response = await fetch(url, requestData);
-    //
-    //     //TODO: validate status
-    //     const error: ClientError | null = ClientError.byStatus(response.status, response.statusText);
-    //     if (!Utils.isNullOrUndefined(error)) {
-    //         throw error;
-    //     }
-    //
-    //     // TODO: make it possible to do request without parsing the json
-    //     return await response.json();
-    // }
-    static async request2(request) {
-        if (typeof window === 'undefined') {
-            // Add user agent when running in Node
-            request.headers['User-Agent'] = 'Attlaz Http/' + VERSION;
-        }
+    static async request(request) {
         const rawRequest = {
             url: request.getFullUrl(),
             method: request.method,

package/dist/Http/HttpClientRequest.d.ts

@@ -1,9 +1,10 @@
+import { Headers } from './Data/Header.js';
 export declare class HttpClientRequest {
-    static readonly GET = "GET";
-    static readonly POST = "POST";
-    static readonly PUT = "PUT";
+    static readonly GET: string;
+    static readonly POST: string;
+    static readonly PUT: string;
     method: string;
-    headers: any;
+    headers: Headers;
     body: any;
     private urlObj;
     constructor(url: string, method?: string);

package/dist/Http/OAuthClient.d.ts

@@ -1,16 +1,17 @@
 import { OAuthClientOptions } from './OAuthClientOptions.js';
 import { OAuthClientToken } from './OAuthClientToken.js';
 import { Parameters } from './Data/Parameters.js';
+import { Headers } from './Data/Header.js';
 export declare class OAuthClient {
     private readonly options;
     private debug;
     private oauthClient;
     private oauthToken;
     private oathClientToken;
+    private refreshTokenPromise;
     constructor(options: OAuthClientOptions);
     authenticate(username: string, password: string): Promise<boolean>;
     authenticate(): Promise<boolean>;
-    private refreshTokenPromise;
     refreshToken(): Promise<void>;
     isTokenExpires(): boolean;
     request(action: string, parameters?: Parameters, method?: string, signWithOauthToken?: boolean): Promise<any>;
@@ -26,6 +27,8 @@ export declare class OAuthClient {
             [key: string]: string | string[];
         };
     } | null): string;
+    getDefaultHeaders(): Headers;
+    private isNodeEnvironment;
     private tokenToOauthClientToken;
     private getUri;
     private createRequestData;

package/dist/Http/OAuthClient.js

@@ -1,15 +1,17 @@
 import ClientOAuth2 from 'client-oauth2';
-import { ClientError } from '../Model/Error/ClientError.js';
+import { ClientError } from './ClientError.js';
 import { HttpClient } from './HttpClient.js';
 import { HttpClientRequest } from './HttpClientRequest.js';
 import { OAuthClientToken } from './OAuthClientToken.js';
 import { JsonSerializable } from '../Model/JsonSerializable.js';
+import { VERSION } from '../version.js';
 export class OAuthClient {
     options;
     debug = false;
     oauthClient;
     oauthToken = null;
     oathClientToken = null;
+    refreshTokenPromise = null;
     constructor(options) {
         this.options = options;
         this.oauthClient = new ClientOAuth2({
@@ -20,7 +22,7 @@ export class OAuthClient {
             redirectUri: options.redirectUri,
             scopes: options.scopes,
             state: options.state,
-            headers: options.headers,
+            headers: this.getDefaultHeaders(),
         });
     }
     async authenticate(username = null, password = null) {
@@ -46,7 +48,6 @@ export class OAuthClient {
             throw ClientError.fromError(e);
         }
     }
-    refreshTokenPromise = null;
     async refreshToken() {
         if (this.debug) {
             console.debug('[OAuthClient] refresh token');
@@ -98,7 +99,7 @@ export class OAuthClient {
                 console.debug('[OAuthClient] Request: ' + requestData.method.toUpperCase() + ' ' + requestData.getFullUrl());
             }
             try {
-                const response = await HttpClient.request2(requestData);
+                const response = await HttpClient.request(requestData);
                 // if (this.debug) {
                 //     console.info('[Client response] ', {body: response.body});
                 // }
@@ -159,6 +160,22 @@ export class OAuthClient {
     getTokenFlowUrl(options = null) {
         return this.oauthClient.token.getUri(options === null ? undefined : options);
     }
+    getDefaultHeaders() {
+        const userAgentInfo = {
+            version: VERSION,
+            language: 'Javascript',
+            language_version: '',
+            publisher: 'Attlaz',
+        };
+        const headers = { 'X-Attlaz-Client': JSON.stringify(userAgentInfo) };
+        if (this.isNodeEnvironment()) {
+            headers['User-Agent'] = 'Attlaz Http/' + VERSION;
+        }
+        return headers;
+    }
+    isNodeEnvironment() {
+        return typeof process !== 'undefined' && process.versions != null && process.versions.node != null;
+    }
     tokenToOauthClientToken(oauthToken) {
         const token = new OAuthClientToken(oauthToken.accessToken, oauthToken.tokenType, oauthToken.refreshToken, oauthToken.data.scopes);
         const rawTokenExpires = oauthToken.expires;
@@ -176,6 +193,7 @@ export class OAuthClient {
     createRequestData(action, parameters = null, method = 'GET', signWithOauthToken = true) {
         const url = this.getUri(action);
         let requestData = new HttpClientRequest(url, method);
+        requestData.headers = this.getDefaultHeaders();
         if ((method === 'POST' || method === 'DELETE' || method === 'PUT') && parameters !== null && parameters !== undefined) {
             if (typeof parameters === 'object') {
                 requestData.body = JsonSerializable.stringify(parameters);

package/dist/Http/OAuthClientOptions.d.ts

@@ -1,13 +1,11 @@
-import { Headers } from './Data/Header.js';
 export declare class OAuthClientOptions {
     apiEndpoint: string;
     readonly clientId: string | null;
     readonly clientSecret: string | null;
-    headers: Headers;
     accessTokenUri: string;
     authorizationUri: string;
     redirectUri: string;
     scopes: string[];
     state: string;
-    constructor(apiEndpoint: string, clientId: string | null, clientSecret: string | null, headers: Headers);
+    constructor(apiEndpoint: string, clientId?: string | null, clientSecret?: string | null);
 }

package/dist/Http/OAuthClientOptions.js

@@ -2,16 +2,14 @@ export class OAuthClientOptions {
     apiEndpoint;
     clientId;
     clientSecret;
-    headers;
     accessTokenUri = 'oauth/token';
     authorizationUri = 'oauth/authorize';
     redirectUri = 'https://example.com/auth/github/callback';
     scopes = ['all'];
     state = 'xyz';
-    constructor(apiEndpoint, clientId, clientSecret, headers) {
+    constructor(apiEndpoint, clientId = null, clientSecret = null) {
         this.apiEndpoint = apiEndpoint;
         this.clientId = clientId;
         this.clientSecret = clientSecret;
-        this.headers = headers;
     }
 }

package/dist/Service/FlowRunEndpoint.js

@@ -1,6 +1,4 @@
 import { Endpoint } from './Endpoint.js';
-import { ClientError } from '../Model/Error/ClientError.js';
-import { HttpClient } from '../Http/HttpClient.js';
 import { FlowRun } from '../Model/Flow/FlowRun.js';
 import { FlowRunSummary } from '../Model/Flow/FlowRunSummary.js';
 import { FlowRunHistory } from '../Model/Flow/FlowRunHistory.js';
@@ -54,9 +52,6 @@ export class FlowRunEndpoint extends Endpoint {
             return result.getData();
         }
         catch (error) {
-            if (error instanceof ClientError && error.code === HttpClient.HTTP_NOTFOUND) {
-                return null;
-            }
             if (this.httpClient.isDebugEnabled()) {
                 console.error('Failed to load flow runs: ' + error);
             }

package/dist/index.d.ts

@@ -7,13 +7,13 @@ export { HttpClientResponse } from './Http/HttpClientResponse.js';
 export { OAuthClient } from './Http/OAuthClient.js';
 export { OAuthClientOptions } from './Http/OAuthClientOptions.js';
 export { OAuthClientToken } from './Http/OAuthClientToken.js';
+export { ClientError } from './Http/ClientError.js';
 /**
  * Models
  */
 export { Adapter } from './Model/Adapter/Adapter.js';
 export { AdapterConfiguration } from './Model/Adapter/AdapterConfiguration.js';
 export { AdapterConnection } from './Model/Adapter/AdapterConnection.js';
-export { ClientError } from './Model/Error/ClientError.js';
 export { EventType } from './Model/Event/EventType.js';
 export { HealthAlert } from './Model/HealthAlert/HealthAlert.js';
 export { HealthAlertStatus } from './Model/HealthAlert/HealthAlertStatus.js';

package/dist/index.js

@@ -7,13 +7,13 @@ export { HttpClientResponse } from './Http/HttpClientResponse.js';
 export { OAuthClient } from './Http/OAuthClient.js';
 export { OAuthClientOptions } from './Http/OAuthClientOptions.js';
 export { OAuthClientToken } from './Http/OAuthClientToken.js';
+export { ClientError } from './Http/ClientError.js';
 /**
  * Models
  */
 export { Adapter } from './Model/Adapter/Adapter.js';
 export { AdapterConfiguration } from './Model/Adapter/AdapterConfiguration.js';
 export { AdapterConnection } from './Model/Adapter/AdapterConnection.js';
-export { ClientError } from './Model/Error/ClientError.js';
 export { EventType } from './Model/Event/EventType.js';
 export { HealthAlert } from './Model/HealthAlert/HealthAlert.js';
 export { HealthAlertStatus } from './Model/HealthAlert/HealthAlertStatus.js';

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "1.11.14";
+export declare const VERSION = "1.12.3";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = "1.11.14";
+export const VERSION = "1.12.3";

package/package.json

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