fix(core): refresh metadata after refresh (#4054)

This commit is contained in:
Alex Yang
2023-08-30 16:22:34 -05:00
committed by GitHub
parent 441e706746
commit 517f4afb31
10 changed files with 204 additions and 132 deletions

View File

@@ -6,9 +6,9 @@ import {
} from '@affine/component/auth-components';
import { Trans } from '@affine/i18n';
import { useAFFiNEI18N } from '@affine/i18n/hooks';
import { signIn } from 'next-auth/react';
import { type FC, useCallback } from 'react';
import { signInCloud } from '../../../utils/cloud-utils';
import { buildCallbackUrl } from './callback-url';
import type { AuthPanelProps } from './index';
import * as style from './style.css';
@@ -33,7 +33,7 @@ export const AfterSignInSendEmail: FC<AuthPanelProps> = ({
<ResendButton
onClick={useCallback(() => {
signIn('email', {
signInCloud('email', {
email,
callbackUrl: buildCallbackUrl('signIn'),
redirect: true,

View File

@@ -5,9 +5,9 @@ import {
ResendButton,
} from '@affine/component/auth-components';
import { useAFFiNEI18N } from '@affine/i18n/hooks';
import { signIn } from 'next-auth/react';
import { type FC, useCallback } from 'react';
import { signInCloud } from '../../../utils/cloud-utils';
import { buildCallbackUrl } from './callback-url';
import type { AuthPanelProps } from './index';
import * as style from './style.css';
@@ -32,7 +32,7 @@ export const AfterSignUpSendEmail: FC<AuthPanelProps> = ({
<ResendButton
onClick={useCallback(() => {
signIn('email', {
signInCloud('email', {
email: email,
callbackUrl: buildCallbackUrl('signUp'),
redirect: true,

View File

@@ -2,8 +2,15 @@ import {
AuthModal as AuthModalBase,
type AuthModalProps as AuthModalBaseProps,
} from '@affine/component/auth-components';
import { atom, useAtom } from 'jotai';
import { type FC, useCallback, useEffect, useMemo } from 'react';
import { refreshRootMetadataAtom } from '@affine/workspace/atom';
import { atom, useAtom, useSetAtom } from 'jotai';
import {
type FC,
startTransition,
useCallback,
useEffect,
useMemo,
} from 'react';
import { AfterSignInSendEmail } from './after-sign-in-send-email';
import { AfterSignUpSendEmail } from './after-sign-up-send-email';
@@ -79,9 +86,14 @@ export const AuthModal: FC<AuthModalBaseProps & AuthProps> = ({
}
}, [open, setAuthEmail, setAuthStore]);
const refreshMetadata = useSetAtom(refreshRootMetadataAtom);
const onSignedIn = useCallback(() => {
setOpen(false);
}, [setOpen]);
startTransition(() => {
refreshMetadata();
});
}, [refreshMetadata, setOpen]);
return (
<AuthModalBase open={open} setOpen={setOpen}>

View File

@@ -8,10 +8,11 @@ import { useMutation } from '@affine/workspace/affine/gql';
import { ArrowDownBigIcon, GoogleDuotoneIcon } from '@blocksuite/icons';
import { Button } from '@toeverything/components/button';
import { useSetAtom } from 'jotai';
import { signIn, type SignInResponse } from 'next-auth/react';
import { type SignInResponse } from 'next-auth/react';
import { type FC, useState } from 'react';
import { useCallback } from 'react';
import { signInCloud } from '../../../utils/cloud-utils';
import { emailRegex } from '../../../utils/email-regex';
import { buildCallbackUrl } from './callback-url';
import type { AuthPanelProps } from './index';
@@ -66,7 +67,7 @@ export const SignIn: FC<AuthPanelProps> = ({
setAuthEmail(email);
if (user) {
signIn('email', {
signInCloud('email', {
email: email,
callbackUrl: buildCallbackUrl('signIn'),
redirect: false,
@@ -75,7 +76,7 @@ export const SignIn: FC<AuthPanelProps> = ({
.catch(console.error);
setAuthState('afterSignInSendEmail');
} else {
signIn('email', {
signInCloud('email', {
email: email,
callbackUrl: buildCallbackUrl('signUp'),
redirect: false,
@@ -102,7 +103,7 @@ export const SignIn: FC<AuthPanelProps> = ({
}}
icon={<GoogleDuotoneIcon />}
onClick={useCallback(() => {
signIn('google').catch(console.error);
signInCloud('google').catch(console.error);
}, [])}
>
{t['Continue with Google']()}

View File

@@ -10,11 +10,11 @@ import { useMutation } from '@affine/workspace/affine/gql';
import { ArrowRightSmallIcon, CameraIcon, DoneIcon } from '@blocksuite/icons';
import { Button, IconButton } from '@toeverything/components/button';
import { useAtom } from 'jotai/index';
import { signOut } from 'next-auth/react';
import { type FC, useCallback, useState } from 'react';
import { authAtom } from '../../../../atoms';
import { useCurrentUser } from '../../../../hooks/affine/use-current-user';
import { signOutCloud } from '../../../../utils/cloud-utils';
import { Upload } from '../../../pure/file-upload';
import * as style from './style.css';
@@ -160,7 +160,7 @@ export const AccountSetting: FC = () => {
desc={t['com.affine.setting.sign.out.message']()}
style={{ cursor: 'pointer' }}
onClick={useCallback(() => {
signOut().catch(console.error);
signOutCloud().catch(console.error);
}, [])}
>
<ArrowRightSmallIcon />

View File

@@ -1,10 +1,10 @@
import { UserAvatar } from '@affine/component/user-avatar';
import { useAFFiNEI18N } from '@affine/i18n/hooks';
import { CloudWorkspaceIcon } from '@blocksuite/icons';
import { signIn } from 'next-auth/react';
import { useCurrentLoginStatus } from '../../hooks/affine/use-current-login-status';
import { useCurrentUser } from '../../hooks/affine/use-current-user';
import { signInCloud } from '../../utils/cloud-utils';
import { StyledSignInButton } from '../pure/footer/styles';
export const LoginCard = () => {
@@ -17,8 +17,7 @@ export const LoginCard = () => {
<StyledSignInButton
data-testid="sign-in-button"
onClick={async () => {
// jump to login page
signIn().catch(console.error);
signInCloud().catch(console.error);
}}
>
<div className="circle">

View File

@@ -1,12 +1,12 @@
import { useAFFiNEI18N } from '@affine/i18n/hooks';
import { CloudWorkspaceIcon } from '@blocksuite/icons';
import { signIn } from 'next-auth/react';
import { type CSSProperties, type FC, forwardRef, useCallback } from 'react';
import { useCurrentLoginStatus } from '../../../hooks/affine/use-current-login-status';
// import { openDisableCloudAlertModalAtom } from '../../../atoms';
import { stringToColour } from '../../../utils';
import { signInCloud } from '../../../utils/cloud-utils';
import { StyledFooter, StyledSignInButton } from './styles';
export const Footer: FC = () => {
const loginStatus = useCurrentLoginStatus();
@@ -25,7 +25,7 @@ const SignInButton = () => {
<StyledSignInButton
data-testid="sign-in-button"
onClick={useCallback(() => {
signIn().catch(console.error);
signInCloud().catch(console.error);
}, [])}
>
<div className="circle">

View File

@@ -0,0 +1,24 @@
import { refreshRootMetadataAtom } from '@affine/workspace/atom';
import { getCurrentStore } from '@toeverything/infra/atom';
// eslint-disable-next-line @typescript-eslint/no-restricted-imports
import { signIn, signOut } from 'next-auth/react';
import { startTransition } from 'react';
export const signInCloud: typeof signIn = async (...args) => {
return signIn(...args).then(result => {
// do not refresh root metadata,
// because the session won't change in this callback
return result;
});
};
export const signOutCloud: typeof signOut = async (...args) => {
return signOut(...args).then(result => {
if (result) {
startTransition(() => {
getCurrentStore().set(refreshRootMetadataAtom);
});
}
return result;
});
};