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

fix(core): OAuth2 scopes does not save

Browse source
This commit is contained in:
Michael Kret 2022-12-05 18:28:34 +02:00 committed by GitHub
parent 67aad63343
commit 7aefed46dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packages/cli/src/credentials/oauth2Credential.api.ts
View file

@ -78,12 +78,14 @@ oauth2CredentialController.get(
throw new ResponseHelper.InternalServerError((error as Error).message); throw new ResponseHelper.InternalServerError((error as Error).message);
} }
const credentialType = (credential as unknown as ICredentialsEncrypted).type;
const mode: WorkflowExecuteMode = 'internal'; const mode: WorkflowExecuteMode = 'internal';
const timezone = config.getEnv('generic.timezone'); const timezone = config.getEnv('generic.timezone');
const credentialsHelper = new CredentialsHelper(encryptionKey); const credentialsHelper = new CredentialsHelper(encryptionKey);
const decryptedDataOriginal = await credentialsHelper.getDecrypted( const decryptedDataOriginal = await credentialsHelper.getDecrypted(
credential as INodeCredentialsDetails, credential as INodeCredentialsDetails,
(credential as unknown as ICredentialsEncrypted).type, credentialType,
mode, mode,
timezone, timezone,
true, true,
@ -91,13 +93,17 @@ oauth2CredentialController.get(
// At some point in the past we saved hidden scopes to credentials (but shouldn't) // At some point in the past we saved hidden scopes to credentials (but shouldn't)
// Delete scope before applying defaults to make sure new scopes are present on reconnect // Delete scope before applying defaults to make sure new scopes are present on reconnect
if (decryptedDataOriginal?.scope) { if (
decryptedDataOriginal?.scope &&
credentialType.includes('OAuth2') &&
!['oAuth2Api'].includes(credentialType)
) {
delete decryptedDataOriginal.scope; delete decryptedDataOriginal.scope;
} }
const oauthCredentials = credentialsHelper.applyDefaultsAndOverwrites( const oauthCredentials = credentialsHelper.applyDefaultsAndOverwrites(
decryptedDataOriginal, decryptedDataOriginal,
(credential as unknown as ICredentialsEncrypted).type, credentialType,
mode, mode,
timezone, timezone,
); );
@ -128,7 +134,7 @@ oauth2CredentialController.get(
// Encrypt the data // Encrypt the data
const credentials = new Credentials( const credentials = new Credentials(
credential as INodeCredentialsDetails, credential as INodeCredentialsDetails,
(credential as unknown as ICredentialsEncrypted).type, credentialType,
(credential as unknown as ICredentialsEncrypted).nodesAccess, (credential as unknown as ICredentialsEncrypted).nodesAccess,
); );
decryptedDataOriginal.csrfSecret = csrfSecret; decryptedDataOriginal.csrfSecret = csrfSecret;