jam411 3 лет назад
Родитель
Сommit
d91b7159ea

+ 5 - 8
packages/app/src/components/Login/InvitedForm.tsx

@@ -1,10 +1,12 @@
 import React from 'react';
 
+import { IUser } from '@growi/core';
 import { useTranslation } from 'next-i18next';
 
-import { useCsrfToken, useCurrentUser } from '../../stores/context';
+import { useCsrfToken } from '../../stores/context';
 
 type InvitedFormProps = {
+  currentUser: IUser,
   invitedFormUsername?: string,
   invitedFormName?: string,
 }
@@ -12,13 +14,8 @@ type InvitedFormProps = {
 export const InvitedForm = (props: InvitedFormProps): JSX.Element => {
   const { t } = useTranslation();
   const { data: csrfToken } = useCsrfToken();
-  const { data: user } = useCurrentUser();
 
-  const { invitedFormUsername, invitedFormName } = props;
-
-  if (user == null) {
-    return <></>;
-  }
+  const { currentUser, invitedFormUsername, invitedFormName } = props;
 
   return (
     <div className="noLogin-dialog p-3 mx-auto" id="noLogin-dialog">
@@ -40,7 +37,7 @@ export const InvitedForm = (props: InvitedFormProps): JSX.Element => {
             disabled
             placeholder={t('Email')}
             name="invitedForm[email]"
-            defaultValue={user.email}
+            defaultValue={currentUser.email}
             required
           />
         </div>

+ 4 - 4
packages/app/src/pages/login/[[...path]].page.tsx

@@ -9,7 +9,7 @@ import { useRouter } from 'next/router';
 import { NoLoginLayout } from '~/components/Layout/NoLoginLayout';
 import { CrowiRequest } from '~/interfaces/crowi-request';
 
-import { useCsrfToken, useCurrentPathname, useCurrentUser } from '../../stores/context';
+import { useCsrfToken, useCurrentPathname } from '../../stores/context';
 import {
   CommonProps, getServerSideCommonProps, useCustomTitle, getNextI18NextConfig,
 } from '../utils/commons';
@@ -34,7 +34,6 @@ const LoginPage: NextPage<Props> = (props: Props) => {
 
   useCsrfToken(props.csrfToken);
   useCurrentPathname(props.currentPathname);
-  useCurrentUser(props.currentUser);
 
   const loginPagesMap = {
     login: {
@@ -50,8 +49,9 @@ const LoginPage: NextPage<Props> = (props: Props) => {
     },
     invited: {
       component: <InvitedForm
-        username={props.invitedFormUsername}
-        name={props.invitedFormName}
+        currentUser={props.currentUser}
+        invitedFormUsername={props.invitedFormUsername}
+        invitedFormName={props.invitedFormName}
       />,
       classNames: ['invited-page'],
     },