redirect to homepage after register

GDGOCBIT · Nov 26, 2023 · 1fecaf2 · 1fecaf2
1 parent ad9a929
commit 1fecaf2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/api/controllers/authController.js b/api/controllers/authController.js
@@ -165,9 +165,13 @@ exports.userRegisterDetails = async (req, res) => {
                 $unset: { jwtRegisterToken: 1 }
             });
 
+            const loginToken = user.getLoginToken();
+            await user.save();
+
             return res.status(200).json({
                 success: true,
-                msg: "Your account is registered successfully!"
+                msg: "Your account is registered successfully!",
+                loginToken
             });
         }
         user = await User.findByIdAndUpdate(req.user._id, {
@@ -179,9 +183,13 @@ exports.userRegisterDetails = async (req, res) => {
             $unset: { jwtRegisterToken: 1 }
         });
 
+        const loginToken = user.getLoginToken();
+        await user.save();
+
         res.status(200).json({
             success: true,
-            msg: "Your account is registered successfully!"
+            msg: "Your account is registered successfully!",
+            loginToken
         });
     }
     catch (error) {

diff --git a/api/controllers/socialController.js b/api/controllers/socialController.js
@@ -25,10 +25,9 @@ exports.googleCallbackController = async function (req, res, next) {
 
         if (user.authType === 'register') {
             const registerToken = user.getRegisterToken();
-            const loginToken = user.getLoginToken();
             await user.save();
 
-            return res.redirect(`${process.env.FRONTEND_URL}/auth?type=${user.authType}&response=${encodeURIComponent(JSON.stringify(userData))}&registerToken=${registerToken}&loginToken=${loginToken}`);
+            return res.redirect(`${process.env.FRONTEND_URL}/auth?type=${user.authType}&response=${encodeURIComponent(JSON.stringify(userData))}&registerToken=${registerToken}`);
         }
         else if (user.authType === 'login') {
             const loginToken = user.getLoginToken();
@@ -60,10 +59,9 @@ exports.twitterCallbackController = async function (req, res, next) {
 
         if (user.authType === 'register') {
             const registerToken = user.getRegisterToken();
-            const loginToken = user.getLoginToken();
             await user.save();
 
-            return res.redirect(`${process.env.FRONTEND_URL}/auth?type=${user.authType}&response=${encodeURIComponent(JSON.stringify(userData))}&registerToken=${registerToken}&loginToken=${loginToken}`);
+            return res.redirect(`${process.env.FRONTEND_URL}/auth?type=${user.authType}&response=${encodeURIComponent(JSON.stringify(userData))}&registerToken=${registerToken}`);
         }
         else if (user.authType === 'login') {
             const loginToken = user.getLoginToken();
@@ -128,9 +126,8 @@ exports.linkedinCallbackController = async function (req, res) {
             }
 
             const registerToken = user.getRegisterToken();
-            const loginToken = user.getLoginToken();
             await user.save();
-            return res.redirect(`${process.env.FRONTEND_URL}/auth?type=${user.authType}&response=${encodeURIComponent(JSON.stringify(userData))}&registerToken=${registerToken}&loginToken=${loginToken}`);
+            return res.redirect(`${process.env.FRONTEND_URL}/auth?type=${user.authType}&response=${encodeURIComponent(JSON.stringify(userData))}&registerToken=${registerToken}`);
         }
 
         user = await User.findByIdAndUpdate(user._id, {

diff --git a/client/src/pages/Auth.jsx b/client/src/pages/Auth.jsx
@@ -333,7 +333,7 @@ const OTPVerify = () => {
 // User detail component
 const NewUser = () => {
   const navigate = useNavigate();
-  const { verifySuccess, user, registerDetail } = useAuthStore()
+  const { user, registerDetail } = useAuthStore()
   const { userRegisterDetails } = useRegisterStore()
 
   const fileRef = useRef()
@@ -369,7 +369,7 @@ const NewUser = () => {
       lastName,
       password,
       ...(imageFile ? { imageFile: imageFile } : { imageFile: '' }),
-      ...(verifySuccess && user ? { shallRedirect: true } : { shallRedirect: false }),
+      shallRedirect: true,
       navigate
     })
   }

diff --git a/client/src/store/useAuthStore.js b/client/src/store/useAuthStore.js
@@ -131,7 +131,7 @@ export const useRegisterStore = create(() => ({
                 .then((result) => {
                     if (result.success === true) {
                         toast.success(result.msg, { duration: 7500 });
-                        useAuthStore.getState().setAuthType("sign-in");
+                        localStorage.setItem("login_token", result.loginToken);
                         if (shallRedirect) navigate("/");
                     }
                     if (result.success === false) toast.error(result.msg, { duration: 7500 });