mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-12-24 20:24:05 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

⚡ Remove server option from Twake-Node till supported

Browse source
This commit is contained in:
Jan Oberhauser 2020-08-04 17:30:08 +02:00
parent b77bdfbcfe
commit 94862d2db4
2 changed files with 44 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
packages/nodes-base/nodes/Twake/GenericFunctions.ts
View file

@ -7,6 +7,8 @@ import {
import {
OptionsWithUri,
} from 'request';
/**
* Make an API request to Twake
*
@ -16,7 +18,7 @@ import {
* @param {object} body
* @returns {Promise<any>}
*/
export async function twakeApiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: object, query?: object, uri?: string): Promise<any> { // tslint:disable-line:no-any
export async function twakeApiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: object, query?: object, uri?: string): Promise<any> { // tslint:disable-line:no-any
const authenticationMethod = this.getNodeParameter('twakeVersion', 0, 'twakeCloudApi') as string;
@ -30,21 +32,20 @@ export async function twakeApiRequest(this: IHookFunctions | IExecuteFunctions |
};
if (authenticationMethod === 'cloud') {
// if (authenticationMethod === 'cloud') {
const credentials = this.getCredentials('twakeCloudApi');
options.headers!.Authorization = `Bearer ${credentials!.workspaceKey}`;
} else {
const credentials = this.getCredentials('twakeServerApi');
options.auth = { user: credentials!.publicId as string, pass: credentials!.privateApiKey as string };
options.uri = `${credentials!.hostUrl}/api/v1${resource}`;
}
// } else {
// const credentials = this.getCredentials('twakeServerApi');
// options.auth = { user: credentials!.publicId as string, pass: credentials!.privateApiKey as string };
// options.uri = `${credentials!.hostUrl}/api/v1${resource}`;
// }
try {
return await this.helpers.request!(options);
} catch (error) {
if( error.error.code === "ECONNREFUSED"){
if (error.error.code === 'ECONNREFUSED') {
throw new Error('Twake host is not accessible!');
}

68
packages/nodes-base/nodes/Twake/Twake.node.ts
View file

@ -34,43 +34,43 @@ export class Twake implements INodeType {
{
name: 'twakeCloudApi',
required: true,
displayOptions: {
show: {
twakeVersion: [
'cloud',
],
},
},
},
{
name: 'twakeServerApi',
required: true,
displayOptions: {
show: {
twakeVersion: [
'server',
],
},
},
// displayOptions: {
// show: {
// twakeVersion: [
// 'cloud',
// ],
// },
// },
},
// {
// name: 'twakeServerApi',
// required: true,
// displayOptions: {
// show: {
// twakeVersion: [
// 'server',
// ],
// },
// },
// },
],
properties: [
{
displayName: 'Twake Version',
name: 'twakeVersion',
type: 'options',
options: [
{
name: 'Cloud',
value: 'cloud',
},
// {
// name: 'Server (Self Hosted)',
// value: 'server',
// },
],
default: 'cloud',
},
// {
// displayName: 'Twake Version',
// name: 'twakeVersion',
// type: 'options',
// options: [
// {
// name: 'Cloud',
// value: 'cloud',
// },
// {
// name: 'Server (Self Hosted)',
// value: 'server',
// },
// ],
// default: 'cloud',
// },
{
displayName: 'Resource',
name: 'resource',