refactor: userId 삭제

src/components/common/SideBar/SideBar.jsx

@@ -17,7 +17,7 @@ import firebase from 'firebase/compat/app';
 import Alarm from '@/icons/alarm.svg';
 import AlarmOff from '@/icons/alarm_off.svg';
 import 'firebase/compat/messaging';
-import { useAlarm, useStoreId, useUserId } from '@/store/useStoreId';
+import { useAlarm, useStoreId } from '@/store/useStoreId';
 import { useMutation } from '@tanstack/react-query';
 import postFcm from './apis/postFcm';
 import postUserFcm from './apis/postUserFcm';
@@ -39,12 +39,12 @@ export default function SideBar() {
   const [canPlaySound, setCanPlaySound] = useState(true);
   const pathName = usePathname();
   const { setAlarm } = useAlarm();
-  const { userId } = useUserId();
+  const token = localStorage.getItem('token');
   const { storeId } = useStoreId();
 
   const userFcmMutation = useMutation({
     // @ts-ignore
-    mutationFn: () => postUserFcm(userId, storeId),
+    mutationFn: () => postUserFcm(token, storeId),
   });
 
   const fcmMutation = useMutation({
@@ -75,9 +75,9 @@ export default function SideBar() {
         console.log('Notification permission granted.');
         messaging
           .getToken()
-          .then((token) => {
+          .then((fcmToken) => {
             // @ts-ignore
-            fcmMutation.mutate({ userId: userId, fcmToken: token });
+            fcmMutation.mutate({ token: token, fcmToken: fcmToken });
           })
           .catch((error) => {
             console.error('Error getting token:', error);

src/components/common/SideBar/apis/postFcm.js

@@ -1,9 +1,16 @@
 import axiosInstance from '@/apis/axiosInstance';
 
-export default async function postFcm({ userId, fcmToken }) {
-  const { data } = await axiosInstance.post('fcm', {
-    userId: userId,
-    fcmToken: fcmToken,
-  });
+export default async function postFcm({ token, fcmToken }) {
+  const { data } = await axiosInstance.post(
+    'fcm',
+    {
+      fcmToken: fcmToken,
+    },
+    {
+      headers: {
+        Authorization: `Bearer ${token}`,
+      },
+    }
+  );
   return data;
 }

src/components/common/SideBar/apis/postUserFcm.js

@@ -1,6 +1,14 @@
 import axiosInstance from '@/apis/axiosInstance';
 
-export default async function postUserFcm(userId, storeId) {
-  const { data } = await axiosInstance.post(`reservation-new/fcm?storeId=${storeId}&userId=${userId}`);
+export default async function postUserFcm(token, storeId) {
+  const { data } = await axiosInstance.post(
+    `reservation-new/fcm?storeId=${storeId}`,
+    {},
+    {
+      headers: {
+        Authorization: `Bearer ${token}`,
+      },
+    }
+  );
   return data;
 }

src/components/page-layout/MainPageLayout/MainPageLayout.jsx

@@ -21,13 +21,12 @@ import { useRouter } from 'next/navigation';
 import { useState, useEffect, useCallback } from 'react';
 import axiosInstance from '@/apis/axiosInstance';
 import ROUTE from '@/constants/route';
-import { useStoreId, useUserId } from '@/store/useStoreId';
+import { useStoreId } from '@/store/useStoreId';
 
 const cn = classNames.bind(styles);
 
 export default function MainPageLayout() {
   const { setStoreId } = useStoreId();
-  const { setUserId } = useUserId();
   const router = useRouter();
   const [email, setEmail] = useState('');
   const [password, setPassword] = useState('');
@@ -48,7 +47,6 @@ export default function MainPageLayout() {
         }
 
         setStoreId(userData.storeRef);
-        setUserId(userData.userid);
 
         alert('로그인에 성공하였습니다.');
         router.push(ROUTE.In_Progress);
@@ -57,7 +55,7 @@ export default function MainPageLayout() {
         console.error('로그인 조건 검증 실패:', error);
       }
     },
-    [router, setStoreId, setUserId]
+    [router, setStoreId]
   );
 
   useEffect(() => {
@@ -82,6 +80,7 @@ export default function MainPageLayout() {
       await setPersistence(auth, browserLocalPersistence);
       const result = await signInWithPopup(auth, provider);
       const token = await result.user.getIdToken();
+      localStorage.setItem('token', token);
       await checkUserPermissions(token);
     } catch (error) {
       alert('Google 로그인에 실패하였습니다. 다시 시도해주세요.');
@@ -98,6 +97,7 @@ export default function MainPageLayout() {
       await setPersistence(auth, browserLocalPersistence);
       const result = await signInWithPopup(auth, provider);
       const token = await result.user.getIdToken();
+      localStorage.setItem('token', token);
       await checkUserPermissions(token);
     } catch (error) {
       alert('Apple 로그인에 실패하였습니다. 다시 시도해주세요.');
@@ -111,6 +111,7 @@ export default function MainPageLayout() {
       await setPersistence(auth, browserLocalPersistence);
       const result = await signInWithEmailAndPassword(auth, email, password);
       const token = await result.user.getIdToken();
+      localStorage.setItem('token', token);
       await checkUserPermissions(token);
     } catch (error) {
       alert('로그인에 실패하였습니다. 이메일과 비밀번호를 확인해주세요.');

src/store/useStoreId.js

@@ -13,18 +13,6 @@ const useStoreId = create(
   )
 );
 
-const useUserId = create(
-  persist(
-    (set) => ({
-      userId: null,
-      setUserId: (userId) => set({ userId: userId }),
-    }),
-    {
-      name: 'userId',
-    }
-  )
-);
-
 const useAlarm = create(
   persist(
     (set) => ({
@@ -37,4 +25,4 @@ const useAlarm = create(
   )
 );
 
-export { useStoreId, useUserId, useAlarm };
+export { useStoreId, useAlarm };