@pokash/n8n-nodes-optima-rest-api 1.2.0 → 1.2.1

package/dist/nodes/OptimaRestApi/OptimaRestApi.node.js

@@ -531,16 +531,16 @@ class OptimaRestApi {
         // Create unique cache key based on credentials
         const loginModel = credentials.loginModel || 'subscription';
         const cacheKey = `${gatewayUrl}:${credentials.username}:${credentials.company}:${loginModel}`;
-        // Check if we have a valid cached token
-        const cached = tokenCache.get(cacheKey);
-        const now = Date.now();
-        let token;
-        if (cached && cached.expiresAt > now) {
-            // Token still valid, use from cache
-            token = cached.token;
-        }
-        else {
-            // Token expired or doesn't exist, authenticate
+        // Helper function to get or refresh authentication token
+        const getAuthToken = async (forceRefresh = false) => {
+            // Check cache unless forced refresh
+            if (!forceRefresh) {
+                const cached = tokenCache.get(cacheKey);
+                const now = Date.now();
+                if (cached && cached.expiresAt > now) {
+                    return cached.token;
+                }
+            }
             // Build login body based on selected model
             const loginBody = {
                 username: credentials.username,
@@ -548,11 +548,9 @@ class OptimaRestApi {
                 company: credentials.company,
             };
             if (loginModel === 'subscription') {
-                // Subscription model (Optima 2026+)
                 loginBody.subscriptionPackages = credentials.subscriptionPackages || 'Podstawowy';
             }
             else {
-                // Traditional modules model
                 loginBody.modules = credentials.modules || 'KP';
             }
             const loginResponse = await this.helpers.request({
@@ -561,11 +559,43 @@ class OptimaRestApi {
                 body: loginBody,
                 json: true,
             });
-            token = loginResponse.Token;
+            const token = loginResponse.Token;
             // Cache token for 50 minutes (assuming 60 min expiry, refresh 10 min early)
+            const now = Date.now();
             const expiresAt = now + (50 * 60 * 1000);
             tokenCache.set(cacheKey, { token, expiresAt });
-        }
+            return token;
+        };
+        // Helper function to make authenticated API requests with automatic retry on 401
+        const makeAuthenticatedRequest = async (requestOptions) => {
+            var _a;
+            // Get token
+            let token = await getAuthToken();
+            // Add authorization header
+            const options = {
+                ...requestOptions,
+                headers: {
+                    ...requestOptions.headers,
+                    Authorization: `Bearer ${token}`,
+                },
+            };
+            try {
+                // Try the request
+                return await this.helpers.request(options);
+            }
+            catch (error) {
+                // Check if it's a 401 error
+                if (error.statusCode === 401 || ((_a = error.response) === null || _a === void 0 ? void 0 : _a.statusCode) === 401) {
+                    // Token expired/invalid - refresh and retry once
+                    token = await getAuthToken(true);
+                    // Retry with new token
+                    options.headers.Authorization = `Bearer ${token}`;
+                    return await this.helpers.request(options);
+                }
+                // Re-throw other errors
+                throw error;
+            }
+        };
         for (let i = 0; i < items.length; i++) {
             try {
                 if (resource === 'customer') {
@@ -589,12 +619,9 @@ class OptimaRestApi {
                         const url = queryString
                             ? `${gatewayUrl}/api/customer?${queryString}`
                             : `${gatewayUrl}/api/customer`;
-                        const response = await this.helpers.request({
+                        const response = await makeAuthenticatedRequest({
                             method: 'GET',
                             url,
-                            headers: {
-                                Authorization: `Bearer ${token}`,
-                            },
                             json: true,
                         });
                         // API returns { Success: true, Customers: [...], TotalCount: ... }
@@ -661,12 +688,9 @@ class OptimaRestApi {
                     }
                     else if (operation === 'create') {
                         const customerData = JSON.parse(this.getNodeParameter('customerData', i));
-                        const response = await this.helpers.request({
+                        const response = await makeAuthenticatedRequest({
                             method: 'POST',
                             url: `${gatewayUrl}/api/customer`,
-                            headers: {
-                                Authorization: `Bearer ${token}`,
-                            },
                             body: customerData,
                             json: true,
                         });
@@ -683,12 +707,9 @@ class OptimaRestApi {
                         const customerData = JSON.parse(this.getNodeParameter('customerData', i));
                         // Add ID to the customer data for PUT request
                         customerData.ID = customerId;
-                        const response = await this.helpers.request({
+                        const response = await makeAuthenticatedRequest({
                             method: 'PUT',
                             url: `${gatewayUrl}/api/customer`,
-                            headers: {
-                                Authorization: `Bearer ${token}`,
-                            },
                             body: customerData,
                             json: true,
                         });
@@ -702,12 +723,9 @@ class OptimaRestApi {
                     }
                     else if (operation === 'delete') {
                         const customerId = this.getNodeParameter('customerId', i);
-                        await this.helpers.request({
+                        await makeAuthenticatedRequest({
                             method: 'DELETE',
                             url: `${gatewayUrl}/api/customer/${customerId}`,
-                            headers: {
-                                Authorization: `Bearer ${token}`,
-                            },
                             json: true,
                         });
                         const result = {
@@ -723,12 +741,9 @@ class OptimaRestApi {
                     if (operation === 'createInvoice') {
                         const documentType = this.getNodeParameter('documentType', i);
                         const documentData = JSON.parse(this.getNodeParameter('documentData', i));
-                        const response = await this.helpers.request({
+                        const response = await makeAuthenticatedRequest({
                             method: 'POST',
                             url: `${gatewayUrl}/api/Documents/Invoice/${documentType}`,
-                            headers: {
-                                Authorization: `Bearer ${token}`,
-                            },
                             body: documentData,
                             json: true,
                         });
@@ -743,12 +758,9 @@ class OptimaRestApi {
                     else if (operation === 'createAdditionalRecord') {
                         const recordType = this.getNodeParameter('recordType', i);
                         const recordData = JSON.parse(this.getNodeParameter('recordData', i));
-                        const response = await this.helpers.request({
+                        const response = await makeAuthenticatedRequest({
                             method: 'POST',
                             url: `${gatewayUrl}/api/Documents/AdditionalRecords/${recordType}`,
-                            headers: {
-                                Authorization: `Bearer ${token}`,
-                            },
                             body: recordData,
                             json: true,
                         });
@@ -773,12 +785,9 @@ class OptimaRestApi {
                     };
                     const dictConfig = dictionaryEndpoints[operation];
                     if (dictConfig) {
-                        const response = await this.helpers.request({
+                        const response = await makeAuthenticatedRequest({
                             method: 'GET',
                             url: `${gatewayUrl}/api/${dictConfig.endpoint}`,
-                            headers: {
-                                Authorization: `Bearer ${token}`,
-                            },
                             json: true,
                         });
                         // API returns { Success: true, [DataKey]: [...], TotalCount: ... }
@@ -855,12 +864,9 @@ class OptimaRestApi {
                         const url = queryString
                             ? `${gatewayUrl}/api/product?${queryString}`
                             : `${gatewayUrl}/api/product`;
-                        const response = await this.helpers.request({
+                        const response = await makeAuthenticatedRequest({
                             method: 'GET',
                             url,
-                            headers: {
-                                Authorization: `Bearer ${token}`,
-                            },
                             json: true,
                         });
                         // API returns { Success: true, Products: [...], TotalCount: ... }
@@ -934,12 +940,9 @@ class OptimaRestApi {
                             FormatId: formatId,
                             FiltrSQL: filtrSQL,
                         };
-                        const response = await this.helpers.request({
+                        const response = await makeAuthenticatedRequest({
                             method: 'POST',
                             url: `${gatewayUrl}/api/Documents/Print`,
-                            headers: {
-                                Authorization: `Bearer ${token}`,
-                            },
                             body: requestBody,
                             json: false,
                             encoding: null, // Get binary data (PDF file)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pokash/n8n-nodes-optima-rest-api",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "n8n node for Comarch Optima REST API integration",
   "keywords": [
     "n8n-community-node-package",