attlaz-client 1.8.11 → 1.8.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/Http/HttpClient.js +1 -2
- package/dist/Http/OAuthClient.d.ts +1 -0
- package/dist/Http/OAuthClient.js +17 -5
- package/dist/Model/Error/ClientError.js +8 -1
- package/dist/Model/Storage/StorageItemInformation.d.ts +5 -0
- package/dist/Model/Storage/StorageItemInformation.js +6 -0
- package/dist/Service/ProjectDeployEndpoint.js +0 -1
- package/dist/Service/StorageEndpoint.d.ts +2 -1
- package/dist/Service/StorageEndpoint.js +1 -1
- package/dist/Service/TaskExecutionRequestEndpoint.js +1 -1
- package/dist/Service/WorkerConfigEndpoint.js +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +5 -3
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +7 -7
package/dist/Http/HttpClient.js
CHANGED
|
@@ -43,8 +43,7 @@ class HttpClient {
|
|
|
43
43
|
jsonData = JSON.parse(rawData);
|
|
44
44
|
}
|
|
45
45
|
catch (e) {
|
|
46
|
-
console.
|
|
47
|
-
console.error('Unable to parse response data to JSON');
|
|
46
|
+
console.error('Unable to parse response data to JSON', { statusText: httpResponse.statusText, error: e });
|
|
48
47
|
}
|
|
49
48
|
httpResponse.body = jsonData;
|
|
50
49
|
}
|
|
@@ -9,6 +9,7 @@ export declare class OAuthClient {
|
|
|
9
9
|
constructor(options: OAuthClientOptions);
|
|
10
10
|
authenticate(username: string, password: string): Promise<boolean>;
|
|
11
11
|
authenticate(): Promise<boolean>;
|
|
12
|
+
private refreshTokenPromise;
|
|
12
13
|
refreshToken(): Promise<void>;
|
|
13
14
|
isTokenExpires(): boolean;
|
|
14
15
|
request(action: string, parameters?: any, method?: string, signWithOauthToken?: boolean): Promise<any>;
|
package/dist/Http/OAuthClient.js
CHANGED
|
@@ -15,6 +15,7 @@ class OAuthClient {
|
|
|
15
15
|
this.debug = false;
|
|
16
16
|
this.oauthToken = null;
|
|
17
17
|
this.oathClientToken = null;
|
|
18
|
+
this.refreshTokenPromise = null;
|
|
18
19
|
this.options = options;
|
|
19
20
|
//
|
|
20
21
|
this.oauthClient = new client_oauth2_1.default({
|
|
@@ -44,11 +45,16 @@ class OAuthClient {
|
|
|
44
45
|
return true;
|
|
45
46
|
}
|
|
46
47
|
catch (e) {
|
|
47
|
-
|
|
48
|
+
if (this.debug) {
|
|
49
|
+
console.debug('[Client] Error during authentication', e);
|
|
50
|
+
}
|
|
48
51
|
throw ClientError_1.ClientError.fromError(e);
|
|
49
52
|
}
|
|
50
53
|
}
|
|
51
54
|
async refreshToken() {
|
|
55
|
+
if (this.debug) {
|
|
56
|
+
console.debug('[OAuthClient] refresh token');
|
|
57
|
+
}
|
|
52
58
|
if (this.oauthToken === null) {
|
|
53
59
|
throw new Error('unable to refresh token, auth token not set');
|
|
54
60
|
}
|
|
@@ -58,8 +64,7 @@ class OAuthClient {
|
|
|
58
64
|
this.oathClientToken = this.tokenToOauthClientToken(this.oauthToken);
|
|
59
65
|
}
|
|
60
66
|
catch (e) {
|
|
61
|
-
|
|
62
|
-
throw error;
|
|
67
|
+
throw ClientError_1.ClientError.fromError(e);
|
|
63
68
|
}
|
|
64
69
|
}
|
|
65
70
|
else {
|
|
@@ -82,12 +87,19 @@ class OAuthClient {
|
|
|
82
87
|
throw new ClientError_1.ClientError('Unable to perform request, access token not provided');
|
|
83
88
|
}
|
|
84
89
|
if (signWithOauthToken && this.oauthToken.expired()) {
|
|
85
|
-
|
|
90
|
+
if (this.refreshTokenPromise === null) {
|
|
91
|
+
this.refreshTokenPromise = this.refreshToken();
|
|
92
|
+
await this.refreshTokenPromise;
|
|
93
|
+
this.refreshTokenPromise = null;
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
await this.refreshTokenPromise;
|
|
97
|
+
}
|
|
86
98
|
}
|
|
87
99
|
}
|
|
88
100
|
const requestData = this.createRequestData(action, parameters, method, signWithOauthToken);
|
|
89
101
|
if (this.debug) {
|
|
90
|
-
console.debug('[
|
|
102
|
+
console.debug('[OAuthClient] Request: ' + requestData.method.toUpperCase() + ' ' + requestData.getFullUrl());
|
|
91
103
|
}
|
|
92
104
|
try {
|
|
93
105
|
const response = await HttpClient_1.HttpClient.request2(requestData);
|
|
@@ -9,7 +9,14 @@ class ClientError {
|
|
|
9
9
|
this.code = code;
|
|
10
10
|
}
|
|
11
11
|
static fromError(error) {
|
|
12
|
-
|
|
12
|
+
if (error.body !== undefined && error.body !== null && error.body.error !== undefined && error.body.error !== null) {
|
|
13
|
+
error = error.body.error;
|
|
14
|
+
}
|
|
15
|
+
let message = error;
|
|
16
|
+
if (error.message !== undefined && error.message !== null) {
|
|
17
|
+
message = error.message;
|
|
18
|
+
}
|
|
19
|
+
let clientError = new ClientError(message);
|
|
13
20
|
//console.error(error);
|
|
14
21
|
if (error.status !== null && error.status !== undefined) {
|
|
15
22
|
const statusCode = error.status;
|
|
@@ -40,7 +40,6 @@ class ProjectDeployEndpoint extends Endpoint_1.Endpoint {
|
|
|
40
40
|
try {
|
|
41
41
|
const projectDeploy = await this.httpClient.request('/projectenvironments/' + projectEnvironmentId + '/deploys', {}, 'POST');
|
|
42
42
|
// TODO: parse deploy
|
|
43
|
-
console.log('Parse deploy', projectDeploy);
|
|
44
43
|
return projectDeploy;
|
|
45
44
|
}
|
|
46
45
|
catch (error) {
|
|
@@ -3,10 +3,11 @@ import { DataResult } from '../Model/Result/DataResult';
|
|
|
3
3
|
import { StorageType } from '../Model/Storage/StorageType';
|
|
4
4
|
import { StorageInformation } from '../Model/Storage/StorageInformation';
|
|
5
5
|
import { StorageItem } from '../Model/Storage/StorageItem';
|
|
6
|
+
import { StorageItemInformation } from '../Model/Storage/StorageItemInformation';
|
|
6
7
|
export declare class StorageEndpoint extends Endpoint {
|
|
7
8
|
getInformation(projectEnvironmentId: string, storageType: StorageType): Promise<DataResult<StorageInformation>>;
|
|
8
9
|
clearPool(projectEnvironmentId: string, storageType: StorageType, poolKey: string): Promise<DataResult<any>>;
|
|
9
|
-
|
|
10
|
+
getPoolItemsInformation(projectEnvironmentId: string, storageType: StorageType, poolKey: string): Promise<DataResult<StorageItemInformation[]>>;
|
|
10
11
|
getItem(projectEnvironmentId: string, storageType: StorageType, poolKey: string, storageItemKey: string): Promise<DataResult<StorageItem>>;
|
|
11
12
|
setItem(projectEnvironmentId: string, storageType: StorageType, poolKey: string, storageItem: StorageItem): Promise<DataResult<StorageItem>>;
|
|
12
13
|
deleteItem(projectEnvironmentId: string, storageType: StorageType, poolKey: string, storageItemKey: string): Promise<DataResult<StorageItem>>;
|
|
@@ -29,7 +29,7 @@ class StorageEndpoint extends Endpoint_1.Endpoint {
|
|
|
29
29
|
throw ex;
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
|
-
async
|
|
32
|
+
async getPoolItemsInformation(projectEnvironmentId, storageType, poolKey) {
|
|
33
33
|
let cmd = '/projectenvironments/' + projectEnvironmentId + '/storage/' + storageType + '/' + poolKey + '/items';
|
|
34
34
|
try {
|
|
35
35
|
const result = await this.request(cmd, null, 'GET');
|
|
@@ -11,7 +11,7 @@ class TaskExecutionRequestEndpoint extends Endpoint_1.Endpoint {
|
|
|
11
11
|
try {
|
|
12
12
|
// TODO: parse
|
|
13
13
|
const result = await this.httpClient.request(url, params, 'POST');
|
|
14
|
-
console.log('TODO: parse postTaskExecutionRequest result', result);
|
|
14
|
+
// console.log('TODO: parse postTaskExecutionRequest result', result);
|
|
15
15
|
return result;
|
|
16
16
|
}
|
|
17
17
|
catch (ex) {
|
|
@@ -33,7 +33,7 @@ class WorkerConfigEndpoint extends Endpoint_1.Endpoint {
|
|
|
33
33
|
try {
|
|
34
34
|
let url = '/projectenvironments/' + workerConfig.projectEnvironment + '/workerconfiguration';
|
|
35
35
|
const result = await this.request(url, workerConfig, 'POST');
|
|
36
|
-
console.log(result);
|
|
36
|
+
// console.log(result);
|
|
37
37
|
return WorkerConfig_1.WorkerConfig.parse(result);
|
|
38
38
|
}
|
|
39
39
|
catch (error) {
|
package/dist/index.d.ts
CHANGED
|
@@ -46,6 +46,7 @@ export { ResultError } from './Model/Result/ResultError';
|
|
|
46
46
|
export { StorageInformation } from './Model/Storage/StorageInformation';
|
|
47
47
|
export { StorageType } from './Model/Storage/StorageType';
|
|
48
48
|
export { StorageItem } from './Model/Storage/StorageItem';
|
|
49
|
+
export { StorageItemInformation } from './Model/Storage/StorageItemInformation';
|
|
49
50
|
/** Trigger **/
|
|
50
51
|
export { ApiTrigger } from './Model/Trigger/ApiTrigger';
|
|
51
52
|
export { ApiTriggerData } from './Model/Trigger/ApiTriggerData';
|
package/dist/index.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
exports.
|
|
5
|
-
exports.Utils = exports.Client = exports.HealthAlertEndpoint = exports.WorkerEndpoint = exports.WorkerConfigEndpoint = exports.UserEndpoint = exports.TriggerEndpoint = exports.TeamsEndpoint = void 0;
|
|
3
|
+
exports.Platform = exports.WebhookTriggerData = exports.WebhookTrigger = exports.TriggerType = exports.TriggerData = exports.Trigger = exports.ScheduleTriggerData = exports.ScheduleTrigger = exports.ApiTriggerData = exports.ApiTrigger = exports.StorageItemInformation = exports.StorageItem = exports.StorageType = exports.StorageInformation = exports.ResultError = exports.DataResult = exports.QueueStatus = exports.ProjectEnvironment = exports.ProjectDeployStatus = exports.ProjectDeployCommit = exports.ProjectDeploy = exports.Project = exports.PlatformLanguage = exports.ChannelHistory = exports.Subscriber = exports.WebhookChannelData = exports.SmsChannelData = exports.SlackChannelData = exports.PushChannelData = exports.EmailChannelData = exports.ChannelType = exports.ChannelData = exports.Channel = exports.LogStreamId = exports.LogStream = exports.LogStatus = exports.LogQuery = exports.LogLevel = exports.Log = exports.HealthTestType = exports.HealthAlertStatus = exports.HealthAlert = exports.EventType = exports.ClientError = exports.OAuthClientToken = exports.OAuthClientOptions = exports.OAuthClient = exports.HttpClientResponse = exports.HttpClientRequest = exports.HttpClient = void 0;
|
|
4
|
+
exports.TaskExecutionRequestEndpoint = exports.TaskExecutionEndpoint = exports.TaskEndpoint = exports.SubscriberEndpoint = exports.StorageEndpoint = exports.SourcesAccountEndpoint = exports.QueueEndpoint = exports.ProjectEnvironmentEndpoint = exports.ProjectDeployEndpoint = exports.PlatformEndpoint = exports.NotificationsEndpoint = exports.TeamMemberEndpoint = exports.LogEndpoint = exports.PlatformLanguageEndpoint = exports.ConfigEndpoint = exports.ProjectEndpoint = exports.ChannelEndpoint = exports.AdapterEndpoint = exports.Endpoint = exports.User = exports.TaskSummary = exports.TaskExecutionStats = exports.TaskExecutionSummary = exports.TaskExecutionStatus = exports.TaskExecutionResponse = exports.TaskExecutionHistory = exports.TaskExecution = exports.Task = exports.State = exports.SourcesAccountRepository = exports.SourcesAccount = exports.PagedResult = exports.Notification = exports.DataValue = exports.Config = exports.AdapterConnection = exports.AdapterConfiguration = exports.Adapter = exports.TeamMemberRole = exports.TeamMemberInviteState = exports.TeamMemberInvite2 = exports.TeamMemberInvite = exports.TeamMember = exports.Team = exports.WorkerState = exports.WorkerInstanceState = exports.WorkerInstance = exports.WorkerConfig = exports.Worker = exports.PlatformImage = void 0;
|
|
5
|
+
exports.Utils = exports.Client = exports.HealthAlertEndpoint = exports.WorkerEndpoint = exports.WorkerConfigEndpoint = exports.UserEndpoint = exports.TriggerEndpoint = exports.TeamsEndpoint = exports.TaskExecutionStatsEndpoint = void 0;
|
|
6
6
|
/**
|
|
7
7
|
* @module
|
|
8
8
|
* @description
|
|
@@ -92,6 +92,8 @@ var StorageType_1 = require("./Model/Storage/StorageType");
|
|
|
92
92
|
Object.defineProperty(exports, "StorageType", { enumerable: true, get: function () { return StorageType_1.StorageType; } });
|
|
93
93
|
var StorageItem_1 = require("./Model/Storage/StorageItem");
|
|
94
94
|
Object.defineProperty(exports, "StorageItem", { enumerable: true, get: function () { return StorageItem_1.StorageItem; } });
|
|
95
|
+
var StorageItemInformation_1 = require("./Model/Storage/StorageItemInformation");
|
|
96
|
+
Object.defineProperty(exports, "StorageItemInformation", { enumerable: true, get: function () { return StorageItemInformation_1.StorageItemInformation; } });
|
|
95
97
|
/** Trigger **/
|
|
96
98
|
var ApiTrigger_1 = require("./Model/Trigger/ApiTrigger");
|
|
97
99
|
Object.defineProperty(exports, "ApiTrigger", { enumerable: true, get: function () { return ApiTrigger_1.ApiTrigger; } });
|
package/dist/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const VERSION = "1.8.
|
|
1
|
+
export declare const VERSION = "1.8.14";
|
package/dist/version.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "attlaz-client",
|
|
3
|
-
"version": "1.8.
|
|
3
|
+
"version": "1.8.14",
|
|
4
4
|
"description": "Javascript Client to access Attlaz API",
|
|
5
5
|
"types": "./dist/index.d.ts",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -30,16 +30,16 @@
|
|
|
30
30
|
"popsicle": "^12.1.0"
|
|
31
31
|
},
|
|
32
32
|
"devDependencies": {
|
|
33
|
-
"@types/jest": "^
|
|
34
|
-
"@types/node": "^
|
|
35
|
-
"jest": "^
|
|
33
|
+
"@types/jest": "^28.1.6",
|
|
34
|
+
"@types/node": "^18.7.2",
|
|
35
|
+
"jest": "^28.1.3",
|
|
36
36
|
"rimraf": "^3.0.2",
|
|
37
37
|
"rollup-plugin-commonjs": "^10.1.0",
|
|
38
38
|
"rollup-plugin-node-resolve": "^5.2.0",
|
|
39
39
|
"rollup-plugin-typescript": "^1.0.1",
|
|
40
|
-
"ts-jest": "^
|
|
41
|
-
"typescript": "^4.
|
|
42
|
-
"dotenv": "^16.0.
|
|
40
|
+
"ts-jest": "^28.0.7",
|
|
41
|
+
"typescript": "^4.7.4",
|
|
42
|
+
"dotenv": "^16.0.1"
|
|
43
43
|
},
|
|
44
44
|
"directories": {
|
|
45
45
|
"test": "test"
|