attlaz-client 1.11.12 → 1.12.0

package/dist/Client.d.ts

@@ -29,13 +29,13 @@ import { FirewallEndpoint } from './Service/FirewallEndpoint.js';
 import { CodeSourceStrategiesEndpoint } from './Service/CodeSourceStrategiesEndpoint.js';
 import { SearchEndpoint } from './Service/SearchEndpoint.js';
 export declare class Client {
-    private readonly apiEndpoint;
-    private readonly clientId;
-    private readonly clientSecret;
     private endpoints;
-    private readonly httpClient;
+    private httpClient;
     private Store;
-    constructor(apiEndpoint: string, clientId: string, clientSecret: string);
+    private apiEndpoint;
+    private parseConfig;
+    constructor(token?: string | null, config?: Record<string, unknown>);
+    setClientCredentials(clientId: string, clientSecret?: string): void;
     private getHeaders;
     getHttpClient(): OAuthClient;
     authenticate(): Promise<boolean>;

package/dist/Client.js

@@ -1,3 +1,4 @@
+import { OAuthClientToken } from './Http/OAuthClientToken.js';
 import { WorkerEndpoint } from './Service/WorkerEndpoint.js';
 import { AdapterEndpoint } from './Service/AdapterEndpoint.js';
 import { ProjectEnvironmentEndpoint } from './Service/ProjectEnvironmentEndpoint.js';
@@ -30,9 +31,6 @@ import { VERSION } from './version.js';
 import { CodeSourceStrategiesEndpoint } from './Service/CodeSourceStrategiesEndpoint.js';
 import { SearchEndpoint } from './Service/SearchEndpoint.js';
 export class Client {
-    apiEndpoint;
-    clientId;
-    clientSecret;
     endpoints;
     httpClient;
     Store = {
@@ -65,21 +63,26 @@ export class Client {
         FirewallEndpoint,
         SearchEndpoint,
     };
-    constructor(apiEndpoint, clientId, clientSecret) {
-        this.apiEndpoint = apiEndpoint;
-        this.clientId = clientId;
-        this.clientSecret = clientSecret;
-        const options = new OAuthClientOptions(apiEndpoint, clientId, clientSecret, this.getHeaders());
+    apiEndpoint = 'https://api.attlaz.com';
+    parseConfig(config) {
+        return config;
+    }
+    constructor(token = null, config = {}) {
+        const parsedConfig = this.parseConfig(config);
+        if (parsedConfig.apiEndpoint !== undefined) {
+            this.apiEndpoint = parsedConfig.apiEndpoint;
+        }
+        const options = new OAuthClientOptions(this.apiEndpoint, null, null, this.getHeaders());
         this.httpClient = new OAuthClient(options);
+        if (token !== null) {
+            const clientToken = new OAuthClientToken(token, 'Bearer', '', '');
+            this.httpClient.setToken(clientToken);
+        }
         this.endpoints = new Map();
-        // this.test = new Map<string, any>();
-        //
-        // this.test.set('WorkerEndpoint', WorkerEndpoint);
-        // this.socketService = socketIo(this.apiEndpoint);
-        //
-        // this.socketService.on('message', (data: any) => {
-        //     console.log('Incoming:', data);
-        // });
+    }
+    setClientCredentials(clientId, clientSecret = '') {
+        const options = new OAuthClientOptions(this.apiEndpoint, clientId, clientSecret, this.getHeaders());
+        this.httpClient = new OAuthClient(options);
     }
     getHeaders() {
         const userAgentInfo = {
@@ -100,6 +103,7 @@ export class Client {
         if (username === null || password === null) {
             return this.httpClient.authenticate();
         }
+        // TODO: this is only possible when clientId and clientSecret are defined
         return this.httpClient.authenticate(username, password);
     }
     isAuthenticated() {
@@ -108,10 +112,6 @@ export class Client {
     getToken() {
         return this.httpClient.getToken();
     }
-    // public getAccessToken(): string {
-    //     return this.httpClient.getAccessToken();
-    // }
-    //
     setToken(token) {
         this.httpClient.setToken(token);
     }

package/dist/Http/HttpClient.js

@@ -51,7 +51,9 @@ export class HttpClient {
                     jsonData = JSON.parse(rawData);
                 }
                 catch (e) {
-                    console.error('Unable to parse response data to JSON', { statusText: httpResponse.statusText, error: e });
+                    console.error('Unable to parse response data to JSON', {
+                        statusText: httpResponse.statusText, error: e,
+                    });
                 }
             }
             httpResponse.body = jsonData;
@@ -61,7 +63,7 @@ export class HttpClient {
         }
         const error = ClientError.byStatus(response.status, response.statusText);
         if (error !== null && error !== undefined) {
-            error.body = httpResponse.body;
+            error.message = httpResponse.body.error.message;
             throw error;
         }
         return httpResponse;

package/dist/Http/OAuthClient.js

@@ -13,8 +13,8 @@ export class OAuthClient {
     constructor(options) {
         this.options = options;
         this.oauthClient = new ClientOAuth2({
-            clientId: options.clientId,
-            clientSecret: options.clientSecret,
+            clientId: options.clientId === null ? undefined : options.clientId,
+            clientSecret: options.clientSecret === null ? undefined : options.clientSecret,
             accessTokenUri: this.getUri(options.accessTokenUri),
             authorizationUri: this.getUri(options.authorizationUri),
             redirectUri: options.redirectUri,
@@ -105,11 +105,14 @@ export class OAuthClient {
                 return response.body;
             }
             catch (error) {
-                const clientError = ClientError.fromError(error);
-                if (this.debug) {
-                    console.error('[Client] Error:', { error, clientError });
+                if (!(error instanceof ClientError)) {
+                    const clientError = ClientError.fromError(error);
+                    if (this.debug) {
+                        console.error('[Client] Error:', { error, clientError });
+                    }
+                    throw clientError;
                 }
-                throw clientError;
+                throw error;
             }
         }
     }

package/dist/Http/OAuthClientOptions.d.ts

@@ -1,13 +1,13 @@
 import { Headers } from './Data/Header.js';
 export declare class OAuthClientOptions {
     apiEndpoint: string;
-    clientId: string;
-    clientSecret: string;
+    readonly clientId: string | null;
+    readonly clientSecret: string | null;
+    headers: Headers;
     accessTokenUri: string;
     authorizationUri: string;
     redirectUri: string;
     scopes: string[];
     state: string;
-    headers: Headers;
-    constructor(apiEndpoint: string, clientId: string, clientSecret: string, headers: Headers);
+    constructor(apiEndpoint: string, clientId: string | null, clientSecret: string | null, headers: Headers);
 }

package/dist/Http/OAuthClientOptions.js

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

package/dist/Model/Error/ClientError.d.ts

@@ -1,10 +1,8 @@
 export declare class ClientError implements Error {
-    message: string;
-    name: string;
     code: number | null;
-    stack: string;
-    body: string | null;
-    constructor(message: string, code?: number | null);
+    name: string;
+    message: string;
+    constructor(name: string, code?: number | null);
     static fromError(error: Error | any): ClientError;
     static byStatus(statusCode: number, statusText: string): ClientError | null;
 }

package/dist/Model/Error/ClientError.js

@@ -1,15 +1,18 @@
 import { HttpClient } from '../../Http/HttpClient.js';
 export class ClientError {
-    message;
-    name;
     code;
-    stack;
-    body = null;
-    constructor(message, code = null) {
-        this.message = message;
+    name;
+    message;
+    // description: string | null;
+    // stack: string;
+    // body: string | null = null;
+    constructor(name, code = null) {
+        this.name = name;
+        this.message = name;
         this.code = code;
     }
     static fromError(error) {
+        console.log(error);
         if (error.body !== undefined && error.body !== null && error.body.error !== undefined && error.body.error !== null) {
             error = error.body.error;
         }
@@ -42,7 +45,7 @@ export class ClientError {
             }
         }
         clientError.name = error.name;
-        clientError.stack = error.stack;
+        // clientError.stack = error.stack;
         return clientError;
     }
     static byStatus(statusCode, statusText) {

package/dist/Service/WorkspaceEndpoint.d.ts

@@ -3,5 +3,6 @@ import { Workspace } from '../Model/Workspace/Workspace.js';
 import { CollectionResult } from '../Model/Result/CollectionResult.js';
 export declare class WorkspaceEndpoint extends Endpoint {
     getAll(): Promise<CollectionResult<Workspace>>;
+    getById(workspaceId: string): Promise<Workspace | null>;
     save(workspace: Workspace): Promise<Workspace>;
 }

package/dist/Service/WorkspaceEndpoint.js

@@ -13,6 +13,19 @@ export class WorkspaceEndpoint extends Endpoint {
             throw e;
         }
     }
+    async getById(workspaceId) {
+        try {
+            const url = '/workspaces/' + workspaceId + '';
+            const result = await this.requestObject(url, null, Workspace.parse);
+            return result.getData();
+        }
+        catch (error) {
+            if (this.httpClient.isDebugEnabled()) {
+                console.error('Failed to load workspace by id: ', error);
+            }
+            throw error;
+        }
+    }
     async save(workspace) {
         try {
             const url = '/workspaces';

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "1.11.8";
+export declare const VERSION = "1.11.14";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = "1.11.8";
+export const VERSION = "1.11.14";

package/package.json

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