From 4b37b2afbac737b37b2d97bd1dca633d452c72df Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Tue, 6 Feb 2024 03:17:33 +0400
Subject: [PATCH] Wired most of the frontend to support ghost users

---
 frontend/src/layouts/AppLayout/AppLayout.tsx  | 72 ++++++++++---------
 .../src/pages/org/[id]/overview/index.tsx     | 18 -----
 .../MemberListTab/MemberListTab.tsx           |  2 +
 3 files changed, 39 insertions(+), 53 deletions(-)

diff --git a/frontend/src/layouts/AppLayout/AppLayout.tsx b/frontend/src/layouts/AppLayout/AppLayout.tsx
index 84dc0f480..357e7c770 100644
--- a/frontend/src/layouts/AppLayout/AppLayout.tsx
+++ b/frontend/src/layouts/AppLayout/AppLayout.tsx
@@ -238,7 +238,7 @@ export const AppLayout = ({ children }: LayoutProps) => {
           projectId: newProjectId
         });
       }
-      
+
       // eslint-disable-next-line no-promise-executor-return -- We do this because the function returns too fast, which sometimes causes an error when the user is redirected.
       await new Promise((resolve) => setTimeout(resolve, 2_000));
 
@@ -250,7 +250,7 @@ export const AppLayout = ({ children }: LayoutProps) => {
       createNotification({ text: "Failed to create workspace", type: "error" });
     }
   };
-  
+
   return (
     <>
       <div className="dark hidden h-screen w-full flex-col overflow-x-hidden md:flex">
@@ -288,41 +288,43 @@ export const AppLayout = ({ children }: LayoutProps) => {
                       </DropdownMenuTrigger>
                       <DropdownMenuContent align="start" className="p-1">
                         <div className="px-2 py-1 text-xs text-mineshaft-400">{user?.email}</div>
-                        {orgs?.map((org) => { 
+                        {orgs?.map((org) => {
                           return (
-                          <DropdownMenuItem key={org.id}>
-                            <Button
-                              onClick={async () => {
-                                if (currentOrg?.id === org.id) return;
-                                
-                                if (org.authEnforced) {
-                                  // org has an org-level auth method enabled (e.g. SAML)
-                                  // -> logout + redirect to SAML SSO
+                            <DropdownMenuItem key={org.id}>
+                              <Button
+                                onClick={async () => {
+                                  if (currentOrg?.id === org.id) return;
 
-                                  await logout.mutateAsync();
-                                  window.open(`/api/v1/sso/redirect/saml2/organizations/${org.slug}`);
-                                  window.close();
-                                  return;
+                                  if (org.authEnforced) {
+                                    // org has an org-level auth method enabled (e.g. SAML)
+                                    // -> logout + redirect to SAML SSO
+
+                                    await logout.mutateAsync();
+                                    window.open(
+                                      `/api/v1/sso/redirect/saml2/organizations/${org.slug}`
+                                    );
+                                    window.close();
+                                    return;
+                                  }
+
+                                  changeOrg(org?.id);
+                                }}
+                                variant="plain"
+                                colorSchema="secondary"
+                                size="xs"
+                                className="flex w-full items-center justify-start p-0 font-normal"
+                                leftIcon={
+                                  currentOrg?.id === org.id && (
+                                    <FontAwesomeIcon icon={faCheck} className="mr-3 text-primary" />
+                                  )
                                 }
-                                
-                                changeOrg(org?.id)
-                              }}
-                              variant="plain"
-                              colorSchema="secondary"
-                              size="xs"
-                              className="flex w-full items-center justify-start p-0 font-normal"
-                              leftIcon={
-                                currentOrg?.id === org.id && (
-                                  <FontAwesomeIcon icon={faCheck} className="mr-3 text-primary" />
-                                )
-                              }
-                            >
-                              <div className="flex w-full items-center justify-between">
-                                {org.name}
-                              </div>
-                            </Button>
-                          </DropdownMenuItem>
-                         )
+                              >
+                                <div className="flex w-full items-center justify-between">
+                                  {org.name}
+                                </div>
+                              </Button>
+                            </DropdownMenuItem>
+                          );
                         })}
                         {/* <DropdownMenuItem key="add-org">
                           <Button
@@ -598,7 +600,7 @@ export const AppLayout = ({ children }: LayoutProps) => {
                           </MenuItem>
                         </a>
                       </Link>
-                      {(window.location.origin.includes("https://app.infisical.com")) && (
+                      {window.location.origin.includes("https://app.infisical.com") && (
                         <Link href={`/org/${currentOrg?.id}/billing`} passHref>
                           <a>
                             <MenuItem
diff --git a/frontend/src/pages/org/[id]/overview/index.tsx b/frontend/src/pages/org/[id]/overview/index.tsx
index f3b6f67b0..10d0924f3 100644
--- a/frontend/src/pages/org/[id]/overview/index.tsx
+++ b/frontend/src/pages/org/[id]/overview/index.tsx
@@ -509,7 +509,6 @@ const OrganizationPage = withPermission(
           projectName: name
         });
 
-        /*
         if (addMembers) {
           const orgUsers = await fetchOrgUsers(currentOrg);
 
@@ -524,23 +523,6 @@ const OrganizationPage = withPermission(
         // eslint-disable-next-line no-promise-executor-return -- We do this because the function returns too fast, which sometimes causes an error when the user is redirected.
         await new Promise((resolve) => setTimeout(resolve, 2_000));
 
-          const decryptKey = await fetchUserWsKey(newWorkspaceId);
-
-          await addWsUser.mutateAsync({
-            workspaceId: newWorkspaceId,
-            decryptKey,
-            userPrivateKey: PRIVATE_KEY,
-            members: orgUsers
-              .filter(
-                ({ status, user: orgUser }) => status === "accepted" && user.email !== orgUser.email
-              )
-              .map(({ user: orgUser, id: orgMembershipId }) => ({
-                userPublicKey: orgUser.publicKey,
-                orgMembershipId
-              }))
-          });
-        }
-        */
         createNotification({ text: "Workspace created", type: "success" });
         handlePopUpClose("addNewWs");
         createNotification({ text: "Workspace created", type: "success" });
diff --git a/frontend/src/views/Project/MembersPage/components/MemberListTab/MemberListTab.tsx b/frontend/src/views/Project/MembersPage/components/MemberListTab/MemberListTab.tsx
index 221cdb763..027ea3c7f 100644
--- a/frontend/src/views/Project/MembersPage/components/MemberListTab/MemberListTab.tsx
+++ b/frontend/src/views/Project/MembersPage/components/MemberListTab/MemberListTab.tsx
@@ -135,6 +135,8 @@ export const MemberListTab = () => {
           text: "Failed to add user to project, unknown project type",
           type: "error"
         });
+
+        return;
       }
       createNotification({
         text: "Successfully added user to the project",