From f56fc0be86552bff36fd38a9474292723b8c7c22 Mon Sep 17 00:00:00 2001
From: swimmingRiver <swimmingr@gmail.com>
Date: Fri, 4 Jul 2025 17:37:42 +0900
Subject: [PATCH 1/6] =?UTF-8?q?feat:=20users=20type=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/supabase/database.types.ts | 41 +++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/lib/supabase/database.types.ts b/src/lib/supabase/database.types.ts
index 685d95a2..a5cb0e0c 100644
--- a/src/lib/supabase/database.types.ts
+++ b/src/lib/supabase/database.types.ts
@@ -1,4 +1,4 @@
-export type Json =
+export type Json =
   | string
   | number
   | boolean
@@ -101,7 +101,7 @@ export type Database = {
         Row: {
           approval_period: number | null;
           approved_count: number;
-          capacity: number | null;
+          capacity: number;
           cover_image_url: string | null;
           created_at: string;
           genre: string;
@@ -116,7 +116,7 @@ export type Database = {
         Insert: {
           approval_period?: number | null;
           approved_count: number;
-          capacity?: number | null;
+          capacity: number;
           cover_image_url?: string | null;
           created_at?: string;
           genre: string;
@@ -131,7 +131,7 @@ export type Database = {
         Update: {
           approval_period?: number | null;
           approved_count?: number;
-          capacity?: number | null;
+          capacity?: number;
           cover_image_url?: string | null;
           created_at?: string;
           genre?: string;
@@ -209,6 +209,39 @@ export type Database = {
           },
         ];
       };
+      users: {
+        Row: {
+          created_at: string;
+          email: string;
+          favorite: string;
+          id: number;
+          image: string | null;
+          last_seen_at: string | null;
+          name: string;
+          updated_at: string | null;
+        };
+        Insert: {
+          created_at?: string;
+          email: string;
+          favorite: string;
+          id?: number;
+          image?: string | null;
+          last_seen_at?: string | null;
+          name: string;
+          updated_at?: string | null;
+        };
+        Update: {
+          created_at?: string;
+          email?: string;
+          favorite?: string;
+          id?: number;
+          image?: string | null;
+          last_seen_at?: string | null;
+          name?: string;
+          updated_at?: string | null;
+        };
+        Relationships: [];
+      };
     };
     Views: {
       [_ in never]: never;

From ecab3817700b04d2ac8ae1ef4174e2369251f3f8 Mon Sep 17 00:00:00 2001
From: swimmingRiver <swimmingr@gmail.com>
Date: Sun, 6 Jul 2025 06:29:16 +0900
Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=ED=9A=8C=EC=9B=90=EA=B0=80?=
 =?UTF-8?q?=EC=9E=85=20=EC=9A=94=EC=B2=AD=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/type.ts                          |  2 +-
 .../auths/signup/_components/SignupForm.tsx   | 12 ++++-----
 src/hooks/api/auth/useCreateUser.ts           |  2 +-
 src/hooks/api/auth/useSignUpForm.ts           |  2 +-
 src/lib/supabase/repositories/users.ts        | 25 +++++++++++++++++++
 5 files changed, 34 insertions(+), 9 deletions(-)
 create mode 100644 src/lib/supabase/repositories/users.ts

diff --git a/src/api/auth/type.ts b/src/api/auth/type.ts
index 87803998..98695c41 100644
--- a/src/api/auth/type.ts
+++ b/src/api/auth/type.ts
@@ -3,7 +3,7 @@ export interface SignUpFormData {
   email: string;
   password: string;
   passwordCheck: string;
-  companyName: string;
+  favorite: string;
 }
 
 export type SignUpRequest = Omit<SignUpFormData, 'passwordCheck'>;
diff --git a/src/app/auths/signup/_components/SignupForm.tsx b/src/app/auths/signup/_components/SignupForm.tsx
index ce88aa06..ac7daae2 100644
--- a/src/app/auths/signup/_components/SignupForm.tsx
+++ b/src/app/auths/signup/_components/SignupForm.tsx
@@ -117,16 +117,16 @@ const SignupForm = () => {
       </div>
 
       <InputForm
-        name="companyName"
+        name="favorite"
         label="좋아하는 작품"
         placeholder="(ex. 위대한 개츠비,원피스)"
         register={{
-          ...register('companyName', {
-            validate: (value) => signUpValidate({ value, name: 'companyName' }),
+          ...register('favorite', {
+            validate: (value) => signUpValidate({ value, name: 'favorite' }),
           }),
         }}
-        hasError={!!errors.companyName}
-        helperText={errors.companyName?.message}
+        hasError={!!errors.favorite}
+        helperText={errors.favorite?.message}
       />
 
       <Button
@@ -138,7 +138,7 @@ const SignupForm = () => {
           errors.email ||
           errors.password ||
           errors.passwordCheck ||
-          errors.companyName
+          errors.favorite
             ? 'bg-gray-400'
             : 'bg-write-main'
         } font-bold text-white`}
diff --git a/src/hooks/api/auth/useCreateUser.ts b/src/hooks/api/auth/useCreateUser.ts
index bffd4534..8975f748 100644
--- a/src/hooks/api/auth/useCreateUser.ts
+++ b/src/hooks/api/auth/useCreateUser.ts
@@ -1,4 +1,4 @@
-import { createUser } from '@/api/auth/api';
+import { createUser } from '@/lib/supabase/repositories/users';
 import { SignUpRequest } from '@/api/auth/type';
 import { useMutation } from '@tanstack/react-query';
 import toast from '@/utils/toast';
diff --git a/src/hooks/api/auth/useSignUpForm.ts b/src/hooks/api/auth/useSignUpForm.ts
index e21e5721..ee06b0f0 100644
--- a/src/hooks/api/auth/useSignUpForm.ts
+++ b/src/hooks/api/auth/useSignUpForm.ts
@@ -19,7 +19,7 @@ const useSignUpForm = () => {
       name: data.name,
       email: data.email,
       password: data.password,
-      companyName: data.companyName,
+      favorite: data.favorite,
     };
 
     createUser(signUpData, {
diff --git a/src/lib/supabase/repositories/users.ts b/src/lib/supabase/repositories/users.ts
new file mode 100644
index 00000000..689a06e5
--- /dev/null
+++ b/src/lib/supabase/repositories/users.ts
@@ -0,0 +1,25 @@
+import { SignUpRequest } from '@/api/auth/type';
+import instanceBaaS from '@/api/instanceBaaS';
+
+export const createUser = async (user: SignUpRequest) => {
+  const { data, error } = await instanceBaaS.auth.signUp({
+    email: user.email,
+    password: user.password,
+    options: {
+      data: {
+        name: user.name,
+        favorite: user.favorite,
+      },
+    },
+  });
+  await instanceBaaS.from('users').insert({
+    email: user.email,
+    name: user.name,
+    favorite: user.favorite,
+    image: null,
+  });
+  if (error) {
+    throw new Error(error.message);
+  }
+  return data;
+};

From 3d46bf7e4a3dd741dff572387ce669f1855d4757 Mon Sep 17 00:00:00 2001
From: swimmingRiver <swimmingr@gmail.com>
Date: Mon, 7 Jul 2025 14:41:57 +0900
Subject: [PATCH 3/6] =?UTF-8?q?feat:=20supabase=20=ED=95=A8=EC=88=98=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/api/auth/useSignInForm.ts    |  8 ++++--
 src/lib/supabase/repositories/users.ts | 38 +++++++++++++++++++++++++-
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/src/hooks/api/auth/useSignInForm.ts b/src/hooks/api/auth/useSignInForm.ts
index 5a0b1655..2b69e1df 100644
--- a/src/hooks/api/auth/useSignInForm.ts
+++ b/src/hooks/api/auth/useSignInForm.ts
@@ -1,9 +1,13 @@
 import { SigninRequest } from '@/api/auth/type';
 import { SubmitHandler, useForm } from 'react-hook-form';
-import { usePostSignin } from './usePostSignin';
+
+import { signin } from '@/lib/supabase/repositories/users';
+import { useMutation } from '@tanstack/react-query';
 
 export const useSignInForm = () => {
-  const { mutate: signIn } = usePostSignin();
+  const { mutate: signIn } = useMutation({
+    mutationFn: (data: SigninRequest) => signin(data),
+  });
 
   const {
     register,
diff --git a/src/lib/supabase/repositories/users.ts b/src/lib/supabase/repositories/users.ts
index 689a06e5..e53901de 100644
--- a/src/lib/supabase/repositories/users.ts
+++ b/src/lib/supabase/repositories/users.ts
@@ -1,5 +1,7 @@
-import { SignUpRequest } from '@/api/auth/type';
+'use server';
+import { SignUpRequest, SigninRequest } from '@/api/auth/type';
 import instanceBaaS from '@/api/instanceBaaS';
+import { cookies } from 'next/headers';
 
 export const createUser = async (user: SignUpRequest) => {
   const { data, error } = await instanceBaaS.auth.signUp({
@@ -23,3 +25,37 @@ export const createUser = async (user: SignUpRequest) => {
   }
   return data;
 };
+
+export const signin = async (user: SigninRequest) => {
+  const { data, error } = await instanceBaaS.auth.signInWithPassword({
+    email: user.email,
+    password: user.password,
+  });
+  if (error) {
+    throw new Error(error.message);
+  }
+  const cookieStore = await cookies();
+  cookieStore.set('access_token', data.session.access_token);
+  cookieStore.set('refresh_token', data.session.refresh_token);
+  return data;
+};
+
+export const signout = async () => {
+  const cookieStore = await cookies();
+  cookieStore.delete('access_token');
+  cookieStore.delete('refresh_token');
+};
+
+export const getUserInfo = async () => {
+  const cookieStore = await cookies();
+  const accessToken = cookieStore.get('access_token');
+  const refreshToken = cookieStore.get('refresh_token');
+  if (!accessToken || !refreshToken) {
+    return null;
+  }
+  const { data, error } = await instanceBaaS.auth.getUser(accessToken.value);
+  if (error) {
+    throw new Error(error.message);
+  }
+  return data;
+};

From af056e9e5100222a773a45f59e2f780b9cff6cc4 Mon Sep 17 00:00:00 2001
From: swimmingRiver <swimmingr@gmail.com>
Date: Tue, 8 Jul 2025 13:27:06 +0900
Subject: [PATCH 4/6] =?UTF-8?q?feat:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/api/auth/usePostSignin.ts    | 4 ++--
 src/hooks/api/auth/useSignInForm.ts    | 7 ++-----
 src/lib/supabase/repositories/users.ts | 9 ++++++++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/hooks/api/auth/usePostSignin.ts b/src/hooks/api/auth/usePostSignin.ts
index 6150390c..671b338f 100644
--- a/src/hooks/api/auth/usePostSignin.ts
+++ b/src/hooks/api/auth/usePostSignin.ts
@@ -1,5 +1,5 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { postSignIn } from '@/api/auth/api';
+import { signin } from '@/lib/supabase/repositories/users';
 import { SigninRequest } from '@/api/auth/type';
 
 import { useRouter } from 'next/navigation';
@@ -10,7 +10,7 @@ export const usePostSignin = () => {
   const queryClient = useQueryClient();
   const router = useRouter();
   return useMutation({
-    mutationFn: (data: SigninRequest) => postSignIn(data),
+    mutationFn: (data: SigninRequest) => signin(data),
     onSuccess: async () => {
       toast.success('로그인에 성공했습니다.');
       await queryClient.prefetchQuery({ queryKey: ['myInfo'] });
diff --git a/src/hooks/api/auth/useSignInForm.ts b/src/hooks/api/auth/useSignInForm.ts
index 2b69e1df..6ecbcdad 100644
--- a/src/hooks/api/auth/useSignInForm.ts
+++ b/src/hooks/api/auth/useSignInForm.ts
@@ -1,13 +1,10 @@
 import { SigninRequest } from '@/api/auth/type';
 import { SubmitHandler, useForm } from 'react-hook-form';
 
-import { signin } from '@/lib/supabase/repositories/users';
-import { useMutation } from '@tanstack/react-query';
+import { usePostSignin } from './usePostSignin';
 
 export const useSignInForm = () => {
-  const { mutate: signIn } = useMutation({
-    mutationFn: (data: SigninRequest) => signin(data),
-  });
+  const { mutate: signIn } = usePostSignin();
 
   const {
     register,
diff --git a/src/lib/supabase/repositories/users.ts b/src/lib/supabase/repositories/users.ts
index e53901de..630f44b7 100644
--- a/src/lib/supabase/repositories/users.ts
+++ b/src/lib/supabase/repositories/users.ts
@@ -54,8 +54,15 @@ export const getUserInfo = async () => {
     return null;
   }
   const { data, error } = await instanceBaaS.auth.getUser(accessToken.value);
+  const { data: user, error: userError } = await instanceBaaS
+    .from('users')
+    .select('*')
+    .eq('email', data.user?.email ?? '');
   if (error) {
     throw new Error(error.message);
   }
-  return data;
+  if (userError) {
+    throw new Error(userError.message);
+  }
+  return user;
 };

From 37324390b1f20b0ea8fd1e55e9b98ba5ed078bc0 Mon Sep 17 00:00:00 2001
From: swimmingRiver <swimmingr@gmail.com>
Date: Thu, 24 Jul 2025 22:05:04 +0900
Subject: [PATCH 5/6] =?UTF-8?q?feat:=20=EC=9C=A0=EC=A0=80=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EA=B0=80=EC=A0=B8=EC=98=A4=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/type.ts                          |  7 +++++++
 src/lib/supabase/repositories/users.ts        | 19 +++++++++++++++----
 .../auth-provider/AuthProvider.client.tsx     |  9 +++++++++
 .../auth-provider/getMyInfoOnServer.ts        | 18 +++++++++++++-----
 src/providers/auth-provider/type.ts           |  5 +++--
 5 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/src/api/auth/type.ts b/src/api/auth/type.ts
index 98695c41..ed72102a 100644
--- a/src/api/auth/type.ts
+++ b/src/api/auth/type.ts
@@ -22,6 +22,13 @@ export interface MyInfoResponse {
   updatedAt: string;
   image: string;
 }
+export interface UserInfoResponse {
+  id: number;
+  name: string;
+  email: string;
+  favorite: string;
+  image: string;
+}
 export interface MyInfoRequest {
   image?: File | null;
   companyName: string;
diff --git a/src/lib/supabase/repositories/users.ts b/src/lib/supabase/repositories/users.ts
index 630f44b7..5cee8ade 100644
--- a/src/lib/supabase/repositories/users.ts
+++ b/src/lib/supabase/repositories/users.ts
@@ -1,5 +1,9 @@
 'use server';
-import { SignUpRequest, SigninRequest } from '@/api/auth/type';
+import {
+  SignUpRequest,
+  SigninRequest,
+  UserInfoResponse,
+} from '@/api/auth/type';
 import instanceBaaS from '@/api/instanceBaaS';
 import { cookies } from 'next/headers';
 
@@ -46,7 +50,7 @@ export const signout = async () => {
   cookieStore.delete('refresh_token');
 };
 
-export const getUserInfo = async () => {
+export const getUserInfo = async (): Promise<UserInfoResponse | null> => {
   const cookieStore = await cookies();
   const accessToken = cookieStore.get('access_token');
   const refreshToken = cookieStore.get('refresh_token');
@@ -57,12 +61,19 @@ export const getUserInfo = async () => {
   const { data: user, error: userError } = await instanceBaaS
     .from('users')
     .select('*')
-    .eq('email', data.user?.email ?? '');
+    .eq('email', data.user?.email ?? '')
+    .single();
   if (error) {
     throw new Error(error.message);
   }
   if (userError) {
     throw new Error(userError.message);
   }
-  return user;
+  return {
+    id: user.id,
+    name: user.name,
+    email: user.email,
+    favorite: user.favorite,
+    image: user.image ?? '',
+  };
 };
diff --git a/src/providers/auth-provider/AuthProvider.client.tsx b/src/providers/auth-provider/AuthProvider.client.tsx
index f5a6b902..7a12b619 100644
--- a/src/providers/auth-provider/AuthProvider.client.tsx
+++ b/src/providers/auth-provider/AuthProvider.client.tsx
@@ -3,6 +3,9 @@
 import { useGetMyInfo } from '@/hooks/api/auth/useGetMyInfo';
 import { createContext, useContext } from 'react';
 import { AuthContextValue, AuthProviderClientProps } from './type';
+import { getUserInfo } from '@/lib/supabase/repositories/users';
+import { useQuery } from '@tanstack/react-query';
+import { UserInfoResponse } from '@/api/auth/type';
 
 const AuthContext = createContext<AuthContextValue | undefined>(undefined);
 
@@ -12,12 +15,18 @@ const AuthProviderClient = ({
   isSignIn,
 }: AuthProviderClientProps) => {
   const { data: myInfo, ...rest } = useGetMyInfo(accessToken ?? '');
+  const { data: userInfo } = useQuery<UserInfoResponse | null>({
+    queryKey: ['userInfo'],
+    queryFn: () => getUserInfo(),
+    enabled: !!accessToken,
+  });
 
   return (
     <AuthContext.Provider
       value={{
         isSignIn,
         myInfo,
+        userInfo,
         queryMethods: rest,
       }}
     >
diff --git a/src/providers/auth-provider/getMyInfoOnServer.ts b/src/providers/auth-provider/getMyInfoOnServer.ts
index 8c8973de..f8095c78 100644
--- a/src/providers/auth-provider/getMyInfoOnServer.ts
+++ b/src/providers/auth-provider/getMyInfoOnServer.ts
@@ -1,14 +1,15 @@
 import { getCookie } from '@/api/cookies';
-import { MyInfoResponse } from '@/api/auth/type';
+import { UserInfoResponse } from '@/api/auth/type';
 import { getQueryClient } from '@/lib/queryClinet';
 import { QUERY_KEY } from '@/constants/queryKey';
 import { AuthProviderServerState } from './type';
-import { getMyInfo } from '@/api/auth/api';
+
 import handleError from '@/utils/error';
+import { getUserInfo } from '@/lib/supabase/repositories/users';
 
 const getMyInfoOnServer = async () => {
   const queryClient = getQueryClient();
-  const accessToken = await getCookie('accessToken');
+  const accessToken = await getCookie('access_token');
 
   const initialState: AuthProviderServerState = {
     myInfo: undefined,
@@ -22,9 +23,16 @@ const getMyInfoOnServer = async () => {
   }
 
   try {
-    const data = await queryClient.fetchQuery<MyInfoResponse>({
+    const data = await queryClient.fetchQuery<UserInfoResponse>({
       queryKey: [QUERY_KEY.MY_INFO],
-      queryFn: () => getMyInfo(accessToken),
+      queryFn: async () => {
+        const data = await getUserInfo();
+        if (!data) {
+          throw new Error('User not found');
+        }
+        return data;
+      },
+      //getMyInfo(accessToken),
     });
     return {
       ...initialState,
diff --git a/src/providers/auth-provider/type.ts b/src/providers/auth-provider/type.ts
index 4d074560..020e2537 100644
--- a/src/providers/auth-provider/type.ts
+++ b/src/providers/auth-provider/type.ts
@@ -1,10 +1,11 @@
-import { MyInfoResponse } from '@/api/auth/type';
+import { MyInfoResponse, UserInfoResponse } from '@/api/auth/type';
 import { QueryClient, UseQueryResult } from '@tanstack/react-query';
 import { ReactNode } from 'react';
 
 export interface AuthContextValue {
   isSignIn: boolean;
   myInfo: MyInfoResponse | undefined;
+  userInfo?: UserInfoResponse | null;
   queryMethods: Omit<UseQueryResult<MyInfoResponse, Error>, 'data'>;
 }
 
@@ -15,7 +16,7 @@ export interface AuthProviderClientProps {
 }
 
 export interface AuthProviderServerState {
-  myInfo: MyInfoResponse | undefined;
+  myInfo: UserInfoResponse | undefined;
   isSignIn: boolean;
   accessToken: string | undefined;
   queryClient: QueryClient;

From c5bd256a45c7c6751d2126979af7a73cc7fed8b5 Mon Sep 17 00:00:00 2001
From: swimmingRiver <swimmingr@gmail.com>
Date: Thu, 24 Jul 2025 22:08:19 +0900
Subject: [PATCH 6/6] =?UTF-8?q?feat:=20=EB=A1=9C=EA=B7=B8=EC=95=84?=
 =?UTF-8?q?=EC=9B=83=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/api/auth/usePostSignout.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/hooks/api/auth/usePostSignout.ts b/src/hooks/api/auth/usePostSignout.ts
index b83752fe..5941c25e 100644
--- a/src/hooks/api/auth/usePostSignout.ts
+++ b/src/hooks/api/auth/usePostSignout.ts
@@ -1,14 +1,14 @@
-import { postSignOut } from '@/api/auth/api';
 import { deleteCookie } from '@/api/cookies';
 import { QUERY_KEY } from '@/constants/queryKey';
+import { signout } from '@/lib/supabase/repositories/users';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
 export const usePostSignout = () => {
   const queryClient = useQueryClient();
   return useMutation({
-    mutationFn: postSignOut,
+    mutationFn: signout,
     onSuccess: () => {
-      deleteCookie('accessToken');
+      deleteCookie('access_token');
       queryClient.removeQueries({ queryKey: [QUERY_KEY.MY_INFO] });
       queryClient.removeQueries({
         queryKey: [QUERY_KEY.GET_USER_ROLE],