Skip to content

Commit

Permalink
feat(Magento 2 Node): Add credential tests (#3086)
Browse files Browse the repository at this point in the history
* Implements Magento Auth API Test

* Deletes unit tests

* Fixed lint issues and changed the URI for the credential test

* ⚡ Move credential verification to the credential file

* ⚡ Simplify code

Co-authored-by: paolo-rechia <paolo@e-bot7.com>
Co-authored-by: ricardo <ricardoespinoza105@gmail.com>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
  • Loading branch information
4 people committed Apr 8, 2022
1 parent c7a037e commit a11b00a
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 5 deletions.
13 changes: 13 additions & 0 deletions packages/nodes-base/credentials/Magento2Api.credentials.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import {
IAuthenticateBearer,
ICredentialTestRequest,
ICredentialType,
INodeProperties,
} from 'n8n-workflow';
Expand All @@ -21,4 +23,15 @@ export class Magento2Api implements ICredentialType {
default: '',
},
];
test: ICredentialTestRequest = {
request: {
baseURL: '={{$credentials.host}}',
url: '/rest/default/V1/modules',
},
};

authenticate = {
type: 'bearer',
properties: {},
} as IAuthenticateBearer;
}
6 changes: 1 addition & 5 deletions packages/nodes-base/nodes/Magento/GenericFunctions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ export async function magentoApiRequest(this: IWebhookFunctions | IHookFunctions
const credentials = await this.getCredentials('magento2Api') as IDataObject;

let options: OptionsWithUri = {
headers: {
'Content-Type': 'application/json',
'Authorization': `Bearer ${credentials.accessToken}`,
},
method,
body,
qs,
Expand All @@ -45,7 +41,7 @@ export async function magentoApiRequest(this: IWebhookFunctions | IHookFunctions
delete options.body;
}
//@ts-ignore
return await this.helpers.request.call(this, options);
return await this.helpers.requestWithAuthentication.call(this, 'magento2Api', options);
} catch (error) {
throw new NodeApiError(this.getNode(), error);
}
Expand Down
8 changes: 8 additions & 0 deletions packages/nodes-base/nodes/Magento/Magento2.node.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
import {
OptionsWithUri,
} from 'request';


import {
IExecuteFunctions,
} from 'n8n-core';

import {
ICredentialsDecrypted,
ICredentialTestFunctions,
IDataObject,
ILoadOptionsFunctions,
INodeCredentialTestResult,
INodeExecutionData,
INodePropertyOptions,
INodeType,
Expand Down

0 comments on commit a11b00a

Please sign in to comment.