admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 10:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

🔀 Merge branch 'master' into oauth-support

Browse Source
This commit is contained in:
Jan Oberhauser
2020-04-04 17:34:10 +02:00
parent 55934465bf 174113a879
commit 9dd9e0d8ba
376 changed files with 45850 additions and 2723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/nodes-base/nodes/Github/GenericFunctions.ts
View File

@@ -19,7 +19,6 @@ import {
* @returns {Promise<any>}
*/
export async function githubApiRequest(this: IHookFunctions | IExecuteFunctions, method: string, endpoint: string, body: object, query?: object): Promise<any> { // tslint:disable-line:no-any
const authenticationMethod = this.getNodeParameter('authentication', 0, 'accessToken') as string;
const options: OptionsWithUri = {
method,
@@ -28,19 +27,30 @@ export async function githubApiRequest(this: IHookFunctions | IExecuteFunctions,
},
body,
qs: query,
uri: `https://api.github.com${endpoint}`,
uri: '',
json: true
};
try {
const authenticationMethod = this.getNodeParameter('authentication', 0, 'accessToken') as string;
if (authenticationMethod === 'accessToken') {
const credentials = this.getCredentials('githubApi');
if (credentials === undefined) {
throw new Error('No credentials got returned!');
}
const baseUrl = credentials!.server || 'https://api.github.com';
options.uri = `${baseUrl}${endpoint}`;
options.headers!.Authorization = `token ${credentials.accessToken}`;
return await this.helpers.request(options);
} else {
const credentials = this.getCredentials('githubOAuth2Api');
const baseUrl = credentials!.server || 'https://api.github.com';
options.uri = `${baseUrl}${endpoint}`;
return await this.helpers.requestOAuth.call(this, 'githubOAuth2Api', options);
}
} catch (error) {