attlaz-client 1.12.3 → 1.13.0

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/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,6 +1,5 @@
 import { fetch } from 'popsicle';
 import { HttpClientResponse } from './HttpClientResponse.js';
-import { VERSION } from '../version.js';
 import { ClientError } from './ClientError.js';
 export class HttpClient {
     static HTTP_BAD_REQUEST = 400;
@@ -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

@@ -4,12 +4,14 @@ 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/Model/Trigger/Trigger.d.ts

@@ -1,17 +1,16 @@
-import { TriggerData } from './TriggerData.js';
 import { State } from '../State.js';
-import { TriggerType } from './TriggerType.js';
 import { StateAware } from '../StateAware.js';
 import { MetaDataAware } from '../../Core/MetaDataAware.js';
+import { DataValueCollection } from '../DataValueCollection.js';
 export declare class Trigger extends MetaDataAware implements StateAware {
     id: string;
-    type: TriggerType;
+    type: string;
     projectEnvironmentId: string;
     flowId: string;
     arguments: {};
-    data: TriggerData;
+    data: DataValueCollection;
     state: State;
-    constructor(id: string, type: TriggerType, projectEnvironmentId: string, flowId: string, data: TriggerData);
+    constructor(id: string, type: string, projectEnvironmentId: string, flowId: string, data: DataValueCollection);
     static parse(rawTrigger: any): Trigger;
-    getData(): TriggerData;
+    getData(): DataValueCollection;
 }

package/dist/Model/Trigger/Trigger.js

@@ -1,8 +1,4 @@
 import { State } from '../State.js';
-import { TriggerType } from './TriggerType.js';
-import { ScheduleTriggerData } from './ScheduleTriggerData.js';
-import { WebhookTriggerData } from './WebhookTriggerData.js';
-import { ApiTriggerData } from './ApiTriggerData.js';
 import { MetaDataAware } from '../../Core/MetaDataAware.js';
 import { DataValueCollection } from '../DataValueCollection.js';
 export class Trigger extends MetaDataAware {
@@ -23,24 +19,10 @@ export class Trigger extends MetaDataAware {
         this.arguments = {};
     }
     static parse(rawTrigger) {
-        const type = TriggerType.fromString(rawTrigger.type);
         const { data } = rawTrigger;
         const flowId = rawTrigger.flow;
-        let triggerData;
-        switch (type) {
-            case TriggerType.Webhook:
-                triggerData = new WebhookTriggerData(data.key);
-                break;
-            case TriggerType.Schedule:
-                triggerData = new ScheduleTriggerData(data.expression);
-                break;
-            case TriggerType.Api:
-                triggerData = new ApiTriggerData();
-                break;
-            default:
-                throw new Error('Unknown trigger type "' + type + '"');
-        }
-        const trigger = new Trigger(rawTrigger.id, type, rawTrigger.project_environment, flowId, triggerData);
+        const parsedData = DataValueCollection.fromObject(rawTrigger.data);
+        const trigger = new Trigger(rawTrigger.id, data.type, data.project_environment, flowId, parsedData);
         trigger.arguments = rawTrigger.arguments;
         trigger.state = State.fromString(rawTrigger.state);
         trigger.metadata = DataValueCollection.fromObject(rawTrigger.metadata);

package/dist/index.d.ts

@@ -59,15 +59,7 @@ export { StorageItemInformation } from './Model/Storage/StorageItemInformation.j
 /** Queue * */
 export { SearchResult } from './Model/Search/SearchResult.js';
 /** Trigger * */
-export { ApiTrigger } from './Model/Trigger/ApiTrigger.js';
-export { ApiTriggerData } from './Model/Trigger/ApiTriggerData.js';
-export { ScheduleTrigger } from './Model/Trigger/ScheduleTrigger.js';
-export { ScheduleTriggerData } from './Model/Trigger/ScheduleTriggerData.js';
 export { Trigger } from './Model/Trigger/Trigger.js';
-export { TriggerData } from './Model/Trigger/TriggerData.js';
-export { TriggerType } from './Model/Trigger/TriggerType.js';
-export { WebhookTrigger } from './Model/Trigger/WebhookTrigger.js';
-export { WebhookTriggerData } from './Model/Trigger/WebhookTriggerData.js';
 /** Worker* */
 export { Platform } from './Model/Worker/Platform.js';
 export { PlatformImage } from './Model/Worker/PlatformImage.js';

package/dist/index.js

@@ -59,15 +59,7 @@ export { StorageItemInformation } from './Model/Storage/StorageItemInformation.j
 /** Queue * */
 export { SearchResult } from './Model/Search/SearchResult.js';
 /** Trigger * */
-export { ApiTrigger } from './Model/Trigger/ApiTrigger.js';
-export { ApiTriggerData } from './Model/Trigger/ApiTriggerData.js';
-export { ScheduleTrigger } from './Model/Trigger/ScheduleTrigger.js';
-export { ScheduleTriggerData } from './Model/Trigger/ScheduleTriggerData.js';
 export { Trigger } from './Model/Trigger/Trigger.js';
-export { TriggerData } from './Model/Trigger/TriggerData.js';
-export { TriggerType } from './Model/Trigger/TriggerType.js';
-export { WebhookTrigger } from './Model/Trigger/WebhookTrigger.js';
-export { WebhookTriggerData } from './Model/Trigger/WebhookTriggerData.js';
 /** Worker* */
 export { Platform } from './Model/Worker/Platform.js';
 export { PlatformImage } from './Model/Worker/PlatformImage.js';

package/dist/version.d.ts

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

package/dist/version.js

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

package/package.json

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

package/dist/Model/Trigger/ApiTrigger.d.ts

@@ -1,6 +0,0 @@
-import { Trigger } from './Trigger.js';
-import { ApiTriggerData } from './ApiTriggerData.js';
-export declare class ApiTrigger extends Trigger {
-    constructor(id: string, projectEnvironmentId: string, flowId: string, data: ApiTriggerData);
-    getData(): ApiTriggerData;
-}

package/dist/Model/Trigger/ApiTrigger.js

@@ -1,10 +0,0 @@
-import { Trigger } from './Trigger.js';
-import { TriggerType } from './TriggerType.js';
-export class ApiTrigger extends Trigger {
-    constructor(id, projectEnvironmentId, flowId, data) {
-        super(id, TriggerType.Api, projectEnvironmentId, flowId, data);
-    }
-    getData() {
-        return super.getData();
-    }
-}

package/dist/Model/Trigger/ApiTriggerData.d.ts

@@ -1,4 +0,0 @@
-import { TriggerData } from './TriggerData.js';
-export declare class ApiTriggerData extends TriggerData {
-    constructor();
-}

package/dist/Model/Trigger/ApiTriggerData.js

@@ -1,6 +0,0 @@
-import { TriggerData } from './TriggerData.js';
-export class ApiTriggerData extends TriggerData {
-    constructor() {
-        super();
-    }
-}

package/dist/Model/Trigger/ScheduleTrigger.d.ts

@@ -1,6 +0,0 @@
-import { ScheduleTriggerData } from './ScheduleTriggerData.js';
-import { Trigger } from './Trigger.js';
-export declare class ScheduleTrigger extends Trigger {
-    constructor(id: string, projectEnvironmentId: string, flowId: string, data: ScheduleTriggerData);
-    getData(): ScheduleTriggerData;
-}

package/dist/Model/Trigger/ScheduleTrigger.js

@@ -1,10 +0,0 @@
-import { Trigger } from './Trigger.js';
-import { TriggerType } from './TriggerType.js';
-export class ScheduleTrigger extends Trigger {
-    constructor(id, projectEnvironmentId, flowId, data) {
-        super(id, TriggerType.Schedule, projectEnvironmentId, flowId, data);
-    }
-    getData() {
-        return super.getData();
-    }
-}

package/dist/Model/Trigger/ScheduleTriggerData.d.ts

@@ -1,5 +0,0 @@
-import { TriggerData } from './TriggerData.js';
-export declare class ScheduleTriggerData extends TriggerData {
-    expression: string;
-    constructor(expression: string);
-}

package/dist/Model/Trigger/ScheduleTriggerData.js

@@ -1,8 +0,0 @@
-import { TriggerData } from './TriggerData.js';
-export class ScheduleTriggerData extends TriggerData {
-    expression;
-    constructor(expression) {
-        super();
-        this.expression = expression;
-    }
-}

package/dist/Model/Trigger/TriggerData.d.ts

@@ -1,3 +0,0 @@
-export declare abstract class TriggerData {
-    toString(): string;
-}

package/dist/Model/Trigger/TriggerData.js

@@ -1,5 +0,0 @@
-export class TriggerData {
-    toString() {
-        return JSON.stringify(this);
-    }
-}

package/dist/Model/Trigger/TriggerType.d.ts

@@ -1,8 +0,0 @@
-export declare enum TriggerType {
-    Schedule = "schedule",
-    Webhook = "webhook",
-    Api = "api"
-}
-export declare namespace TriggerType {
-    function fromString(input: string): TriggerType;
-}

package/dist/Model/Trigger/TriggerType.js

@@ -1,17 +0,0 @@
-import { Utils } from '../../Utils.js';
-export var TriggerType;
-(function (TriggerType) {
-    TriggerType["Schedule"] = "schedule";
-    TriggerType["Webhook"] = "webhook";
-    TriggerType["Api"] = "api";
-})(TriggerType || (TriggerType = {}));
-(function (TriggerType) {
-    function fromString(input) {
-        const result = Utils.parseEnum(input, TriggerType);
-        if (result === null) {
-            throw new Error('Unable to parse TriggerType from string: Unknown TriggerType "' + input + '"');
-        }
-        return result;
-    }
-    TriggerType.fromString = fromString;
-})(TriggerType || (TriggerType = {}));

package/dist/Model/Trigger/WebhookTrigger.d.ts

@@ -1,6 +0,0 @@
-import { WebhookTriggerData } from './WebhookTriggerData.js';
-import { Trigger } from './Trigger.js';
-export declare class WebhookTrigger extends Trigger {
-    constructor(id: string, projectEnvironmentId: string, flowId: string, data: WebhookTriggerData);
-    getData(): WebhookTriggerData;
-}

package/dist/Model/Trigger/WebhookTrigger.js

@@ -1,10 +0,0 @@
-import { Trigger } from './Trigger.js';
-import { TriggerType } from './TriggerType.js';
-export class WebhookTrigger extends Trigger {
-    constructor(id, projectEnvironmentId, flowId, data) {
-        super(id, TriggerType.Webhook, projectEnvironmentId, flowId, data);
-    }
-    getData() {
-        return super.getData();
-    }
-}

package/dist/Model/Trigger/WebhookTriggerData.d.ts

@@ -1,5 +0,0 @@
-import { TriggerData } from './TriggerData.js';
-export declare class WebhookTriggerData extends TriggerData {
-    key: string;
-    constructor(key: string);
-}

package/dist/Model/Trigger/WebhookTriggerData.js

@@ -1,8 +0,0 @@
-import { TriggerData } from './TriggerData.js';
-export class WebhookTriggerData extends TriggerData {
-    key;
-    constructor(key) {
-        super();
-        this.key = key;
-    }
-}