attlaz-client 1.18.0 → 1.18.2

package/dist/Http/OAuthClient.js

@@ -155,15 +155,15 @@ export class OAuthClient {
         return typeof process !== 'undefined' && process.versions != null && process.versions.node != null;
     }
     tokenToOauthClientToken(oauthToken) {
-        // console.log('Auth token', oauthToken);
-        // let scopes: string = '';
-        // if (Object.prototype.hasOwnProperty.call(oauthToken.data, 'scopes')) {
-        //     scopes = oauthToken.data.scopes;
-        // } else if (Object.prototype.hasOwnProperty.call(oauthToken.data, 'scope')) {
-        //     scopes = oauthToken.data.scope;
-        // }
+        let scopes = '';
+        if (Object.prototype.hasOwnProperty.call(oauthToken, 'scopes') && oauthToken.scopes !== undefined) {
+            scopes = oauthToken.scopes;
+        }
+        else if (Object.prototype.hasOwnProperty.call(oauthToken, 'scope') && oauthToken.scope !== undefined) {
+            scopes = oauthToken.scope;
+        }
         const refreshToken = oauthToken.refresh_token === undefined || oauthToken.refresh_token === null ? null : oauthToken.refresh_token;
-        const token = new OAuthClientToken(oauthToken.access_token, oauthToken.token_type, refreshToken, oauthToken.scope);
+        const token = new OAuthClientToken(oauthToken.access_token, oauthToken.token_type, refreshToken, scopes);
         const t = new Date();
         t.setSeconds(t.getSeconds() + oauthToken.expires_in);
         token.expires = t;

package/dist/Service/SubscriberEndpoint.d.ts

@@ -1,8 +1,9 @@
 import { Endpoint } from './Endpoint.js';
 import { Subscriber } from '../Model/Messaging/Subscriber.js';
 import { CollectionResult } from '../Model/Result/CollectionResult.js';
+import { CursorPagination } from '../Model/Pagination/CursorPagination.js';
 export declare class SubscriberEndpoint extends Endpoint {
-    getSubscribersByFlow(flowId: string, projectEnvironmentId?: string | null): Promise<CollectionResult<Subscriber>>;
-    getSubscribersByChannel(channelId: string): Promise<CollectionResult<Subscriber>>;
+    getSubscribersByFlow(flowId: string, projectEnvironmentId?: string | null, pagination?: CursorPagination | null): Promise<CollectionResult<Subscriber>>;
+    getSubscribersByChannel(channelId: string, pagination?: CursorPagination | null): Promise<CollectionResult<Subscriber>>;
     save(subscriber: Subscriber): Promise<Subscriber>;
 }

package/dist/Service/SubscriberEndpoint.js

@@ -1,17 +1,20 @@
 import { Endpoint } from './Endpoint.js';
 import { Subscriber } from '../Model/Messaging/Subscriber.js';
-import { Utils } from '../Utils.js';
+import { QueryString } from '../Http/Data/QueryString.js';
 export class SubscriberEndpoint extends Endpoint {
-    async getSubscribersByFlow(flowId, projectEnvironmentId = null) {
-        let parameters = null;
-        if (!Utils.isNullOrUndefined(projectEnvironmentId)) {
-            parameters = { environment: projectEnvironmentId };
+    async getSubscribersByFlow(flowId, projectEnvironmentId = null, pagination = null) {
+        const qu = new QueryString('/flows/' + flowId + '/subscribers');
+        if (projectEnvironmentId !== null && projectEnvironmentId !== undefined) {
+            qu.set('environment', projectEnvironmentId);
         }
-        const result = await this.requestCollection('/flows/' + flowId + '/subscribers', Subscriber.parseRaw, parameters);
+        qu.addPagination(pagination);
+        const result = await this.requestCollection(qu, Subscriber.parseRaw);
         return result;
     }
-    async getSubscribersByChannel(channelId) {
-        const result = await this.requestCollection('/channels/' + channelId + '/subscribers', Subscriber.parseRaw);
+    async getSubscribersByChannel(channelId, pagination = null) {
+        const qu = new QueryString('/channels/' + channelId + '/subscribers');
+        qu.addPagination(pagination);
+        const result = await this.requestCollection(qu, Subscriber.parseRaw);
         return result;
     }
     async save(subscriber) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "attlaz-client",
-  "version": "1.18.0",
+  "version": "1.18.2",
   "description": "Javascript Client to access Attlaz API",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -47,15 +47,16 @@
   "devDependencies": {
     "@types/jest": "^29.5.2",
     "@types/node": "^22.1.0",
-    "@typescript-eslint/eslint-plugin": "^8.12.2",
-    "@typescript-eslint/parser": "^8.12.2",
     "dotenv": "^16.3.1",
-    "eslint": "^8.42.0",
-    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-config-attlaz-base": "^1.0.17",
+    "eslint": "^9.14.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jsdoc": "^50.4.3",
+    "eslint-plugin-jsdoc": "^50.1.0",
     "eslint-plugin-prefer-arrow": "^1.2.3",
-    "eslint-plugin-promise": "^7.0.0",
+    "eslint-plugin-promise": "^7.1.0",
+    "@typescript-eslint/eslint-plugin": "^8.1.0",
+    "@typescript-eslint/parser": "^8.1.0",
     "jest": "^29.5.0",
     "rimraf": "^6.0.1",
     "rollup-plugin-commonjs": "^10.1.0",