The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(auth): sign up in the resolved workspace in single-workspace mode (#24523)
Thomas Göttgens834fef98edc3
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSignInUp.test.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSignInUp.test.tsxnew file mode 100644index 00000000000..b8ed878b94e--- /dev/null+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSignInUp.test.tsx@@ -0,0 +1,116 @@+import { act, renderHook } from '@testing-library/react';+import { type UseFormReturn } from 'react-hook-form';+import { MemoryRouter } from 'react-router-dom';++import { i18n } from '@lingui/core';+import { I18nProvider } from '@lingui/react';+import { Provider as JotaiProvider } from 'jotai';++import { useAuth } from '@/auth/hooks/useAuth';+import { type Form } from '@/auth/sign-in-up/hooks/useSignInUpForm';+import { useSignInUp } from '@/auth/sign-in-up/hooks/useSignInUp';+import { signInUpModeState } from '@/auth/states/signInUpModeState';+import { workspacePublicDataState } from '@/auth/states/workspacePublicDataState';+import { SignInUpMode } from '@/auth/types/signInUpMode';+import {+ jotaiStore,+ resetJotaiStore,+} from '@/ui/utilities/state/jotai/jotaiStore';+import { type PublicWorkspaceData } from '~/generated-metadata/graphql';++jest.mock('@/auth/hooks/useAuth', () => ({ useAuth: jest.fn() }));++jest.mock('@/domain-manager/hooks/useIsCurrentLocationOnAWorkspace', () => ({+ useIsCurrentLocationOnAWorkspace: () => ({ isOnAWorkspace: true }),+}));++jest.mock('@/ui/feedback/snack-bar-manager/hooks/useSnackBar', () => ({+ useSnackBar: () => ({ enqueueErrorSnackBar: jest.fn() }),+}));++jest.mock('@/client-config/hooks/useCaptcha', () => ({+ useCaptcha: () => ({ isCaptchaReady: true }),+}));++jest.mock('@/captcha/hooks/useReadCaptchaToken', () => ({+ useReadCaptchaToken: () => ({ readCaptchaToken: () => 'captcha-token' }),+}));++jest.mock(+ '@/domain-manager/hooks/useBuildSearchParamsFromUrlSyncedStates',+ () => ({+ useBuildSearchParamsFromUrlSyncedStates: () => ({+ buildSearchParamsFromUrlSyncedStates: async () => ({}),+ }),+ }),+);++const signUpWithCredentialsMock = jest.fn();+const signUpWithCredentialsInWorkspaceMock = jest.fn();++(useAuth as jest.Mock).mockReturnValue({+ signUpWithCredentialsInWorkspace: signUpWithCredentialsInWorkspaceMock,+ signUpWithCredentials: signUpWithCredentialsMock,+ checkUserExists: { checkUserExistsQuery: jest.fn() },+});++const credentials: Form = {+ email: '[email protected]',+ password: 'Passw0rd!',+ exist: false,+ captchaToken: '',+};++const renderUseSignInUp = (workspacePublicData: PublicWorkspaceData | null) => {+ jotaiStore.set(workspacePublicDataState.atom, workspacePublicData);+ jotaiStore.set(signInUpModeState.atom, SignInUpMode.SignUp);++ return renderHook(() => useSignInUp({} as UseFormReturn<Form>), {+ wrapper: ({ children }) => (+ <JotaiProvider store={jotaiStore}>+ <I18nProvider i18n={i18n}>+ <MemoryRouter>{children}</MemoryRouter>+ </I18nProvider>+ </JotaiProvider>+ ),+ });+};++describe('useSignInUp > submitCredentials > sign-up routing', () => {+ beforeEach(() => {+ resetJotaiStore();+ jest.clearAllMocks();+ });++ it('signs up in the workspace when the location resolves one, so its approved access domains are checked', async () => {+ const { result } = renderUseSignInUp({+ id: 'workspace-id',+ } as PublicWorkspaceData);++ await act(() => result.current.submitCredentials(credentials));++ expect(signUpWithCredentialsInWorkspaceMock).toHaveBeenCalledWith(+ expect.objectContaining({+ email: '[email protected]',+ password: 'Passw0rd!',+ captchaToken: 'captcha-token',+ }),+ );+ expect(signUpWithCredentialsInWorkspaceMock).toHaveBeenCalledTimes(1);+ expect(signUpWithCredentialsMock).not.toHaveBeenCalled();+ });++ it('signs up without a workspace when the location has none yet', async () => {+ const { result } = renderUseSignInUp(null);++ await act(() => result.current.submitCredentials(credentials));++ expect(signUpWithCredentialsMock).toHaveBeenCalledWith(+ '[email protected]',+ 'Passw0rd!',+ 'captcha-token',+ );+ expect(signUpWithCredentialsMock).toHaveBeenCalledTimes(1);+ expect(signUpWithCredentialsInWorkspaceMock).not.toHaveBeenCalled();+ });+});diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.tsindex cfd89e59385..05b2768047c 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.ts+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.ts@@ -5,6 +5,7 @@ import { useLocation, useParams, useSearchParams } from 'react-router-dom';import { type Form } from '@/auth/sign-in-up/hooks/useSignInUpForm';import { lastAuthenticatedMethodState } from '@/auth/states/lastAuthenticatedMethodState';import { signInUpModeState } from '@/auth/states/signInUpModeState';+import { workspacePublicDataState } from '@/auth/states/workspacePublicDataState';import {SignInUpStep,signInUpStepState,@@ -13,7 +14,6 @@ import { AuthenticatedMethod } from '@/auth/types/AuthenticatedMethod.enum';import { SignInUpMode } from '@/auth/types/signInUpMode';import { useReadCaptchaToken } from '@/captcha/hooks/useReadCaptchaToken';import { useCaptcha } from '@/client-config/hooks/useCaptcha';-import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';import { useBuildSearchParamsFromUrlSyncedStates } from '@/domain-manager/hooks/useBuildSearchParamsFromUrlSyncedStates';import { useIsCurrentLocationOnAWorkspace } from '@/domain-manager/hooks/useIsCurrentLocationOnAWorkspace';import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';@@ -35,9 +35,7 @@ export const useSignInUp = (form: UseFormReturn<Form>) => {const [signInUpStep, setSignInUpStep] = useAtomState(signInUpStepState);const [signInUpMode, setSignInUpMode] = useAtomState(signInUpModeState);const { isOnAWorkspace } = useIsCurrentLocationOnAWorkspace();- const isMultiWorkspaceEnabled = useAtomStateValue(- isMultiWorkspaceEnabledState,- );+ const workspacePublicData = useAtomStateValue(workspacePublicDataState);const { isCaptchaReady } = useCaptcha();const setLastAuthenticatedMethod = useSetAtomState(lastAuthenticatedMethodState,@@ -161,7 +159,7 @@ export const useSignInUp = (form: UseFormReturn<Form>) => {if (!isInviteMode &&signInUpMode === SignInUpMode.SignUp &&- (!isOnAWorkspace || !isMultiWorkspaceEnabled)+ (!isOnAWorkspace || !isDefined(workspacePublicData))) {return await signUpWithCredentials(data.email.toLowerCase().trim(),@@ -203,7 +201,7 @@ export const useSignInUp = (form: UseFormReturn<Form>) => {enqueueErrorSnackBar,buildSearchParamsFromUrlSyncedStates,isOnAWorkspace,- isMultiWorkspaceEnabled,+ workspacePublicData,setLastAuthenticatedMethod,t,],