Merge pull request 'bug/merge-marker' (#5) from bug/merge-marker into master
Reviewed-on: #5
This commit is contained in:
commit
f3b5f6c953
|
|
@ -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',
|
||||
// },
|
||||
// };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,11 +17,8 @@ async function plutioApiRequestToken(this: IExecuteFunctions | ILoadOptionsFunct
|
|||
const clientId = `${credentials.clientId}`;
|
||||
const clientSecret = `${credentials.clientSecret}`;
|
||||
const business = `${credentials.business}`;
|
||||
<<<<<<< HEAD
|
||||
|
||||
const endpoint = 'api.plutio.com/v1.10';
|
||||
=======
|
||||
const endpoint = 'api.plutio.com/v1.9';
|
||||
>>>>>>> master
|
||||
const returnData: IDataObject[] = [];
|
||||
|
||||
let responseData;
|
||||
|
|
@ -62,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}`;
|
||||
|
|
|
|||
|
|
@ -826,26 +826,6 @@ export class Plutio implements INodeType {
|
|||
}
|
||||
}
|
||||
if ('project' === resource) {
|
||||
if ('getCklph' === operation) {
|
||||
const contributor = this.getNodeParameter('contributor', i) as IDataObject;
|
||||
|
||||
if (contributor) {
|
||||
let contributorId;
|
||||
const users = await plutioApiRequest.call(this, 'GET', '/people');
|
||||
for (const user of users) {
|
||||
if (user.contactEmails[0].address === contributor || contributor === user._id) {
|
||||
contributorId = user._id;
|
||||
}
|
||||
}
|
||||
qs.contributors = contributorId as string;
|
||||
}
|
||||
const project = await plutioApiRequest.call(this, 'GET', '/projects', {}, qs);
|
||||
if (project.length === 1) {
|
||||
responseData = project;
|
||||
} else {
|
||||
responseData = {'name': 'default'};
|
||||
}
|
||||
}
|
||||
if ('get' === operation) {
|
||||
const options = this.getNodeParameter('options', i) as IDataObject;
|
||||
|
||||
|
|
@ -997,7 +977,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;
|
||||
|
|
|
|||
|
|
@ -41,12 +41,6 @@ export const projectOperations: INodeProperties[] = [
|
|||
description: 'Get projects',
|
||||
action: 'Get a project',
|
||||
},
|
||||
// {
|
||||
// name: 'Chykalophia',
|
||||
// value: 'getCklph',
|
||||
// description: 'Get projects by contributor\'s email for CKLPH',
|
||||
// action: 'Get a project',
|
||||
// },
|
||||
{
|
||||
name: 'Move',
|
||||
value: 'move',
|
||||
|
|
@ -60,7 +54,7 @@ export const projectOperations: INodeProperties[] = [
|
|||
action: 'Update a project',
|
||||
},
|
||||
],
|
||||
default: 'getCklph',
|
||||
default: 'get',
|
||||
},
|
||||
];
|
||||
|
||||
|
|
@ -114,7 +108,7 @@ export const projectDescription: INodeProperties[] = [
|
|||
displayName: 'Template Name or ID',
|
||||
name: 'templateId',
|
||||
type: 'options',
|
||||
description: 'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
|
||||
description: 'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/nodes/expressions.html#expressions">expression</a>',
|
||||
default: '',
|
||||
typeOptions: {
|
||||
loadOptionsMethod: 'getProjectTemplateId',
|
||||
|
|
@ -152,7 +146,7 @@ export const projectDescription: INodeProperties[] = [
|
|||
displayName: 'Custom Field Name or ID',
|
||||
name: '_id',
|
||||
type: 'options',
|
||||
description: 'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
|
||||
description: 'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/nodes/expressions.html#expressions">expression</a>',
|
||||
default: '',
|
||||
typeOptions: {
|
||||
loadOptionsMethod: 'getProjectCustomField',
|
||||
|
|
@ -198,7 +192,7 @@ export const projectDescription: INodeProperties[] = [
|
|||
displayName: 'Contributors: Name or ID',
|
||||
name: 'value',
|
||||
type: 'options',
|
||||
description: 'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
|
||||
description: 'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/nodes/expressions.html#expressions">expression</a>',
|
||||
default: '',
|
||||
typeOptions: {
|
||||
loadOptionsMethod: 'getUsers',
|
||||
|
|
@ -248,7 +242,7 @@ export const projectDescription: INodeProperties[] = [
|
|||
displayName: 'Contributor\'s Email\, Name or ID',
|
||||
name: 'contributor',
|
||||
type: 'options',
|
||||
description: 'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
|
||||
description: 'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/nodes/expressions.html#expressions">expression</a>',
|
||||
default: '',
|
||||
typeOptions: {
|
||||
loadOptionsMethod: 'getEmails',
|
||||
|
|
@ -258,7 +252,7 @@ export const projectDescription: INodeProperties[] = [
|
|||
displayName: 'Project Name or ID',
|
||||
name: '_id',
|
||||
type: 'options',
|
||||
description: 'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
|
||||
description: 'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/nodes/expressions.html#expressions">expression</a>',
|
||||
default: '',
|
||||
typeOptions: {
|
||||
loadOptionsMethod: 'getProjectId',
|
||||
|
|
@ -266,24 +260,4 @@ export const projectDescription: INodeProperties[] = [
|
|||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
displayName: 'Contributor\'s Email\, Name or ID',
|
||||
name: 'contributor',
|
||||
type: 'options',
|
||||
description: 'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
|
||||
default: '',
|
||||
typeOptions: {
|
||||
loadOptionsMethod: 'getEmails',
|
||||
},
|
||||
displayOptions: {
|
||||
show: {
|
||||
resource: [
|
||||
'project',
|
||||
],
|
||||
operation: [
|
||||
'getCklph',
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
];
|
||||
|
|
|
|||
Loading…
Reference in New Issue