refactor: migrate away from querystring (#4180)

refactor: migrate away from querystring
This commit is contained in:
Michael Kret
2022-09-23 17:48:45 +03:00
committed by GitHub
parent 27e2ce0470
commit 7aa40bf95d
3 changed files with 12 additions and 12 deletions

View File

@@ -16,7 +16,6 @@ import {
IDataObject,
} from 'n8n-workflow';
import { resolve as pathResolve } from 'path';
import querystring from 'querystring';
import { Db, ICredentialsDb, ResponseHelper } from '..';
import { RESPONSE_ERROR_MESSAGES } from '../constants';
@@ -141,11 +140,14 @@ oauth2CredentialController.get(
// if scope uses comma, change it as the library always return then with spaces
if ((get(oauthCredentials, 'scope') as string).includes(',')) {
const data = querystring.parse(returnUri.split('?')[1]);
data.scope = get(oauthCredentials, 'scope') as string;
returnUri = `${get(oauthCredentials, 'authUrl', '') as string}?${querystring.stringify(
data,
)}`;
// const data = new URLSearchParams(returnUri.split('?')[1]);
// data.set('scope', get(oauthCredentials, 'scope') as string);
// returnUri = `${get(oauthCredentials, 'authUrl', '') as string}?${data.toString()}`;
const data = returnUri.split('?')[1];
const scope = get(oauthCredentials, 'scope') as string;
const percentEncoded = [data, `scope=${encodeURIComponent(scope)}`].join('&');
returnUri = `${get(oauthCredentials, 'authUrl', '') as string}?${percentEncoded}`;
}
if (authQueryParameters) {