fixing login with 2fa

atlp-rwanda · Nov 21, 2024 · 7f73ff8 · 7f73ff8
1 parent e239c9e
commit 7f73ff8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/pages/LoginWith2fa.tsx b/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,18 +97,18 @@ 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();
@@ -152,7 +152,7 @@ const TwoFactorPage: React.FC = () => {
         variables: {
           email,
           otp: currentInput.join(''),
-          TwoWayVerificationToken,
+         // TwoWayVerificationToken,
         },
       });
     } finally {

diff --git a/src/pages/Organization/AdminLogin.tsx b/src/pages/Organization/AdminLogin.tsx
@@ -80,11 +80,11 @@ function AdminLogin() {
         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,
+               // TwoWayVerificationToken: data.loginUser.TwoWayVerificationToken,
               },})
 
           }else{

diff --git a/src/pages/Organization/LoginMutation.tsx b/src/pages/Organization/LoginMutation.tsx
@@ -5,7 +5,7 @@ const LOGIN_MUTATION = gql`
     loginUser(loginInput: $loginInput) {
       token
       otpRequired
-      TwoWayVerificationToken
+     
       user {
         id
         role
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ const LOGIN_MUTATION = gql` @@
         loginUser(loginInput: $loginInput) {
           token
           otpRequired
-          TwoWayVerificationToken
           user {
             id
             role
@@ Expand Down @@