giong to test account confirmation again

adizafri2000 · Jun 30, 2024 · 584edc6 · 584edc6
1 parent b945313
commit 584edc6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/...oot-backend/src/main/java/com/example/springbootbackend/auth/JwtAuthenticationFilter.java b/...oot-backend/src/main/java/com/example/springbootbackend/auth/JwtAuthenticationFilter.java
@@ -18,11 +18,11 @@ protected boolean shouldNotFilter(HttpServletRequest request) throws ServletExce
         String path = request.getRequestURI();
         if ( path.equals("/auth/login") ||
                 path.equals("/auth/signup") ||
-                path.equals("auth/refresh") ||
-                path.equals("auth/sendmail") ||
-                path.equals("auth/forgot-password") ||
-                path.equals("auth/reset-password") ||
-                path.equals("auth/resend-confirmation") ||
+                path.equals("/auth/refresh") ||
+                path.equals("/auth/sendmail") ||
+                path.equals("/auth/forgot-password") ||
+                path.equals("/auth/reset-password") ||
+                path.equals("/auth/resend-confirmation") ||
                 path.equals("/swagger-ui")
         ) {
             return true;
@@ -41,7 +41,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
                 !path.equals("/auth/sendmail") &&
                 !path.equals("/swagger-ui") &&
                 !path.equals("/auth/forgot-password") &&
-                !path.equals("auth/resend-confirmation") &&
+                !path.equals("/auth/resend-confirmation") &&
                 !path.equals("/auth/reset-password")
         ){
             String header = request.getHeader("Authorization");

diff --git a/web/src/pages/ConfirmationPage.jsx b/web/src/pages/ConfirmationPage.jsx
@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react';
-import { useParams, useNavigate } from 'react-router-dom';
+import { useNavigate, useLocation } from 'react-router-dom';
 import authService from '../services/auth';
 import CircularProgress from '@mui/material/CircularProgress';
 import { toast } from 'react-toastify';
@@ -10,11 +10,19 @@ const ConfirmationPage = () => {
     const [success, setSuccess] = useState(false);
     const [showResendForm, setShowResendForm] = useState(false);
     const [email, setEmail] = useState('');
-    const { token } = useParams();
     const navigate = useNavigate();
     const theme = useTheme();
+    const location = useLocation();
 
     useEffect(() => {
+        const query = new URLSearchParams(location.search);
+        const token = query.get('token');
+
+        if (!token) {
+            toast.error('Invalid confirmation link.');
+            return;
+        }
+
         const confirmAccount = async (token) => {
             try {
                 setIsLoading(true);
@@ -24,14 +32,15 @@ const ConfirmationPage = () => {
                 navigate('/login');
             } catch (error) {
                 console.error('Failed to confirm account:', error);
-                toast.error('Failed to confirm account: ', error);
+                toast.error(`Failed to confirm account: ${error}`);
                 setSuccess(false);
             } finally {
                 setIsLoading(false);
             }
         };
+
         confirmAccount(token);
-    }, [token, navigate]);
+    }, [location, navigate]);
 
     const handleResendEmail = () => {
         setShowResendForm(true);
@@ -41,6 +50,7 @@ const ConfirmationPage = () => {
         try {
             setIsLoading(true);
             const data = { email };
+            console.log('resend confirm email data: ', data)
             await authService.resendConfirmationEmail(data);
             toast.success('Confirmation email sent, please check your email.');
             setShowResendForm(false);