attlaz-client 1.4.31 → 1.5.1

package/dist/Client.d.ts

@@ -35,7 +35,7 @@ export declare class Client {
     authenticate(): Promise<boolean>;
     authenticate(username: string, password: string): Promise<boolean>;
     isAuthenticated(): boolean;
-    getToken(): OAuthClientToken;
+    getToken(): OAuthClientToken | null;
     setToken(token: OAuthClientToken): void;
     unsetAccessToken(): void;
     getApiInformation(): Promise<{

package/dist/Client.js

@@ -73,7 +73,10 @@ class Client {
     getHttpClient() {
         return this.httpClient;
     }
-    async authenticate(username, password) {
+    async authenticate(username = null, password = null) {
+        if (username === null || password === null) {
+            return this.httpClient.authenticate();
+        }
         return this.httpClient.authenticate(username, password);
     }
     isAuthenticated() {

package/dist/Http/HttpClient.js

@@ -51,9 +51,9 @@ class HttpClient {
         // TODO: set user agent
         // rawRequest.negotiateHttpVersion = NegotiateHttpVersion.HTTP1_ONLY;
         const response = await (0, popsicle_1.fetch)(request.getFullUrl(), rawRequest);
-        const httpResponse = new HttpClientResponse_1.HttpClientResponse();
-        httpResponse.status = response.status;
-        httpResponse.statusText = response.statusText;
+        const httpResponse = new HttpClientResponse_1.HttpClientResponse(response.status, response.statusText);
+        // httpResponse.status = response.status;
+        // httpResponse.statusText = response.statusText;
         // TODO: should we get JSON immediately?
         // response.json
         // httpResponse.body = await response.text();

package/dist/Http/HttpClientRequest.spec.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const HttpClientRequest_1 = require("./HttpClientRequest");
 test('Test query string', async () => {
-    const request = new HttpClientRequest_1.HttpClientRequest('http://example.com');
-    expect(request.getFullUrl()).toBe('http://example.com');
+    const request = new HttpClientRequest_1.HttpClientRequest('https://example.com');
+    expect(request.getFullUrl()).toBe('https://example.com');
     request.addQueryParam('queryparam1', 'queryparam1value');
-    expect(request.getFullUrl()).toBe('http://example.com?queryparam1=queryparam1value');
+    expect(request.getFullUrl()).toBe('https://example.com?queryparam1=queryparam1value');
 });
 test('Test query string - add to existing query string', async () => {
-    const request = new HttpClientRequest_1.HttpClientRequest('http://example.com?queryparam0=queryparam0value');
-    expect(request.getFullUrl()).toBe('http://example.com?queryparam0=queryparam0value');
+    const request = new HttpClientRequest_1.HttpClientRequest('https://example.com?queryparam0=queryparam0value');
+    expect(request.getFullUrl()).toBe('https://example.com?queryparam0=queryparam0value');
     request.addQueryParam('queryparam1', 'queryparam1value');
-    expect(request.getFullUrl()).toBe('http://example.com?queryparam0=queryparam0value&queryparam1=queryparam1value');
+    expect(request.getFullUrl()).toBe('https://example.com?queryparam0=queryparam0value&queryparam1=queryparam1value');
 });

package/dist/Http/HttpClientResponse.d.ts

@@ -1,5 +1,6 @@
 export declare class HttpClientResponse {
     status: number;
     statusText: string;
-    body: any;
+    body: any | null;
+    constructor(status: number, statusText: string);
 }

package/dist/Http/HttpClientResponse.js

@@ -2,5 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpClientResponse = void 0;
 class HttpClientResponse {
+    constructor(status, statusText) {
+        this.body = null;
+        this.status = status;
+        this.statusText = statusText;
+    }
 }
 exports.HttpClientResponse = HttpClientResponse;

package/dist/Http/OAuthClient.js

@@ -4,7 +4,7 @@ exports.OAuthClient = void 0;
 const ClientError_1 = require("../Model/Error/ClientError");
 const HttpClient_1 = require("./HttpClient");
 const HttpClientRequest_1 = require("./HttpClientRequest");
-const Utils_1 = require("../Utils");
+const OAuthClientToken_1 = require("./OAuthClientToken");
 const ClientOAuth2 = require("client-oauth2");
 const JsonSerializable_1 = require("../Model/JsonSerializable");
 class OAuthClient {
@@ -23,11 +23,11 @@ class OAuthClient {
             state: this.options.state
         });
     }
-    async authenticate(username, password) {
+    async authenticate(username = null, password = null) {
         //TODO: should we encrypt the password in the client (or is https save enough)?
         try {
             let accessToken;
-            if (!Utils_1.Utils.isNullOrUndefined(username) && !Utils_1.Utils.isNullOrUndefined(password)) {
+            if (username !== null && username !== undefined && password !== null && password !== undefined) {
                 // Password flow
                 accessToken = await this.oauthClient.owner.getToken(username, password);
             }
@@ -44,6 +44,9 @@ class OAuthClient {
         }
     }
     async refreshToken() {
+        if (this.oauthToken === null) {
+            throw new Error('unable to refresh token, auth token not set');
+        }
         if (this.oauthToken.refreshToken !== undefined && this.oauthToken.refreshToken !== null && this.oauthToken.refreshToken !== '') {
             try {
                 this.oauthToken = await this.oauthToken.refresh();
@@ -68,8 +71,13 @@ class OAuthClient {
             throw new ClientError_1.ClientError('Unable to perform request, access token not provided');
         }
         else {
-            if (signWithOauthToken && this.oauthToken.expired()) {
-                await this.refreshToken();
+            if (signWithOauthToken) {
+                if (this.oauthToken === null) {
+                    throw new ClientError_1.ClientError('Unable to perform request, access token not provided');
+                }
+                if (signWithOauthToken && this.oauthToken.expired()) {
+                    await this.refreshToken();
+                }
             }
             const requestData = this.createRequestData(action, parameters, method, signWithOauthToken);
             if (this.debug) {
@@ -92,14 +100,20 @@ class OAuthClient {
         if (this.oauthToken === null) {
             return null;
         }
-        console.log(this.oauthToken.data);
-        return {
-            access_token: this.oauthToken.accessToken,
-            token_type: this.oauthToken.tokenType,
-            refresh_token: this.oauthToken.refreshToken,
-            expires: this.oauthToken.expires,
-            scope: this.oauthToken.data.scope
-        };
+        console.log('Oauth token', this.oauthToken);
+        const token = new OAuthClientToken_1.OAuthClientToken(this.oauthToken.accessToken, this.oauthToken.tokenType, this.oauthToken.refreshToken, this.oauthToken.data.scopes);
+        const rawTokenExpires = this.oauthToken.expires;
+        if (rawTokenExpires !== null && rawTokenExpires !== undefined) {
+            token.expires = rawTokenExpires;
+        }
+        // return {
+        //     access_token: this.oauthToken.accessToken,
+        //     token_type: this.oauthToken.tokenType,
+        //     refresh_token: this.oauthToken.refreshToken,
+        //     expires: (this.oauthToken as any as { expires: Date }).expires,
+        //     scope: this.oauthToken.data.scope
+        // };
+        return token;
     }
     setToken(token) {
         const data = {
@@ -127,7 +141,7 @@ class OAuthClient {
         return this.debug;
     }
     getTokenFlowUrl(options = null) {
-        return this.oauthClient.token.getUri(options);
+        return this.oauthClient.token.getUri(options === null ? undefined : options);
     }
     getUri(uri) {
         if (uri.indexOf("http://") == 0 || uri.indexOf("https://") == 0) {
@@ -157,6 +171,9 @@ class OAuthClient {
             });
         }
         if (signWithOauthToken) {
+            if (this.oauthToken === null) {
+                throw new ClientError_1.ClientError('Unable to perform request, access token not provided');
+            }
             if (this.oauthToken.expired()) {
                 throw new Error('Unable to sign request, token is expired');
             }
@@ -167,6 +184,9 @@ class OAuthClient {
         return requestData;
     }
     signRequest(requestObject) {
+        if (this.oauthToken === null) {
+            throw new ClientError_1.ClientError('Unable to sign request, access token not provided');
+        }
         const tokenType = this.oauthToken.tokenType;
         const accessToken = this.oauthToken.accessToken;
         if (tokenType !== undefined && tokenType.toLowerCase() === 'bearer') {

package/dist/Http/OAuthClientOptions.js

@@ -5,7 +5,7 @@ class OAuthClientOptions {
     constructor(apiEndpoint, clientId, clientSecret) {
         this.accessTokenUri = 'oauth/token';
         this.authorizationUri = 'oauth/authorize';
-        this.redirectUri = 'http://example.com/auth/github/callback';
+        this.redirectUri = 'https://example.com/auth/github/callback';
         this.scopes = ['all'];
         this.state = 'xyz';
         this.apiEndpoint = apiEndpoint;

package/dist/Http/OAuthClientToken.d.ts

@@ -2,8 +2,9 @@ export declare class OAuthClientToken {
     access_token: string;
     token_type: string;
     refresh_token: string | null;
-    expires: Date;
+    expires: Date | null;
     scope: string;
+    constructor(access_token: string, token_type: string, refresh_token: string, scope: string);
     static isExpired(token: OAuthClientToken): boolean;
     static serialize(token: OAuthClientToken): string;
     static deserialize(serializedToken: string): OAuthClientToken;

package/dist/Http/OAuthClientToken.js

@@ -2,8 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAuthClientToken = void 0;
 class OAuthClientToken {
+    constructor(access_token, token_type, refresh_token, scope) {
+        this.access_token = '';
+        this.token_type = '';
+        this.refresh_token = null;
+        this.expires = null;
+        this.scope = '';
+        this.access_token = access_token;
+        this.token_type = token_type;
+        this.refresh_token = refresh_token;
+        this.scope = scope;
+    }
     static isExpired(token) {
-        console.log(token);
+        if (token.expires === null) {
+            return false;
+        }
         return token.expires <= new Date();
     }
     static serialize(token) {
@@ -11,7 +24,12 @@ class OAuthClientToken {
     }
     static deserialize(serializedToken) {
         const token = JSON.parse(serializedToken);
-        token.expires = new Date(token.expires);
+        if (token.expires !== null && token.expires !== undefined) {
+            token.expires = new Date(token.expires);
+        }
+        else {
+            token.expires = null;
+        }
         return token;
     }
 }

package/dist/Model/Error/ClientError.js

@@ -13,7 +13,10 @@ class ClientError {
         if (error.status !== null && error.status !== undefined) {
             const statusCode = error.status;
             const body = error.body;
-            clientError = this.byStatus(statusCode, body);
+            const clientErrorByStatus = this.byStatus(statusCode, body);
+            if (clientErrorByStatus !== null) {
+                clientError = clientErrorByStatus;
+            }
         }
         else {
             if (error.code !== null && error.code !== undefined) {

package/dist/Model/HealthAlert/HealthAlertStatus.js

@@ -11,7 +11,7 @@ var HealthAlertStatus;
 (function (HealthAlertStatus) {
     function fromString(input) {
         const result = Utils_1.Utils.parseEnum(input, HealthAlertStatus);
-        if (Utils_1.Utils.isNullOrUndefined(result)) {
+        if (result === null) {
             throw new Error('Unable to parse HealthAlertStatus from string: Unknown HealthAlertStatus "' + input + '"');
         }
         return result;

package/dist/Model/HealthAlert/HealthTestType.js

@@ -12,7 +12,7 @@ var HealthTestType;
 (function (HealthTestType) {
     function fromString(input) {
         const result = Utils_1.Utils.parseEnum(input, HealthTestType);
-        if (Utils_1.Utils.isNullOrUndefined(result)) {
+        if (result === null) {
             throw new Error('Unable to parse HealthTestType from string: Unknown HealthTestType "' + input + '"');
         }
         return result;

package/dist/Model/Log/LogLevel.js

@@ -51,7 +51,7 @@ var LogLevel;
     LogLevel.toNumeric = toNumeric;
     function fromString(input) {
         const result = Utils_1.Utils.parseEnum(input, LogLevel);
-        if (Utils_1.Utils.isNullOrUndefined(result)) {
+        if (result === null) {
             throw new Error('Unable to parse LogLevel from string: Unknown LogLevel "' + input + '"');
         }
         return result;

package/dist/Model/Log/LogQuery.d.ts

@@ -3,8 +3,8 @@ import { LogStreamId } from './LogStreamId';
 import { DataValueValue } from '../DataValue';
 export declare class LogQuery {
     readonly logStreamId: LogStreamId;
-    message: string;
-    hidden: boolean;
+    message: string | null;
+    hidden: boolean | null;
     logLevels: LogLevel[];
     tags: Array<{
         key: string;

package/dist/Model/Messaging/Channel/ChannelType.js

@@ -13,7 +13,7 @@ var ChannelType;
 (function (ChannelType) {
     function fromString(input) {
         const result = Utils_1.Utils.parseEnum(input, ChannelType);
-        if (Utils_1.Utils.isNullOrUndefined(result)) {
+        if (result === null) {
             throw new Error('Unable to parse ChannelType from string: Unknown ChannelType "' + input + '"');
         }
         return result;

package/dist/Model/Messaging/Subscriber.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Subscriber = void 0;
 const State_1 = require("../State");
+const LogLevel_1 = require("../Log/LogLevel");
 class Subscriber {
-    constructor(id, eventTypes, projectEnvironment, task, taskExecution, channels, logLevelThreshold = null) {
+    constructor(id, eventTypes, projectEnvironment, task, taskExecution, channels, logLevelThreshold = LogLevel_1.LogLevel.Debug) {
         this.state = State_1.State.Active;
         this.id = id;
         this.eventTypes = eventTypes;

package/dist/Model/PagedResult.d.ts

@@ -2,5 +2,5 @@ export declare class PagedResult<T> {
     pageSize: number;
     totalCount: number;
     data: Array<T>;
-    constructor(data: Array<T>, pageSize?: number, totalCount?: number);
+    constructor(data: Array<T>, pageSize?: number | null, totalCount?: number | null);
 }

package/dist/Model/PagedResult.js

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PagedResult = void 0;
-const Utils_1 = require("../Utils");
 class PagedResult {
     constructor(data, pageSize = null, totalCount = null) {
         this.data = data;
-        if (Utils_1.Utils.isNullOrUndefined(pageSize)) {
+        if (pageSize === null) {
             pageSize = data.length;
         }
         this.pageSize = pageSize;
-        if (Utils_1.Utils.isNullOrUndefined(totalCount)) {
+        if (totalCount === null) {
             totalCount = data.length;
         }
         this.totalCount = totalCount;

package/dist/Model/Project/ProjectDeployStatus.js

@@ -15,7 +15,7 @@ var ProjectDeployStatus;
 (function (ProjectDeployStatus) {
     function fromString(input) {
         const result = Utils_1.Utils.parseEnum(input, ProjectDeployStatus);
-        if (Utils_1.Utils.isNullOrUndefined(result)) {
+        if (result === null) {
             throw new Error('Unable to parse ProjectDeployStatus from string: Unknown ProjectDeployStatus "' + input + '"');
         }
         return result;

package/dist/Model/Project/ProjectEnvironment.d.ts

@@ -6,7 +6,7 @@ export declare class ProjectEnvironment implements StateAware {
     projectId: string;
     name: string;
     sourceBranch: string;
-    parent?: string;
+    parent: string | null;
     isLocal: boolean;
     state: State;
     static parse(rawProjectEnvironment: any): ProjectEnvironment;

package/dist/Model/Result/DataResult.d.ts

@@ -5,7 +5,7 @@ export declare class DataResult<T> {
     constructor();
     static parse<T>(raw: any): DataResult<T>;
     setData(data: T): void;
-    getData(): T;
+    getData(): T | null;
     addError(error: ResultError): void;
     getErrors(): ResultError[];
     hasErrors(): boolean;

package/dist/Model/State.js

@@ -11,7 +11,7 @@ var State;
 (function (State) {
     function fromString(input) {
         const result = Utils_1.Utils.parseEnum(input, State);
-        if (Utils_1.Utils.isNullOrUndefined(result)) {
+        if (result === null) {
             throw new Error('Unable to parse State from string: Unknown State "' + input + '"');
         }
         return result;

package/dist/Model/Storage/StorageType.js

@@ -12,7 +12,7 @@ var StorageType;
 (function (StorageType) {
     function fromString(input) {
         const result = Utils_1.Utils.parseEnum(input, StorageType);
-        if (Utils_1.Utils.isNullOrUndefined(result)) {
+        if (result === null) {
             throw new Error('Unable to parse StorageType from string: Unknown StorageType "' + input + '"');
         }
         return result;

package/dist/Model/TaskExecutionStatus.js

@@ -15,7 +15,7 @@ var TaskExecutionStatus;
 (function (TaskExecutionStatus) {
     function fromString(input) {
         const result = Utils_1.Utils.parseEnum(input, TaskExecutionStatus);
-        if (Utils_1.Utils.isNullOrUndefined(result)) {
+        if (result === null) {
             throw new Error('Unable to parse TaskExecutionStatus from string: Unknown TaskExecutionStatus "' + input + '"');
         }
         return result;

package/dist/Model/Team/TeamMemberInviteState.js

@@ -14,7 +14,7 @@ var TeamMemberInviteState;
 (function (TeamMemberInviteState) {
     function fromString(input) {
         const result = Utils_1.Utils.parseEnum(input, TeamMemberInviteState);
-        if (Utils_1.Utils.isNullOrUndefined(result)) {
+        if (result === null) {
             throw new Error('Unable to parse TeamMemberInviteState from string: Unknown TeamMemberInviteState "' + input + '"');
         }
         return result;

package/dist/Model/Trigger/TriggerType.js

@@ -11,7 +11,7 @@ var TriggerType;
 (function (TriggerType) {
     function fromString(input) {
         const result = Utils_1.Utils.parseEnum(input, TriggerType);
-        if (Utils_1.Utils.isNullOrUndefined(result)) {
+        if (result === null) {
             throw new Error('Unable to parse TriggerType from string: Unknown TriggerType "' + input + '"');
         }
         return result;

package/dist/Model/Worker/WorkerInstanceState.js

@@ -11,7 +11,7 @@ var WorkerInstanceState;
 (function (WorkerInstanceState) {
     function fromString(input) {
         const result = Utils_1.Utils.parseEnum(input, WorkerInstanceState);
-        if (Utils_1.Utils.isNullOrUndefined(result)) {
+        if (result === null) {
             throw new Error('Unable to parse WorkerInstanceState from string: Unknown WorkerInstanceState "' + input + '"');
         }
         return result;

package/dist/Model/Worker/WorkerState.js

@@ -13,7 +13,7 @@ var WorkerState;
 (function (WorkerState) {
     function fromString(input) {
         const result = Utils_1.Utils.parseEnum(input, WorkerState);
-        if (Utils_1.Utils.isNullOrUndefined(result)) {
+        if (result === null) {
             throw new Error('Unable to parse WorkerState from string: Unknown WorkerState "' + input + '"');
         }
         return result;

package/dist/Service/ChannelEndpoint.js

@@ -10,9 +10,10 @@ class ChannelEndpoint extends Endpoint_1.Endpoint {
         try {
             const result = await this.request('/channels/' + channelId + '');
             if (Utils_1.Utils.isNullOrUndefined(result)) {
-                return null;
             }
-            result.setData(Channel_1.Channel.parse(result.getData()));
+            else {
+                result.setData(Channel_1.Channel.parse(result.getData()));
+            }
             return result;
         }
         catch (ex) {
@@ -58,9 +59,12 @@ class ChannelEndpoint extends Endpoint_1.Endpoint {
         try {
             const rawChannelHistory = await this.request('/channels/' + channelId + '/messages');
             const data = [];
-            const orig = rawChannelHistory.getData();
-            for (const rawChannelMessage of orig) {
-                data.push(ChannelHistory_1.ChannelHistory.parse(rawChannelMessage));
+            const resultData = rawChannelHistory.getData();
+            if (resultData !== null) {
+                const orig = resultData;
+                for (const rawChannelMessage of orig) {
+                    data.push(ChannelHistory_1.ChannelHistory.parse(rawChannelMessage));
+                }
             }
             rawChannelHistory.setData(data);
             return rawChannelHistory;

package/dist/Service/ConfigEndpoint.d.ts

@@ -1,7 +1,7 @@
 import { Endpoint } from './Endpoint';
 import { Config } from '../Model/Config';
 export declare class ConfigEndpoint extends Endpoint {
-    getConfigByTask(taskId: string, projectEnvironmentId?: string): Promise<Config[]>;
-    getByProject(projectId: string, projectEnvironmentId?: string): Promise<Config[]>;
+    getConfigByTask(taskId: string, projectEnvironmentId?: string | null): Promise<Config[]>;
+    getByProject(projectId: string, projectEnvironmentId?: string | null): Promise<Config[]>;
     saveByProject(projectId: string, configs: Config[]): Promise<any>;
 }

package/dist/Service/HealthAlertEndpoint.js

@@ -3,18 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HealthAlertEndpoint = void 0;
 const Endpoint_1 = require("./Endpoint");
 const HealthAlert_1 = require("../Model/HealthAlert/HealthAlert");
-const Utils_1 = require("../Utils");
 class HealthAlertEndpoint extends Endpoint_1.Endpoint {
     async getLatestByProjectEnvironment(projectEnvironmentId) {
         try {
             let url = '/projectenvironments/' + projectEnvironmentId + '/health';
             const result = await this.request(url);
-            if (Utils_1.Utils.isNullOrUndefined(result)) {
-                return null;
-            }
+            // if (Utils.isNullOrUndefined(result)) {
+            //     return null;
+            // }
             let alerts = [];
-            for (let raw of result.getData()) {
-                alerts.push(HealthAlert_1.HealthAlert.parse(raw));
+            const resultData = result.getData();
+            if (resultData !== null) {
+                for (let raw of resultData) {
+                    alerts.push(HealthAlert_1.HealthAlert.parse(raw));
+                }
             }
             return alerts;
         }

package/dist/Service/LogEndpoint.js

@@ -95,9 +95,13 @@ class LogEndpoint extends Endpoint_1.Endpoint {
             let url = '/logstreams/' + Utils_1.Utils.base64encode(logStreamId.id) + '/info';
             const dataResult = await this.request(url);
             if (Utils_1.Utils.isNullOrUndefined(dataResult)) {
-                return null;
+                throw new Error('Invalid response');
             }
-            const rawData = dataResult.getData();
+            const data = dataResult.getData();
+            if (data === null) {
+                throw new Error('Invalid response');
+            }
+            const rawData = data;
             const logLevels = new Map();
             Object.keys(rawData.level_count).forEach((logLevelKey, index) => {
                 const logLevel = LogLevel_1.LogLevel.fromString(logLevelKey);

package/dist/Service/ProjectDeployEndpoint.d.ts

@@ -1,7 +1,7 @@
 import { Endpoint } from './Endpoint';
 import { ProjectDeploy } from '../Model/Project/ProjectDeploy';
 export declare class ProjectDeployEndpoint extends Endpoint {
-    getById(deployId: number): Promise<ProjectDeploy>;
+    getById(deployId: number): Promise<ProjectDeploy | null>;
     getByProjectEnvironment(projectEnvironmentId: string): Promise<ProjectDeploy[]>;
     requestDeploy(projectEnvironmentId: string): Promise<any>;
 }

package/dist/Service/ProjectEndpoint.d.ts

@@ -3,6 +3,6 @@ import { Project } from '../Model/Project/Project';
 export declare class ProjectEndpoint extends Endpoint {
     getAll(): Promise<Project[]>;
     getByTeam(teamId: string): Promise<Project[]>;
-    getById(projectId: string): Promise<Project>;
+    getById(projectId: string): Promise<Project | null>;
     save(project: Project): Promise<Project>;
 }

package/dist/Service/QueueEndpoint.js

@@ -10,9 +10,11 @@ class QueueEndpoint extends Endpoint_1.Endpoint {
             let url = '/projectenvironments/' + projectEnvironmentId + '/queues';
             const result = await this.request(url);
             if (Utils_1.Utils.isNullOrUndefined(result)) {
-                return null;
+                // return null;
+            }
+            else {
+                result.setData(QueueStatus_1.QueueStatus.parse(result.getData()));
             }
-            result.setData(QueueStatus_1.QueueStatus.parse(result.getData()));
             return result;
         }
         catch (error) {

package/dist/Service/SourcesAccountEndpoint.js

@@ -4,6 +4,7 @@ exports.SourcesAccountEndpoint = void 0;
 const Endpoint_1 = require("./Endpoint");
 const SourcesAccount_1 = require("../Model/SourcesAccount");
 const SourcesAccountRepository_1 = require("../Model/SourcesAccountRepository");
+const Utils_1 = require("../Utils");
 class SourcesAccountEndpoint extends Endpoint_1.Endpoint {
     async getAll() {
         const rawSourcesAccounts = await this.httpClient.request('sourcesaccounts');
@@ -22,7 +23,7 @@ class SourcesAccountEndpoint extends Endpoint_1.Endpoint {
         return sourcesAccountRepositories;
     }
     async getRepositoryBranches(sourcesAccountId, repositoryKey) {
-        repositoryKey = btoa(repositoryKey);
+        repositoryKey = Utils_1.Utils.base64encode(repositoryKey);
         const rawBranches = await this.httpClient.request('sourcesaccounts/' + sourcesAccountId + '/repositories/' + repositoryKey + '/branches');
         return rawBranches;
     }

package/dist/Service/StorageEndpoint.js

@@ -2,15 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StorageEndpoint = void 0;
 const Endpoint_1 = require("./Endpoint");
-const Utils_1 = require("../Utils");
 class StorageEndpoint extends Endpoint_1.Endpoint {
     async getInformation(projectEnvironmentId, storageType) {
         let cmd = '/projectenvironments/' + projectEnvironmentId + '/storage/' + storageType;
         try {
             const result = await this.request(cmd, null, 'GET');
-            if (Utils_1.Utils.isNullOrUndefined(result)) {
-                return null;
-            }
+            // if (Utils.isNullOrUndefined(result)) {
+            //     return null;
+            // }
             return result;
         }
         catch (ex) {
@@ -24,9 +23,9 @@ class StorageEndpoint extends Endpoint_1.Endpoint {
         let cmd = '/projectenvironments/' + projectEnvironmentId + '/storage/' + storageType + '/' + poolKey;
         try {
             const result = await this.request(cmd, null, 'DELETE');
-            if (Utils_1.Utils.isNullOrUndefined(result)) {
-                return null;
-            }
+            // if (Utils.isNullOrUndefined(result)) {
+            //     return null;
+            // }
             return result;
         }
         catch (ex) {

package/dist/Service/SubscriberEndpoint.d.ts

@@ -1,7 +1,7 @@
 import { Endpoint } from './Endpoint';
 import { Subscriber } from '../Model/Messaging/Subscriber';
 export declare class SubscriberEndpoint extends Endpoint {
-    getSubscribersByTask(taskId: string, projectEnvironmentId?: string): Promise<Subscriber[]>;
+    getSubscribersByTask(taskId: string, projectEnvironmentId?: string | null): Promise<Subscriber[]>;
     getSubscribersByChannel(channelId: string): Promise<Subscriber[]>;
     save(subscriber: Subscriber): Promise<any>;
 }

package/dist/Service/TaskEndpoint.js

@@ -26,7 +26,7 @@ class TaskEndpoint extends Endpoint_1.Endpoint {
         try {
             const rawTask = await this.httpClient.request('/tasks/' + taskId);
             if (Utils_1.Utils.isNullOrUndefined(rawTask)) {
-                return null;
+                throw new Error('Task not found');
             }
             return Task_1.Task.parse(rawTask);
         }
@@ -65,7 +65,7 @@ class TaskEndpoint extends Endpoint_1.Endpoint {
         try {
             const rawTaskSummary = await this.httpClient.request('tasks/' + taskId + '/summaries', parameters);
             if (Utils_1.Utils.isNullOrUndefined(rawTaskSummary)) {
-                return null;
+                throw new Error('Task not found');
             }
             return TaskSummary_1.TaskSummary.parse(rawTaskSummary);
         }

package/dist/Service/TaskExecutionEndpoint.d.ts

@@ -5,8 +5,8 @@ import { TaskExecutionHistory } from '../Model/TaskExecutionHistory';
 import { TaskExecutionStatus } from '../Model/TaskExecutionStatus';
 export declare class TaskExecutionEndpoint extends Endpoint {
     getTaskExecutions(taskId: string): Promise<TaskExecution[]>;
-    getTaskExecutionSummaries(taskId: string, from?: Date, to?: Date, projectEnvironmentId?: string): Promise<TaskExecutionSummary[]>;
-    getTaskExecutionSummary(taskId: string, taskExecutionId: string): Promise<TaskExecutionSummary>;
+    getTaskExecutionSummaries(taskId: string, from?: Date | null, to?: Date | null, projectEnvironmentId?: string | null): Promise<TaskExecutionSummary[]>;
+    getTaskExecutionSummary(taskExecutionId: string): Promise<TaskExecutionSummary>;
     getTaskExecutionHistory(taskExecutionId: string): Promise<TaskExecutionHistory[]>;
-    updateTaskExecution(taskExecutionId: string, status: TaskExecutionStatus, time?: Date): Promise<TaskExecution>;
+    updateTaskExecution(taskExecutionId: string, status: TaskExecutionStatus, time?: Date | null): Promise<TaskExecution>;
 }

package/dist/Service/TaskExecutionEndpoint.js

@@ -26,20 +26,20 @@ class TaskExecutionEndpoint extends Endpoint_1.Endpoint {
     async getTaskExecutionSummaries(taskId, from = null, to = null, projectEnvironmentId = null) {
         try {
             let params = null;
-            if (!Utils_1.Utils.isNullOrUndefined(from)) {
-                if (Utils_1.Utils.isNullOrUndefined(params)) {
+            if (from !== null && from !== undefined) {
+                if (params === null || params === undefined) {
                     params = {};
                 }
                 params.from = from.toISOString();
             }
-            if (!Utils_1.Utils.isNullOrUndefined(to)) {
-                if (Utils_1.Utils.isNullOrUndefined(params)) {
+            if (to !== null && to !== undefined) {
+                if (params === null || params === undefined) {
                     params = {};
                 }
                 params.to = to.toISOString();
             }
             if (!Utils_1.Utils.isNullOrUndefined(projectEnvironmentId)) {
-                if (Utils_1.Utils.isNullOrUndefined(params)) {
+                if (params === null || params === undefined) {
                     params = {};
                 }
                 params.environment = projectEnvironmentId;
@@ -58,11 +58,11 @@ class TaskExecutionEndpoint extends Endpoint_1.Endpoint {
             throw error;
         }
     }
-    async getTaskExecutionSummary(taskId, taskExecutionId) {
+    async getTaskExecutionSummary(taskExecutionId) {
         try {
             const rawTaskExecution = await this.httpClient.request('/taskexecutions/' + taskExecutionId + '/summaries');
             if (Utils_1.Utils.isNullOrUndefined(rawTaskExecution)) {
-                return null;
+                throw new Error('Unable to get task execution');
             }
             return TaskExecutionSummary_1.TaskExecutionSummary.parse(rawTaskExecution);
         }

package/dist/Service/TeamMemberEndpoint.js

@@ -38,9 +38,9 @@ class TeamMemberEndpoint extends Endpoint_1.Endpoint {
         }
         try {
             const result = await this.request(cmd, { invites: rawInvites }, 'POST');
-            if (Utils_1.Utils.isNullOrUndefined(result)) {
-                return null;
-            }
+            // if (Utils.isNullOrUndefined(result)) {
+            //     return null;
+            // }
             return result;
         }
         catch (ex) {

package/dist/Service/TriggerEndpoint.d.ts

@@ -1,7 +1,7 @@
 import { Endpoint } from './Endpoint';
 import { Trigger } from '../Model/Trigger/Trigger';
 export declare class TriggerEndpoint extends Endpoint {
-    getByTask(taskId: string, projectEnvironmentId?: string): Promise<Trigger[]>;
+    getByTask(taskId: string, projectEnvironmentId?: string | null): Promise<Trigger[]>;
     getById(id: string): Promise<Trigger | null>;
     save(trigger: Trigger): Promise<Trigger>;
 }

package/dist/Service/UserEndpoint.js

@@ -10,7 +10,7 @@ class UserEndpoint extends Endpoint_1.Endpoint {
         let cmd = '/user';
         const rawUser = await this.httpClient.request(cmd);
         if (Utils_1.Utils.isNullOrUndefined(rawUser)) {
-            return null;
+            throw new Error('User not found');
         }
         return User_1.User.parse(rawUser);
     }
@@ -77,8 +77,9 @@ class UserEndpoint extends Endpoint_1.Endpoint {
             let url = '/user/';
             const data = { user, invitation_code: invitationCode };
             const result = await this.request(url, data, 'PUT', false);
-            if (!Utils_1.Utils.isNullOrUndefined(result.getData().createdUser)) {
-                result.setData({ createdUser: User_1.User.parse(result.getData().createdUser) });
+            const resultData = result.getData();
+            if (resultData !== null && resultData.createdUser !== null) {
+                result.setData({ createdUser: User_1.User.parse(resultData.createdUser) });
             }
             return result;
         }

package/dist/Service/WorkerConfigEndpoint.d.ts

@@ -1,6 +1,6 @@
 import { Endpoint } from './Endpoint';
 import { WorkerConfig } from '../Model/Worker/WorkerConfig';
 export declare class WorkerConfigEndpoint extends Endpoint {
-    getByProjectEnvironment(projectEnvironmentId: string): Promise<WorkerConfig[]>;
+    getByProjectEnvironment(projectEnvironmentId: string): Promise<WorkerConfig[] | null>;
     save(workerConfig: WorkerConfig): Promise<WorkerConfig>;
 }

package/dist/Service/WorkerConfigEndpoint.js

@@ -12,8 +12,12 @@ class WorkerConfigEndpoint extends Endpoint_1.Endpoint {
             if (Utils_1.Utils.isNullOrUndefined(result)) {
                 return null;
             }
+            const resultData = result.getData();
+            if (resultData === null) {
+                return null;
+            }
             let workerConfigValues = [];
-            for (let rawConfig of result.getData()) {
+            for (let rawConfig of resultData) {
                 workerConfigValues.push(WorkerConfig_1.WorkerConfig.parse(rawConfig));
             }
             return workerConfigValues;

package/dist/Service/WorkerEndpoint.js

@@ -12,7 +12,7 @@ class WorkerEndpoint extends Endpoint_1.Endpoint {
             let url = '/projectenvironments/' + projectEnvironmentId + '/workers';
             const result = await this.httpClient.request(url);
             if (Utils_1.Utils.isNullOrUndefined(result)) {
-                return null;
+                throw new Error('Unable to find worker');
             }
             return Worker_1.Worker.parse(result);
         }

package/dist/Utils.d.ts

@@ -1,7 +1,7 @@
 export declare class Utils {
     static isNullOrUndefined(variable: any): boolean;
     static isTrue(input: string | number | boolean | null | undefined): boolean;
-    static parseRawDate(input: Date): Date | null;
+    static parseRawDate(input: Date): Date;
     static parseEnum<T>(input: string, Enum: any): T | null;
     static base64encode(input: string): string;
     static base64decode(encodedString: string): string;

package/dist/Utils.js

@@ -12,24 +12,31 @@ class Utils {
         if (input !== null && input !== undefined) {
             return new Date(input);
         }
-        return null;
+        throw new Error('Unable to parse date, null/undefined');
     }
     static parseEnum(input, Enum) {
         if (this.isNullOrUndefined(input)) {
             return null;
         }
+        // tslint:disable-next-line:forin
         for (const property in Enum) {
+            // noinspection JSUnfilteredForInLoop
             const enumMember = Enum[property];
             if (typeof enumMember === 'string' || typeof enumMember === 'number') {
                 if (enumMember.toString().toUpperCase() === input.toString().toUpperCase()) {
                     // const key = enumMember as string as keyof typeof Enum;
-                    return Enum[property];
+                    const res = Enum[property];
+                    if (res === undefined) {
+                        return null;
+                    }
+                    return res;
                 }
             }
             else if (typeof enumMember === 'string') {
                 console.error('Unable to parse enum type: ' + typeof enumMember + ' for enum ', Enum);
             }
         }
+        return null;
     }
     static base64encode(input) {
         if (input === null || input === undefined || input === '') {

package/dist/auth.spec.js

@@ -20,16 +20,30 @@ test('Test client credentials flow', async () => {
     client.getHttpClient().enableDebug();
     await client.authenticate();
     const user = await client.getUserEndpoint().getUser();
+    if (user === null) {
+        throw new Error('User is null');
+    }
     // console.log('User', user);
     expect(user.email).toBe('demo@attlaz.com');
     // TODO: how to get the seconds to wait for the token to expire?
-    const expiresIn = client.getToken().expires.getTime() - (new Date()).getTime();
+    const token = client.getToken();
+    if (token === null) {
+        throw new Error('Token is null');
+    }
+    if (token.expires === null) {
+        throw new Error('Token expires not set');
+    }
+    const expiresIn = token.expires.getTime() - (new Date()).getTime();
     if (expiresIn < 30) {
         const waitSecondsForTokenToExpire = expiresIn + 5;
         // 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();
+        const token = client.getToken();
+        if (token === null) {
+            throw new Error('Token is null');
+        }
+        expect(OAuthClientToken_1.OAuthClientToken.isExpired(token)).toBeTruthy();
     }
     // const user2: User = await client.getUserEndpoint().getUser()
     // expect(user.email).toBe('demo@attlaz.com');
@@ -46,9 +60,13 @@ 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();
+    const token = client.getToken();
+    if (token === null) {
+        throw new Error('Token is null');
+    }
+    expect(OAuthClientToken_1.OAuthClientToken.isExpired(token)).toBeTruthy();
     const user2 = await client.getUserEndpoint().getUser();
-    expect(user.email).toBe(passwordFlowUsername);
+    expect(user2.email).toBe(passwordFlowUsername);
 });
 test('Test password authentication - invalid', async () => {
     expect.assertions(3);
@@ -70,6 +88,9 @@ test('Test set access token + JSON encode', async () => {
     client.getHttpClient().enableDebug();
     await client.authenticate(passwordFlowUsername, passwordFlowPassword);
     const token = client.getToken();
+    if (token === null) {
+        throw new Error('Token is null');
+    }
     expect(OAuthClientToken_1.OAuthClientToken.isExpired(token)).toBeFalsy();
     const encoded = OAuthClientToken_1.OAuthClientToken.serialize(token);
     console.log(encoded);

package/dist/data.spec.js

@@ -26,6 +26,9 @@ test('Test get project', async () => {
     client.getHttpClient().enableDebug();
     await client.authenticate();
     const project = await client.getProjectEndpoint().getById('8B5C14EBB');
+    if (project === null) {
+        throw new Error('Project is null');
+    }
     // console.log('User', user);
     expect(project.id).toBe('8B5C14EBB');
 });

package/package.json

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