diff --git a/packages/nodes-base/nodes/NextCloud/GenericFunctions.ts b/packages/nodes-base/nodes/NextCloud/GenericFunctions.ts index 32481c5118..673a24100b 100644 --- a/packages/nodes-base/nodes/NextCloud/GenericFunctions.ts +++ b/packages/nodes-base/nodes/NextCloud/GenericFunctions.ts @@ -17,6 +17,9 @@ import { * @returns {Promise} */ export async function nextCloudApiRequest(this: IHookFunctions | IExecuteFunctions, method: string, endpoint: string, body: object | string | Buffer, headers?: object, encoding?: null | undefined, query?: object): Promise { // tslint:disable-line:no-any + const resource = this.getNodeParameter('resource', 0); + const operation = this.getNodeParameter('operation', 0); + const options : OptionsWithUri = { headers, method, @@ -46,9 +49,6 @@ export async function nextCloudApiRequest(this: IHookFunctions | IExecuteFunctio options.uri = `${credentials.webDavUrl}/${encodeURI(endpoint)}`; - const resource = this.getNodeParameter('resource', 0); - const operation = this.getNodeParameter('operation', 0); - if (resource === 'user' && operation === 'create') { options.uri = options.uri.replace('/remote.php/webdav', ''); } @@ -61,10 +61,13 @@ export async function nextCloudApiRequest(this: IHookFunctions | IExecuteFunctio options.uri = `${credentials.webDavUrl}/${encodeURI(endpoint)}`; + if (resource === 'user' && operation === 'create') { + options.uri = options.uri.replace('/remote.php/webdav', ''); + } + return await this.helpers.requestOAuth2!.call(this, 'nextCloudOAuth2Api', options); } } catch (error) { - console.log(error); throw new Error(`NextCloud Error. Status Code: ${error.statusCode}. Message: ${error.message}`); } } diff --git a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts index d3c8cc7be1..39f8f569bd 100644 --- a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts +++ b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts @@ -200,7 +200,7 @@ export class NextCloud implements INodeType { options: [ { name: 'Create', - value: 'Create', + value: 'create', description: 'Invite a user to a NextCloud organization', }, ], @@ -510,7 +510,7 @@ export class NextCloud implements INodeType { // user:create // ---------------------------------- { - displayName: 'User ID', + displayName: 'Username', name: 'userId', type: 'string', default: '', @@ -526,7 +526,7 @@ export class NextCloud implements INodeType { }, }, placeholder: 'john', - description: 'The ID of the user to invite.', + description: 'Username the user will have.', }, { displayName: 'Email', @@ -551,6 +551,7 @@ export class NextCloud implements INodeType { displayName: 'Additional Fields', name: 'additionalFields', type: 'collection', + placeholder: 'Add Field', default: {}, displayOptions: { show: {