final code

shahriarsajeeb · shahriarsajeeb · commit 062ef3daa28d · 2023-04-30T05:50:44.000+06:00
diff --git a/backend/app.js b/backend/app.js
@@ -7,13 +7,13 @@ const cors = require("cors");
 const path = require("path");
 
 app.use(cors({
-  origin: '*',
+  origin: 'https://eshop-tutorial-cefl.vercel.app',
   credentials: true
 }));
 
 app.use(express.json());
 app.use(cookieParser());
-app.use("/", express.static(path.join(__dirname, "./uploads")));
+app.use("/", express.static(path.join(__dirname,"./uploads")));
 app.use("/test", (req, res) => {
   res.send("Hello world!");
 });
diff --git a/backend/config/.env b/backend/config/.env
@@ -1,11 +1,11 @@
-PORT = 
-DB_URL = 
-JWT_SECRET_KEY = 
-JWT_EXPIRES = 
-ACTIVATION_SECRET = 
-SMPT_HOST = 
-SMPT_PORT = 
-SMPT_PASSWORD = 
-SMPT_MAIL = 
-STRIPE_API_KEY = 
-STRIPE_SECRET_KEY = 
+PORT = 8000
+DB_URL = "mongodb+srv://shahriarsajeeb:e-shop1234@cluster0.6dckvfx.mongodb.net/test"
+JWT_SECRET_KEY = "dfbkjgflseiia3948943954wfsdchsgfuw#%#%"
+JWT_EXPIRES = 7d
+ACTIVATION_SECRET = hfskjdweuiwe093$wew$@%W!Edfonoddfi
+SMPT_HOST = smtp.gmail.com
+SMPT_PORT = 465
+SMPT_PASSWORD = ezxxqmjhjdnfucdv
+SMPT_MAIL = support@becodemy.com
+STRIPE_API_KEY = pk_test_51KlcLFBK9PCk4OhCmCUGNNnJqLHcllocV6d5ipQEHXibYE0Rfi8vxULYBluJYRI7HmieplqMzZ2tCp6kDpyIZztI00n4yXPaWc
+STRIPE_SECRET_KEY = sk_test_51KlcLFBK9PCk4OhCKkvgwl13JW7d25lL6emYThvmMCCcGYDzzWWBtfLvXVj78txO88F3sRbCAcNQdaSPcsz5n4tC00OS0gAQqW
diff --git a/backend/controller/shop.js b/backend/controller/shop.js
@@ -44,7 +44,7 @@ router.post("/create-shop", upload.single("file"), async (req, res, next) => {
 
     const activationToken = createActivationToken(seller);
 
-    const activationUrl = `http://localhost:3000/seller/activation/${activationToken}`;
+    const activationUrl = `https://eshop-tutorial-cefl.vercel.app/seller/activation/${activationToken}`;
 
     try {
       await sendMail({
diff --git a/backend/controller/user.js b/backend/controller/user.js
@@ -41,7 +41,7 @@ router.post("/create-user", upload.single("file"), async (req, res, next) => {
 
     const activationToken = createActivationToken(user);
 
-    const activationUrl = `http://localhost:3000/activation/${activationToken}`;
+    const activationUrl = `https://eshop-tutorial-cefl.vercel.app/activation/${activationToken}`;
 
     try {
       await sendMail({
diff --git a/backend/utils/jwtToken.js b/backend/utils/jwtToken.js
@@ -6,6 +6,7 @@ const sendToken = (user, statusCode, res) => {
   const options = {
     expires: new Date(Date.now() + 90 * 24 * 60 * 60 * 1000),
     httpOnly: true,
+    sameSite: "none",
     Secure: true,
   };
 
diff --git a/frontend/src/redux/actions/user.js b/frontend/src/redux/actions/user.js
@@ -9,9 +9,6 @@ export const loadUser = () => async (dispatch) => {
     });
     const { data } = await axios.get(`${server}/user/getuser`, {
       withCredentials: true,
-      headers: {
-        "Access-Control-Allow-Credentials": true,
-      },
     });
     dispatch({
       type: "LoadUserSuccess",
@@ -33,9 +30,6 @@ export const loadSeller = () => async (dispatch) => {
     });
     const { data } = await axios.get(`${server}/shop/getSeller`, {
       withCredentials: true,
-      headers: {
-        "Access-Control-Allow-Credentials": true,
-      },
     });
     dispatch({
       type: "LoadSellerSuccess",
@@ -158,9 +152,6 @@ export const getAllUsers = () => async (dispatch) => {
 
     const { data } = await axios.get(`${server}/user/admin-all-users`, {
       withCredentials: true,
-      headers: {
-        "Access-Control-Allow-Credentials": true,
-      },
     });
 
     dispatch({
