From e370a782a7ee4dbc27b474848505ef008f75ccac Mon Sep 17 00:00:00 2001 From: Kevin Wu Date: Wed, 28 Aug 2024 21:15:39 -0700 Subject: [PATCH] feat: flag middleware behind prod node_env --- client/src/utils/auth/firebase.ts | 18 +++++++++--------- server/src/app.ts | 4 +++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/client/src/utils/auth/firebase.ts b/client/src/utils/auth/firebase.ts index 15636d0..6172385 100644 --- a/client/src/utils/auth/firebase.ts +++ b/client/src/utils/auth/firebase.ts @@ -60,7 +60,7 @@ export const refreshToken = async () => { if (currentUser) { const refreshToken = currentUser.refreshToken; const { - data: { access_token: idToken }, + data: { access_token: id_token }, } = await axios.post(REFRESH_URL, { grant_type: "refresh_token", refresh_token: refreshToken, @@ -69,18 +69,18 @@ export const refreshToken = async () => { // Sets the appropriate cookies after refreshing access token setCookie({ key: cookieKeys.ACCESS_TOKEN, - value: idToken, + value: id_token, config: cookieConfig, }); - const user = await backend.get(`/users/${auth.currentUser?.uid}`); - setCookie({ - key: cookieKeys.ROLE, - value: user.data[0].type, - config: cookieConfig, - }); + // const user = await backend.get(`/users/${auth.currentUser?.uid}`); + // setCookie({ + // key: cookieKeys.ROLE, + // value: user.data[0].type, + // config: cookieConfig, + // }); - return { accessToken: idToken, currentUser: user.data[0] }; + return { accessToken: id_token }; } return null; }; diff --git a/server/src/app.ts b/server/src/app.ts index c5f3dda..f91e8fc 100644 --- a/server/src/app.ts +++ b/server/src/app.ts @@ -32,7 +32,9 @@ app.use( app.use(cookieParser()); app.use(express.json()); -app.use(verifyToken); +if (process.env.NODE_ENV === "production") { + app.use(verifyToken); +} app.use("/", sampleRouter); // TODO: delete sample endpoint app.use("/users", userRouter);