@flexbe/sdk 0.2.34 → 0.2.35

package/README.md

@@ -19,7 +19,7 @@ const client = new FlexbeClient({
     baseUrl: 'https://api.flexbe.com', // optional
     timeout: 30000, // optional, defaults to 30 seconds
 });
-const siteApi = client.getSiteApi(SITE_ID)
+const siteApi = client.getSiteApi(SITE_ID);
 
 // Using the Pages API for a specific site
 try {
@@ -28,14 +28,15 @@ try {
         limit: 10,
         offset: 0,
         type: 'page',
-        status: 'published'
+        status: 'published',
     });
     console.log(pages.pages);
 
     // Get a single page from site
     const page = await siteApi.pages.getPage(123);
     console.log(page);
-} catch (error) {
+}
+catch (error) {
     console.error(error.message);
 }
 
@@ -58,6 +59,7 @@ try {
 ## Environment Variables
 
 The SDK supports the following environment variables:
+
 - `FLEXBE_API_KEY`: Your API key (required for API Key authentication)
 - `FLEXBE_API_URL`: Base URL (defaults to 'https://api.flexbe.com')
 
@@ -79,4 +81,4 @@ npm run lint
 
 ## License
 
-MIT
+MIT

package/dist/browser/client/api-client.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { NotFoundException, ForbiddenException, BadRequestException, UnauthorizedException, ServerException, TimeoutException, FlexbeAuthType } from '../types';
+import { BadRequestException, FlexbeAuthType, ForbiddenException, NotFoundException, ServerException, TimeoutException, UnauthorizedException } from '../types';
 import { TokenManager } from './token-manager';
 export class ApiClient {
     constructor(config) {
@@ -29,7 +29,7 @@ export class ApiClient {
                 if (!token) {
                     throw new Error('No valid bearer token available');
                 }
-                headers['Authorization'] = `Bearer ${token}`;
+                headers.Authorization = `Bearer ${token}`;
             }
             return headers;
         });
@@ -59,7 +59,7 @@ export class ApiClient {
                     const defaultError = {
                         message: response.statusText,
                         error: response.statusText,
-                        statusCode: response.status
+                        statusCode: response.status,
                     };
                     const errorData = yield response.json().catch(() => defaultError);
                     switch (errorData.statusCode) {
@@ -81,7 +81,7 @@ export class ApiClient {
                                 message: errorData.message,
                                 error: errorData.error,
                                 statusCode: errorData.statusCode,
-                                errors: errorData.errors
+                                errors: errorData.errors,
                             };
                     }
                 }
@@ -112,18 +112,28 @@ export class ApiClient {
         });
     }
     get(url, config) {
-        return this.request(Object.assign(Object.assign({}, config), { url, method: 'GET' }));
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.request(Object.assign(Object.assign({}, config), { url, method: 'GET' }));
+        });
     }
     post(url, data, config) {
-        return this.request(Object.assign(Object.assign({}, config), { url, method: 'POST', body: JSON.stringify(data) }));
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.request(Object.assign(Object.assign({}, config), { url, method: 'POST', body: JSON.stringify(data) }));
+        });
     }
     put(url, data, config) {
-        return this.request(Object.assign(Object.assign({}, config), { url, method: 'PUT', body: JSON.stringify(data) }));
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.request(Object.assign(Object.assign({}, config), { url, method: 'PUT', body: JSON.stringify(data) }));
+        });
     }
     patch(url, data, config) {
-        return this.request(Object.assign(Object.assign({}, config), { url, method: 'PATCH', body: JSON.stringify(data) }));
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.request(Object.assign(Object.assign({}, config), { url, method: 'PATCH', body: JSON.stringify(data) }));
+        });
     }
     delete(url, config) {
-        return this.request(Object.assign(Object.assign({}, config), { url, method: 'DELETE' }));
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.request(Object.assign(Object.assign({}, config), { url, method: 'DELETE' }));
+        });
     }
 }

package/dist/browser/client/client.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { FlexbeAuthType } from '../types';
 import { ApiClient } from './api-client';
-import { SiteApi } from './site-api';
 import { MetaApi } from './meta-api';
+import { SiteApi } from './site-api';
 import { TokenManager } from './token-manager';
 export class FlexbeClient {
     constructor(config) {

package/dist/browser/client/meta-api.js

@@ -18,7 +18,7 @@ export class MetaApi {
     getSiteLanguages() {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.api.get('/meta/site-languages', {
-                headers: { 'Authorization': '' }
+                headers: { Authorization: '' },
             });
             return response.data;
         });
@@ -30,7 +30,7 @@ export class MetaApi {
     getUserLanguages() {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.api.get('/meta/user-languages', {
-                headers: { 'Authorization': '' }
+                headers: { Authorization: '' },
             });
             return response.data;
         });
@@ -42,7 +42,7 @@ export class MetaApi {
     getSiteCurrencies() {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.api.get('/meta/site-currencies', {
-                headers: { 'Authorization': '' }
+                headers: { Authorization: '' },
             });
             return response.data;
         });

package/dist/browser/client/pages.js

@@ -30,7 +30,8 @@ export class Pages {
      */
     getPages(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const processedParams = params ? Object.assign(Object.assign({}, params), { type: Array.isArray(params.type) ? params.type.join(',') : params.type, status: Array.isArray(params.status) ? params.status.join(',') : params.status }) : undefined;
+            const processedParams = params
+                ? Object.assign(Object.assign({}, params), { type: Array.isArray(params.type) ? params.type.join(',') : params.type, status: Array.isArray(params.status) ? params.status.join(',') : params.status }) : undefined;
             const response = yield this.api.get(`/sites/${this.siteId}/pages`, { params: processedParams });
             return response.data;
         });
@@ -233,7 +234,7 @@ export class Pages {
     bulkDeletePages(ids) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.api.delete(`/sites/${this.siteId}/pages`, {
-                body: JSON.stringify({ ids })
+                body: JSON.stringify({ ids }),
             });
             return response.data;
         });

package/dist/browser/client/token-manager.js

@@ -13,6 +13,7 @@ const TOKEN_REFRESH_THRESHOLD = 5 * 60 * 1000; // update token 5 minutes before
 export class TokenManager {
     constructor() {
         this.tokenPromise = null;
+        this.isRevoking = false;
     }
     static getInstance() {
         if (!TokenManager.instance) {
@@ -29,6 +30,9 @@ export class TokenManager {
     getToken() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
+            if (this.isRevoking) {
+                return null;
+            }
             const token = this.getStoredToken();
             if (token && token.expiresAt > Date.now()) {
                 // TODO check if token expire less that 1 minute
@@ -45,10 +49,14 @@ export class TokenManager {
     }
     revokeToken() {
         return __awaiter(this, void 0, void 0, function* () {
+            this.isRevoking = true;
             const token = this.getStoredToken();
-            this.clearToken();
-            if (!token)
+            if (!token) {
+                this.isRevoking = false;
                 return;
+            }
+            // Optimistic token cleanup
+            this.clearToken();
             try {
                 const controller = new AbortController();
                 const timeoutId = setTimeout(() => controller.abort(), 30000);
@@ -56,7 +64,7 @@ export class TokenManager {
                     method: 'POST',
                     headers: {
                         'Content-Type': 'application/json',
-                        'Authorization': `Bearer ${token.accessToken}`
+                        Authorization: `Bearer ${token.accessToken}`,
                     },
                     body: JSON.stringify({ token: token.accessToken }),
                     credentials: 'include',
@@ -67,11 +75,17 @@ export class TokenManager {
             catch (error) {
                 console.error('Failed to revoke token:', error);
             }
+            finally {
+                // Finally cleanup the token
+                this.clearToken();
+                this.isRevoking = false;
+            }
         });
     }
     getStoredToken() {
-        if (typeof window === 'undefined')
+        if (typeof window === 'undefined') {
             return null;
+        }
         const storedToken = localStorage.getItem(TOKEN_STORAGE_KEY);
         if (!storedToken) {
             return null;
@@ -104,28 +118,23 @@ export class TokenManager {
         return __awaiter(this, void 0, void 0, function* () {
             const controller = new AbortController();
             const timeoutId = setTimeout(() => controller.abort(), 30000);
-            try {
-                const response = yield fetch('/oauth/token', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({ grant_type: 'client_credentials' }),
-                    credentials: 'include',
-                    signal: controller.signal,
-                });
-                clearTimeout(timeoutId);
-                if (!response.ok) {
-                    const errorData = yield response.json().catch(() => ({ message: response.statusText }));
-                    if (response.status === 401) {
-                        throw new UnauthorizedException(errorData.message || response.statusText);
-                    }
-                    throw new Error(errorData.message || response.statusText);
+            const response = yield fetch('/oauth/token', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ grant_type: 'client_credentials' }),
+                credentials: 'include',
+                signal: controller.signal,
+            });
+            clearTimeout(timeoutId);
+            if (!response.ok) {
+                const errorData = yield response.json().catch(() => ({ message: response.statusText }));
+                if (response.status === 401) {
+                    throw new UnauthorizedException(errorData.message || response.statusText);
                 }
-                const data = yield response.json();
-                this.setToken(data);
-            }
-            catch (error) {
-                throw error;
+                throw new Error(errorData.message || response.statusText);
             }
+            const data = yield response.json();
+            this.setToken(data);
         });
     }
     setToken(tokenResponse) {

package/dist/cjs/client/api-client.js

@@ -22,7 +22,7 @@ class ApiClient {
             if (!token) {
                 throw new Error('No valid bearer token available');
             }
-            headers['Authorization'] = `Bearer ${token}`;
+            headers.Authorization = `Bearer ${token}`;
         }
         return headers;
     }
@@ -57,7 +57,7 @@ class ApiClient {
                 const defaultError = {
                     message: response.statusText,
                     error: response.statusText,
-                    statusCode: response.status
+                    statusCode: response.status,
                 };
                 const errorData = await response.json().catch(() => defaultError);
                 switch (errorData.statusCode) {
@@ -79,7 +79,7 @@ class ApiClient {
                             message: errorData.message,
                             error: errorData.error,
                             statusCode: errorData.statusCode,
-                            errors: errorData.errors
+                            errors: errorData.errors,
                         };
                 }
             }
@@ -108,19 +108,19 @@ class ApiClient {
             throw error;
         }
     }
-    get(url, config) {
+    async get(url, config) {
         return this.request({ ...config, url, method: 'GET' });
     }
-    post(url, data, config) {
+    async post(url, data, config) {
         return this.request({ ...config, url, method: 'POST', body: JSON.stringify(data) });
     }
-    put(url, data, config) {
+    async put(url, data, config) {
         return this.request({ ...config, url, method: 'PUT', body: JSON.stringify(data) });
     }
-    patch(url, data, config) {
+    async patch(url, data, config) {
         return this.request({ ...config, url, method: 'PATCH', body: JSON.stringify(data) });
     }
-    delete(url, config) {
+    async delete(url, config) {
         return this.request({ ...config, url, method: 'DELETE' });
     }
 }

package/dist/cjs/client/client.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlexbeClient = void 0;
 const types_1 = require("../types");
 const api_client_1 = require("./api-client");
-const site_api_1 = require("./site-api");
 const meta_api_1 = require("./meta-api");
+const site_api_1 = require("./site-api");
 const token_manager_1 = require("./token-manager");
 class FlexbeClient {
     constructor(config) {

package/dist/cjs/client/meta-api.js

@@ -11,7 +11,7 @@ class MetaApi {
      */
     async getSiteLanguages() {
         const response = await this.api.get('/meta/site-languages', {
-            headers: { 'Authorization': '' }
+            headers: { Authorization: '' },
         });
         return response.data;
     }
@@ -21,7 +21,7 @@ class MetaApi {
      */
     async getUserLanguages() {
         const response = await this.api.get('/meta/user-languages', {
-            headers: { 'Authorization': '' }
+            headers: { Authorization: '' },
         });
         return response.data;
     }
@@ -31,7 +31,7 @@ class MetaApi {
      */
     async getSiteCurrencies() {
         const response = await this.api.get('/meta/site-currencies', {
-            headers: { 'Authorization': '' }
+            headers: { Authorization: '' },
         });
         return response.data;
     }

package/dist/cjs/client/pages.js

@@ -23,11 +23,13 @@ class Pages {
      * @throws {TimeoutException} When the request times out
      */
     async getPages(params) {
-        const processedParams = params ? {
-            ...params,
-            type: Array.isArray(params.type) ? params.type.join(',') : params.type,
-            status: Array.isArray(params.status) ? params.status.join(',') : params.status
-        } : undefined;
+        const processedParams = params
+            ? {
+                ...params,
+                type: Array.isArray(params.type) ? params.type.join(',') : params.type,
+                status: Array.isArray(params.status) ? params.status.join(',') : params.status,
+            }
+            : undefined;
         const response = await this.api.get(`/sites/${this.siteId}/pages`, { params: processedParams });
         return response.data;
     }
@@ -208,7 +210,7 @@ class Pages {
      */
     async bulkDeletePages(ids) {
         const response = await this.api.delete(`/sites/${this.siteId}/pages`, {
-            body: JSON.stringify({ ids })
+            body: JSON.stringify({ ids }),
         });
         return response.data;
     }

package/dist/cjs/client/token-manager.js

@@ -7,6 +7,7 @@ const TOKEN_REFRESH_THRESHOLD = 5 * 60 * 1000; // update token 5 minutes before
 class TokenManager {
     constructor() {
         this.tokenPromise = null;
+        this.isRevoking = false;
     }
     static getInstance() {
         if (!TokenManager.instance) {
@@ -21,6 +22,9 @@ class TokenManager {
         return TokenManager.instance;
     }
     async getToken() {
+        if (this.isRevoking) {
+            return null;
+        }
         const token = this.getStoredToken();
         if (token && token.expiresAt > Date.now()) {
             // TODO check if token expire less that 1 minute
@@ -35,10 +39,14 @@ class TokenManager {
         return retrievedToken?.accessToken ?? null;
     }
     async revokeToken() {
+        this.isRevoking = true;
         const token = this.getStoredToken();
-        this.clearToken();
-        if (!token)
+        if (!token) {
+            this.isRevoking = false;
             return;
+        }
+        // Optimistic token cleanup
+        this.clearToken();
         try {
             const controller = new AbortController();
             const timeoutId = setTimeout(() => controller.abort(), 30000);
@@ -46,7 +54,7 @@ class TokenManager {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',
-                    'Authorization': `Bearer ${token.accessToken}`
+                    Authorization: `Bearer ${token.accessToken}`,
                 },
                 body: JSON.stringify({ token: token.accessToken }),
                 credentials: 'include',
@@ -57,10 +65,16 @@ class TokenManager {
         catch (error) {
             console.error('Failed to revoke token:', error);
         }
+        finally {
+            // Finally cleanup the token
+            this.clearToken();
+            this.isRevoking = false;
+        }
     }
     getStoredToken() {
-        if (typeof window === 'undefined')
+        if (typeof window === 'undefined') {
             return null;
+        }
         const storedToken = localStorage.getItem(TOKEN_STORAGE_KEY);
         if (!storedToken) {
             return null;
@@ -90,28 +104,23 @@ class TokenManager {
     async doRetrieveToken() {
         const controller = new AbortController();
         const timeoutId = setTimeout(() => controller.abort(), 30000);
-        try {
-            const response = await fetch('/oauth/token', {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({ grant_type: 'client_credentials' }),
-                credentials: 'include',
-                signal: controller.signal,
-            });
-            clearTimeout(timeoutId);
-            if (!response.ok) {
-                const errorData = await response.json().catch(() => ({ message: response.statusText }));
-                if (response.status === 401) {
-                    throw new types_1.UnauthorizedException(errorData.message || response.statusText);
-                }
-                throw new Error(errorData.message || response.statusText);
+        const response = await fetch('/oauth/token', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ grant_type: 'client_credentials' }),
+            credentials: 'include',
+            signal: controller.signal,
+        });
+        clearTimeout(timeoutId);
+        if (!response.ok) {
+            const errorData = await response.json().catch(() => ({ message: response.statusText }));
+            if (response.status === 401) {
+                throw new types_1.UnauthorizedException(errorData.message || response.statusText);
             }
-            const data = await response.json();
-            this.setToken(data);
-        }
-        catch (error) {
-            throw error;
+            throw new Error(errorData.message || response.statusText);
         }
+        const data = await response.json();
+        this.setToken(data);
     }
     setToken(tokenResponse) {
         const expiresAt = this.getExpirationFromToken(tokenResponse.accessToken);

package/dist/esm/client/api-client.js

@@ -1,4 +1,4 @@
-import { NotFoundException, ForbiddenException, BadRequestException, UnauthorizedException, ServerException, TimeoutException, FlexbeAuthType } from '../types';
+import { BadRequestException, FlexbeAuthType, ForbiddenException, NotFoundException, ServerException, TimeoutException, UnauthorizedException } from '../types';
 import { TokenManager } from './token-manager';
 export class ApiClient {
     constructor(config) {
@@ -19,7 +19,7 @@ export class ApiClient {
             if (!token) {
                 throw new Error('No valid bearer token available');
             }
-            headers['Authorization'] = `Bearer ${token}`;
+            headers.Authorization = `Bearer ${token}`;
         }
         return headers;
     }
@@ -54,7 +54,7 @@ export class ApiClient {
                 const defaultError = {
                     message: response.statusText,
                     error: response.statusText,
-                    statusCode: response.status
+                    statusCode: response.status,
                 };
                 const errorData = await response.json().catch(() => defaultError);
                 switch (errorData.statusCode) {
@@ -76,7 +76,7 @@ export class ApiClient {
                             message: errorData.message,
                             error: errorData.error,
                             statusCode: errorData.statusCode,
-                            errors: errorData.errors
+                            errors: errorData.errors,
                         };
                 }
             }
@@ -105,19 +105,19 @@ export class ApiClient {
             throw error;
         }
     }
-    get(url, config) {
+    async get(url, config) {
         return this.request({ ...config, url, method: 'GET' });
     }
-    post(url, data, config) {
+    async post(url, data, config) {
         return this.request({ ...config, url, method: 'POST', body: JSON.stringify(data) });
     }
-    put(url, data, config) {
+    async put(url, data, config) {
         return this.request({ ...config, url, method: 'PUT', body: JSON.stringify(data) });
     }
-    patch(url, data, config) {
+    async patch(url, data, config) {
         return this.request({ ...config, url, method: 'PATCH', body: JSON.stringify(data) });
     }
-    delete(url, config) {
+    async delete(url, config) {
         return this.request({ ...config, url, method: 'DELETE' });
     }
 }

package/dist/esm/client/client.js

@@ -1,7 +1,7 @@
 import { FlexbeAuthType } from '../types';
 import { ApiClient } from './api-client';
-import { SiteApi } from './site-api';
 import { MetaApi } from './meta-api';
+import { SiteApi } from './site-api';
 import { TokenManager } from './token-manager';
 export class FlexbeClient {
     constructor(config) {

package/dist/esm/client/meta-api.js

@@ -8,7 +8,7 @@ export class MetaApi {
      */
     async getSiteLanguages() {
         const response = await this.api.get('/meta/site-languages', {
-            headers: { 'Authorization': '' }
+            headers: { Authorization: '' },
         });
         return response.data;
     }
@@ -18,7 +18,7 @@ export class MetaApi {
      */
     async getUserLanguages() {
         const response = await this.api.get('/meta/user-languages', {
-            headers: { 'Authorization': '' }
+            headers: { Authorization: '' },
         });
         return response.data;
     }
@@ -28,7 +28,7 @@ export class MetaApi {
      */
     async getSiteCurrencies() {
         const response = await this.api.get('/meta/site-currencies', {
-            headers: { 'Authorization': '' }
+            headers: { Authorization: '' },
         });
         return response.data;
     }

package/dist/esm/client/pages.js

@@ -20,11 +20,13 @@ export class Pages {
      * @throws {TimeoutException} When the request times out
      */
     async getPages(params) {
-        const processedParams = params ? {
-            ...params,
-            type: Array.isArray(params.type) ? params.type.join(',') : params.type,
-            status: Array.isArray(params.status) ? params.status.join(',') : params.status
-        } : undefined;
+        const processedParams = params
+            ? {
+                ...params,
+                type: Array.isArray(params.type) ? params.type.join(',') : params.type,
+                status: Array.isArray(params.status) ? params.status.join(',') : params.status,
+            }
+            : undefined;
         const response = await this.api.get(`/sites/${this.siteId}/pages`, { params: processedParams });
         return response.data;
     }
@@ -205,7 +207,7 @@ export class Pages {
      */
     async bulkDeletePages(ids) {
         const response = await this.api.delete(`/sites/${this.siteId}/pages`, {
-            body: JSON.stringify({ ids })
+            body: JSON.stringify({ ids }),
         });
         return response.data;
     }