Revert "fix(signinup): several issues (#12698)" (#12745)

This reverts commit 9612a4928d.

(Causes a google auth sign-up issue)

packages/twenty-front/src/modules/auth/components/Logo.tsx

@@ -5,7 +5,7 @@ import { Avatar } from 'twenty-ui/display';
 import { UndecoratedLink } from 'twenty-ui/navigation';
 import { REACT_APP_SERVER_BASE_URL } from '~/config';
 import { useRedirectToDefaultDomain } from '~/modules/domain-manager/hooks/useRedirectToDefaultDomain';
-import { useReadDefaultDomainFromConfiguration } from '~/modules/domain-manager/hooks/useReadDefaultDomainFromConfiguration';
+import { AppPath } from '~/modules/types/AppPath';
 
 type LogoProps = {
   primaryLogo?: string | null;
@@ -59,8 +59,6 @@ export const Logo = ({
   const { redirectToDefaultDomain } = useRedirectToDefaultDomain();
   const defaultPrimaryLogoUrl = `${window.location.origin}/images/icons/android/android-launchericon-192-192.png`;
 
-  const { defaultUrl } = useReadDefaultDomainFromConfiguration();
-
   const primaryLogoUrl = getImageAbsoluteURI({
     imageUrl: primaryLogo ?? defaultPrimaryLogoUrl,
     baseUrl: REACT_APP_SERVER_BASE_URL,
@@ -79,7 +77,7 @@ export const Logo = ({
     <StyledContainer onClick={() => onClick?.()}>
       {isUsingDefaultLogo ? (
         <UndecoratedLink
-          to={defaultUrl.toString()}
+          to={AppPath.SignInUp}
           onClick={redirectToDefaultDomain}
         >
           <StyledPrimaryLogo src={primaryLogoUrl} />

packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpGlobalScopeFormEffect.tsx

@@ -3,18 +3,15 @@ import {
   signInUpStepState,
 } from '@/auth/states/signInUpStepState';
 import { useEffect } from 'react';
-import { useRecoilValue, useSetRecoilState } from 'recoil';
+import { useSetRecoilState } from 'recoil';
 import { isDefined } from 'twenty-shared/utils';
 import { useAuth } from '@/auth/hooks/useAuth';
 import { useSearchParams } from 'react-router-dom';
-import { availableWorkspacesState } from '@/auth/states/availableWorkspacesState';
-import { countAvailableWorkspaces } from '@/auth/utils/availableWorkspacesUtils';
 
 export const SignInUpGlobalScopeFormEffect = () => {
   const setSignInUpStep = useSetRecoilState(signInUpStepState);
   const [searchParams, setSearchParams] = useSearchParams();
   const { setAuthTokens, loadCurrentUser } = useAuth();
-  const availableWorkspaces = useRecoilValue(availableWorkspacesState);
 
   useEffect(() => {
     const tokenPair = searchParams.get('tokenPair');
@@ -23,9 +20,6 @@ export const SignInUpGlobalScopeFormEffect = () => {
       searchParams.delete('tokenPair');
       setSearchParams(searchParams);
       loadCurrentUser();
-    }
-
-    if (countAvailableWorkspaces(availableWorkspaces) > 1) {
       setSignInUpStep(SignInUpStep.WorkspaceSelection);
     }
   }, [
@@ -34,7 +28,6 @@ export const SignInUpGlobalScopeFormEffect = () => {
     setSignInUpStep,
     loadCurrentUser,
     setAuthTokens,
-    availableWorkspaces,
   ]);
 
   return <></>;

packages/twenty-front/src/modules/domain-manager/hooks/useReadDefaultDomainFromConfiguration.ts

@@ -10,11 +10,7 @@ export const useReadDefaultDomainFromConfiguration = () => {
     ? `${domainConfiguration.defaultSubdomain}.${domainConfiguration.frontDomain}`
     : domainConfiguration.frontDomain;
 
-  const defaultUrl = new URL(window.location.href);
-  defaultUrl.hostname = defaultDomain;
-
   return {
     defaultDomain,
-    defaultUrl,
   };
 };

packages/twenty-front/src/pages/auth/SignInUp.tsx

@@ -1,8 +1,11 @@
 import { useSignInUp } from '@/auth/sign-in-up/hooks/useSignInUp';
 import { useSignInUpForm } from '@/auth/sign-in-up/hooks/useSignInUpForm';
-import { SignInUpStep } from '@/auth/states/signInUpStepState';
+import {
+  SignInUpStep,
+  signInUpStepState,
+} from '@/auth/states/signInUpStepState';
 import { workspacePublicDataState } from '@/auth/states/workspacePublicDataState';
-import { useRecoilValue } from 'recoil';
+import { useRecoilValue, useSetRecoilState } from 'recoil';
 
 import { Logo } from '@/auth/components/Logo';
 import { Title } from '@/auth/components/Title';
@@ -27,7 +30,6 @@ import { isDefined } from 'twenty-shared/utils';
 import { AnimatedEaseIn } from 'twenty-ui/utilities';
 import { PublicWorkspaceDataOutput } from '~/generated/graphql';
 import { SignInUpGlobalScopeFormEffect } from '@/auth/sign-in-up/components/internal/SignInUpGlobalScopeFormEffect';
-import { useAuth } from '@/auth/hooks/useAuth';
 
 const StandardContent = ({
   workspacePublicData,
@@ -60,6 +62,7 @@ const StandardContent = ({
 
 export const SignInUp = () => {
   const { t } = useLingui();
+  const setSignInUpStep = useSetRecoilState(signInUpStepState);
 
   const { form } = useSignInUpForm();
   const { signInUpStep } = useSignInUp(form);
@@ -70,14 +73,11 @@ export const SignInUp = () => {
   const isMultiWorkspaceEnabled = useRecoilValue(isMultiWorkspaceEnabledState);
   const { workspaceInviteHash, workspace: workspaceFromInviteHash } =
     useWorkspaceFromInviteHash();
-  const { signOut } = useAuth();
 
   const [searchParams] = useSearchParams();
 
   const onClickOnLogo = () => {
-    if (!isOnAWorkspace && signInUpStep === SignInUpStep.WorkspaceSelection) {
+    setSignInUpStep(SignInUpStep.Init);
-      signOut();
-    }
   };
 
   const title = useMemo(() => {

packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts

@@ -399,24 +399,23 @@ export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspace> {
       displayName: workspace.displayName,
       workspaceUrls: this.domainManagerService.getWorkspaceUrls(workspace),
       logo: workspace.logo,
-      sso:
+      sso: workspace.workspaceSSOIdentityProviders.reduce(
-        workspace.workspaceSSOIdentityProviders?.reduce(
+        (acc, identityProvider) =>
-          (acc, identityProvider) =>
+          acc.concat(
-            acc.concat(
+            identityProvider.status === 'Inactive'
-              identityProvider.status === 'Inactive'
+              ? []
-                ? []
+              : [
-                : [
+                  {
-                    {
+                    id: identityProvider.id,
-                      id: identityProvider.id,
+                    name: identityProvider.name,
-                      name: identityProvider.name,
+                    issuer: identityProvider.issuer,
-                      issuer: identityProvider.issuer,
+                    type: identityProvider.type,
-                      type: identityProvider.type,
+                    status: identityProvider.status,
-                      status: identityProvider.status,
+                  },
-                    },
+                ],
-                  ],
+          ),
-            ),
+        [] as AvailableWorkspace['sso'],
-          [] as AvailableWorkspace['sso'],
+      ),
-        ) ?? [],
     };
   }
 
@@ -440,12 +439,7 @@ export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspace> {
           ({ workspace, appToken }) => {
             return {
               ...this.castWorkspaceToAvailableWorkspace(workspace),
-              ...(appToken
+              ...(appToken ? { personalInviteToken: appToken.value } : {}),
-                ? {
-                    personalInviteToken: appToken.value,
-                    inviteHash: workspace.inviteHash,
-                  }
-                : {}),
             };
           },
         ),