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

* fixed issue in NextCloud node: all user actions except create and all folder share actions were broken, because they wrongfully addressed the webdav endpoint

Browse source 
* added sharing via internal link for files and folders
This commit is contained in:
Jörn Bungartz 2024-08-12 22:14:33 -06:00
parent 4f392b5e3e
commit 741a5d9b5c
2 changed files with 124 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packages/nodes-base/nodes/NextCloud/GenericFunctions.ts
View file

@ -19,9 +19,8 @@ export async function nextCloudApiRequest(
headers?: IDataObject, headers?: IDataObject,
encoding?: null | undefined, encoding?: null | undefined,
query?: IDataObject, query?: IDataObject,
webDavEndpoint: boolean = true,
) { ) {
const resource = this.getNodeParameter('resource', 0);
const operation = this.getNodeParameter('operation', 0);
const authenticationMethod = this.getNodeParameter('authentication', 0); const authenticationMethod = this.getNodeParameter('authentication', 0);
let credentials; let credentials;
@ -47,11 +46,7 @@ export async function nextCloudApiRequest(
options.uri = `${credentials.webDavUrl}/${encodeURI(endpoint)}`; options.uri = `${credentials.webDavUrl}/${encodeURI(endpoint)}`;
if (resource === 'user' && operation === 'create') { if (!webDavEndpoint) {
options.uri = options.uri.replace('/remote.php/webdav', '');
}
if (resource === 'file' && operation === 'share') {
options.uri = options.uri.replace('/remote.php/webdav', ''); options.uri = options.uri.replace('/remote.php/webdav', '');
} }

162
packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
View file

@ -471,6 +471,10 @@ export class NextCloud implements INodeType {
name: 'Group', name: 'Group',
value: 1, value: 1,
}, },
{
name: 'Internal Link',
value: 200,
},
{ {
name: 'Public Link', name: 'Public Link',
value: 3, value: 3,
@ -594,6 +598,13 @@ export class NextCloud implements INodeType {
value: 2, value: 2,
}, },
], ],
displayOptions: {
show: {
'/resource': ['file', 'folder'],
'/operation': ['share'],
'/shareType': [7, 4, 1, 3, 0],
},
},
default: 1, default: 1,
description: 'The share permissions to set', description: 'The share permissions to set',
}, },
@ -877,6 +888,7 @@ export class NextCloud implements INodeType {
let endpoint = ''; let endpoint = '';
let requestMethod: IHttpRequestMethods = 'GET'; let requestMethod: IHttpRequestMethods = 'GET';
let responseData: any; let responseData: any;
let useWebDavEndpoint: boolean = true;
let body: string | Buffer | IDataObject = ''; let body: string | Buffer | IDataObject = '';
const headers: IDataObject = {}; const headers: IDataObject = {};
@ -958,32 +970,52 @@ export class NextCloud implements INodeType {
// share // share
// ---------------------------------- // ----------------------------------
requestMethod = 'POST';
endpoint = 'ocs/v2.php/apps/files_sharing/api/v1/shares';
headers['OCS-APIRequest'] = true;
headers['Content-Type'] = 'application/x-www-form-urlencoded';
const bodyParameters = this.getNodeParameter('options', i); const bodyParameters = this.getNodeParameter('options', i);
bodyParameters.path = this.getNodeParameter('path', i) as string; bodyParameters.path = this.getNodeParameter('path', i) as string;
bodyParameters.shareType = this.getNodeParameter('shareType', i) as number; bodyParameters.shareType = this.getNodeParameter('shareType', i) as number;
if (bodyParameters.shareType === 0) { // Internal link?
bodyParameters.shareWith = this.getNodeParameter('user', i) as string; if (bodyParameters.shareType === 200) {
} else if (bodyParameters.shareType === 7) { // ----------------------------------
bodyParameters.shareWith = this.getNodeParameter('circleId', i) as number; // share:internalLink
} else if (bodyParameters.shareType === 4) { // ----------------------------------
bodyParameters.shareWith = this.getNodeParameter('email', i) as string;
} else if (bodyParameters.shareType === 1) {
bodyParameters.shareWith = this.getNodeParameter('groupId', i) as number;
}
// @ts-ignore headers['Content-Type'] = 'application/xml';
body = new URLSearchParams(bodyParameters).toString(); body = `<?xml version="1.0" encoding="UTF-8"?>
<d:propfind xmlns:d="DAV:">
<d:prop xmlns:oc="http://owncloud.org/ns">
<oc:fileid/>
</d:prop>
</d:propfind>`;
requestMethod = 'PROPFIND' as IHttpRequestMethods;
endpoint = this.getNodeParameter('path', i) as string;
} else {
requestMethod = 'POST';
useWebDavEndpoint = false;
endpoint = 'ocs/v2.php/apps/files_sharing/api/v1/shares';
headers['OCS-APIRequest'] = true;
headers['Content-Type'] = 'application/x-www-form-urlencoded';
if (bodyParameters.shareType === 0) {
bodyParameters.shareWith = this.getNodeParameter('user', i) as string;
} else if (bodyParameters.shareType === 7) {
bodyParameters.shareWith = this.getNodeParameter('circleId', i) as number;
} else if (bodyParameters.shareType === 4) {
bodyParameters.shareWith = this.getNodeParameter('email', i) as string;
} else if (bodyParameters.shareType === 1) {
bodyParameters.shareWith = this.getNodeParameter('groupId', i) as number;
}
// @ts-ignore
body = new URLSearchParams(bodyParameters).toString();
}
} }
} else if (resource === 'user') { } else if (resource === 'user') {
useWebDavEndpoint = false;
if (operation === 'create') { if (operation === 'create') {
// ---------------------------------- // ----------------------------------
// user:create // user:create
@ -1097,6 +1129,7 @@ export class NextCloud implements INodeType {
headers, headers,
encoding, encoding,
qs, qs,
useWebDavEndpoint,
); );
} catch (error) { } catch (error) {
if (this.continueOnFail(error)) { if (this.continueOnFail(error)) {
@ -1134,32 +1167,81 @@ export class NextCloud implements INodeType {
endpoint, endpoint,
); );
} else if (['file', 'folder'].includes(resource) && operation === 'share') { } else if (['file', 'folder'].includes(resource) && operation === 'share') {
// eslint-disable-next-line @typescript-eslint/no-loop-func const bodyParameters = this.getNodeParameter('options', i);
const jsonResponseData: IDataObject = await new Promise((resolve, reject) => { bodyParameters.path = this.getNodeParameter('path', i) as string;
parseString(responseData as string, { explicitArray: false }, (err, data) => { bodyParameters.shareType = this.getNodeParameter('shareType', i) as number;
if (err) {
return reject(err);
}
if (data.ocs.meta.status !== 'ok') { if (bodyParameters.shareType === 200) {
return reject( // Make sure, we end the path in a slash because this is what will be returned by NextCloud
new NodeApiError( if (bodyParameters.path.slice(-1) !== '/') {
this.getNode(), bodyParameters.path += '/';
(data.ocs.meta.message as JsonObject) || (data.ocs.meta.status as JsonObject), }
),
);
}
resolve(data.ocs.data as IDataObject); // eslint-disable-next-line @typescript-eslint/no-loop-func
const jsonResponseData: IDataObject = await new Promise((resolve, reject) => {
parseString(responseData as string, { explicitArray: false }, (err, data) => {
if (err) {
return reject(err);
}
resolve(data as IDataObject);
});
}); });
}); const baseUrl = credentials.webDavUrl.toString().replace('/remote.php/webdav', '');
if (
jsonResponseData['d:multistatus'] !== undefined &&
jsonResponseData['d:multistatus'] !== null &&
(jsonResponseData['d:multistatus'] as IDataObject)['d:response'] !== null
) {
// @ts-ignore
const response = jsonResponseData['d:multistatus']['d:response'];
// when getting the file id for a folder, we also get the whole folder content.
// In that case we need to find the file id of the folder itself
if (Array.isArray(response)) {
response.forEach((item: IDataObject) => {
if (
item['d:href']?.toString().replace('/remote.php/webdav', '') ===
bodyParameters.path
) {
// @ts-ignore
const fileid = item['d:propstat']['d:prop']['oc:fileid'] as IDataObject;
const internalLink = `${baseUrl}/f/${fileid}`;
returnData.push({ json: { link: internalLink }, pairedItem: { item: i } });
}
});
} else {
const fileid = response['d:propstat']['d:prop']['oc:fileid'] as IDataObject;
const internalLink = `${baseUrl}/f/${fileid}`;
returnData.push({ json: { link: internalLink }, pairedItem: { item: i } });
}
}
} else {
// eslint-disable-next-line @typescript-eslint/no-loop-func
const jsonResponseData: IDataObject = await new Promise((resolve, reject) => {
parseString(responseData as string, { explicitArray: false }, (err, data) => {
if (err) {
return reject(err);
}
const executionData = this.helpers.constructExecutionMetaData( if (data.ocs.meta.status !== 'ok') {
wrapData(jsonResponseData), return reject(
{ itemData: { item: i } }, new NodeApiError(
); this.getNode(),
(data.ocs.meta.message as JsonObject) || (data.ocs.meta.status as JsonObject),
),
);
}
returnData.push(...executionData); resolve(data.ocs.data as IDataObject);
});
});
const executionData = this.helpers.constructExecutionMetaData(
wrapData(jsonResponseData),
{ itemData: { item: i } },
);
returnData.push(...executionData);
}
} else if (resource === 'user') { } else if (resource === 'user') {
if (operation !== 'getAll') { if (operation !== 'getAll') {
// eslint-disable-next-line @typescript-eslint/no-loop-func // eslint-disable-next-line @typescript-eslint/no-loop-func