attlaz-client 1.4.3 → 1.4.4

package/dist/Service/WorkerConfigEndpoint.js

@@ -1,18 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WorkerConfigEndpoint = void 0;
-const __1 = require("..");
-class WorkerConfigEndpoint extends __1.Endpoint {
+import { Endpoint } from './Endpoint';
+import { Utils } from '../Utils';
+import { WorkerConfig } from '../Model/Worker/WorkerConfig';
+export class WorkerConfigEndpoint extends Endpoint {
     async getByProjectEnvironment(projectEnvironmentId) {
         try {
             let url = '/projectenvironments/' + projectEnvironmentId + '/workerconfiguration';
             const result = await this.request(url);
-            if (__1.Utils.isNullOrUndefined(result)) {
+            if (Utils.isNullOrUndefined(result)) {
                 return null;
             }
             let workerConfigValues = [];
             for (let rawConfig of result.getData()) {
-                workerConfigValues.push(__1.WorkerConfig.parse(rawConfig));
+                workerConfigValues.push(WorkerConfig.parse(rawConfig));
             }
             return workerConfigValues;
         }
@@ -28,7 +27,7 @@ class WorkerConfigEndpoint extends __1.Endpoint {
             let url = '/projectenvironments/' + workerConfig.projectEnvironment + '/workerconfiguration';
             const result = await this.request(url, workerConfig, 'POST');
             console.log(result);
-            return __1.WorkerConfig.parse(result);
+            return WorkerConfig.parse(result);
         }
         catch (error) {
             if (this.httpClient.isDebugEnabled()) {
@@ -38,4 +37,3 @@ class WorkerConfigEndpoint extends __1.Endpoint {
         }
     }
 }
-exports.WorkerConfigEndpoint = WorkerConfigEndpoint;

package/dist/Service/WorkerEndpoint.d.ts

@@ -1,5 +1,7 @@
 import { Endpoint } from './Endpoint';
-import { DataResult, Worker, WorkerImage } from '..';
+import { Worker } from '../Model/Worker/Worker';
+import { DataResult } from '../Model/Result/DataResult';
+import { WorkerImage } from '../Model/Worker/WorkerImage';
 export declare class WorkerEndpoint extends Endpoint {
     getByProjectEnvironment(projectEnvironmentId: string): Promise<Worker>;
     update(projectEnvironmentId: string): Promise<DataResult<boolean>>;

package/dist/Service/WorkerEndpoint.js

@@ -1,18 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WorkerEndpoint = void 0;
-const Endpoint_1 = require("./Endpoint");
-const Utils_1 = require("../Utils");
-const __1 = require("..");
-class WorkerEndpoint extends Endpoint_1.Endpoint {
+import { Endpoint } from './Endpoint';
+import { Utils } from '../Utils';
+import { Worker } from '../Model/Worker/Worker';
+import { WorkerImage } from '../Model/Worker/WorkerImage';
+// import {DataResult, Worker, WorkerImage} from '..';
+export class WorkerEndpoint extends Endpoint {
     async getByProjectEnvironment(projectEnvironmentId) {
         try {
             let url = '/projectenvironments/' + projectEnvironmentId + '/workers';
             const result = await this.httpClient.request(url);
-            if (Utils_1.Utils.isNullOrUndefined(result)) {
+            if (Utils.isNullOrUndefined(result)) {
                 return null;
             }
-            return __1.Worker.parse(result);
+            return Worker.parse(result);
         }
         catch (error) {
             if (this.httpClient.isDebugEnabled()) {
@@ -39,9 +38,8 @@ class WorkerEndpoint extends Endpoint_1.Endpoint {
         const rawWorkerImages = await this.httpClient.request(cmd);
         const result = [];
         for (let rawWorkerImage of rawWorkerImages) {
-            result.push(__1.WorkerImage.parse(rawWorkerImage));
+            result.push(WorkerImage.parse(rawWorkerImage));
         }
         return result;
     }
 }
-exports.WorkerEndpoint = WorkerEndpoint;

package/dist/Utils.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Utils = void 0;
-class Utils {
+export class Utils {
     static isNullOrUndefined(variable) {
         return variable === null || variable === undefined;
     }
@@ -34,14 +31,10 @@ class Utils {
     static base64encode(input) {
         return Buffer.from(input).toString('base64');
     }
-    // public static base64encode(rawString: string): string {
-    //     return btoa(rawString);
-    // }
     static base64decode(encodedString) {
         if (encodedString === null || encodedString === undefined || encodedString === '') {
             return '';
         }
-        return atob(encodedString);
+        return Buffer.from(encodedString, 'base64').toString();
     }
 }
-exports.Utils = Utils;

package/dist/Utils.spec.js

@@ -1,22 +1,25 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const TriggerType_1 = require("./Model/Trigger/TriggerType");
-const TaskExecutionStatus_1 = require("./Model/TaskExecutionStatus");
-const ChannelType_1 = require("./Model/Messaging/Channel/ChannelType");
-const ProjectDeployStatus_1 = require("./Model/Project/ProjectDeployStatus");
-const State_1 = require("./Model/State");
-const LogLevel_1 = require("./Model/Log/LogLevel");
-const StorageType_1 = require("./Model/Storage/StorageType");
-const WorkerInstanceState_1 = require("./Model/Worker/WorkerInstanceState");
-const WorkerState_1 = require("./Model/Worker/WorkerState");
+import { TriggerType } from './Model/Trigger/TriggerType';
+import { TaskExecutionStatus } from './Model/TaskExecutionStatus';
+import { ChannelType } from './Model/Messaging/Channel/ChannelType';
+import { ProjectDeployStatus } from './Model/Project/ProjectDeployStatus';
+import { State } from './Model/State';
+import { LogLevel } from './Model/Log/LogLevel';
+import { StorageType } from './Model/Storage/StorageType';
+import { WorkerInstanceState } from './Model/Worker/WorkerInstanceState';
+import { WorkerState } from './Model/Worker/WorkerState';
+import { Utils } from './Utils';
 test('Test enum parsing', () => {
-    expect(TriggerType_1.TriggerType.fromString('webhook')).toBe(TriggerType_1.TriggerType.Webhook);
-    expect(TaskExecutionStatus_1.TaskExecutionStatus.fromString('complete')).toBe(TaskExecutionStatus_1.TaskExecutionStatus.Complete);
-    expect(ChannelType_1.ChannelType.fromString('slack')).toBe(ChannelType_1.ChannelType.Slack);
-    expect(LogLevel_1.LogLevel.fromString('debug')).toBe(LogLevel_1.LogLevel.Debug);
-    expect(ProjectDeployStatus_1.ProjectDeployStatus.fromString('complete')).toBe(ProjectDeployStatus_1.ProjectDeployStatus.Complete);
-    expect(StorageType_1.StorageType.fromString('cache')).toBe(StorageType_1.StorageType.Cache);
-    expect(State_1.State.fromString('active')).toBe(State_1.State.Active);
-    expect(WorkerInstanceState_1.WorkerInstanceState.fromString('started')).toBe(WorkerInstanceState_1.WorkerInstanceState.Started);
-    expect(WorkerState_1.WorkerState.fromString('active')).toBe(WorkerState_1.WorkerState.Active);
+    expect(TriggerType.fromString('webhook')).toBe(TriggerType.Webhook);
+    expect(TaskExecutionStatus.fromString('complete')).toBe(TaskExecutionStatus.Complete);
+    expect(ChannelType.fromString('slack')).toBe(ChannelType.Slack);
+    expect(LogLevel.fromString('debug')).toBe(LogLevel.Debug);
+    expect(ProjectDeployStatus.fromString('complete')).toBe(ProjectDeployStatus.Complete);
+    expect(StorageType.fromString('cache')).toBe(StorageType.Cache);
+    expect(State.fromString('active')).toBe(State.Active);
+    expect(WorkerInstanceState.fromString('started')).toBe(WorkerInstanceState.Started);
+    expect(WorkerState.fromString('active')).toBe(WorkerState.Active);
+});
+test('Test base64 encode/decode', () => {
+    expect(Utils.base64encode('Lorem ipsum')).toBe('TG9yZW0gaXBzdW0=');
+    expect(Utils.base64decode('TG9yZW0gaXBzdW0=')).toBe('Lorem ipsum');
 });

package/dist/auth.spec.js

@@ -1,9 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const Client_1 = require("./Client");
-const OAuthClientToken_1 = require("./Http/OAuthClientToken");
-const Utils_1 = require("./Utils");
-const HttpClient_1 = require("./Http/HttpClient");
+import { Client } from './Client';
+import { OAuthClientToken } from './Http/OAuthClientToken';
+import { Utils } from './Utils';
+import { HttpClient } from './Http/HttpClient';
 jest.setTimeout((60) * 1000);
 // const apiEndpoint: string = 'http://localhost:5728/';
 const apiEndpoint = 'https://api2.attlaz.com';
@@ -16,7 +14,7 @@ const passwordFlowPassword = 'koetjeboe';
 const tokenExpirationInSeconds = 5;
 test('Test client credentials flow', async () => {
     expect.assertions(2);
-    let client = new Client_1.Client(apiEndpoint, clientCredentialClientId, clientCredentialClientSecret);
+    let client = new Client(apiEndpoint, clientCredentialClientId, clientCredentialClientSecret);
     client.getHttpClient().enableDebug();
     await client.authenticate();
     const user = await client.getUserEndpoint().getUser();
@@ -29,14 +27,14 @@ test('Test client credentials flow', async () => {
         // console.log(client.getToken().expires);
         await new Promise((r) => setTimeout(r, waitSecondsForTokenToExpire * 1000));
         // TODO: make sure we are not authenticated anymore
-        expect(OAuthClientToken_1.OAuthClientToken.isExpired(client.getToken())).toBeTruthy();
+        expect(OAuthClientToken.isExpired(client.getToken())).toBeTruthy();
     }
     // const user2: User = await client.getUserEndpoint().getUser()
     // expect(user.email).toBe('demo@attlaz.com');
 });
 test('Test password authentication - valid', async () => {
     expect.assertions(3);
-    let client = new Client_1.Client(apiEndpoint, passwordFlowClientId, passwordFlowClientSecret);
+    let client = new Client(apiEndpoint, passwordFlowClientId, passwordFlowClientSecret);
     client.getHttpClient().enableDebug();
     await client.authenticate(passwordFlowUsername, passwordFlowPassword);
     const user = await client.getUserEndpoint().getUser();
@@ -46,38 +44,38 @@ test('Test password authentication - valid', async () => {
     const waitSecondsForTokenToExpire = tokenExpirationInSeconds + 5;
     // console.log(client.getToken().expires);
     await new Promise((r) => setTimeout(r, waitSecondsForTokenToExpire * 1000));
-    expect(OAuthClientToken_1.OAuthClientToken.isExpired(client.getToken())).toBeTruthy();
+    expect(OAuthClientToken.isExpired(client.getToken())).toBeTruthy();
     const user2 = await client.getUserEndpoint().getUser();
     expect(user.email).toBe(passwordFlowUsername);
 });
 test('Test password authentication - invalid', async () => {
     expect.assertions(3);
-    let client = new Client_1.Client(apiEndpoint, passwordFlowClientId, passwordFlowClientSecret);
+    let client = new Client(apiEndpoint, passwordFlowClientId, passwordFlowClientSecret);
     client.getHttpClient().enableDebug();
     await expect(client.authenticate(passwordFlowUsername, 'wrongpassword'))
         .rejects
-        .toHaveProperty('code', HttpClient_1.HttpClient.HTTP_UNAUTHORIZED);
+        .toHaveProperty('code', HttpClient.HTTP_UNAUTHORIZED);
     await expect(client.getUserEndpoint().getUser())
         .rejects
         .toHaveProperty('message', 'Unable to perform request, access token not provided');
     await expect(client.authenticate('wrongusername', 'wrongpassword'))
         .rejects
-        .toHaveProperty('code', HttpClient_1.HttpClient.HTTP_UNAUTHORIZED);
+        .toHaveProperty('code', HttpClient.HTTP_UNAUTHORIZED);
 });
 test('Test set access token + JSON encode', async () => {
     expect.assertions(4);
-    let client = new Client_1.Client(apiEndpoint, passwordFlowClientId, passwordFlowClientSecret);
+    let client = new Client(apiEndpoint, passwordFlowClientId, passwordFlowClientSecret);
     client.getHttpClient().enableDebug();
     await client.authenticate(passwordFlowUsername, passwordFlowPassword);
     const token = client.getToken();
-    expect(OAuthClientToken_1.OAuthClientToken.isExpired(token)).toBeFalsy();
-    const encoded = OAuthClientToken_1.OAuthClientToken.serialize(token);
+    expect(OAuthClientToken.isExpired(token)).toBeFalsy();
+    const encoded = OAuthClientToken.serialize(token);
     console.log(encoded);
-    const decodedToken = OAuthClientToken_1.OAuthClientToken.deserialize(encoded);
+    const decodedToken = OAuthClientToken.deserialize(encoded);
     client.setToken(decodedToken);
     const user = await client.getUserEndpoint().getUser();
     expect(user.email).toBe(passwordFlowUsername);
-    let client2 = new Client_1.Client(apiEndpoint, passwordFlowClientId, passwordFlowClientSecret);
+    let client2 = new Client(apiEndpoint, passwordFlowClientId, passwordFlowClientSecret);
     client2.getHttpClient().enableDebug();
     console.log(decodedToken);
     client2.setToken(decodedToken);
@@ -101,19 +99,19 @@ test('Test set access token + JSON encode', async () => {
 });
 test('Test set expired tokens', async () => {
     expect.assertions(4);
-    let client = new Client_1.Client(apiEndpoint, passwordFlowClientId, passwordFlowClientSecret);
+    let client = new Client(apiEndpoint, passwordFlowClientId, passwordFlowClientSecret);
     client.getHttpClient().enableDebug();
-    const encodedToken = Utils_1.Utils.base64decode('eyJhY2Nlc3NfdG9rZW4iOiJvZVZpYXVhdk9wTkNpekNLRmxXUGpuaEI5aHNSdFViMFFTTVJlQWFuIiwidG9rZW5fdHlwZSI6ImJlYXJlciIsInJlZnJlc2hfdG9rZW4iOiJ4N0pINTVaR3U5OGFPN3VQaGlmS2RZME8yc3BYS0IzN296bElDUGtJIiwiZXhwaXJlcyI6IjIwMjEtMDMtMTlUMjE6MTQ6MTkuNzkyWiIsInNjb3BlIjoiYWxsIn0=');
-    const token = OAuthClientToken_1.OAuthClientToken.deserialize(encodedToken);
+    const encodedToken = Utils.base64decode('eyJhY2Nlc3NfdG9rZW4iOiJvZVZpYXVhdk9wTkNpekNLRmxXUGpuaEI5aHNSdFViMFFTTVJlQWFuIiwidG9rZW5fdHlwZSI6ImJlYXJlciIsInJlZnJlc2hfdG9rZW4iOiJ4N0pINTVaR3U5OGFPN3VQaGlmS2RZME8yc3BYS0IzN296bElDUGtJIiwiZXhwaXJlcyI6IjIwMjEtMDMtMTlUMjE6MTQ6MTkuNzkyWiIsInNjb3BlIjoiYWxsIn0=');
+    const token = OAuthClientToken.deserialize(encodedToken);
     client.setToken(token);
-    expect(OAuthClientToken_1.OAuthClientToken.isExpired(token)).toBeTruthy();
+    expect(OAuthClientToken.isExpired(token)).toBeTruthy();
     expect(client.getHttpClient().isTokenExpires()).toBeTruthy();
     await expect(client.getHttpClient().refreshToken())
         .rejects
-        .toHaveProperty('code', HttpClient_1.HttpClient.HTTP_UNAUTHORIZED);
+        .toHaveProperty('code', HttpClient.HTTP_UNAUTHORIZED);
     await expect(client.getUserEndpoint().getUser())
         .rejects
-        .toHaveProperty('code', HttpClient_1.HttpClient.HTTP_UNAUTHORIZED);
+        .toHaveProperty('code', HttpClient.HTTP_UNAUTHORIZED);
     // const user: User = await client.getUserEndpoint().getUser()
     // expect(user.email).toBe(passwordFlowUsername);
     //

package/dist/data.spec.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const Client_1 = require("./Client");
+import { Client } from './Client';
 jest.setTimeout((60) * 1000);
 // const apiEndpoint: string = 'http://localhost:5728/';
 const apiEndpoint = 'https://api2.attlaz.com';
@@ -13,7 +11,7 @@ const passwordFlowPassword = 'koetjeboe';
 const tokenExpirationInSeconds = 5;
 test('Test get user', async () => {
     expect.assertions(1);
-    let client = new Client_1.Client(apiEndpoint, clientCredentialClientId, clientCredentialClientSecret);
+    let client = new Client(apiEndpoint, clientCredentialClientId, clientCredentialClientSecret);
     client.getHttpClient().enableDebug();
     await client.authenticate();
     const user = await client.getUserEndpoint().getUser();
@@ -22,7 +20,7 @@ test('Test get user', async () => {
 });
 test('Test get project', async () => {
     expect.assertions(1);
-    let client = new Client_1.Client(apiEndpoint, clientCredentialClientId, clientCredentialClientSecret);
+    let client = new Client(apiEndpoint, clientCredentialClientId, clientCredentialClientSecret);
     client.getHttpClient().enableDebug();
     await client.authenticate();
     const project = await client.getProjectEndpoint().getById('8B5C14EBB');