feat: srp handover for admin and minor bug fix in mfa

frontend/src/hooks/api/admin/types.ts

@@ -10,6 +10,7 @@ export type TServerConfig = {
 
 export type TCreateAdminUserDTO = {
   email: string;
+  password: string;
   firstName: string;
   lastName?: string;
   protectedKey: string;

frontend/src/views/Login/components/MFAStep/MFAStep.tsx

@@ -60,48 +60,45 @@ export const MFAStep = ({ email, password, providerAuthToken }: Props) => {
   // They don't have password
   const handleLoginMfaOauth = async (callbackPort: string, organizationId?: string) => {
     setIsLoading(true);
-    if (callbackPort) {
-      // attemptCliLogin
-      const { token } = await verifyMfaToken({
-        email,
-        mfaCode
-      });
-      //
-      // unset temporary (MFA) JWT token and set JWT token
-      SecurityClient.setMfaToken("");
-      SecurityClient.setToken(token);
-      SecurityClient.setProviderAuthToken("");
-      const privateKey = await fetchMyPrivateKey();
-      localStorage.setItem("PRIVATE_KEY", privateKey);
+    const { token } = await verifyMfaToken({
+      email,
+      mfaCode
+    });
+    //
+    // unset temporary (MFA) JWT token and set JWT token
+    SecurityClient.setMfaToken("");
+    SecurityClient.setToken(token);
+    SecurityClient.setProviderAuthToken("");
+    const privateKey = await fetchMyPrivateKey();
+    localStorage.setItem("PRIVATE_KEY", privateKey);
 
-      // case: organization ID is present from the provider auth token -- select the org and use the new jwt token in the CLI, then navigate to the org
-      if (organizationId) {
-        const { token: newJwtToken } = await selectOrganization({ organizationId });
-        if (callbackPort) {
-          const cliUrl = `http://127.0.0.1:${callbackPort}/`;
-          const instance = axios.create();
-          await instance.post(cliUrl, {
-            email,
-            privateKey,
-            JTWToken: newJwtToken
-          });
-        }
-        await navigateUserToOrg(router, organizationId);
+    // case: organization ID is present from the provider auth token -- select the org and use the new jwt token in the CLI, then navigate to the org
+    if (organizationId) {
+      const { token: newJwtToken } = await selectOrganization({ organizationId });
+      if (callbackPort) {
+        const cliUrl = `http://127.0.0.1:${callbackPort}/`;
+        const instance = axios.create();
+        await instance.post(cliUrl, {
+          email,
+          privateKey,
+          JTWToken: newJwtToken
+        });
       }
-      // case: no organization ID is present -- navigate to the select org page IF the user has any orgs
-      // if the user has no orgs, navigate to the create org page
-      else {
-        const userOrgs = await fetchOrganizations();
+      await navigateUserToOrg(router, organizationId);
+    }
+    // case: no organization ID is present -- navigate to the select org page IF the user has any orgs
+    // if the user has no orgs, navigate to the create org page
+    else {
+      const userOrgs = await fetchOrganizations();
 
-        // case: user has orgs, so we navigate the user to select an org
-        if (userOrgs.length > 0) {
-          navigateUserToSelectOrg(router, callbackPort);
-        }
-        // case: no orgs found, so we navigate the user to create an org
-        // cli login will fail in this case
-        else {
-          await navigateUserToOrg(router);
-        }
+      // case: user has orgs, so we navigate the user to select an org
+      if (userOrgs.length > 0) {
+        navigateUserToSelectOrg(router, callbackPort);
+      }
+      // case: no orgs found, so we navigate the user to create an org
+      // cli login will fail in this case
+      else {
+        await navigateUserToOrg(router);
       }
     }
   };

frontend/src/views/admin/SignUpPage/SignUpPage.tsx

@@ -73,6 +73,7 @@ export const SignUpPage = () => {
       const { privateKey, ...userPass } = await generateUserPassKey(email, password);
       const res = await createAdminUser({
         email,
+        password,
         firstName,
         lastName,
         ...userPass