attlaz-client 1.9.14 → 1.9.16

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

@@ -0,0 +1,3 @@
+export type Headers = {
+    [key: string]: string | string[];
+};

package/dist/Http/Data/Header.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -0,0 +1,3 @@
+export type Parameters = {
+    [key: string]: string | number;
+} | object | null;

package/dist/Http/Data/Parameters.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/Http/OAuthClient.d.ts

@@ -1,5 +1,6 @@
 import { OAuthClientOptions } from './OAuthClientOptions';
 import { OAuthClientToken } from './OAuthClientToken';
+import { Parameters } from './Data/Parameters';
 export declare class OAuthClient {
     private readonly options;
     private debug;
@@ -12,7 +13,7 @@ export declare class OAuthClient {
     private refreshTokenPromise;
     refreshToken(): Promise<void>;
     isTokenExpires(): boolean;
-    request(action: string, parameters?: any, method?: string, signWithOauthToken?: boolean): Promise<any>;
+    request(action: string, parameters?: Parameters, method?: string, signWithOauthToken?: boolean): Promise<any>;
     isAuthenticated(): boolean;
     getToken(): OAuthClientToken | null;
     setToken(token: OAuthClientToken): void;

package/dist/Http/OAuthClient.js

@@ -179,18 +179,19 @@ class OAuthClient {
         let requestData = new HttpClientRequest_1.HttpClientRequest(url, method);
         if ((method === 'POST' || method === 'DELETE' || method === 'PUT') && parameters !== null && parameters !== undefined) {
             if (typeof parameters === 'object') {
-                parameters = JsonSerializable_1.JsonSerializable.stringify(parameters);
+                requestData.body = JsonSerializable_1.JsonSerializable.stringify(parameters);
             }
             else if (typeof parameters === 'string') {
+                requestData.body = parameters;
             }
             else {
                 console.error('Unknown parameter type: ' + typeof parameters);
             }
-            requestData.body = parameters;
             requestData.setJsonHeader();
         }
         if (method === 'GET' && parameters !== null && parameters !== undefined) {
             Object.keys(parameters).forEach((key, index) => {
+                // @ts-ignore
                 const value = parameters[key];
                 requestData.addQueryParam(key, value);
             });

package/dist/Http/OAuthClientOptions.d.ts

@@ -1,3 +1,4 @@
+import { Headers } from './Data/Header';
 export declare class OAuthClientOptions {
     apiEndpoint: string;
     clientId: string;
@@ -7,10 +8,6 @@ export declare class OAuthClientOptions {
     redirectUri: string;
     scopes: string[];
     state: string;
-    headers: {
-        [key: string]: string | string[];
-    };
-    constructor(apiEndpoint: string, clientId: string, clientSecret: string, headers: {
-        [key: string]: string | string[];
-    });
+    headers: Headers;
+    constructor(apiEndpoint: string, clientId: string, clientSecret: string, headers: Headers);
 }

package/dist/Model/Trigger/Trigger.js

@@ -20,6 +20,7 @@ class Trigger extends MetaDataAware_1.MetaDataAware {
         this.arguments = {};
     }
     static parse(rawTrigger) {
+        console.log(rawTrigger);
         const type = TriggerType_1.TriggerType.fromString(rawTrigger.type);
         const data = rawTrigger.data;
         const flowId = rawTrigger.flow;

package/dist/Service/ChannelEndpoint.d.ts

@@ -8,5 +8,5 @@ export declare class ChannelEndpoint extends Endpoint {
     getByOwner(): Promise<CollectionResult<Channel>>;
     getMessages(channelId: string): Promise<CollectionResult<ChannelHistory>>;
     save(subscriberChannel: Channel): Promise<Channel>;
-    testChannel(subscriberChannel: Channel): Promise<any>;
+    testChannel(subscriberChannel: Channel): Promise<boolean>;
 }

package/dist/Service/ChannelEndpoint.js

@@ -106,7 +106,7 @@ class ChannelEndpoint extends Endpoint_1.Endpoint {
                 console.log('testChannel wrong data', { result, parsed: re });
                 throw new Error('Something went wrong');
             }
-            return result;
+            return re.tested;
         }
         catch (ex) {
             if (this.httpClient.isDebugEnabled()) {

package/dist/Service/Endpoint.d.ts

@@ -1,12 +1,13 @@
 import { OAuthClient } from '../Http/OAuthClient';
-import { DataResult } from '../Model/Result/DataResult';
 import { CollectionResult } from '../Model/Result/CollectionResult';
 import { ObjectResult } from '../Model/Result/ObjectResult';
+import { Parameters } from '../Http/Data/Parameters';
 export declare abstract class Endpoint {
     protected httpClient: OAuthClient;
     constructor(httpClient: OAuthClient);
-    requestCollection<T>(action: string, parameters: any, parser: (input: any) => T, method?: string, signWithOauthToken?: boolean): Promise<CollectionResult<T>>;
-    requestObject<T>(action: string, parameters: any, parser: (input: any) => T, method?: string, signWithOauthToken?: boolean): Promise<ObjectResult<T>>;
-    request<T>(action: string, parameters?: any, method?: string, signWithOauthToken?: boolean): Promise<DataResult<T>>;
+    private formatParameters;
+    private formatKey;
+    requestCollection<T>(action: string, parameters: Parameters | undefined, parser: (input: any) => T, method?: string, signWithOauthToken?: boolean): Promise<CollectionResult<T>>;
+    requestObject<T>(action: string, parameters: Parameters | undefined, parser: (input: any) => T, method?: string, signWithOauthToken?: boolean): Promise<ObjectResult<T>>;
     parseCollection<T>(rawData: object[], parser: (input: any) => T): T[];
 }

package/dist/Service/Endpoint.js

@@ -1,17 +1,68 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Endpoint = void 0;
-const DataResult_1 = require("../Model/Result/DataResult");
 const CollectionResult_1 = require("../Model/Result/CollectionResult");
 const ObjectResult_1 = require("../Model/Result/ObjectResult");
 const HttpClient_1 = require("../Http/HttpClient");
 const Utils_1 = require("../Utils");
 const ObjectWrapper_1 = require("../Model/Result/ObjectWrapper");
+const DataValueCollection_1 = require("../Model/DataValueCollection");
+const JsonSerializable_1 = require("../Model/JsonSerializable");
 class Endpoint {
     constructor(httpClient) {
         this.httpClient = httpClient;
     }
+    formatParameters(data = null) {
+        if (data === null || data === undefined) {
+            return null;
+        }
+        if (Array.isArray(data)) {
+            const result = [];
+            for (const value of data) {
+                result.push(this.formatParameters(value));
+            }
+            return result;
+        }
+        // if (DateHelper.isDate(data)) {
+        //     return DateHelper.toString(data);
+        // }
+        // tODo: this does not seem to work correclty
+        if (data instanceof JsonSerializable_1.JsonSerializable && 'jsonSerialize' in data) {
+            return data.jsonSerialize();
+        }
+        if (typeof data === 'object') {
+            if (
+            // data instanceof WorkspaceId ||
+            // data instanceof ProjectEnvironmentId ||
+            // data instanceof ProjectId ||
+            // data instanceof OrganisationId ||
+            // data instanceof FlowId ||
+            // data instanceof FlowRunId ||
+            // data instanceof UserId ||
+            // data instanceof DataCollectionResult ||
+            // data instanceof SuccessResult ||
+            data instanceof DataValueCollection_1.DataValueCollection) {
+                return this.formatParameters(data.jsonSerialize());
+            }
+            const result = {};
+            for (const [key, value] of Object.entries(data)) {
+                const formattedKey = this.formatKey(key);
+                result[formattedKey] = this.formatParameters(value);
+            }
+            return result;
+        }
+        return data;
+    }
+    formatKey(key) {
+        let formattedKey = key.replace(/([A-Z])/g, ' $1');
+        formattedKey = formattedKey.split(' ').join('_').toLowerCase();
+        if (formattedKey.endsWith('_id')) {
+            formattedKey = formattedKey.substring(0, formattedKey.length - '_id'.length);
+        }
+        return formattedKey;
+    }
     async requestCollection(action, parameters = null, parser, method = 'GET', signWithOauthToken = true) {
+        parameters = this.formatParameters(parameters);
         const requestResponse = await this.httpClient.request(action, parameters, method, signWithOauthToken);
         const result = new CollectionResult_1.CollectionResult();
         /**
@@ -32,6 +83,7 @@ class Endpoint {
         return result;
     }
     async requestObject(action, parameters = null, parser, method = 'GET', signWithOauthToken = true) {
+        parameters = this.formatParameters(parameters);
         const result = new ObjectResult_1.ObjectResult();
         try {
             let requestResponse = await this.httpClient.request(action, parameters, method, signWithOauthToken);
@@ -39,8 +91,8 @@ class Endpoint {
             /**
              * Parse errors
              */
-            // TODO: temporary check untill we know the API is fully upgraded
-            if (requestResponse.hasOwnProperty('data') && requestResponse.data !== undefined) {
+            // TODO: temporary check until we know the API is fully upgraded
+            if ((requestResponse.hasOwnProperty('data') && !requestResponse.hasOwnProperty('id')) && requestResponse.data !== undefined) {
                 console.error('Response for object "' + action + '" seem to still use old "data" property', { requestResponse });
                 requestResponse = requestResponse.data;
             }
@@ -57,10 +109,11 @@ class Endpoint {
         return result;
     }
     ;
-    async request(action, parameters = null, method = 'GET', signWithOauthToken = true) {
-        const result = await this.httpClient.request(action, parameters, method, signWithOauthToken);
-        return DataResult_1.DataResult.parse(result);
-    }
+    // public async request<T>(action: string, parameters: any | null = null, method: string = 'GET', signWithOauthToken: boolean = true): Promise<DataResult<T>> {
+    //     const result: any = await this.httpClient.request(action, parameters, method, signWithOauthToken);
+    //
+    //     return DataResult.parse<T>(result);
+    // }
     parseCollection(rawData, parser) {
         const data = [];
         if (!Array.isArray(rawData)) {

package/dist/Service/FlowRunEndpoint.js

@@ -16,28 +16,27 @@ class FlowRunEndpoint extends Endpoint_1.Endpoint {
     async getFlowRunSummaries(flowId, from = null, to = null, flowRunStatuses = null, projectEnvironmentId = null) {
         try {
             let params = null;
-            if (from !== null && from !== undefined) {
-                params = {};
-                params.from = from.toISOString();
-            }
-            if (to !== null && to !== undefined) {
-                if (params === null || params === undefined) {
-                    params = {};
-                }
-                params.to = to.toISOString();
-            }
+            // if (from !== null && from !== undefined) {
+            //
+            //     params = {};
+            //
+            //     params.from = from.toISOString();
+            // }
+            // if (to !== null && to !== undefined) {
+            //     if (params === null || params === undefined) {
+            //         params = {};
+            //     }
+            //     params.to = to.toISOString();
+            // }
             if (!Utils_1.Utils.isNullOrUndefined(projectEnvironmentId)) {
-                if (params === null || params === undefined) {
-                    params = {};
-                }
-                params.environment = projectEnvironmentId;
-            }
-            if (flowRunStatuses !== null && flowRunStatuses.length > 0) {
-                if (params === null || params === undefined) {
-                    params = {};
-                }
-                params.statuses = flowRunStatuses;
+                params = { project_environment: projectEnvironmentId };
             }
+            // if (flowRunStatuses !== null && flowRunStatuses.length > 0) {
+            //     if (params === null || params === undefined) {
+            //         params = {};
+            //     }
+            //     params.statuses = flowRunStatuses;
+            // }
             const result = await this.requestCollection('/flows/' + flowId + '/runsummaries', params, FlowRunSummary_1.FlowRunSummary.parse);
             return result;
         }
@@ -50,8 +49,8 @@ class FlowRunEndpoint extends Endpoint_1.Endpoint {
     }
     async getFlowRunSummary(flowRunId) {
         try {
-            const result = await this.requestObject('/taskexecutions/' + flowRunId + '/summaries', null, FlowRunSummary_1.FlowRunSummary.parse);
-            return result;
+            const result = await this.requestObject('/flowruns/' + flowRunId + '/summaries', null, FlowRunSummary_1.FlowRunSummary.parse);
+            return result.getData();
         }
         catch (error) {
             if (error instanceof ClientError_1.ClientError && error.code === HttpClient_1.HttpClient.HTTP_NOTFOUND) {
@@ -72,10 +71,10 @@ class FlowRunEndpoint extends Endpoint_1.Endpoint {
             throw new Error('Task execution id cannot be empty');
         }
         let params = {};
-        if (!Utils_1.Utils.isNullOrUndefined(status)) {
+        if (status !== null && status !== undefined) {
             params.status = status;
         }
-        if (!Utils_1.Utils.isNullOrUndefined(time)) {
+        if (time !== null && time !== undefined) {
             params.time = time;
         }
         const result = await this.requestObject('/flowruns/' + taskExecutionId + '', params, FlowRun_1.FlowRun.parse, 'POST');

package/dist/Service/FlowRunRequestEndpoint.d.ts

@@ -1,5 +1,6 @@
 import { Endpoint } from './Endpoint';
 import { FlowRunResponse } from '../Model/Flow/FlowRunResponse';
+import { Parameters } from '../Http/Data/Parameters';
 export declare class FlowRunRequestEndpoint extends Endpoint {
-    postFlowRunRequest(taskId: string, params: any, wait?: boolean): Promise<FlowRunResponse>;
+    postFlowRunRequest(taskId: string, params: Parameters, wait?: boolean): Promise<FlowRunResponse>;
 }

package/dist/Service/NotificationsEndpoint.d.ts

@@ -3,5 +3,5 @@ import { Notification } from '../Model/Notification';
 import { CollectionResult } from '../Model/Result/CollectionResult';
 export declare class NotificationsEndpoint extends Endpoint {
     getAll(unacknowledgedOnly?: boolean): Promise<CollectionResult<Notification>>;
-    save(notification: Notification): Promise<any>;
+    save(notification: Notification): Promise<Notification>;
 }

package/dist/Service/NotificationsEndpoint.js

@@ -24,7 +24,11 @@ class NotificationsEndpoint extends Endpoint_1.Endpoint {
             return raw;
         };
         const result = await this.requestObject('/notifications', notification, parser, 'POST');
-        return result.getData();
+        const savedNotification = result.getData();
+        if (savedNotification === null) {
+            throw new Error('Something went wrong');
+        }
+        return savedNotification;
     }
 }
 exports.NotificationsEndpoint = NotificationsEndpoint;

package/dist/Service/ProjectEndpoint.js

@@ -31,7 +31,7 @@ class ProjectEndpoint extends Endpoint_1.Endpoint {
     async getById(projectId) {
         try {
             const result = await this.requestObject('projects/' + projectId + '', null, Project_1.Project.parse);
-            return result;
+            return result.getData();
         }
         catch (error) {
             if (this.httpClient.isDebugEnabled()) {

package/dist/Service/StorageEndpoint.js

@@ -25,7 +25,7 @@ class StorageEndpoint extends Endpoint_1.Endpoint {
         let cmd = '/projectenvironments/' + projectEnvironmentId + '/storage/' + storageType + '/' + poolKey;
         try {
             const parser = (raw) => {
-                return raw.cleared;
+                return raw.deleted;
             };
             const result = await this.requestObject(cmd, null, parser, 'DELETE');
             const re = result.getData();
@@ -33,7 +33,7 @@ class StorageEndpoint extends Endpoint_1.Endpoint {
                 console.log('clearpool wrong data', { result, parsed: re });
                 throw new Error('Something went wrong');
             }
-            return re.cleared;
+            return re.deleted;
         }
         catch (ex) {
             if (this.httpClient.isDebugEnabled()) {

package/dist/Service/WorkspaceMemberEndpoint.js

@@ -90,7 +90,7 @@ class WorkspaceMemberEndpoint extends Endpoint_1.Endpoint {
         userAction.userId = rawUserEvent.user;
         userAction.workspaceId = rawUserEvent.workspace;
         userAction.action = rawUserEvent.action;
-        userAction.resourceId = rawUserEvent.resource_id;
+        userAction.resourceId = rawUserEvent.resource;
         userAction.resourceType = rawUserEvent.resource_type;
         userAction.description = rawUserEvent.description;
         userAction.ip = rawUserEvent.ip;

package/package.json

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