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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Gregory Schier
2025-05-20 08:09:11 -07:00
parent 2c3fb25932 4ae7f99264
commit d02883282f
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/auth-oauth2/src/grants/implicit.ts
View File

@@ -31,7 +31,7 @@ export function getImplicit(
} }
const authorizationUrl = new URL(`${authorizationUrlRaw ?? ''}`); const authorizationUrl = new URL(`${authorizationUrlRaw ?? ''}`);
authorizationUrl.searchParams.set('response_type', 'code'); authorizationUrl.searchParams.set('response_type', 'token');
authorizationUrl.searchParams.set('client_id', clientId); authorizationUrl.searchParams.set('client_id', clientId);
if (redirectUri) authorizationUrl.searchParams.set('redirect_uri', redirectUri); if (redirectUri) authorizationUrl.searchParams.set('redirect_uri', redirectUri);
if (scope) authorizationUrl.searchParams.set('scope', scope); if (scope) authorizationUrl.searchParams.set('scope', scope);
@@ -42,25 +42,33 @@ export function getImplicit(
} }
const authorizationUrlStr = authorizationUrl.toString(); const authorizationUrlStr = authorizationUrl.toString();
let foundAccessToken = false;
let { close } = await ctx.window.openUrl({ let { close } = await ctx.window.openUrl({
url: authorizationUrlStr, url: authorizationUrlStr,
label: 'oauth-authorization-url', label: 'oauth-authorization-url',
async onClose() {
if (!foundAccessToken) {
reject(new Error('Authorization window closed'));
}
},
async onNavigate({ url: urlStr }) { async onNavigate({ url: urlStr }) {
const url = new URL(urlStr); const url = new URL(urlStr);
if (url.searchParams.has('error')) { if (url.searchParams.has('error')) {
return reject(Error(`Failed to authorize: ${url.searchParams.get('error')}`)); return reject(Error(`Failed to authorize: ${url.searchParams.get('error')}`));
} }
const hash = url.hash.slice(1);
const params = new URLSearchParams(hash);
const accessToken = params.get('access_token');
if (!accessToken) {
return;
}
foundAccessToken = true;
// Close the window here, because we don't need it anymore // Close the window here, because we don't need it anymore
close(); close();
const hash = url.hash.slice(1);
const params = new URLSearchParams(hash);
const idToken = params.get('id_token');
if (idToken) {
params.set('access_token', idToken);
params.delete('id_token');
}
const response = Object.fromEntries(params) as unknown as AccessTokenRawResponse; const response = Object.fromEntries(params) as unknown as AccessTokenRawResponse;
try { try {
resolve(await storeToken(ctx, contextId, response)); resolve(await storeToken(ctx, contextId, response));