Merge pull request #21 from BatShu/feature/auth-api

[FEAT] add body in readUserApi
BatShu · Oct 23, 2023 · d77ef94 · d77ef94
2 parents 0ad2043 + 46a3b54
commit d77ef94
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/src/data/util/fetcher.ts b/src/data/util/fetcher.ts
@@ -29,30 +29,39 @@ const request = async <T>(
 };
 
 const API = {
-  GET: async <T>(endpoint: string, config?: RequestInit) => {
+  headers: {},
+
+  GET: async function <T>(endpoint: string, config?: RequestInit) {
     return await request<T>(`${VITE_API_BASE_URL}/${endpoint}`, {
       method: "GET",
       ...config,
+      headers: { ...this.headers, ...config?.headers },
     });
   },
 
-  POST: async <T>(endpoint: string, config?: RequestInit) =>
-    await request<T>(`${VITE_API_BASE_URL}/${endpoint}`, {
+  POST: async function <T>(endpoint: string, config?: RequestInit) {
+    return await request<T>(`${VITE_API_BASE_URL}/${endpoint}`, {
       method: "POST",
       ...config,
-    }),
+      headers: { ...this.headers, ...config?.headers },
+    });
+  },
 
-  DELETE: async <T>(endpoint: string, config?: RequestInit) =>
+  DELETE: async function <T>(endpoint: string, config?: RequestInit) {
     await request<T>(`${VITE_API_BASE_URL}/${endpoint}`, {
       method: "DELETE",
       ...config,
-    }),
+      headers: { ...this.headers, ...config?.headers },
+    });
+  },
 
-  PATCH: async <T>(endpoint: string, config?: RequestInit) =>
+  PATCH: async function <T>(endpoint: string, config?: RequestInit) {
     await request<T>(`${VITE_API_BASE_URL}/${endpoint}`, {
       method: "PATCH",
       ...config,
-    }),
+      headers: { ...this.headers, ...config?.headers },
+    });
+  },
 };
 
 export { request, API };
diff --git a/src/provider/AuthProvider.tsx b/src/provider/AuthProvider.tsx
@@ -1,3 +1,5 @@
+import { API } from "@/data/util/fetcher";
+import { getAuthHeader } from "@/data/util/header";
 import { HOME_PATH, LOGIN_PATH, SIGNUP_PATH } from "@/domain/constants/paths";
 import { useAuthStore } from "@/store/authStore";
 import { Backdrop, CircularProgress, css } from "@mui/material";
@@ -16,7 +18,10 @@ export const AuthProvider = () => {
       navigate(HOME_PATH, { replace: true });
       return;
     }
-    if (user != null) return;
+    if (user != null) {
+      (async () => (API.headers = (await getAuthHeader(user)).headers))();
+      return;
+    }
     navigate(LOGIN_PATH, { replace: true });
   }, [user, location, navigate, setUser, init]);