feat: added new middlewares

overexpload · Mar 10, 2024 · 62b0223 · 62b0223
1 parent 411bf3f
commit 62b0223
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/client/src/features/authSlice.js b/client/src/features/authSlice.js
@@ -36,12 +36,7 @@ const authSlice = createSlice({
                 state.isSuccess = true;
                 state.user = action.payload.user;
                 localStorage.setItem("user", JSON.stringify(action.payload.user));
-                Cookies.set("token", action.payload.token, {
-                    secure: true,
-                    sameSite: "none",
-                    path: '/',
-                    expires: 3,
-                });
+                Cookies.set("token", action.payload.token, { expires: 3, sameSite: 'none', secure: true });
             })
             .addCase(login.rejected, (state, action) => {
                 state.isLoading = false;
@@ -57,12 +52,7 @@ const authSlice = createSlice({
                 state.isSuccess = true;
                 state.user = action.payload.user;
                 localStorage.setItem("user", JSON.stringify(action.payload.user));
-                Cookies.set("token", action.payload.token, {
-                    secure: true,
-                    sameSite: "none",
-                    path: '/',
-                    expires: 3,
-                });
+                Cookies.set("token", action.payload.token, { expires: 3, sameSite: 'none', secure: true });
             })
             .addCase(signUp.rejected, (state, action) => {
                 state.isLoading = false;

diff --git a/server/app.js b/server/app.js
@@ -9,8 +9,7 @@ const { notFound, errorHandler } = require('./middlewares/errorMiddlewares')
 
 const userRoute = require('./routes/indexRoute.js')
 const adminRoute = require('./routes/adminRoute.js')
-// const ORIGIN = process.env.NODE_ENV === 'development' ? "http://localhost:4000" : 'https://thalia.vercel.app'
-const ORIGIN = ["http://localhost:4000", 'https://thalia.vercel.app']
+const ORIGIN = process.env.NODE_ENV === 'development' ? "http://localhost:4000" : 'https://thalia.vercel.app'
 const corsConfig = {
     origin: ORIGIN,
     credentials: true,
@@ -25,6 +24,13 @@ app.use(express.json());
 app.use(express.urlencoded({ extended: true }))
 app.use(cookieParser());
 app.use(cors(corsConfig))
+app.use((req, res, next) => {
+    res.setHeader('Access-Control-Allow-Origin', ORIGIN);
+    res.setHeader('Access-Control-Allow-Credentials', true);
+    res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS, PUT, PATCH, DELETE');
+    res.setHeader('Access-Control-Allow-Headers', 'Authorization, Content-Type');
+    next();
+});
 
 //routes
 app.use('/api', userRoute)