admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 18:12:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Strapi Node): Strapi credentials notice (#6289)

Browse Source
This commit is contained in:
Michael Kret
2023-05-23 12:00:02 +03:00
committed by GitHub
parent ed7f3b845f
commit bbe6d4c4db
3 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/nodes-base/nodes/Strapi/GenericFunctions.ts
View File

@@ -10,11 +10,17 @@ import type {
} from 'n8n-workflow';
import { NodeApiError } from 'n8n-workflow';
export const removeTrailingSlash = (url: string) => {
if (url.endsWith('/')) {
return url.slice(0, -1);
}
return url;
};
export async function strapiApiRequest(
this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions | IWebhookFunctions,
method: string,
resource: string,
body: IDataObject = {},
qs: IDataObject = {},
uri?: string,
@@ -22,16 +28,15 @@ export async function strapiApiRequest(
) {
const credentials = await this.getCredentials('strapiApi');
const url = removeTrailingSlash(credentials.url as string);
try {
const options: OptionsWithUri = {
headers: {},
method,
body,
qs,
uri:
uri || credentials.apiVersion === 'v4'
? `${credentials.url}/api${resource}`
: `${credentials.url}${resource}`,
uri: uri || credentials.apiVersion === 'v4' ? `${url}/api${resource}` : `${url}${resource}`,
json: true,
qsStringifyOptions: {
arrayFormat: 'indice',
@@ -54,6 +59,9 @@ export async function getToken(
this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions | IWebhookFunctions,
): Promise<any> {
const credentials = await this.getCredentials('strapiApi');
const url = removeTrailingSlash(credentials.url as string);
let options = {} as OptionsWithUri;
options = {
headers: {
@@ -64,10 +72,7 @@ export async function getToken(
identifier: credentials.email,
password: credentials.password,
},
uri:
credentials.apiVersion === 'v4'
? `${credentials.url}/api/auth/local`
: `${credentials.url}/auth/local`,
uri: credentials.apiVersion === 'v4' ? `${url}/api/auth/local` : `${url}/auth/local`,
json: true,
};
return this.helpers.request(options);