Merge pull request #22 from SystemEngineeringTeam/issue/14

CurrentUser周りの変更
SystemEngineeringTeam · May 28, 2024 · 1813677 · 1813677
2 parents d869e9a + 6248ec2
commit 1813677
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/src/layouts/BaseLayout.tsx b/src/layouts/BaseLayout.tsx
@@ -7,7 +7,7 @@ import 'the-new-css-reset/css/reset.css';
 import { createGlobalStyle } from 'styled-components';
 import LoginPage from '@/components/pages/login';
 import Header from '@/components/shared/Header';
-import { userAtomLoadable } from '@/stores/userAtom';
+import { currentUserAtomLoadable } from '@/stores/currentUserAtom';
 import { theme } from '@/utils/theme';
 
 const { Header: HeaderContainer, Content } = Layout;
@@ -26,7 +26,7 @@ const GlobalStyle = createGlobalStyle`
 `;
 
 const BaseLayout = (): ReactElement => {
-  const user = useAtomValue(userAtomLoadable);
+  const user = useAtomValue(currentUserAtomLoadable);
 
   if (user.state === 'hasError') throw Error('Failed to fetch user data');
 
@@ -44,7 +44,7 @@ const BaseLayout = (): ReactElement => {
                 <LoadingOutlined />
               </Flex>
             )}
-            {user.state === 'hasData' && (user.data.signined ? <Outlet /> : <LoginPage />)}
+            {user.state === 'hasData' && (user.data != null ? <Outlet /> : <LoginPage />)}
           </Content>
         </Layout>
       </App>

diff --git a/src/stores/userAtom.ts → src/stores/currentUserAtom.ts b/src/stores/userAtom.ts → src/stores/currentUserAtom.ts
@@ -1,13 +1,12 @@
 import { atom } from 'jotai';
 import { loadable } from 'jotai/utils';
-import { type SigninedUser } from '@/types/user';
+import { type CurrentUser } from '@/types/user';
 import { waitMs } from '@/utils/promise';
 
-const fetchUser = async (): Promise<SigninedUser<boolean>> => {
+const fetchCurrentUser = async (): Promise<CurrentUser> => {
   await waitMs(2000);
 
-  const user: SigninedUser<boolean> = {
-    signined: true,
+  const user: CurrentUser = {
     id: '0000-0000-0000-0000',
     firstName: '智',
     lastName: '佐藤',
@@ -38,5 +37,5 @@ const fetchUser = async (): Promise<SigninedUser<boolean>> => {
   return user;
 };
 
-const userAtom = atom(async () => await fetchUser());
-export const userAtomLoadable = loadable(userAtom);
+const currentUserAtomAtom = atom(async () => await fetchCurrentUser());
+export const currentUserAtomLoadable = loadable(currentUserAtomAtom);
diff --git a/src/types/user.ts b/src/types/user.ts
@@ -54,12 +54,4 @@ export type User<WithPrivate extends boolean> = UserBase &
   (ActiveUserProps | OBOGMemberProps | ExternalMember) &
   (WithPrivate extends true ? PrivateProps : Record<never, never>);
 
-type IsSigninedUser = {
-  signined: true;
-} & User<true>;
-
-interface IsNotSigninedUser {
-  signined: false;
-}
-
-export type SigninedUser<T extends boolean> = T extends true ? IsSigninedUser : IsNotSigninedUser;
+export type CurrentUser = User<true> | null;