fixing login with 2fa

Author: janet-barbie

src/pages/LoginWith2fa.tsx

@@ -42,12 +42,12 @@ export const LOGIN_WITH_2FA = gql`
   mutation LoginWithTwoFactorAuthentication(
     $email: String!
     $otp: String!
-    $TwoWayVerificationToken: String!
+    # $TwoWayVerificationToken: String!
   ) {
     loginWithTwoFactorAuthentication(
       email: $email
       otp: $otp
-      TwoWayVerificationToken: $TwoWayVerificationToken
+      # TwoWayVerificationToken: $TwoWayVerificationToken
     ) {
       token
       user {
@@ -84,7 +84,7 @@ const TwoFactorPage: React.FC = () => {
 
   const location = useLocation();
   const navigate = useNavigate();
-  const { email, TwoWayVerificationToken } = location.state || {};
+  const { email } = location.state || {};
   useEffect(() => {
     // Update document class and localStorage when theme changes
     if (isDark) {
@@ -97,30 +97,30 @@ const TwoFactorPage: React.FC = () => {
   }, [isDark]);
 
   useEffect(() => {
-    if (!email || !TwoWayVerificationToken) {
+    if (!email ) {
       navigate('/login');
     }
-  }, [email, TwoWayVerificationToken, navigate]);
+  }, [email,  navigate]);
 
   const [loginWithTwoFactorAuthentication] = useMutation<LoginResponse>(
     LOGIN_WITH_2FA,
     {
       onCompleted: async (data) => {
         const response = data.loginWithTwoFactorAuthentication;
         try {
-          localStorage.setItem('authToken', response.token);
+          //localStorage.setItem('authToken', response.token);
           localStorage.setItem('user', JSON.stringify(response.user));
           await login(response);
           await client.resetStore();
           toast.success(response.message);
 
           const rolePaths: Record<string, string> = {
-            superAdmin: '/dashboard',
+            superAdmin: '/organizations',
             admin: '/trainees',
             coordinator: '/trainees',
             manager: '/dashboard',
             ttl: '/ttl-trainees',
-            trainee: '/dashboard',
+            trainee: '/performance',
           };
 
           const redirectPath = rolePaths[response.user.role] || '/dashboard';
@@ -152,7 +152,7 @@ const TwoFactorPage: React.FC = () => {
         variables: {
           email,
           otp: currentInput.join(''),
-          TwoWayVerificationToken,
+         // TwoWayVerificationToken,
         },
       });
     } finally {

src/pages/Organization/AdminLogin.tsx

@@ -75,46 +75,46 @@ function AdminLogin() {
           },
         },
 
+
         /* istanbul ignore next */
         onCompleted: async (data) => {
           if (data.loginUser.otpRequired) {
             setOtpRequired(true);
-            setTwoWayVerificationToken(data.loginUser.TwoWayVerificationToken);
+           // setTwoWayVerificationToken(data.loginUser.TwoWayVerificationToken);
             navigate('/users/LoginWith2fa', {
               state: {
                 email: userInput.email,
-                TwoWayVerificationToken: data.loginUser.TwoWayVerificationToken,
-              },
-            });
-          } else {
-            /* istanbul ignore next */
-            toast.success(data.addMemberToCohort);
-            /* istanbul ignore next */
-            login(data.loginUser);
-            /* istanbul ignore next */
-            await client.resetStore();
-            /* istanbul ignore next */
-            toast.success(t(`Welcome`) as ToastContent<unknown>);
+               // TwoWayVerificationToken: data.loginUser.TwoWayVerificationToken,
+              },})
+
+          }else{
             /* istanbul ignore next */
-            if (data.loginUser) {
-              redirect
-                ? navigate(`${redirect}`)
-                : data.loginUser.user.role === 'superAdmin'
-                ? navigate(`/dashboard`)
-                : data.loginUser.user.role === 'admin'
-                ? navigate(`/trainees`)
-                : data.loginUser.user.role === 'coordinator'
-                ? navigate(`/trainees`)
-                : data.loginUser.user.role === 'manager'
-                ? navigate(`/dashboard`)
-                : data.loginUser.user.role === 'ttl'
-                ? navigate('/ttl-trainees')
-                : navigate('/dashboard');
-            } else {
-              navigate('/dashboard');
-            }
+          toast.success(data.addMemberToCohort);
+          /* istanbul ignore next */
+          login(data.loginUser);
+          /* istanbul ignore next */
+          await client.resetStore();
+          /* istanbul ignore next */
+          toast.success(t(`Welcome`) as ToastContent<unknown>);
+          /* istanbul ignore next */
+          if (data.loginUser) {
+            redirect
+              ? navigate(`${redirect}`)
+              : data.loginUser.user.role === 'superAdmin'
+              ? navigate(`/dashboard`)
+              : data.loginUser.user.role === 'admin'
+              ? navigate(`/trainees`)
+              : data.loginUser.user.role === 'coordinator'
+              ? navigate(`/trainees`)
+              : data.loginUser.user.role === 'manager'
+              ? navigate(`/dashboard`)
+              : data.loginUser.user.role === 'ttl'
+              ? navigate('/ttl-trainees')
+              : navigate('/performance');
+          } else {
+            navigate('/dashboard');
           }
-        },
+        }},
         onError: (err) => {
           /* istanbul ignore next */
           console.log(err.message);

src/pages/Organization/LoginMutation.tsx

@@ -5,7 +5,7 @@ const LOGIN_MUTATION = gql`
     loginUser(loginInput: $loginInput) {
       token
       otpRequired
-      TwoWayVerificationToken
+     
       user {
         id
         role