starred/yaak
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-04-10 19:26:49 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

fix: send id_token in OAuth2 requests (#223)

Browse Source
This commit is contained in:
James Cleverley-Prance
2025-06-03 17:28:56 +01:00
committed by GitHub
parent 6eb16afd96
commit eb5ef7d7d5
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/auth-oauth2/src/index.ts
View File

@@ -303,6 +303,7 @@ export const plugin: PluginDefinition = {
const headerPrefix = stringArg(values, 'headerPrefix'); const headerPrefix = stringArg(values, 'headerPrefix');
const grantType = stringArg(values, 'grantType') as GrantType; const grantType = stringArg(values, 'grantType') as GrantType;
const credentialsInBody = values.credentials === 'body'; const credentialsInBody = values.credentials === 'body';
const tokenName = values.tokenName === 'id_token' ? 'id_token' : 'access_token';
let token: AccessToken; let token: AccessToken;
if (grantType === 'authorization_code') { if (grantType === 'authorization_code') {
@@ -328,7 +329,7 @@ export const plugin: PluginDefinition = {
codeVerifier: stringArgOrNull(values, 'pkceCodeVerifier'), codeVerifier: stringArgOrNull(values, 'pkceCodeVerifier'),
} }
: null, : null,
tokenName: values.tokenName === 'id_token' ? 'id_token' : 'access_token', tokenName: tokenName,
}); });
} else if (grantType === 'implicit') { } else if (grantType === 'implicit') {
const authorizationUrl = stringArg(values, 'authorizationUrl'); const authorizationUrl = stringArg(values, 'authorizationUrl');
@@ -342,7 +343,7 @@ export const plugin: PluginDefinition = {
scope: stringArgOrNull(values, 'scope'), scope: stringArgOrNull(values, 'scope'),
audience: stringArgOrNull(values, 'audience'), audience: stringArgOrNull(values, 'audience'),
state: stringArgOrNull(values, 'state'), state: stringArgOrNull(values, 'state'),
tokenName: values.tokenName === 'id_token' ? 'id_token' : 'access_token', tokenName: tokenName,
}); });
} else if (grantType === 'client_credentials') { } else if (grantType === 'client_credentials') {
const accessTokenUrl = stringArg(values, 'accessTokenUrl'); const accessTokenUrl = stringArg(values, 'accessTokenUrl');
@@ -374,7 +375,7 @@ export const plugin: PluginDefinition = {
throw new Error('Invalid grant type ' + grantType); throw new Error('Invalid grant type ' + grantType);
} }
const headerValue = `${headerPrefix} ${token.response.access_token}`.trim(); const headerValue = `${headerPrefix} ${token.response[tokenName]}`.trim();
return { return {
setHeaders: [ setHeaders: [
{ {