mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-01-13 05:47:31 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

⚡ Add support for specifying Matrix homeserver URL (#1065)

Browse source
This commit is contained in:
Tulir Asokan 2020-10-16 00:01:07 +03:00 committed by GitHub
parent a76cdda4d3
commit ea328e56cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/nodes-base/credentials/MatrixApi.credentials.ts
View file

@ -15,5 +15,11 @@ export class MatrixApi implements ICredentialType {
type: 'string' as NodePropertyTypes, type: 'string' as NodePropertyTypes,
default: '', default: '',
}, },
{
displayName: 'Homeserver URL',
name: 'homeserverUrl',
type: 'string' as NodePropertyTypes,
default: 'https://matrix-client.matrix.org',
},
]; ];
} }

6
packages/nodes-base/nodes/Matrix/GenericFunctions.ts
View file

@ -36,9 +36,7 @@ export async function matrixApiRequest(this: IExecuteFunctions | IExecuteSingleF
}, },
body, body,
qs: query, qs: query,
// Override URL when working with media only. All other endpoints use client. uri: '',
//@ts-ignore
uri: option.hasOwnProperty('overridePrefix') ? `https://matrix.org/_matrix/${option.overridePrefix}/r0${resource}` : `https://matrix.org/_matrix/client/r0${resource}`,
json: true, json: true,
}; };
options = Object.assign({}, options, option); options = Object.assign({}, options, option);
@ -56,6 +54,8 @@ export async function matrixApiRequest(this: IExecuteFunctions | IExecuteSingleF
if (credentials === undefined) { if (credentials === undefined) {
throw new Error('No credentials got returned!'); throw new Error('No credentials got returned!');
} }
//@ts-ignore
options.uri = `${credentials.homeserverUrl}/_matrix/${option.overridePrefix || 'client'}/r0${resource}`;
options.headers!.Authorization = `Bearer ${credentials.accessToken}`; options.headers!.Authorization = `Bearer ${credentials.accessToken}`;
//@ts-ignore //@ts-ignore
response = await this.helpers.request(options); response = await this.helpers.request(options);