Small improvements

This commit is contained in:
ricardo 2021-01-22 14:58:06 -05:00
parent 233a390075
commit 2ca9c6de7d
2 changed files with 11 additions and 7 deletions

View file

@ -17,6 +17,9 @@ import {
* @returns {Promise<any>}
*/
export async function nextCloudApiRequest(this: IHookFunctions | IExecuteFunctions, method: string, endpoint: string, body: object | string | Buffer, headers?: object, encoding?: null | undefined, query?: object): Promise<any> { // 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}`);
}
}

View file

@ -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: {