Chykalophia
/
n8n-nodes-plutio
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed merge conflict marker

This commit is contained in:
Joel Sanguenza 2022-09-15 00:43:01 +08:00
parent ab691f648c
commit ed7dc578c5
3 changed files with 1 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
credentials/PlutioApi.credentials.ts
View File

@ -1,43 +1,12 @@
import {
ICredentialType,
INodeProperties,
ICredentialDataDecryptedObject,
IAuthenticateGeneric,
IExecuteFunctions,
ICredentialTestRequest,
NodeApiError,
IDataObject,
} from 'n8n-workflow';
export class PlutioApi implements ICredentialType {
name = 'plutioApi';
displayName = 'Plutio API';
extends = ['oAuth2Api'];
properties: INodeProperties[] = [
// {
// displayName: 'Grant Type',
// name: 'grantType',
// type: 'hidden',
// default: 'client_credentials',
// },
// {
// displayName: 'Scope',
// name: 'scope',
// type: 'hidden',
// default: '*',
// },
// {
// displayName: 'Authentication',
// name: 'authentication',
// type: 'hidden',
// default: 'header',
// },
// {
// displayName: 'Access Token URL',
// name: 'accessTokenUrl',
// type: 'hidden',
// default: 'https://api.plutio.com/v1.10/oauth/token',
// },
{
displayName: 'Client ID',
name: 'clientId',
@ -60,57 +29,4 @@ export class PlutioApi implements ICredentialType {
default: '',
},
];
// async preAuthentication(this: IExecuteFunctions, credentials: ICredentialDataDecryptedObject) {
// const endpoint = 'api.plutio.com/v1.10';
// const returnData: IDataObject[] = [];
// let access_token;
// try {
// access_token = await this.helpers.httpRequest({
// method: 'POST',
// url: `https://${endpoint}/oauth/token`,
// headers: {
// 'Content-Type': 'application/x-www-form-urlencoded',
// 'business': `${credentials.business}`,
// },
// body: {
// 'client_id': `${credentials.clientId}`,
// 'client_secret': `${credentials.clientSecret}`,
// 'grant_type': 'client_credentials',
// },
// json: true,
// }) as {access_token: IDataObject};
// if (Array.isArray(access_token)) {
// returnData.push.apply(returnData, access_token as IDataObject[]);
// } else {
// if (access_token === undefined) {
// access_token = {
// success: true,
// };
// }
// returnData.push(access_token as IDataObject);
// }
// if (returnData[0].accessToken) {
// return {accessToken: returnData[0].accessToken};
// }
// } catch (error) {
// throw new NodeApiError(this.getNode(), error);
// }
// }
// authenticate: IAuthenticateGeneric = {
// type: 'generic',
// properties: {
// headers: {
// 'Content-Type': 'application/json',
// 'Business': '={{$credentials.business}}',
// 'Authorization': '=Bearer {{$credentials.accessToken}}',
// },
// },
// };
// test: ICredentialTestRequest = {
// request: {
// baseURL: 'https://api.plutio.com/v1.10',
// url: '/templates',
// },
// };
}

4
nodes/Plutio/GenericFunctions.ts
View File

@ -59,11 +59,7 @@ async function plutioApiRequestToken(this: IExecuteFunctions | ILoadOptionsFunct
// Rest API function for plutio node.
export async function plutioApiRequest(this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, query: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
<<<<<<< HEAD
const endpoint = 'api.plutio.com/v1.10';
=======
const endpoint = 'api.plutio.com/v1.9';
>>>>>>> master
const credentials = await this.getCredentials('plutioApi');
const plutioApiToken = await plutioApiRequestToken.call(this);
const business = `${credentials.business}`;

2
nodes/Plutio/Plutio.node.ts
View File

@ -997,7 +997,7 @@ export class Plutio implements INodeType {
body.contributors = contributor as [string];
}
responseData = await plutioApiRequest.call(this, 'PUT', '/projects', body);;
responseData = await plutioApiRequest.call(this, 'PUT', '/projects', body);
}
if ('move' === operation) {
const _id = this.getNodeParameter('_id', 0) as string;