n8n-nodes-qlik-cloud 1.2.2 → 1.2.4

package/dist/nodes/QlikCloud/QlikCloud.node.js

@@ -887,13 +887,44 @@ class QlikCloud {
                 {
                     name: 'qlikCloudApi',
                     required: true,
+                    displayOptions: {
+                        show: {
+                            authentication: [
+                                'apiToken',
+                            ],
+                        },
+                    },
                 },
                 {
                     name: 'qlikCloudOAuth2Api',
                     required: true,
+                    displayOptions: {
+                        show: {
+                            authentication: [
+                                'oAuth2',
+                            ],
+                        },
+                    },
                 },
             ],
             properties: [
+                {
+                    displayName: 'Authentication',
+                    name: 'authentication',
+                    type: 'options',
+                    options: [
+                        {
+                            name: 'API Token',
+                            value: 'apiToken',
+                        },
+                        {
+                            name: 'OAuth2',
+                            value: 'oAuth2',
+                        },
+                    ],
+                    default: 'apiToken',
+                    description: 'Choose how to authenticate to Qlik Cloud',
+                },
                 {
                     displayName: 'Resource',
                     name: 'resource',

package/dist/nodes/QlikCloud/shared/transport.js

@@ -3,17 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.qlikApiRequest = qlikApiRequest;
 const n8n_workflow_1 = require("n8n-workflow");
 async function qlikApiRequest(method, endpoint, body, qs, returnFullResponse = false, extraOptions = {}) {
-    const credentials = await this.getCredentials('qlikCloudApi');
+    const authenticationMethod = this.getNodeParameter('authentication', 0);
+    const credentialType = authenticationMethod === 'oAuth2' ? 'qlikCloudOAuth2Api' : 'qlikCloudApi';
+    const credentials = await this.getCredentials(credentialType);
     if (!credentials) {
         throw new n8n_workflow_1.NodeApiError(this.getNode(), {
-            message: 'No credentials found for Qlik Cloud API',
+            message: `No credentials found for Qlik Cloud API (${authenticationMethod === 'oAuth2' ? 'OAuth2' : 'API Token'})`,
         });
     }
     const baseUrl = credentials.baseUrl.replace(/\/+$/, '');
-    const accessToken = credentials.accessToken;
     const url = `${baseUrl}${endpoint.startsWith('/') ? endpoint : `/${endpoint}`}`;
-    const headers = {
-        Authorization: `Bearer ${accessToken}`,
+    const baseHeaders = {
         'Content-Type': 'application/json',
         ...(extraOptions.headers || {}),
     };
@@ -21,15 +21,25 @@ async function qlikApiRequest(method, endpoint, body, qs, returnFullResponse = f
         method,
         url,
         qs,
-        json: extraOptions.json ?? true,
         returnFullResponse,
         ...extraOptions,
-        headers,
+        json: extraOptions.json ?? true,
+        headers: baseHeaders,
     };
+    if (authenticationMethod === 'apiToken') {
+        const accessToken = credentials.accessToken;
+        options.headers = {
+            Authorization: `Bearer ${accessToken}`,
+            ...baseHeaders,
+        };
+    }
     if (body !== undefined) {
         options.body = body;
     }
     try {
+        if (authenticationMethod === 'oAuth2') {
+            return await this.helpers.httpRequestWithAuthentication.call(this, credentialType, options);
+        }
         return await this.helpers.httpRequest(options);
     }
     catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-qlik-cloud",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "n8n node for Qlik Cloud REST APIs integration",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/nodes/QlikCloud/QlikCloud.node.ts

@@ -1240,13 +1240,44 @@ export class QlikCloud implements INodeType {
 			{
 				name: 'qlikCloudApi',
 				required: true,
+				displayOptions: {
+					show: {
+						authentication: [
+							'apiToken',
+						],
+					},
+				},
 			},
 			{
 				name: 'qlikCloudOAuth2Api',
 				required: true,
+				displayOptions: {
+					show: {
+						authentication: [
+							'oAuth2',
+						],
+					},
+				},
 			},
 		],
 		properties: [
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				options: [
+					{
+						name: 'API Token',
+						value: 'apiToken',
+					},
+					{
+						name: 'OAuth2',
+						value: 'oAuth2',
+					},
+				],
+				default: 'apiToken',
+				description: 'Choose how to authenticate to Qlik Cloud',
+			},
 			{
 				displayName: 'Resource',
 				name: 'resource',

package/src/nodes/QlikCloud/shared/transport.ts

@@ -14,20 +14,20 @@ export async function qlikApiRequest(
 	returnFullResponse: boolean = false,
 	extraOptions: Partial<IHttpRequestOptions> = {},
 ): Promise<any> {
-	const credentials = await this.getCredentials('qlikCloudApi');
+	const authenticationMethod = this.getNodeParameter('authentication', 0) as 'apiToken' | 'oAuth2';
+	const credentialType = authenticationMethod === 'oAuth2' ? 'qlikCloudOAuth2Api' : 'qlikCloudApi';
+	const credentials = await this.getCredentials(credentialType);
 
 	if (!credentials) {
 		throw new NodeApiError(this.getNode(), {
-			message: 'No credentials found for Qlik Cloud API',
+			message: `No credentials found for Qlik Cloud API (${authenticationMethod === 'oAuth2' ? 'OAuth2' : 'API Token'})`,
 		} as any);
 	}
 
 	const baseUrl = (credentials.baseUrl as string).replace(/\/+$/, '');
-	const accessToken = credentials.accessToken as string;
 	const url = `${baseUrl}${endpoint.startsWith('/') ? endpoint : `/${endpoint}`}`;
 
-	const headers = {
-		Authorization: `Bearer ${accessToken}`,
+	const baseHeaders = {
 		'Content-Type': 'application/json',
 		...(extraOptions.headers || {}),
 	};
@@ -36,17 +36,29 @@ export async function qlikApiRequest(
 		method,
 		url,
 		qs,
-		json: extraOptions.json ?? true,
 		returnFullResponse,
 		...extraOptions,
-		headers,
+		json: extraOptions.json ?? true,
+		headers: baseHeaders,
 	};
 
+	if (authenticationMethod === 'apiToken') {
+		const accessToken = credentials.accessToken as string;
+		options.headers = {
+			Authorization: `Bearer ${accessToken}`,
+			...baseHeaders,
+		};
+	}
+
 	if (body !== undefined) {
 		options.body = body;
 	}
 
 	try {
+		if (authenticationMethod === 'oAuth2') {
+			return await this.helpers.httpRequestWithAuthentication.call(this, credentialType, options);
+		}
+
 		return await this.helpers.httpRequest(options);
 	} catch (error) {
 		const errMessage = error instanceof Error ? error.message : typeof error === 'string' ? error : JSON.stringify(error);