admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 9612a4928d.

(Causes a google auth sign-up issue)
This commit is contained in:
Marie
2025-06-19 18:15:15 +02:00
committed by GitHub
parent b778b6ebad
commit adcf6107e7
5 changed files with 28 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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} />

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

@ -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 <></>;

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

@ -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,
};
};