Merge remote-tracking branch 'origin' into stripe-error

frontend/src/pages/cli-redirect.tsx

@@ -0,0 +1,18 @@
+import Head from "next/head";
+
+export default function CliRedirect() {
+  return (
+    <div className='bg-bunker-800 md:h-screen flex flex-col justify-between'>
+      <Head>
+        <title>Infisical Cli | Login Successful!</title>
+        <link rel='icon' href='/infisical.ico' />
+      </Head>
+      <div className='flex flex-col items-center justify-center text-gray-200 h-screen w-screen'>
+        <p className='text-4xl mt-32'>Head back to your terminal!</p>
+        <p className='mt-2 mb-1 text-lg'>
+          You&apos;ve successfully logged into infisical-cli
+        </p>
+      </div>
+    </div>
+  );
+}

frontend/src/pages/login.tsx

@@ -4,13 +4,16 @@ import Head from "next/head";
 import Image from "next/image";
 import Link from "next/link";
 import { useRouter } from "next/router";
+import axios from "axios"
 
 // import ListBox from '@app/components/basic/Listbox';
 import InitialLoginStep from "@app/components/login/InitialLoginStep";
 import MFAStep from "@app/components/login/MFAStep";
 import PasswordInputStep from "@app/components/login/PasswordInputStep";
 import { useProviderAuth } from "@app/hooks/useProviderAuth";
-import { isLoggedIn } from "@app/reactQuery";
+import { getAuthToken, isLoggedIn } from "@app/reactQuery";
+
+import { fetchUserDetails } from "~/hooks/api/users/queries";
 
 import getWorkspaces from "./api/workspace/getWorkspaces";
 
@@ -20,6 +23,7 @@ export default function Login() {
   const [password, setPassword] = useState("");
   const [step, setStep] = useState(1);
   const { t } = useTranslation();
+
   // const lang = router.locale ?? 'en';
   const {
     providerAuthToken,
@@ -44,6 +48,20 @@ export default function Login() {
       try {
         const userWorkspaces = await getWorkspaces();
         userWorkspace = userWorkspaces[0] && userWorkspaces[0]._id;
+
+        // user details
+        const userDetails = await fetchUserDetails()
+        // send details back to client
+
+        const queryParams = new URLSearchParams(window.location.search)
+        if (queryParams && queryParams.get("callback_port")) {
+          const callbackPort = queryParams.get("callback_port")
+
+          // send post request to cli with details
+          const cliUrl = `http://localhost:${callbackPort}`
+          const instance = axios.create()
+          await instance.post(cliUrl, { email: userDetails.email, privateKey: localStorage.getItem("PRIVATE_KEY"), JTWToken: getAuthToken() })
+        }
         router.push(`/dashboard/${userWorkspace}`);
       } catch (error) {
         console.log("Error - Not logged in yet");
@@ -69,7 +87,7 @@ export default function Login() {
     }
 
     if (loginStep === 1) {
-      return <InitialLoginStep 
+      return <InitialLoginStep
         setStep={setStep}
         email={email}
         setEmail={setEmail}