Fix: Formatting and support for selecting org (line 109-122)

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

@@ -1,8 +1,8 @@
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import Link from "next/link";
-import { useRouter } from "next/router"
-import axios from "axios"
+import { useRouter } from "next/router";
+import axios from "axios";
 import jwt_decode from "jwt-decode";
 
 import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
@@ -10,179 +10,191 @@ import attemptCliLogin from "@app/components/utilities/attemptCliLogin";
 import attemptLogin from "@app/components/utilities/attemptLogin";
 import { Button, Input } from "@app/components/v2";
 import { useUpdateUserAuthMethods } from "@app/hooks/api";
+import { fetchOrganizations } from "@app/hooks/api/organization/queries";
 import { fetchUserDetails } from "@app/hooks/api/users/queries";
 
-import { navigateUserToOrg } from "../../Login.utils";
+import { navigateUserToOrg, navigateUserToSelectOrg } from "../../Login.utils";
 
-type Props = { 
-    providerAuthToken: string;
-    email: string;
-    password: string;
-    setPassword: (password: string) => void;
-    setStep: (step: number) => void;
-}
+type Props = {
+  providerAuthToken: string;
+  email: string;
+  password: string;
+  setPassword: (password: string) => void;
+  setStep: (step: number) => void;
+};
 
 export const PasswordStep = ({
-    providerAuthToken,
-    email,
-    password,
-    setPassword,
-    setStep,
+  providerAuthToken,
+  email,
+  password,
+  setPassword,
+  setStep
 }: Props) => {
-    const { createNotification } = useNotificationContext();
-    const [isLoading, setIsLoading] = useState(false);
-    const { t } = useTranslation();
-    const router = useRouter();
-    const { mutateAsync } = useUpdateUserAuthMethods();
-    
-    const {
-        callbackPort,
-        isLinkingRequired,
-        authMethod,
-        organizationId
-    } = jwt_decode(providerAuthToken) as any;
-    
-    const handleLogin = async (e:React.FormEvent) => {
-        e.preventDefault()
-        try {
-            setIsLoading(true);
-            
-            if (callbackPort) {
-                // attemptCliLogin
-                const isCliLoginSuccessful = await attemptCliLogin({
-                    email,
-                    password,
-                    providerAuthToken
-                })
+  const { createNotification } = useNotificationContext();
+  const [isLoading, setIsLoading] = useState(false);
+  const { t } = useTranslation();
+  const router = useRouter();
+  const { mutateAsync } = useUpdateUserAuthMethods();
 
-                if (isCliLoginSuccessful && isCliLoginSuccessful.success) {
+  const { callbackPort, isLinkingRequired, authMethod, organizationId } = jwt_decode(
+    providerAuthToken
+  ) as any;
 
-                    if (isCliLoginSuccessful.mfaEnabled) {
-                        // case: login requires MFA step
-                        setStep(2);
-                        setIsLoading(false);
-                        return;
-                    }
-                    // case: login was successful
-                    const cliUrl = `http://127.0.0.1:${callbackPort}/`
+  const handleLogin = async (e: React.FormEvent) => {
+    e.preventDefault();
+    try {
+      setIsLoading(true);
 
-                    // send request to server endpoint
-                    const instance = axios.create()
-                    await instance.post(cliUrl, { ...isCliLoginSuccessful.loginResponse })
+      if (callbackPort) {
+        // attemptCliLogin
+        const isCliLoginSuccessful = await attemptCliLogin({
+          email,
+          password,
+          providerAuthToken
+        });
 
-                    // cli page
-                    router.push("/cli-redirect");
-
-                    // on success, router.push to cli Login Successful page
-                }
-            } else {
-                const loginAttempt = await attemptLogin({
-                    email,
-                    password,
-                    providerAuthToken,
-                });
-
-                if (loginAttempt && loginAttempt.success) {
-                    // case: login was successful
-
-                    if (loginAttempt.mfaEnabled) {
-                        // TODO: deal with MFA
-                        // case: login requires MFA step
-                        setIsLoading(false);
-                        setStep(2);
-                        return;
-                    }
-
-                    // case: login does not require MFA step
-                    setIsLoading(false);
-                    createNotification({
-                        text: "Successfully logged in",
-                        type: "success"
-                    });
-                    
-                    if (isLinkingRequired) {
-                    const user = await fetchUserDetails();
-                        const newAuthMethods = [...user.authMethods, authMethod] 
-                        await mutateAsync({
-                            authMethods: newAuthMethods
-                        });
-                    }
-
-                    await navigateUserToOrg(router, organizationId);
-                }
-            }
-        } catch (err) {
+        if (isCliLoginSuccessful && isCliLoginSuccessful.success) {
+          if (isCliLoginSuccessful.mfaEnabled) {
+            // case: login requires MFA step
+            setStep(2);
             setIsLoading(false);
-            createNotification({
-                text: "Login unsuccessful. Double-check your master password and try again.",
-                type: "error"
-            });
-            console.error(err);
+            return;
+          }
+          // case: login was successful
+          const cliUrl = `http://127.0.0.1:${callbackPort}/`;
+
+          // send request to server endpoint
+          const instance = axios.create();
+          await instance.post(cliUrl, { ...isCliLoginSuccessful.loginResponse });
+
+          // cli page
+          router.push("/cli-redirect");
+
+          // on success, router.push to cli Login Successful page
         }
-    };
-    
-    return (
-        <form 
-            onSubmit={handleLogin}
-            className="h-full mx-auto w-full max-w-md px-6 pt-8"
+      } else {
+        const loginAttempt = await attemptLogin({
+          email,
+          password,
+          providerAuthToken
+        });
+
+        if (loginAttempt && loginAttempt.success) {
+          // case: login was successful
+
+          if (loginAttempt.mfaEnabled) {
+            // TODO: deal with MFA
+            // case: login requires MFA step
+            setIsLoading(false);
+            setStep(2);
+            return;
+          }
+
+          // case: login does not require MFA step
+          setIsLoading(false);
+          createNotification({
+            text: "Successfully logged in",
+            type: "success"
+          });
+
+          if (isLinkingRequired) {
+            const user = await fetchUserDetails();
+            const newAuthMethods = [...user.authMethods, authMethod];
+            await mutateAsync({
+              authMethods: newAuthMethods
+            });
+          }
+
+          // case: organization ID is present from the provider auth token -- navigate directly to the org
+          if (organizationId) {
+            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();
+
+            if (userOrgs.length > 0) {
+              navigateUserToSelectOrg(router);
+            } else {
+              await navigateUserToOrg(router);
+            }
+          }
+        }
+      }
+    } catch (err) {
+      setIsLoading(false);
+      createNotification({
+        text: "Login unsuccessful. Double-check your master password and try again.",
+        type: "error"
+      });
+      console.error(err);
+    }
+  };
+
+  return (
+    <form onSubmit={handleLogin} className="mx-auto h-full w-full max-w-md px-6 pt-8">
+      <div className="mb-8">
+        <p className="mx-auto mb-4 flex w-max justify-center bg-gradient-to-b from-white to-bunker-200 bg-clip-text text-center text-xl font-medium text-transparent">
+          {isLinkingRequired ? "Link your account" : "What's your Infisical password?"}
+        </p>
+        {isLinkingRequired && (
+          <div className="mx-auto flex w-max flex-col items-center text-xs text-bunker-400">
+            <span className="max-w-sm px-4 text-center duration-200">
+              An existing account without this SSO authentication method enabled was found under the
+              same email. Login with your password to link the account.
+            </span>
+          </div>
+        )}
+      </div>
+      <div className="relative mx-auto flex max-h-24 w-1/4 w-full min-w-[22rem] items-center justify-center rounded-lg md:max-h-28 lg:w-1/6">
+        <div className="flex max-h-24 w-full items-center justify-center rounded-lg md:max-h-28">
+          <Input
+            value={password}
+            onChange={(e) => setPassword(e.target.value)}
+            type="password"
+            placeholder="Enter your password..."
+            isRequired
+            autoComplete="current-password"
+            id="current-password"
+            className="h-12"
+          />
+        </div>
+      </div>
+      <div className="mx-auto mt-4 flex w-1/4 w-full min-w-[22rem] items-center justify-center rounded-md text-center lg:w-1/6">
+        <Button
+          type="submit"
+          colorSchema="primary"
+          variant="outline_bg"
+          isFullWidth
+          isLoading={isLoading}
+          className="h-14"
         >
-            <div className="mb-8">
-                <p className="mx-auto flex w-max justify-center text-xl font-medium text-transparent bg-clip-text bg-gradient-to-b from-white to-bunker-200 text-center mb-4">
-                    {isLinkingRequired ? "Link your account" : "What's your Infisical password?"}
-                </p>
-                {isLinkingRequired && (
-                    <div className="text-bunker-400 text-xs flex flex-col items-center w-max mx-auto">
-                        <span className='duration-200 max-w-sm text-center px-4'>
-                            An existing account without this SSO authentication method enabled was found under the same email. Login with your password to link the account.
-                        </span>
-                    </div>
-                )}
-            </div>
-            <div className="relative flex items-center justify-center lg:w-1/6 w-1/4 min-w-[22rem] mx-auto w-full rounded-lg max-h-24 md:max-h-28">
-                <div className="flex items-center justify-center w-full rounded-lg max-h-24 md:max-h-28">
-                    <Input
-                        value={password}
-                        onChange={(e) => setPassword(e.target.value)}
-                        type="password"
-                        placeholder="Enter your password..."
-                        isRequired
-                        autoComplete="current-password"
-                        id="current-password"
-                        className="h-12"
-                    />
-                </div>
-            </div>
-            <div className='lg:w-1/6 w-1/4 w-full mx-auto flex items-center justify-center min-w-[22rem] text-center rounded-md mt-4'>
-                <Button
-                    type="submit"
-                    colorSchema="primary" 
-                    variant="outline_bg"
-                    isFullWidth
-                    isLoading={isLoading}
-                    className="h-14"
-                > 
-                    {t("login.login")} 
-                </Button>
-            </div>
-            <div className="text-bunker-400 text-xs flex flex-col items-center w-max mx-auto mt-4">
-                <span className='duration-200 max-w-sm text-center px-4'>
-                    Infisical Master Password serves as a decryption mechanism so that even Google is not able to access your secrets.
-                </span>
-                <Link href="/verify-email">
-                    <span className='hover:underline mt-2 hover:underline-offset-4 hover:decoration-primary-700 hover:text-bunker-200 duration-200 cursor-pointer'>{t("login.forgot-password")}</span>
-                </Link>
-            </div>
-            <div className="flex flex-row items-center justify-center">
-                <button
-                    onClick={() => {
-                        router.push("/login");
-                    }}
-                    type="button"
-                    className="text-bunker-400 text-xs hover:underline mt-2 hover:underline-offset-4 hover:decoration-primary-700 hover:text-bunker-200 duration-200 cursor-pointer"
-                >
-                    {t("login.other-option")}
-                </button>
-            </div>
-        </form>
-    );
-}
+          {t("login.login")}
+        </Button>
+      </div>
+      <div className="mx-auto mt-4 flex w-max flex-col items-center text-xs text-bunker-400">
+        <span className="max-w-sm px-4 text-center duration-200">
+          Infisical Master Password serves as a decryption mechanism so that even Google is not able
+          to access your secrets.
+        </span>
+        <Link href="/verify-email">
+          <span className="mt-2 cursor-pointer duration-200 hover:text-bunker-200 hover:underline hover:decoration-primary-700 hover:underline-offset-4">
+            {t("login.forgot-password")}
+          </span>
+        </Link>
+      </div>
+      <div className="flex flex-row items-center justify-center">
+        <button
+          onClick={() => {
+            router.push("/login");
+          }}
+          type="button"
+          className="mt-2 cursor-pointer text-xs text-bunker-400 duration-200 hover:text-bunker-200 hover:underline hover:decoration-primary-700 hover:underline-offset-4"
+        >
+          {t("login.other-option")}
+        </button>
+      </div>
+    </form>
+  );
+};