Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-15 05:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(core): close popup after oauth login (#10273)

Browse Source
This commit is contained in:
EYHN
2025-02-19 14:44:02 +08:00
committed by GitHub
parent b50e507fc5
commit c0cc4224bb
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/frontend/apps/mobile/src/app.tsx
View File

@@ -74,7 +74,7 @@ framework.impl(PopupWindowProvider, {
url = `${redirectProxy}?${search.toString()}`; url = `${redirectProxy}?${search.toString()}`;
} }
window.open(url, '_blank', 'noreferrer noopener'); window.open(url, '_blank', 'popup noreferrer noopener');
}, },
}); });
framework.impl(HapticProvider, { framework.impl(HapticProvider, {

2
packages/frontend/apps/web/src/app.tsx
View File

@@ -69,7 +69,7 @@ framework.impl(PopupWindowProvider, {
url = `${redirectProxy}?${search.toString()}`; url = `${redirectProxy}?${search.toString()}`;
} }
window.open(url, '_blank', 'noreferrer noopener'); window.open(url, '_blank', 'popup noreferrer noopener');
}, },
}); });
const frameworkProvider = framework.provider(); const frameworkProvider = framework.provider();

6
packages/frontend/core/src/desktop/pages/auth/oauth-callback.tsx
View File

@@ -4,7 +4,6 @@ import {
type LoaderFunction, type LoaderFunction,
redirect, redirect,
useLoaderData, useLoaderData,
// eslint-disable-next-line @typescript-eslint/no-restricted-imports
useNavigate, useNavigate,
} from 'react-router-dom'; } from 'react-router-dom';
@@ -76,9 +75,8 @@ export const Component = () => {
triggeredRef.current = true; triggeredRef.current = true;
auth auth
.signInOauth(data.code, data.state, data.provider) .signInOauth(data.code, data.state, data.provider)
.then(({ redirectUri }) => { .then(() => {
// TODO(@forehalo): need a good way to go back to previous tab and close current one window.close();
nav(redirectUri ?? '/');
}) })
.catch(e => { .catch(e => {
nav(`/sign-in?error=${encodeURIComponent(e.message)}`); nav(`/sign-in?error=${encodeURIComponent(e.message)}`);