Revert "Add. 소셜 로그인 구현"

This reverts commit e4f77a8.
ddok-ddak · Feb 1, 2024 · cd63938 · cd63938
1 parent e4f77a8
commit cd63938
Show file tree

Hide file tree

Showing 15 changed files with 314 additions and 641 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -70,7 +70,6 @@
     "react-app-polyfill": "^3.0.0",
     "react-chartjs-2": "^5.1.0",
     "react-color": "^2.19.3",
-    "react-cookie": "^7.0.2",
     "react-countdown": "^2.3.5",
     "react-dev-utils": "^12.0.1",
     "react-dom": "^18.2.0",

diff --git a/src/App.tsx b/src/App.tsx
@@ -22,66 +22,35 @@ import ResetPWMode from './pages/auth/resetPW/ResetPWMode';
 import ResetPWStep from './pages/auth/resetPW/ResetPWSteps';
 import AccountSetting from './pages/settings/AccountSetting';
 import PopupMessage from './components/common/PopupMessage';
-import LoginRedirect from './pages/auth/login/LoginRedirect';
-import { CookiesProvider } from 'react-cookie';
 
 function App() {
   return (
     <BrowserRouter>
       <ThemeProvider theme={theme}>
-        <CookiesProvider>
-          <Box
-            sx={{ display: 'flex', flexDirection: 'column', height: '100vh' }}
-          >
-            <Box sx={{ height: '94vh' }}>
-              <Routes>
-                <Route path="/" element={<Navigate to="/login" />} />
-                <Route path="/login" element={<Login />} />
-                <Route path="/signin/redirect" element={<LoginRedirect />} />
-                <Route path="/signUp" element={<SignUp />} />
-                <Route path="/findID" element={<FindID />} />
-
-                <Route path="/resetPW" element={<ResetPWStep />} />
-                <Route path="/resetPWMode" element={<ResetPWMode />} />
-
-                <Route
-                  path="/record"
-                  element={
-                    <>
-                      <RecordPage />
-                      <BottomNav />
-                    </>
-                  }
-                />
-                <Route
-                  path="/statistics"
-                  element={
-                    <>
-                      <StatisticsPage />
-                      <BottomNav />
-                    </>
-                  }
-                />
-                <Route
-                  path="/settings"
-                  element={
-                    <>
-                      <SettingsPage />
-                      <BottomNav />
-                    </>
-                  }
-                />
-                <Route path="/settings/account" element={<AccountSetting />} />
-
-                <Route path="/record/edit" element={<EditRecordPage />} />
-                <Route path="/category" element={<CategoryPage />} />
-                <Route path="/category/edit" element={<EditCategoryPage />} />
-              </Routes>
-            </Box>
+        <Box sx={{display: 'flex', flexDirection: 'column', height: '100vh'}}>
+          <Box sx={{height: '94vh'}}>
+            <Routes>
+              <Route path="/" element={<Navigate to="/login" />} />
+              <Route path="/login" element={<Login />} />
+              <Route path="/signUp" element={<SignUp />} />
+              <Route path="/findID" element={<FindID />} />
+
+              <Route path="/resetPW" element={<ResetPWStep />} />
+              <Route path="/resetPWMode" element={<ResetPWMode />} />
+
+              <Route path="/record" element={<><RecordPage /><BottomNav /></>} />
+              <Route path="/statistics" element={<><StatisticsPage /><BottomNav /></>} />
+              <Route path="/settings" element={<><SettingsPage /><BottomNav /></>} />
+              <Route path="/settings/account" element={<AccountSetting />} />
+
+              <Route path="/record/edit" element={<EditRecordPage />} />
+              <Route path="/category" element={<CategoryPage />} />
+              <Route path="/category/edit" element={<EditCategoryPage />} />
+            </Routes>
           </Box>
-          <PopupMessage />
-          <Modal />
-        </CookiesProvider>
+        </Box>
+        <PopupMessage />
+        <Modal />
       </ThemeProvider>
     </BrowserRouter>
   );

diff --git a/src/api/auth.ts b/src/api/auth.ts
@@ -55,35 +55,6 @@ export const addUser = async (request: UserData) => {
 
 /************************  SIGN IN  ************************/
 
-/**
- * user sign in
- * @param request: UserData 
- * @returns response
- */
-export const signIn = async (request: UserData) => {
-  const response = await callAPI({
-    url: '/api/v1/auth/signin',
-    method: 'POST',
-    body: request,
-  });
-
-  return response as CommonResponse;
-};
-
-/**
- * user social sign in
- * @param registrationId (google / naver / kakao)
- * @returns response
- */
-export const socialSignIn = async (registrationId: string) => {
-  const response = await callAPI({
-    url: `/api/oauth2/authorization/${registrationId}`,
-    method: 'GET',
-  });
-
-  return response as CommonResponse;
-};
-
 
 /************************ USER INFO ************************/
 

diff --git a/src/api/common/api.ts b/src/api/common/api.ts
@@ -1,20 +1,16 @@
 import { Method } from 'axios';
 
 import CommonResponse, { getInstance } from '../http';
-import { Cookies } from 'react-cookie';
 
 export interface APIContract {
-  headers?: any;
   method: Method;
   url: string;
   params?: object;
   body?: object;
 }
 
-const cookies = new Cookies();
-
 export const callAPI = async <T = any>(
-  { headers, url, method, params, body }: APIContract,
+  { url, method, params, body }: APIContract,
   isLoading?: boolean,
 ): Promise<any> => {
   let response: CommonResponse = {
@@ -24,20 +20,16 @@ export const callAPI = async <T = any>(
   };
 
   try {
-    const request = {
-      headers: {
-        Authorization: `bearer ${cookies.get('accessToken')}`,
-      },
+    response = await getInstance(isLoading).request({
       url,
       method,
       params,
       data: body,
-    };
-    response = await getInstance(isLoading).request(request);
+    });
   } catch (error) {
     response.data = error;
   }
 
   // return response as CommonResponse<T>; 추후에 response 정해지면 any 대신 사용
   return response as any;
-};
+};
diff --git a/src/icons/social/GoogleIcon.tsx → src/components/auth/Google.tsx b/src/icons/social/GoogleIcon.tsx → src/components/auth/Google.tsx
@@ -1,4 +1,4 @@
-const GoogleIcon = () => {
+const Naver = () => {
   return (
     <svg
       width="46"
@@ -28,4 +28,4 @@ const GoogleIcon = () => {
   );
 };
 
-export default GoogleIcon;
+export default Naver;
diff --git a/src/icons/social/KakaoIcon.tsx → src/components/auth/Kakao.tsx b/src/icons/social/KakaoIcon.tsx → src/components/auth/Kakao.tsx
@@ -1,4 +1,4 @@
-const KakaoIcon = () => {
+const Naver = () => {
   return (
     <svg
       width="46"
@@ -16,4 +16,4 @@ const KakaoIcon = () => {
   );
 };
 
-export default KakaoIcon;
+export default Naver;
diff --git a/src/icons/social/NaverIcon.tsx → src/components/auth/Naver.tsx b/src/icons/social/NaverIcon.tsx → src/components/auth/Naver.tsx
@@ -1,4 +1,4 @@
-const NaverIcon = () => {
+const Naver = () => {
   return (
     <svg
       width="46"
@@ -16,4 +16,4 @@ const NaverIcon = () => {
   );
 };
 
-export default NaverIcon;
+export default Naver;