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): Fix OAuth2 callback for grantType=clientCredentials (#6500)

Browse source 
Co-authored-by: agobrech <ael.gobrecht@gmail.com>
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™ 2023-06-21 12:25:27 +02:00 committed by GitHub
parent 1cf36e1ed6
commit 25b92169ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -272,24 +272,19 @@ oauth2CredentialController.get(
scopes: split(get(oauthCredentials, 'scope', 'openid,') as string, ','), scopes: split(get(oauthCredentials, 'scope', 'openid,') as string, ','),
}; };
if ((get(oauthCredentials, 'authentication', 'header') as string) === 'body') { if (oauthCredentials.grantType === 'pkce') {
options = {
body: { code_verifier: decryptedDataOriginal.codeVerifier },
};
} else if ((get(oauthCredentials, 'authentication', 'header') as string) === 'body') {
options = { options = {
body: { body: {
...(oauthCredentials.grantType === 'pkce' && { client_id: get(oauthCredentials, 'clientId') as string,
code_verifier: decryptedDataOriginal.codeVerifier, client_secret: get(oauthCredentials, 'clientSecret', '') as string,
}),
...(oauthCredentials.grantType === 'authorizationCode' && {
client_id: get(oauthCredentials, 'clientId') as string,
client_secret: get(oauthCredentials, 'clientSecret', '') as string,
}),
}, },
}; };
// @ts-ignore // @ts-ignore
delete oAuth2Parameters.clientSecret; delete oAuth2Parameters.clientSecret;
} else if (oauthCredentials.grantType === 'pkce') {
options = {
body: { code_verifier: decryptedDataOriginal.codeVerifier },
};
} }
await Container.get(ExternalHooks).run('oauth2.callback', [oAuth2Parameters]); await Container.get(ExternalHooks).run('oauth2.callback', [oAuth2Parameters]);