attlaz-client 1.2.11 → 1.4.0

package/dist/Http/HttpClient.js

@@ -47,6 +47,7 @@ class HttpClient {
             omitDefaultHeaders: true,
             body: request.body
         };
+        // TODO: set user agent
         // rawRequest.negotiateHttpVersion = NegotiateHttpVersion.HTTP1_ONLY;
         const response = await popsicle_1.fetch(request.getFullUrl(), rawRequest);
         const httpResponse = new HttpClientResponse_1.HttpClientResponse();
@@ -55,7 +56,16 @@ class HttpClient {
         // TODO: should we get JSON immediately?
         // response.json
         // httpResponse.body = await response.text();
-        httpResponse.body = await response.json();
+        const rawData = await response.text();
+        let jsonData = null;
+        try {
+            jsonData = JSON.parse(rawData);
+        }
+        catch (e) {
+            console.log(httpResponse.statusText);
+            console.error('Unable to parse response data to JSON');
+        }
+        httpResponse.body = jsonData;
         const error = __1.ClientError.byStatus(response.status, response.statusText);
         if (!Utils_1.Utils.isNullOrUndefined(error)) {
             // const body: string = await response.text();

package/dist/Http/OAuthClient.js

@@ -168,7 +168,7 @@ class OAuthClient {
     signRequest(requestObject) {
         const tokenType = this.oauthToken.tokenType;
         const accessToken = this.oauthToken.accessToken;
-        if (tokenType.toLowerCase() === 'bearer') {
+        if (tokenType !== undefined && tokenType.toLowerCase() === 'bearer') {
             requestObject.setHeader('Authorization', 'Bearer ' + accessToken);
         }
         else {

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

@@ -1,18 +1,18 @@
 import { LogLevel } from "./LogLevel";
+import { LogStreamId } from './LogStreamId';
 export declare class Log {
     id: string;
-    date: Date;
-    level: LogLevel;
+    readonly logStream: LogStreamId;
+    readonly date: Date;
+    readonly level: LogLevel;
     message: string;
     context: object;
-    resolved: boolean;
     tags: Array<{
         key: string;
         value: string;
     }>;
-    ignored: boolean;
     _version: string;
-    constructor();
+    constructor(logStream: LogStreamId, level: LogLevel, date: Date);
     static parse(rawLog: any): Log;
     setTag(key: string, value: string): void;
     getTagValue(key: string): string | null;

package/dist/Model/Log/Log.js

@@ -2,22 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Log = void 0;
 const LogLevel_1 = require("./LogLevel");
+const LogStreamId_1 = require("./LogStreamId");
 class Log {
-    constructor() {
-        this.resolved = false;
+    constructor(logStream, level, date) {
         this.tags = [];
-        this.ignored = false;
+        this.logStream = logStream;
+        this.level = level;
+        this.date = date;
     }
     static parse(rawLog) {
-        let log = new Log();
+        const date = new Date(rawLog.date);
+        const level = LogLevel_1.LogLevel.fromString(rawLog.level);
+        const logStream = new LogStreamId_1.LogStreamId(rawLog.logStream.id);
+        let log = new Log(logStream, level, date);
         log.id = rawLog.id;
-        log.date = new Date(rawLog.date);
-        log.level = LogLevel_1.LogLevel.fromString(rawLog.level);
         log.message = rawLog.message;
         log.context = rawLog.context;
-        log.resolved = rawLog.resolved;
         log.tags = rawLog.tags;
-        log.ignored = rawLog.ignored;
         log._version = rawLog._version;
         return log;
     }

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

@@ -1,7 +1,9 @@
 import { LogLevel } from './LogLevel';
+import { LogStreamId } from './LogStreamId';
 export declare class LogQuery {
+    readonly logStreamId: LogStreamId;
     message: string;
-    resolved: boolean;
+    hidden: boolean;
     logLevels: LogLevel[];
     tags: Array<{
         key: string;
@@ -13,5 +15,5 @@ export declare class LogQuery {
         field: string;
         direction: number;
     }>;
-    constructor();
+    constructor(logStreamId: LogStreamId);
 }

package/dist/Model/Log/LogQuery.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LogQuery = void 0;
 class LogQuery {
-    constructor() {
+    constructor(logStreamId) {
         this.message = null;
-        this.resolved = null;
+        this.hidden = null;
         this.pageSize = 1000;
         this.pageNum = 0;
+        this.logStreamId = logStreamId;
     }
 }
 exports.LogQuery = LogQuery;

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

@@ -0,0 +1,4 @@
+export declare class LogStreamId {
+    readonly id: string;
+    constructor(id: string);
+}

package/dist/Model/Log/LogStreamId.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LogStreamId = void 0;
+class LogStreamId {
+    constructor(id) {
+        this.id = id;
+    }
+}
+exports.LogStreamId = LogStreamId;

package/dist/Model/Messaging/Channel/Channel.d.ts

@@ -1,6 +1,7 @@
 import { ChannelType } from './ChannelType';
 import { State } from '../../State';
-export declare class Channel {
+import { StateAware } from '../../StateAware';
+export declare class Channel implements StateAware {
     id: string;
     owner: string;
     label: string;

package/dist/Model/Messaging/Subscriber.d.ts

@@ -1,7 +1,8 @@
 import { State } from '../State';
 import { EventType } from '../Event/EventType';
 import { LogLevel } from '../Log/LogLevel';
-export declare class Subscriber {
+import { StateAware } from '../StateAware';
+export declare class Subscriber implements StateAware {
     id: string;
     eventTypes: EventType[];
     projectEnvironment: string;

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

@@ -1,5 +1,6 @@
 import { State } from '../State';
-export declare class Language {
+import { StateAware } from '../StateAware';
+export declare class Language implements StateAware {
     id: number;
     name: string;
     description: string;

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

@@ -1,5 +1,6 @@
 import { State } from '../State';
-export declare class Project {
+import { StateAware } from '../StateAware';
+export declare class Project implements StateAware {
     id: string;
     key: string;
     name: string;

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

@@ -1,5 +1,6 @@
 import { State } from '../State';
-export declare class ProjectEnvironment {
+import { StateAware } from '../StateAware';
+export declare class ProjectEnvironment implements StateAware {
     id: string;
     key: string;
     projectId: string;

package/dist/Model/StateAware.d.ts

@@ -0,0 +1,4 @@
+import { State } from './State';
+export interface StateAware {
+    state: State;
+}

package/dist/Model/StateAware.js

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

package/dist/Model/Task.d.ts

@@ -1,5 +1,6 @@
 import { State } from './State';
-export declare class Task {
+import { StateAware } from './StateAware';
+export declare class Task implements StateAware {
     id: string;
     key: string;
     name: string;

package/dist/Model/Team/Team.d.ts

@@ -1,5 +1,6 @@
 import { State } from '../State';
-export declare class Team {
+import { StateAware } from '../StateAware';
+export declare class Team implements StateAware {
     id: string;
     name: string;
     state: State;

package/dist/Model/Trigger/Trigger.d.ts

@@ -1,7 +1,8 @@
 import { TriggerData } from "./TriggerData";
 import { State } from '../State';
 import { TriggerType } from './TriggerType';
-export declare class Trigger {
+import { StateAware } from '../StateAware';
+export declare class Trigger implements StateAware {
     id: string;
     type: TriggerType;
     projectEnvironment: string;

package/dist/Model/User/UserAuthProvider.d.ts

@@ -1,5 +1,6 @@
 import { State } from '../State';
-export declare class UserAuthProvider {
+import { StateAware } from '../StateAware';
+export declare class UserAuthProvider implements StateAware {
     id: number;
     userId: string;
     provider: string;

package/dist/Model/User.d.ts

@@ -1,5 +1,6 @@
 import { State } from './State';
-export declare class User {
+import { StateAware } from './StateAware';
+export declare class User implements StateAware {
     id: string;
     username: string;
     firstname: string;

package/dist/Model/Worker/WorkerImage.d.ts

@@ -1,5 +1,6 @@
 import { State } from '../State';
-export declare class WorkerImage {
+import { StateAware } from '../StateAware';
+export declare class WorkerImage implements StateAware {
     id: number;
     name: string;
     image: string;

package/dist/Service/LogEndpoint.js

@@ -4,6 +4,7 @@ exports.LogEndpoint = void 0;
 const Endpoint_1 = require("./Endpoint");
 const PagedResult_1 = require("../Model/PagedResult");
 const Log_1 = require("../Model/Log/Log");
+const Utils_1 = require("../Utils");
 class LogEndpoint extends Endpoint_1.Endpoint {
     getLogs(logQuery) {
         return new Promise((resolve, reject) => {
@@ -11,12 +12,12 @@ class LogEndpoint extends Endpoint_1.Endpoint {
             arrQuery.push('pageSize=' + logQuery.pageSize);
             arrQuery.push('pageNum=' + logQuery.pageNum);
             // Resolved
-            if (logQuery.resolved !== null && logQuery.resolved !== undefined) {
-                if (logQuery.resolved === true) {
-                    arrQuery.push('resolved=1');
+            if (logQuery.hidden !== null && logQuery.hidden !== undefined) {
+                if (logQuery.hidden === true) {
+                    arrQuery.push('hidden=1');
                 }
                 else {
-                    arrQuery.push('resolved=0');
+                    arrQuery.push('hidden=0');
                 }
             }
             // LogLevels
@@ -33,7 +34,7 @@ class LogEndpoint extends Endpoint_1.Endpoint {
                 const strTags = arrTags.join(',');
                 arrQuery.push('tags=' + strTags);
             }
-            let cmd = '/system/logs/?' + arrQuery.join('&');
+            let cmd = '/logstreams/' + Utils_1.Utils.base64encode(logQuery.logStreamId.id) + '/logs/?' + arrQuery.join('&');
             this.httpClient.request(cmd).then((rawLogs) => {
                 let logs = [];
                 for (let rawLog of rawLogs.data) {
@@ -51,7 +52,7 @@ class LogEndpoint extends Endpoint_1.Endpoint {
     }
     save(log) {
         return new Promise((resolve, reject) => {
-            let cmd = '/system/logs/';
+            let cmd = '/logstreams/' + Utils_1.Utils.base64encode(log.logStream.id) + '/logs';
             this.httpClient.request(cmd, log, 'POST').then((rawSavedLog) => {
                 resolve(Log_1.Log.parse(rawSavedLog));
             }).catch((reason) => {

package/dist/Service/UserEndpoint.js

@@ -60,7 +60,7 @@ class UserEndpoint extends __1.Endpoint {
     async update(user) {
         try {
             let url = '/user/' + user.id;
-            const result = await this.httpClient.request(url, user, 'POST');
+            const result = await this.httpClient.request(url, { user }, 'POST');
             return __1.User.parse(result);
         }
         catch (e) {

package/dist/index.d.ts

@@ -16,6 +16,7 @@ export { HealthTestType } from './Model/HealthAlert/HealthTestType';
 export { Log } from './Model/Log/Log';
 export { LogLevel } from './Model/Log/LogLevel';
 export { LogQuery } from './Model/Log/LogQuery';
+export { LogStreamId } from './Model/Log/LogStreamId';
 export { LogType } from './Model/Log/LogType';
 /** Messaging **/
 export { Channel } from './Model/Messaging/Channel/Channel';

package/dist/index.js

@@ -33,6 +33,8 @@ var LogLevel_1 = require("./Model/Log/LogLevel");
 Object.defineProperty(exports, "LogLevel", { enumerable: true, get: function () { return LogLevel_1.LogLevel; } });
 var LogQuery_1 = require("./Model/Log/LogQuery");
 Object.defineProperty(exports, "LogQuery", { enumerable: true, get: function () { return LogQuery_1.LogQuery; } });
+var LogStreamId_1 = require("./Model/Log/LogStreamId");
+Object.defineProperty(exports, "LogStreamId", { enumerable: true, get: function () { return LogStreamId_1.LogStreamId; } });
 var LogType_1 = require("./Model/Log/LogType");
 Object.defineProperty(exports, "LogType", { enumerable: true, get: function () { return LogType_1.LogType; } });
 /** Messaging **/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "attlaz-client",
-  "version": "1.2.11",
+  "version": "1.4.0",
   "description": "Javascript Client to access Attlaz API",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -25,13 +25,13 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "client-oauth2": "^4.2.5",
+    "client-oauth2": "^4.3.3",
     "esm": "^3.2.25",
     "popsicle": "^12.1.0"
   },
   "devDependencies": {
     "@types/jest": "^26.0.15",
-    "@types/node": "^14.14.6",
+    "@types/node": "^16.0.0",
     "jest": "^26.6.3",
     "rimraf": "^3.0.2",
     "ts-jest": "^26.4.3",