Feature/#294 user 관련 supabase api 추가

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'>;
@@ -26,6 +26,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;

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`}

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';

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'] });

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],

src/hooks/api/auth/useSignInForm.ts

@@ -1,5 +1,6 @@
-import { SigninFormData } from '@/api/auth/type';
-import { SubmitHandler, useForm, UseFormProps } from 'react-hook-form';
+import { SigninRequest } from '@/api/auth/type';
+import { SubmitHandler, useForm } from 'react-hook-form';
+
 import { usePostSignin } from './usePostSignin';
 
 export function useSignInForm(options: UseFormProps<SigninFormData>) {

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, {

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;

src/lib/supabase/repositories/users.ts

@@ -0,0 +1,79 @@
+'use server';
+import {
+  SignUpRequest,
+  SigninRequest,
+  UserInfoResponse,
+} 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({
+    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;
+};
+
+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 (): Promise<UserInfoResponse | null> => {
+  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);
+  const { data: user, error: userError } = await instanceBaaS
+    .from('users')
+    .select('*')
+    .eq('email', data.user?.email ?? '')
+    .single();
+  if (error) {
+    throw new Error(error.message);
+  }
+  if (userError) {
+    throw new Error(userError.message);
+  }
+  return {
+    id: user.id,
+    name: user.name,
+    email: user.email,
+    favorite: user.favorite,
+    image: user.image ?? '',
+  };
+};

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,
       }}
     >

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,

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;