There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.
TypeScript appcrdteditorelectronknowledge-basemarkdownmironotesnotionnotion-alternativerustrust-langrust-languagetabletableviewwhiteboardwikiworkspace
feat(core): close popup after oauth login (#10273)
EYHNc0cc4224bb1e
diff --git a/packages/frontend/apps/mobile/src/app.tsx b/packages/frontend/apps/mobile/src/app.tsxindex 9625cc503e..3b7e5d86ca 100644--- a/packages/frontend/apps/mobile/src/app.tsx+++ b/packages/frontend/apps/mobile/src/app.tsx@@ -74,7 +74,7 @@ framework.impl(PopupWindowProvider, {url = `${redirectProxy}?${search.toString()}`;}- window.open(url, '_blank', 'noreferrer noopener');+ window.open(url, '_blank', 'popup noreferrer noopener');},});framework.impl(HapticProvider, {diff --git a/packages/frontend/apps/web/src/app.tsx b/packages/frontend/apps/web/src/app.tsxindex 8e82d8d147..e967f827bf 100644--- a/packages/frontend/apps/web/src/app.tsx+++ b/packages/frontend/apps/web/src/app.tsx@@ -69,7 +69,7 @@ framework.impl(PopupWindowProvider, {url = `${redirectProxy}?${search.toString()}`;}- window.open(url, '_blank', 'noreferrer noopener');+ window.open(url, '_blank', 'popup noreferrer noopener');},});const frameworkProvider = framework.provider();diff --git a/packages/frontend/core/src/desktop/pages/auth/oauth-callback.tsx b/packages/frontend/core/src/desktop/pages/auth/oauth-callback.tsxindex 453f4a6e32..ff158563d2 100644--- a/packages/frontend/core/src/desktop/pages/auth/oauth-callback.tsx+++ b/packages/frontend/core/src/desktop/pages/auth/oauth-callback.tsx@@ -4,7 +4,6 @@ import {type LoaderFunction,redirect,useLoaderData,- // eslint-disable-next-line @typescript-eslint/no-restricted-importsuseNavigate,} from 'react-router-dom';@@ -76,9 +75,8 @@ export const Component = () => {triggeredRef.current = true;auth.signInOauth(data.code, data.state, data.provider)- .then(({ redirectUri }) => {- // TODO(@forehalo): need a good way to go back to previous tab and close current one- nav(redirectUri ?? '/');+ .then(() => {+ window.close();}).catch(e => {nav(`/sign-in?error=${encodeURIComponent(e.message)}`);