Merge pull request #76 from bbiyongbbiyong/develop

develop -> main
bbiyongbbiyong · Aug 12, 2023 · 13cf389 · 13cf389
2 parents 52a606a + 51674a8
commit 13cf389
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/src/pages/Notification.jsx b/src/pages/Notification.jsx
@@ -7,7 +7,7 @@ import { getMessaging, getToken } from 'firebase/messaging';
 import notification from '../assets/notification.svg';
 import ToggleButton from '../components/ToggleButton';
 import { firebaseVapidKey } from '../data/firebaseConfig';
-
+import { getToken as getAccessToken } from '../utils/tokenUtil';
 import '../css/Notification.css';
 
 const Notification = () => {
@@ -17,6 +17,8 @@ const Notification = () => {
   const [toggleStatus, setToggleStatus] = useState([]);
   const [notifyOn, setNotifyOn] = useState(false);
 
+  const accessToken = getAccessToken();
+
   const navigate = useNavigate();
 
   const handleAllToggleStatus = (checked) => {
@@ -41,7 +43,6 @@ const Notification = () => {
 
   const onClickSave = () => {
     const requestData = {
-      memberId: 0,
       notifyOn,
       notificationList: [...notificationStatus].reduce((object, [key, value]) => {
         object[key] = value;
@@ -50,7 +51,11 @@ const Notification = () => {
     };
 
     try {
-      axios.post('https://api.bbiyong-bbiyong.seoul.kr/notification/save/topic', requestData);
+      axios.post('https://api.bbiyong-bbiyong.seoul.kr/topic', requestData, {
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+        },
+      });
       navigate('/');
     } catch (e) {
       alert('설정 저장 중 에러가 발생했습니다! 잠시 후 다시 시도해주세요');
@@ -80,10 +85,13 @@ const Notification = () => {
       .catch((error) => {
         console.log('FCM 토큰 가져오기 오류 : ', error);
       });
+
     const getNotificationList = async () => {
-      const response = await axios.get(
-        'https://api.bbiyong-bbiyong.seoul.kr/notification/0/get/topic',
-      );
+      const response = await axios.get('https://api.bbiyong-bbiyong.seoul.kr/topic', {
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+        },
+      });
 
       setNotificationStatus(
         Object.keys(response.data.data.notificationList).reduce((map, key) => {