From 14c60bd075e2ac83a8521f0b27df9e7a5c7d187f Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Tue, 12 Mar 2024 21:54:21 +0100
Subject: [PATCH] Fix: Admin signup, select organization

---
 frontend/src/views/admin/SignUpPage/SignUpPage.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/admin/SignUpPage/SignUpPage.tsx b/frontend/src/views/admin/SignUpPage/SignUpPage.tsx
index 8a26030ce..29134e50e 100644
--- a/frontend/src/views/admin/SignUpPage/SignUpPage.tsx
+++ b/frontend/src/views/admin/SignUpPage/SignUpPage.tsx
@@ -12,7 +12,7 @@ import { saveTokenToLocalStorage } from "@app/components/utilities/saveTokenToLo
 import SecurityClient from "@app/components/utilities/SecurityClient";
 import { Button, ContentLoader, FormControl, Input } from "@app/components/v2";
 import { useServerConfig } from "@app/context";
-import { useCreateAdminUser } from "@app/hooks/api";
+import { useCreateAdminUser, useSelectOrganization } from "@app/hooks/api";
 import { generateUserBackupKey, generateUserPassKey } from "@app/lib/crypto";
 import { isLoggedIn } from "@app/reactQuery";
 
@@ -64,6 +64,7 @@ export const SignUpPage = () => {
   }, []);
 
   const { mutateAsync: createAdminUser } = useCreateAdminUser();
+  const { mutateAsync: selectOrganization } = useSelectOrganization();
 
   const handleFormSubmit = async ({ email, password, firstName, lastName }: TFormSchema) => {
     // avoid multi submission
@@ -76,6 +77,7 @@ export const SignUpPage = () => {
         lastName,
         ...userPass
       });
+
       SecurityClient.setToken(res.token);
       saveTokenToLocalStorage({
         publicKey: userPass.publicKey,
@@ -84,6 +86,8 @@ export const SignUpPage = () => {
         tag: userPass.encryptedPrivateKeyTag,
         privateKey
       });
+      await selectOrganization({ organizationId: res.organization.id });
+
       // TODO(akhilmhdh): This is such a confusing pattern and too unreliable
       // Will be refactored in next iteration to make it url based rather than local storage ones
       // Part of migration to nextjs 14