Fix: update user check logic in Activate and ResetPassword pages

aelassas · Feb 4, 2025 · 7c56669 · 7c56669
1 parent b7c8140
commit 7c56669
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/backend/src/pages/Activate.tsx b/backend/src/pages/Activate.tsx
@@ -119,7 +119,9 @@ const Activate = () => {
   }
 
   const onLoad = async (user?: bookcarsTypes.User) => {
-    if (!user) {
+    if (user) {
+      setNoMatch(true)
+    } else {
       const params = new URLSearchParams(window.location.search)
       if (params.has('u') && params.has('e') && params.has('t')) {
         const _userId = params.get('u')

diff --git a/backend/src/pages/ResetPassword.tsx b/backend/src/pages/ResetPassword.tsx
@@ -104,7 +104,9 @@ const ResetPassword = () => {
   }
 
   const onLoad = async (user?: bookcarsTypes.User) => {
-    if (!user) {
+    if (user) {
+      setNoMatch(true)
+    } else {
       const params = new URLSearchParams(window.location.search)
       if (params.has('u') && params.has('e') && params.has('t')) {
         const _userId = params.get('u')

diff --git a/frontend/src/pages/Activate.tsx b/frontend/src/pages/Activate.tsx
@@ -121,7 +121,9 @@ const Activate = () => {
   }
 
   const onLoad = async (user?: bookcarsTypes.User) => {
-    if (!user) {
+    if (user) {
+      setNoMatch(true)
+    } else {
       const params = new URLSearchParams(window.location.search)
       if (params.has('u') && params.has('e') && params.has('t')) {
         const _userId = params.get('u')

diff --git a/frontend/src/pages/ResetPassword.tsx b/frontend/src/pages/ResetPassword.tsx
@@ -106,7 +106,9 @@ const ResetPassword = () => {
   }
 
   const onLoad = async (user?: bookcarsTypes.User) => {
-    if (!user) {
+    if (user) {
+      setNoMatch(true)
+    } else {
       const params = new URLSearchParams(window.location.search)
       if (params.has('u') && params.has('e') && params.has('t')) {
         const _userId = params.get('u')