refacto(*): rename hostname to custom domain (#10100)

packages/twenty-front/src/generated-metadata/graphql.ts

@@ -109,7 +109,6 @@ export type AuthorizeApp = {
 export type AvailableWorkspaceOutput = {
   __typename?: 'AvailableWorkspaceOutput';
   displayName?: Maybe<Scalars['String']['output']>;
-  hostname?: Maybe<Scalars['String']['output']>;
   id: Scalars['String']['output'];
   logo?: Maybe<Scalars['String']['output']>;
   sso: Array<SsoConnection>;
@@ -385,15 +384,15 @@ export type CursorPaging = {
   last?: InputMaybe<Scalars['Int']['input']>;
 };
 
-export type CustomHostnameDetails = {
+export type CustomDomainDetails = {
-  __typename?: 'CustomHostnameDetails';
+  __typename?: 'CustomDomainDetails';
-  hostname: Scalars['String']['output'];
+  customDomain: Scalars['String']['output'];
   id: Scalars['String']['output'];
-  records: Array<CustomHostnameVerification>;
+  records: Array<CustomDomainVerification>;
 };
 
-export type CustomHostnameVerification = {
+export type CustomDomainVerification = {
-  __typename?: 'CustomHostnameVerification';
+  __typename?: 'CustomDomainVerification';
   key: Scalars['String']['output'];
   status: Scalars['String']['output'];
   type: Scalars['String']['output'];
@@ -1105,6 +1104,7 @@ export type MutationSendInvitationsArgs = {
 export type MutationSignUpArgs = {
   captchaToken?: InputMaybe<Scalars['String']['input']>;
   email: Scalars['String']['input'];
+  locale?: InputMaybe<Scalars['String']['input']>;
   password: Scalars['String']['input'];
   workspaceId?: InputMaybe<Scalars['String']['input']>;
   workspaceInviteHash?: InputMaybe<Scalars['String']['input']>;
@@ -1373,8 +1373,8 @@ export type Query = {
   findWorkspaceFromInviteHash: Workspace;
   findWorkspaceInvitations: Array<WorkspaceInvitation>;
   getAvailablePackages: Scalars['JSON']['output'];
+  getCustomDomainDetails?: Maybe<CustomDomainDetails>;
   getEnvironmentVariablesGrouped: EnvironmentVariablesOutput;
-  getHostnameDetails?: Maybe<CustomHostnameDetails>;
   getPostgresCredentials?: Maybe<PostgresCredentials>;
   getProductPrices: BillingProductPricesOutput;
   getPublicWorkspaceDataByDomain: PublicWorkspaceDataOutput;
@@ -1971,8 +1971,8 @@ export type UpdateWorkflowVersionStepInput = {
 
 export type UpdateWorkspaceInput = {
   allowImpersonation?: InputMaybe<Scalars['Boolean']['input']>;
+  customDomain?: InputMaybe<Scalars['String']['input']>;
   displayName?: InputMaybe<Scalars['String']['input']>;
-  hostname?: InputMaybe<Scalars['String']['input']>;
   inviteHash?: InputMaybe<Scalars['String']['input']>;
   isGoogleAuthEnabled?: InputMaybe<Scalars['Boolean']['input']>;
   isMicrosoftAuthEnabled?: InputMaybe<Scalars['Boolean']['input']>;
@@ -1997,6 +1997,7 @@ export type User = {
   id: Scalars['UUID']['output'];
   isEmailVerified: Scalars['Boolean']['output'];
   lastName: Scalars['String']['output'];
+  locale: Scalars['String']['output'];
   onboardingStatus?: Maybe<OnboardingStatus>;
   passwordHash?: Maybe<Scalars['String']['output']>;
   supportUserHash?: Maybe<Scalars['String']['output']>;
@@ -2103,13 +2104,13 @@ export type Workspace = {
   billingSubscriptions: Array<BillingSubscription>;
   createdAt: Scalars['DateTime']['output'];
   currentBillingSubscription?: Maybe<BillingSubscription>;
+  customDomain?: Maybe<Scalars['String']['output']>;
   databaseSchema: Scalars['String']['output'];
   databaseUrl: Scalars['String']['output'];
   deletedAt?: Maybe<Scalars['DateTime']['output']>;
   displayName?: Maybe<Scalars['String']['output']>;
   featureFlags?: Maybe<Array<FeatureFlag>>;
   hasValidEnterpriseKey: Scalars['Boolean']['output'];
-  hostname?: Maybe<Scalars['String']['output']>;
   id: Scalars['UUID']['output'];
   inviteHash?: Maybe<Scalars['String']['output']>;
   isGoogleAuthEnabled: Scalars['Boolean']['output'];
@@ -2198,18 +2199,18 @@ export type WorkspaceNameAndId = {
   id: Scalars['String']['output'];
 };
 
+export type WorkspaceUrlsAndId = {
+  __typename?: 'WorkspaceUrlsAndId';
+  id: Scalars['String']['output'];
+  workspaceUrls: WorkspaceUrls;
+};
+
 export type WorkspaceUrls = {
   __typename?: 'workspaceUrls';
   customUrl?: Maybe<Scalars['String']['output']>;
   subdomainUrl: Scalars['String']['output'];
 };
 
-export type WorkspaceUrlsAndId = {
-  __typename?: 'workspaceUrlsAndId';
-  id: Scalars['String']['output'];
-  workspaceUrls: WorkspaceUrls;
-};
-
 export type RemoteServerFieldsFragment = { __typename?: 'RemoteServer', id: string, createdAt: any, foreignDataWrapperId: string, foreignDataWrapperOptions?: any | null, foreignDataWrapperType: string, updatedAt: any, schema?: string | null, label: string, userMappingOptions?: { __typename?: 'UserMappingOptionsUser', user?: string | null } | null };
 
 export type RemoteTableFieldsFragment = { __typename?: 'RemoteTable', id?: any | null, name: string, schema?: string | null, status: RemoteTableStatus, schemaPendingUpdates?: Array<DistantTableUpdate> | null };

packages/twenty-front/src/generated/graphql.tsx

@@ -102,7 +102,6 @@ export type AuthorizeApp = {
 export type AvailableWorkspaceOutput = {
   __typename?: 'AvailableWorkspaceOutput';
   displayName?: Maybe<Scalars['String']>;
-  hostname?: Maybe<Scalars['String']>;
   id: Scalars['String'];
   logo?: Maybe<Scalars['String']>;
   sso: Array<SsoConnection>;
@@ -322,15 +321,15 @@ export type CursorPaging = {
   last?: InputMaybe<Scalars['Int']>;
 };
 
-export type CustomHostnameDetails = {
+export type CustomDomainDetails = {
-  __typename?: 'CustomHostnameDetails';
+  __typename?: 'CustomDomainDetails';
-  hostname: Scalars['String'];
+  customDomain: Scalars['String'];
   id: Scalars['String'];
-  records: Array<CustomHostnameVerification>;
+  records: Array<CustomDomainVerification>;
 };
 
-export type CustomHostnameVerification = {
+export type CustomDomainVerification = {
-  __typename?: 'CustomHostnameVerification';
+  __typename?: 'CustomDomainVerification';
   key: Scalars['String'];
   status: Scalars['String'];
   type: Scalars['String'];
@@ -1238,7 +1237,7 @@ export type Query = {
   findWorkspaceFromInviteHash: Workspace;
   findWorkspaceInvitations: Array<WorkspaceInvitation>;
   getAvailablePackages: Scalars['JSON'];
-  getCustomHostnameDetails?: Maybe<CustomHostnameDetails>;
+  getCustomDomainDetails?: Maybe<CustomDomainDetails>;
   getEnvironmentVariablesGrouped: EnvironmentVariablesOutput;
   getPostgresCredentials?: Maybe<PostgresCredentials>;
   getProductPrices: BillingProductPricesOutput;
@@ -1760,8 +1759,8 @@ export type UpdateWorkflowVersionStepInput = {
 
 export type UpdateWorkspaceInput = {
   allowImpersonation?: InputMaybe<Scalars['Boolean']>;
+  customDomain?: InputMaybe<Scalars['String']>;
   displayName?: InputMaybe<Scalars['String']>;
-  hostname?: InputMaybe<Scalars['String']>;
   inviteHash?: InputMaybe<Scalars['String']>;
   isGoogleAuthEnabled?: InputMaybe<Scalars['Boolean']>;
   isMicrosoftAuthEnabled?: InputMaybe<Scalars['Boolean']>;
@@ -1786,6 +1785,7 @@ export type User = {
   id: Scalars['UUID'];
   isEmailVerified: Scalars['Boolean'];
   lastName: Scalars['String'];
+  locale: Scalars['String'];
   onboardingStatus?: Maybe<OnboardingStatus>;
   passwordHash?: Maybe<Scalars['String']>;
   supportUserHash?: Maybe<Scalars['String']>;
@@ -1882,13 +1882,13 @@ export type Workspace = {
   billingSubscriptions: Array<BillingSubscription>;
   createdAt: Scalars['DateTime'];
   currentBillingSubscription?: Maybe<BillingSubscription>;
+  customDomain?: Maybe<Scalars['String']>;
   databaseSchema: Scalars['String'];
   databaseUrl: Scalars['String'];
   deletedAt?: Maybe<Scalars['DateTime']>;
   displayName?: Maybe<Scalars['String']>;
   featureFlags?: Maybe<Array<FeatureFlag>>;
   hasValidEnterpriseKey: Scalars['Boolean'];
-  hostname?: Maybe<Scalars['String']>;
   id: Scalars['UUID'];
   inviteHash?: Maybe<Scalars['String']>;
   isGoogleAuthEnabled: Scalars['Boolean'];
@@ -1977,18 +1977,18 @@ export type WorkspaceNameAndId = {
   id: Scalars['String'];
 };
 
+export type WorkspaceUrlsAndId = {
+  __typename?: 'WorkspaceUrlsAndId';
+  id: Scalars['String'];
+  workspaceUrls: WorkspaceUrls;
+};
+
 export type WorkspaceUrls = {
   __typename?: 'workspaceUrls';
   customUrl?: Maybe<Scalars['String']>;
   subdomainUrl: Scalars['String'];
 };
 
-export type WorkspaceUrlsAndId = {
-  __typename?: 'workspaceUrlsAndId';
-  id: Scalars['String'];
-  workspaceUrls: WorkspaceUrls;
-};
-
 export type TimelineCalendarEventFragmentFragment = { __typename?: 'TimelineCalendarEvent', id: any, title: string, description: string, location: string, startsAt: string, endsAt: string, isFullDay: boolean, visibility: CalendarChannelVisibility, participants: Array<{ __typename?: 'TimelineCalendarEventParticipant', personId?: any | null, workspaceMemberId?: any | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string }> };
 
 export type TimelineCalendarEventParticipantFragmentFragment = { __typename?: 'TimelineCalendarEventParticipant', personId?: any | null, workspaceMemberId?: any | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string };
@@ -2133,7 +2133,7 @@ export type ImpersonateMutationVariables = Exact<{
 }>;
 
 
-export type ImpersonateMutation = { __typename?: 'Mutation', impersonate: { __typename?: 'ImpersonateOutput', workspace: { __typename?: 'workspaceUrlsAndId', id: string, workspaceUrls: { __typename?: 'workspaceUrls', subdomainUrl: string, customUrl?: string | null } }, loginToken: { __typename?: 'AuthToken', token: string, expiresAt: string } } };
+export type ImpersonateMutation = { __typename?: 'Mutation', impersonate: { __typename?: 'ImpersonateOutput', workspace: { __typename?: 'WorkspaceUrlsAndId', id: string, workspaceUrls: { __typename?: 'workspaceUrls', subdomainUrl: string, customUrl?: string | null } }, loginToken: { __typename?: 'AuthToken', token: string, expiresAt: string } } };
 
 export type RenewTokenMutationVariables = Exact<{
   appToken: Scalars['String'];
@@ -2160,7 +2160,7 @@ export type SignUpMutationVariables = Exact<{
 }>;
 
 
-export type SignUpMutation = { __typename?: 'Mutation', signUp: { __typename?: 'SignUpOutput', loginToken: { __typename?: 'AuthToken', token: string, expiresAt: string }, workspace: { __typename?: 'workspaceUrlsAndId', id: string, workspaceUrls: { __typename?: 'workspaceUrls', subdomainUrl: string, customUrl?: string | null } } } };
+export type SignUpMutation = { __typename?: 'Mutation', signUp: { __typename?: 'SignUpOutput', loginToken: { __typename?: 'AuthToken', token: string, expiresAt: string }, workspace: { __typename?: 'WorkspaceUrlsAndId', id: string, workspaceUrls: { __typename?: 'workspaceUrls', subdomainUrl: string, customUrl?: string | null } } } };
 
 export type UpdatePasswordViaResetTokenMutationVariables = Exact<{
   token: Scalars['String'];
@@ -2295,7 +2295,7 @@ export type ListSsoIdentityProvidersByWorkspaceIdQueryVariables = Exact<{ [key:
 
 export type ListSsoIdentityProvidersByWorkspaceIdQuery = { __typename?: 'Query', listSSOIdentityProvidersByWorkspaceId: Array<{ __typename?: 'FindAvailableSSOIDPOutput', type: IdentityProviderType, id: string, name: string, issuer: string, status: SsoIdentityProviderStatus }> };
 
-export type UserQueryFragmentFragment = { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, analyticsTinybirdJwts?: { __typename?: 'AnalyticsTinybirdJwtMap', getWebhookAnalytics: string, getPageviewsAnalytics: string, getUsersAnalytics: string, getServerlessFunctionDuration: string, getServerlessFunctionSuccessRate: string, getServerlessFunctionErrorCount: string } | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, currentUserWorkspace?: { __typename?: 'UserWorkspace', settingsPermissions?: Array<SettingsFeatures> | null } | null, currentWorkspace?: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, isPublicInviteLinkEnabled: boolean, isGoogleAuthEnabled: boolean, isMicrosoftAuthEnabled: boolean, isPasswordAuthEnabled: boolean, subdomain: string, hasValidEnterpriseKey: boolean, hostname?: string | null, metadataVersion: number, workspaceMembersCount?: number | null, workspaceUrls: { __typename?: 'workspaceUrls', subdomainUrl: string, customUrl?: string | null }, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: FeatureFlagKey, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null, billingSubscriptions: Array<{ __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus }> } | null, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, subdomain: string, hostname?: string | null, workspaceUrls: { __typename?: 'workspaceUrls', subdomainUrl: string, customUrl?: string | null } } | null }> };
+export type UserQueryFragmentFragment = { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, analyticsTinybirdJwts?: { __typename?: 'AnalyticsTinybirdJwtMap', getWebhookAnalytics: string, getPageviewsAnalytics: string, getUsersAnalytics: string, getServerlessFunctionDuration: string, getServerlessFunctionSuccessRate: string, getServerlessFunctionErrorCount: string } | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, currentUserWorkspace?: { __typename?: 'UserWorkspace', settingsPermissions?: Array<SettingsFeatures> | null } | null, currentWorkspace?: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, isPublicInviteLinkEnabled: boolean, isGoogleAuthEnabled: boolean, isMicrosoftAuthEnabled: boolean, isPasswordAuthEnabled: boolean, subdomain: string, hasValidEnterpriseKey: boolean, customDomain?: string | null, metadataVersion: number, workspaceMembersCount?: number | null, workspaceUrls: { __typename?: 'workspaceUrls', subdomainUrl: string, customUrl?: string | null }, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: FeatureFlagKey, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null, billingSubscriptions: Array<{ __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus }> } | null, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, subdomain: string, customDomain?: string | null, workspaceUrls: { __typename?: 'workspaceUrls', subdomainUrl: string, customUrl?: string | null } } | null }> };
 
 export type DeleteUserAccountMutationVariables = Exact<{ [key: string]: never; }>;
 
@@ -2312,7 +2312,7 @@ export type UploadProfilePictureMutation = { __typename?: 'Mutation', uploadProf
 export type GetCurrentUserQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetCurrentUserQuery = { __typename?: 'Query', currentUser: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, analyticsTinybirdJwts?: { __typename?: 'AnalyticsTinybirdJwtMap', getWebhookAnalytics: string, getPageviewsAnalytics: string, getUsersAnalytics: string, getServerlessFunctionDuration: string, getServerlessFunctionSuccessRate: string, getServerlessFunctionErrorCount: string } | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, currentUserWorkspace?: { __typename?: 'UserWorkspace', settingsPermissions?: Array<SettingsFeatures> | null } | null, currentWorkspace?: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, isPublicInviteLinkEnabled: boolean, isGoogleAuthEnabled: boolean, isMicrosoftAuthEnabled: boolean, isPasswordAuthEnabled: boolean, subdomain: string, hasValidEnterpriseKey: boolean, hostname?: string | null, metadataVersion: number, workspaceMembersCount?: number | null, workspaceUrls: { __typename?: 'workspaceUrls', subdomainUrl: string, customUrl?: string | null }, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: FeatureFlagKey, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null, billingSubscriptions: Array<{ __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus }> } | null, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, subdomain: string, hostname?: string | null, workspaceUrls: { __typename?: 'workspaceUrls', subdomainUrl: string, customUrl?: string | null } } | null }> } };
+export type GetCurrentUserQuery = { __typename?: 'Query', currentUser: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, analyticsTinybirdJwts?: { __typename?: 'AnalyticsTinybirdJwtMap', getWebhookAnalytics: string, getPageviewsAnalytics: string, getUsersAnalytics: string, getServerlessFunctionDuration: string, getServerlessFunctionSuccessRate: string, getServerlessFunctionErrorCount: string } | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, currentUserWorkspace?: { __typename?: 'UserWorkspace', settingsPermissions?: Array<SettingsFeatures> | null } | null, currentWorkspace?: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, isPublicInviteLinkEnabled: boolean, isGoogleAuthEnabled: boolean, isMicrosoftAuthEnabled: boolean, isPasswordAuthEnabled: boolean, subdomain: string, hasValidEnterpriseKey: boolean, customDomain?: string | null, metadataVersion: number, workspaceMembersCount?: number | null, workspaceUrls: { __typename?: 'workspaceUrls', subdomainUrl: string, customUrl?: string | null }, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: FeatureFlagKey, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null, billingSubscriptions: Array<{ __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus }> } | null, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, subdomain: string, customDomain?: string | null, workspaceUrls: { __typename?: 'workspaceUrls', subdomainUrl: string, customUrl?: string | null } } | null }> } };
 
 export type ActivateWorkflowVersionMutationVariables = Exact<{
   workflowVersionId: Scalars['String'];
@@ -2415,7 +2415,7 @@ export type UpdateWorkspaceMutationVariables = Exact<{
 }>;
 
 
-export type UpdateWorkspaceMutation = { __typename?: 'Mutation', updateWorkspace: { __typename?: 'Workspace', id: any, hostname?: string | null, subdomain: string, displayName?: string | null, logo?: string | null, allowImpersonation: boolean, isPublicInviteLinkEnabled: boolean, isGoogleAuthEnabled: boolean, isMicrosoftAuthEnabled: boolean, isPasswordAuthEnabled: boolean } };
+export type UpdateWorkspaceMutation = { __typename?: 'Mutation', updateWorkspace: { __typename?: 'Workspace', id: any, customDomain?: string | null, subdomain: string, displayName?: string | null, logo?: string | null, allowImpersonation: boolean, isPublicInviteLinkEnabled: boolean, isGoogleAuthEnabled: boolean, isMicrosoftAuthEnabled: boolean, isPasswordAuthEnabled: boolean } };
 
 export type UploadWorkspaceLogoMutationVariables = Exact<{
   file: Scalars['Upload'];
@@ -2424,10 +2424,10 @@ export type UploadWorkspaceLogoMutationVariables = Exact<{
 
 export type UploadWorkspaceLogoMutation = { __typename?: 'Mutation', uploadWorkspaceLogo: string };
 
-export type GetCustomHostnameDetailsQueryVariables = Exact<{ [key: string]: never; }>;
+export type GetCustomDomainDetailsQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetCustomHostnameDetailsQuery = { __typename?: 'Query', getCustomHostnameDetails?: { __typename?: 'CustomHostnameDetails', hostname: string, records: Array<{ __typename?: 'CustomHostnameVerification', type: string, key: string, value: string, validationType: string, status: string }> } | null };
+export type GetCustomDomainDetailsQuery = { __typename?: 'Query', getCustomDomainDetails?: { __typename?: 'CustomDomainDetails', customDomain: string, records: Array<{ __typename?: 'CustomDomainVerification', type: string, key: string, value: string, validationType: string, status: string }> } | null };
 
 export type GetWorkspaceFromInviteHashQueryVariables = Exact<{
   inviteHash: Scalars['String'];
@@ -2589,7 +2589,7 @@ export const UserQueryFragmentFragmentDoc = gql`
     isPasswordAuthEnabled
     subdomain
     hasValidEnterpriseKey
-    hostname
+    customDomain
     workspaceUrls {
       subdomainUrl
       customUrl
@@ -2618,7 +2618,7 @@ export const UserQueryFragmentFragmentDoc = gql`
       logo
       displayName
       subdomain
-      hostname
+      customDomain
       workspaceUrls {
         subdomainUrl
         customUrl
@@ -4791,7 +4791,7 @@ export const UpdateWorkspaceDocument = gql`
     mutation UpdateWorkspace($input: UpdateWorkspaceInput!) {
   updateWorkspace(data: $input) {
     id
-    hostname
+    customDomain
     subdomain
     displayName
     logo
@@ -4860,10 +4860,10 @@ export function useUploadWorkspaceLogoMutation(baseOptions?: Apollo.MutationHook
 export type UploadWorkspaceLogoMutationHookResult = ReturnType<typeof useUploadWorkspaceLogoMutation>;
 export type UploadWorkspaceLogoMutationResult = Apollo.MutationResult<UploadWorkspaceLogoMutation>;
 export type UploadWorkspaceLogoMutationOptions = Apollo.BaseMutationOptions<UploadWorkspaceLogoMutation, UploadWorkspaceLogoMutationVariables>;
-export const GetCustomHostnameDetailsDocument = gql`
+export const GetCustomDomainDetailsDocument = gql`
-    query GetCustomHostnameDetails {
+    query GetCustomDomainDetails {
-  getCustomHostnameDetails {
+  getCustomDomainDetails {
-    hostname
+    customDomain
     records {
       type
       key
@@ -4876,31 +4876,31 @@ export const GetCustomHostnameDetailsDocument = gql`
     `;
 
 /**
- * __useGetCustomHostnameDetailsQuery__
+ * __useGetCustomDomainDetailsQuery__
  *
- * To run a query within a React component, call `useGetCustomHostnameDetailsQuery` and pass it any options that fit your needs.
+ * To run a query within a React component, call `useGetCustomDomainDetailsQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetCustomHostnameDetailsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * When your component renders, `useGetCustomDomainDetailsQuery` returns an object from Apollo Client that contains loading, error, and data properties
  * you can use to render your UI.
  *
  * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
  *
  * @example
- * const { data, loading, error } = useGetCustomHostnameDetailsQuery({
+ * const { data, loading, error } = useGetCustomDomainDetailsQuery({
  *   variables: {
  *   },
  * });
  */
-export function useGetCustomHostnameDetailsQuery(baseOptions?: Apollo.QueryHookOptions<GetCustomHostnameDetailsQuery, GetCustomHostnameDetailsQueryVariables>) {
+export function useGetCustomDomainDetailsQuery(baseOptions?: Apollo.QueryHookOptions<GetCustomDomainDetailsQuery, GetCustomDomainDetailsQueryVariables>) {
         const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<GetCustomHostnameDetailsQuery, GetCustomHostnameDetailsQueryVariables>(GetCustomHostnameDetailsDocument, options);
+        return Apollo.useQuery<GetCustomDomainDetailsQuery, GetCustomDomainDetailsQueryVariables>(GetCustomDomainDetailsDocument, options);
       }
-export function useGetCustomHostnameDetailsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetCustomHostnameDetailsQuery, GetCustomHostnameDetailsQueryVariables>) {
+export function useGetCustomDomainDetailsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetCustomDomainDetailsQuery, GetCustomDomainDetailsQueryVariables>) {
           const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<GetCustomHostnameDetailsQuery, GetCustomHostnameDetailsQueryVariables>(GetCustomHostnameDetailsDocument, options);
+          return Apollo.useLazyQuery<GetCustomDomainDetailsQuery, GetCustomDomainDetailsQueryVariables>(GetCustomDomainDetailsDocument, options);
         }
-export type GetCustomHostnameDetailsQueryHookResult = ReturnType<typeof useGetCustomHostnameDetailsQuery>;
+export type GetCustomDomainDetailsQueryHookResult = ReturnType<typeof useGetCustomDomainDetailsQuery>;
-export type GetCustomHostnameDetailsLazyQueryHookResult = ReturnType<typeof useGetCustomHostnameDetailsLazyQuery>;
+export type GetCustomDomainDetailsLazyQueryHookResult = ReturnType<typeof useGetCustomDomainDetailsLazyQuery>;
-export type GetCustomHostnameDetailsQueryResult = Apollo.QueryResult<GetCustomHostnameDetailsQuery, GetCustomHostnameDetailsQueryVariables>;
+export type GetCustomDomainDetailsQueryResult = Apollo.QueryResult<GetCustomDomainDetailsQuery, GetCustomDomainDetailsQueryVariables>;
 export const GetWorkspaceFromInviteHashDocument = gql`
     query GetWorkspaceFromInviteHash($inviteHash: String!) {
   findWorkspaceFromInviteHash(inviteHash: $inviteHash) {

packages/twenty-front/src/modules/auth/states/currentWorkspaceState.ts

@@ -20,7 +20,7 @@ export type CurrentWorkspace = Pick<
   | 'isPasswordAuthEnabled'
   | 'hasValidEnterpriseKey'
   | 'subdomain'
-  | 'hostname'
+  | 'customDomain'
   | 'workspaceUrls'
   | 'metadataVersion'
 >;

packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useFieldMetadataItem.ts

@@ -161,7 +161,7 @@ export const queries = {
         isPasswordAuthEnabled
         subdomain
         hasValidEnterpriseKey
-        hostname
+        customDomain
         workspaceUrls {
           subdomainUrl
           customUrl
@@ -190,7 +190,7 @@ export const queries = {
           logo
           displayName
           subdomain
-          hostname
+          customDomain
           workspaceUrls {
             subdomainUrl
             customUrl
@@ -308,7 +308,7 @@ export const responseData = {
       },
       workspaceMembers: [],
       currentUserWorkspace: {
-        settingsPermissions: ['DATA_MODEL']
+        settingsPermissions: ['DATA_MODEL'],
       },
       currentWorkspace: {
         id: 'test-workspace-id',
@@ -323,7 +323,7 @@ export const responseData = {
         isMicrosoftAuthEnabled: false,
         isPasswordAuthEnabled: true,
         subdomain: 'test',
-        hostname: null,
+        customDomain: null,
         workspaceUrls: {
           customUrl: undefined,
           subdomainUrl: 'https://test.twenty.com/',

packages/twenty-front/src/modules/ui/field/display/components/LinksDisplay.tsx

@@ -6,7 +6,7 @@ import { ExpandableList } from '@/ui/layout/expandable-list/components/Expandabl
 import { isDefined } from 'twenty-shared';
 import { checkUrlType } from '~/utils/checkUrlType';
 import { getAbsoluteUrl } from '~/utils/url/getAbsoluteUrl';
-import { getUrlHostName } from '~/utils/url/getUrlHostName';
+import { getUrlHostname } from '~/utils/url/getUrlHostname';
 
 type LinksDisplayProps = {
   value?: FieldLinksValue;
@@ -29,7 +29,7 @@ export const LinksDisplay = ({ value }: LinksDisplayProps) => {
           const absoluteUrl = getAbsoluteUrl(url);
           return {
             url: absoluteUrl,
-            label: label || getUrlHostName(absoluteUrl),
+            label: label || getUrlHostname(absoluteUrl),
             type: checkUrlType(absoluteUrl),
           };
         }),

packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts

@@ -40,7 +40,7 @@ export const USER_QUERY_FRAGMENT = gql`
       isPasswordAuthEnabled
       subdomain
       hasValidEnterpriseKey
-      hostname
+      customDomain
       workspaceUrls {
         subdomainUrl
         customUrl
@@ -69,7 +69,7 @@ export const USER_QUERY_FRAGMENT = gql`
         logo
         displayName
         subdomain
-        hostname
+        customDomain
         workspaceUrls {
           subdomainUrl
           customUrl

packages/twenty-front/src/modules/workspace/graphql/mutations/updateWorkspace.ts

@@ -4,7 +4,7 @@ export const UPDATE_WORKSPACE = gql`
   mutation UpdateWorkspace($input: UpdateWorkspaceInput!) {
     updateWorkspace(data: $input) {
       id
-      hostname
+      customDomain
       subdomain
       displayName
       logo

packages/twenty-front/src/modules/workspace/graphql/queries/getCustomDomainDetails.ts

@@ -1,9 +1,9 @@
 import { gql } from '@apollo/client';
 
-export const GET_CUSTOM_HOSTNAME_DETAILS = gql`
+export const GET_CUSTOM_DOMAIN_DETAILS = gql`
-  query GetCustomHostnameDetails {
+  query GetCustomDomainDetails {
-    getCustomHostnameDetails {
+    getCustomDomainDetails {
-      hostname
+      customDomain
       records {
         type
         key

packages/twenty-front/src/pages/settings/workspace/SettingsCustomDomain.tsx

@@ -3,29 +3,29 @@ import styled from '@emotion/styled';
 import { useLingui } from '@lingui/react/macro';
 import { Controller, useFormContext } from 'react-hook-form';
 import { H2Title, Section } from 'twenty-ui';
-import { useGetCustomHostnameDetailsQuery } from '~/generated/graphql';
+import { useGetCustomDomainDetailsQuery } from '~/generated/graphql';
-import { SettingsHostnameRecords } from '~/pages/settings/workspace/SettingsHostnameRecords';
+import { SettingsCustomDomainRecords } from '~/pages/settings/workspace/SettingsCustomDomainRecords';
 
-const StyledDomainFromWrapper = styled.div`
+const StyledDomainFormWrapper = styled.div`
   align-items: center;
   display: flex;
 `;
 
-export const SettingsHostname = () => {
+export const SettingsCustomDomain = () => {
-  const { data: getHostnameDetailsData } = useGetCustomHostnameDetailsQuery();
+  const { data: getCustomDomainDetailsData } = useGetCustomDomainDetailsQuery();
 
   const { t } = useLingui();
 
   const { control, getValues } = useFormContext<{
-    hostname: string;
+    customDomain: string;
   }>();
 
   return (
     <Section>
       <H2Title title={t`Domain`} description={t`Set the name of your domain`} />
-      <StyledDomainFromWrapper>
+      <StyledDomainFormWrapper>
         <Controller
-          name="hostname"
+          name="customDomain"
           control={control}
           render={({ field: { onChange, value }, fieldState: { error } }) => (
             <TextInputV2
@@ -37,12 +37,12 @@ export const SettingsHostname = () => {
             />
           )}
         />
-      </StyledDomainFromWrapper>
+      </StyledDomainFormWrapper>
-      {getHostnameDetailsData?.getCustomHostnameDetails &&
+      {getCustomDomainDetailsData?.getCustomDomainDetails &&
-        getValues('hostname') ===
+        getValues('customDomain') ===
-          getHostnameDetailsData?.getCustomHostnameDetails?.hostname && (
+          getCustomDomainDetailsData?.getCustomDomainDetails?.customDomain && (
-          <SettingsHostnameRecords
+          <SettingsCustomDomainRecords
-            records={getHostnameDetailsData.getCustomHostnameDetails.records}
+            records={getCustomDomainDetailsData.getCustomDomainDetails.records}
           />
         )}
     </Section>

packages/twenty-front/src/pages/settings/workspace/SettingsCustomDomainEffect.tsx

@@ -2,16 +2,16 @@ import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { useEffect } from 'react';
 import { useRecoilValue } from 'recoil';
 import { isDefined } from 'twenty-shared';
-import { useGetCustomHostnameDetailsQuery } from '~/generated/graphql';
+import { useGetCustomDomainDetailsQuery } from '~/generated/graphql';
 
-export const SettingsHostnameEffect = () => {
+export const SettingsCustomDomainEffect = () => {
-  const { refetch } = useGetCustomHostnameDetailsQuery();
+  const { refetch } = useGetCustomDomainDetailsQuery();
 
   const currentWorkspace = useRecoilValue(currentWorkspaceState);
 
   useEffect(() => {
     let pollIntervalFn: null | ReturnType<typeof setInterval> = null;
-    if (isDefined(currentWorkspace?.hostname)) {
+    if (isDefined(currentWorkspace?.customDomain)) {
       pollIntervalFn = setInterval(async () => {
         refetch();
       }, 3000);
@@ -22,7 +22,7 @@ export const SettingsHostnameEffect = () => {
         clearInterval(pollIntervalFn);
       }
     };
-  }, [currentWorkspace?.hostname, refetch]);
+  }, [currentWorkspace?.customDomain, refetch]);
 
   return <></>;
 };

packages/twenty-front/src/pages/settings/workspace/SettingsCustomDomainRecords.tsx

@@ -5,12 +5,12 @@ import { TableBody } from '@/ui/layout/table/components/TableBody';
 import { TableCell } from '@/ui/layout/table/components/TableCell';
 import { TextInputV2 } from '@/ui/input/components/TextInputV2';
 import { Table } from '@/ui/layout/table/components/Table';
-import { CustomHostnameDetails } from '~/generated/graphql';
+import { CustomDomainDetails } from '~/generated/graphql';
 
-export const SettingsHostnameRecords = ({
+export const SettingsCustomDomainRecords = ({
   records,
 }: {
-  records: CustomHostnameDetails['records'];
+  records: CustomDomainDetails['records'];
 }) => {
   return (
     <Table>

packages/twenty-front/src/pages/settings/workspace/SettingsDomain.tsx

@@ -12,7 +12,7 @@ import {
   useUpdateWorkspaceMutation,
 } from '~/generated/graphql';
 import { useRedirectToWorkspaceDomain } from '@/domain-manager/hooks/useRedirectToWorkspaceDomain';
-import { SettingsHostname } from '~/pages/settings/workspace/SettingsHostname';
+import { SettingsCustomDomain } from '~/pages/settings/workspace/SettingsCustomDomain';
 import { SettingsSubdomain } from '~/pages/settings/workspace/SettingsSubdomain';
 import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
 import { useNavigateSettings } from '~/hooks/useNavigateSettings';
@@ -24,7 +24,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { SettingsHostnameEffect } from '~/pages/settings/workspace/SettingsHostnameEffect';
+import { SettingsCustomDomainEffect } from '~/pages/settings/workspace/SettingsCustomDomainEffect';
 import { isDefined } from 'twenty-shared';
 
 export const SettingsDomain = () => {
@@ -40,12 +40,12 @@ export const SettingsDomain = () => {
         .regex(/^[a-z0-9][a-z0-9-]{1,28}[a-z0-9]$/, {
           message: t`Use letter, number and dash only. Start and finish with a letter or a number`,
         }),
-      hostname: z
+      customDomain: z
         .string()
         .regex(
           /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9])$/,
           {
-            message: t`Invalid custom hostname. Custom hostnames have to be smaller than 256 characters in length, cannot be IP addresses, cannot contain spaces, cannot contain any special characters such as _~\`!@#$%^*()=+{}[]|\\;:'",<>/? and cannot begin or end with a '-' character.`,
+            message: t`Invalid custom domain. Custom domains have to be smaller than 256 characters in length, cannot be IP addresses, cannot contain spaces, cannot contain any special characters such as _~\`!@#$%^*()=+{}[]|\\;:'",<>/? and cannot begin or end with a '-' character.`,
           },
         )
         .max(256)
@@ -68,35 +68,37 @@ export const SettingsDomain = () => {
 
   const form = useForm<{
     subdomain: string;
-    hostname: string | null;
+    customDomain: string | null;
   }>({
     mode: 'onChange',
     delayError: 500,
     defaultValues: {
       subdomain: currentWorkspace?.subdomain ?? '',
-      hostname: currentWorkspace?.hostname ?? null,
+      customDomain: currentWorkspace?.customDomain ?? null,
     },
     resolver: zodResolver(validationSchema),
   });
 
   const subdomainValue = form.watch('subdomain');
-  const hostnameValue = form.watch('hostname');
+  const customDomainValue = form.watch('customDomain');
 
-  const updateHostname = (
+  const updateCustomDomain = (
-    hostname: string | null | undefined,
+    customDomain: string | null | undefined,
     currentWorkspace: CurrentWorkspace,
   ) => {
     updateWorkspace({
       variables: {
         input: {
-          hostname:
+          customDomain:
-            isDefined(hostname) && hostname.length > 0 ? hostname : null,
+            isDefined(customDomain) && customDomain.length > 0
+              ? customDomain
+              : null,
         },
       },
       onCompleted: () => {
         setCurrentWorkspace({
           ...currentWorkspace,
-          hostname: hostname,
+          customDomain,
         });
       },
       onError: (error) => {
@@ -173,8 +175,8 @@ export const SettingsDomain = () => {
       return updateSubdomain(values.subdomain, currentWorkspace);
     }
 
-    if (values.hostname !== currentWorkspace.hostname) {
+    if (values.customDomain !== currentWorkspace.customDomain) {
-      return updateHostname(values.hostname, currentWorkspace);
+      return updateCustomDomain(values.customDomain, currentWorkspace);
     }
   };
 
@@ -197,7 +199,7 @@ export const SettingsDomain = () => {
           isSaveDisabled={
             !form.formState.isValid ||
             (subdomainValue === currentWorkspace?.subdomain &&
-              hostnameValue === currentWorkspace?.hostname)
+              customDomainValue === currentWorkspace?.customDomain)
           }
           onCancel={() => navigate(SettingsPath.Workspace)}
           onSave={handleSave}
@@ -207,13 +209,13 @@ export const SettingsDomain = () => {
       <SettingsPageContainer>
         {/* eslint-disable-next-line react/jsx-props-no-spreading */}
         <FormProvider {...form}>
-          {(!currentWorkspace?.hostname || !isCustomDomainEnabled) && (
+          {(!currentWorkspace?.customDomain || !isCustomDomainEnabled) && (
             <SettingsSubdomain />
           )}
           {isCustomDomainEnabled && (
             <>
-              <SettingsHostnameEffect />
+              <SettingsCustomDomainEffect />
-              <SettingsHostname />
+              <SettingsCustomDomain />
             </>
           )}
         </FormProvider>

packages/twenty-front/src/utils/url/__tests__/getUrlHostName.test.ts

@@ -1,25 +1,25 @@
-import { getUrlHostName } from '~/utils/url/getUrlHostName';
+import { getUrlHostname } from '~/utils/url/getUrlHostname';
 
-describe('getUrlHostName', () => {
+describe('getUrlHostname', () => {
   it("returns the URL's hostname", () => {
-    expect(getUrlHostName('https://www.example.com')).toBe('example.com');
+    expect(getUrlHostname('https://www.example.com')).toBe('example.com');
-    expect(getUrlHostName('http://subdomain.example.com')).toBe(
+    expect(getUrlHostname('http://subdomain.example.com')).toBe(
       'subdomain.example.com',
     );
-    expect(getUrlHostName('https://www.example.com/path')).toBe('example.com');
+    expect(getUrlHostname('https://www.example.com/path')).toBe('example.com');
-    expect(getUrlHostName('https://www.example.com?query=123')).toBe(
+    expect(getUrlHostname('https://www.example.com?query=123')).toBe(
       'example.com',
     );
-    expect(getUrlHostName('http://localhost:3000')).toBe('localhost');
+    expect(getUrlHostname('http://localhost:3000')).toBe('localhost');
-    expect(getUrlHostName('example.com')).toBe('example.com');
+    expect(getUrlHostname('example.com')).toBe('example.com');
-    expect(getUrlHostName('www.subdomain.example.com')).toBe(
+    expect(getUrlHostname('www.subdomain.example.com')).toBe(
       'subdomain.example.com',
     );
   });
 
   it('returns an empty string for invalid URLs', () => {
-    expect(getUrlHostName('?o')).toBe('');
+    expect(getUrlHostname('?o')).toBe('');
-    expect(getUrlHostName('')).toBe('');
+    expect(getUrlHostname('')).toBe('');
-    expect(getUrlHostName('\\')).toBe('');
+    expect(getUrlHostname('\\')).toBe('');
   });
 });

packages/twenty-front/src/utils/url/getUrlHostname.ts

@@ -1,6 +1,6 @@
 import { getAbsoluteUrl } from '~/utils/url/getAbsoluteUrl';
 
-export const getUrlHostName = (url: string) => {
+export const getUrlHostname = (url: string) => {
   try {
     const absoluteUrl = getAbsoluteUrl(url);
     return new URL(absoluteUrl).hostname.replace(/^www\./i, '');

packages/twenty-server/src/database/typeorm/core/migrations/common/1739178177820-rename-hostname-to-custom-domain.ts

@@ -0,0 +1,25 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class RenameHostnameToCustomDomain1739178177820
+  implements MigrationInterface
+{
+  name = 'RenameHostnameToCustomDomain1739178177820';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" RENAME COLUMN "hostname" TO "customDomain"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" RENAME CONSTRAINT "UQ_e6fa363bdaf45cbf8ce97bcebf0" TO "UQ_900f0a3eb789159c26c8bcb39cd"`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" RENAME CONSTRAINT "UQ_900f0a3eb789159c26c8bcb39cd" TO "UQ_e6fa363bdaf45cbf8ce97bcebf0"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" RENAME COLUMN "customDomain" TO "hostname"`,
+    );
+  }
+}

packages/twenty-server/src/engine/core-modules/admin-panel/__tests__/admin-panel.spec.ts

@@ -99,7 +99,7 @@ describe('AdminPanelService', () => {
         {
           provide: DomainManagerService,
           useValue: {
-            getworkspaceUrls: jest.fn().mockReturnValue({
+            getWorkspaceUrls: jest.fn().mockReturnValue({
               customUrl: undefined,
               subdomainUrl: 'https://twenty.twenty.com',
             }),

packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.service.ts

@@ -74,7 +74,7 @@ export class AdminPanelService {
     return {
       workspace: {
         id: user.workspaces[0].workspace.id,
-        workspaceUrls: this.domainManagerService.getworkspaceUrls(
+        workspaceUrls: this.domainManagerService.getWorkspaceUrls(
           user.workspaces[0].workspace,
         ),
       },

packages/twenty-server/src/engine/core-modules/admin-panel/dtos/impersonate.output.ts

@@ -1,13 +1,13 @@
 import { Field, ObjectType } from '@nestjs/graphql';
 
 import { AuthToken } from 'src/engine/core-modules/auth/dto/token.entity';
-import { workspaceUrlsAndId } from 'src/engine/core-modules/workspace/dtos/workspace-subdomain-id.dto';
+import { WorkspaceUrlsAndId } from 'src/engine/core-modules/workspace/dtos/workspace-subdomain-id.dto';
 
 @ObjectType()
 export class ImpersonateOutput {
   @Field(() => AuthToken)
   loginToken: AuthToken;
 
-  @Field(() => workspaceUrlsAndId)
+  @Field(() => WorkspaceUrlsAndId)
-  workspace: workspaceUrlsAndId;
+  workspace: WorkspaceUrlsAndId;
 }

packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts

@@ -234,7 +234,7 @@ export class AuthResolver {
       loginToken,
       workspace: {
         id: workspace.id,
-        workspaceUrls: this.domainManagerService.getworkspaceUrls(workspace),
+        workspaceUrls: this.domainManagerService.getWorkspaceUrls(workspace),
       },
     };
   }

packages/twenty-server/src/engine/core-modules/auth/controllers/google-auth.controller.ts

@@ -118,7 +118,7 @@ export class GoogleAuthController {
       return res.redirect(
         this.guardRedirectService.getRedirectErrorUrlAndCaptureExceptions(
           err,
-          this.guardRedirectService.getSubdomainAndHostnameFromWorkspace(
+          this.guardRedirectService.getSubdomainAndCustomDomainFromWorkspace(
             currentWorkspace,
           ),
         ),

packages/twenty-server/src/engine/core-modules/auth/controllers/microsoft-auth.controller.ts

@@ -119,7 +119,7 @@ export class MicrosoftAuthController {
       return res.redirect(
         this.guardRedirectService.getRedirectErrorUrlAndCaptureExceptions(
           err,
-          this.guardRedirectService.getSubdomainAndHostnameFromWorkspace(
+          this.guardRedirectService.getSubdomainAndCustomDomainFromWorkspace(
             currentWorkspace,
           ),
         ),

packages/twenty-server/src/engine/core-modules/auth/controllers/sso-auth.controller.ts

@@ -157,7 +157,7 @@ export class SSOAuthController {
       return res.redirect(
         this.guardRedirectService.getRedirectErrorUrlAndCaptureExceptions(
           err,
-          this.guardRedirectService.getSubdomainAndHostnameFromWorkspace(
+          this.guardRedirectService.getSubdomainAndCustomDomainFromWorkspace(
             workspaceIdentityProvider?.workspace,
           ),
         ),

packages/twenty-server/src/engine/core-modules/auth/dto/available-workspaces.output.ts

@@ -7,7 +7,7 @@ import {
   IdentityProviderType,
   SSOIdentityProviderStatus,
 } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';
-import { workspaceUrls } from 'src/engine/core-modules/workspace/dtos/workspace-endpoints.dto';
+import { workspaceUrls } from 'src/engine/core-modules/workspace/dtos/workspace-urls.dto';
 
 @ObjectType()
 class SSOConnection {
@@ -38,9 +38,6 @@ export class AvailableWorkspaceOutput {
   @Field(() => workspaceUrls)
   workspaceUrls: workspaceUrls;
 
-  @Field(() => String, { nullable: true })
-  hostname?: string;
-
   @Field(() => String, { nullable: true })
   logo?: string;
 

packages/twenty-server/src/engine/core-modules/auth/dto/sign-up.output.ts

@@ -1,6 +1,6 @@
 import { Field, ObjectType } from '@nestjs/graphql';
 
-import { workspaceUrlsAndId } from 'src/engine/core-modules/workspace/dtos/workspace-subdomain-id.dto';
+import { WorkspaceUrlsAndId } from 'src/engine/core-modules/workspace/dtos/workspace-subdomain-id.dto';
 
 import { AuthToken } from './token.entity';
 
@@ -9,6 +9,6 @@ export class SignUpOutput {
   @Field(() => AuthToken)
   loginToken: AuthToken;
 
-  @Field(() => workspaceUrlsAndId)
+  @Field(() => WorkspaceUrlsAndId)
-  workspace: workspaceUrlsAndId;
+  workspace: WorkspaceUrlsAndId;
 }

packages/twenty-server/src/engine/core-modules/auth/guards/enterprise-features-enabled.guard.ts

@@ -30,7 +30,9 @@ export class EnterpriseFeaturesEnabledGuard implements CanActivate {
       this.guardRedirectService.dispatchErrorFromGuard(
         context,
         err,
-        this.guardRedirectService.getSubdomainAndHostnameFromContext(context),
+        this.guardRedirectService.getSubdomainAndCustomDomainFromContext(
+          context,
+        ),
       );
 
       return false;

packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-exchange-code-for-token.guard.ts

@@ -53,7 +53,9 @@ export class GoogleAPIsOauthExchangeCodeForTokenGuard extends AuthGuard(
       this.guardRedirectService.dispatchErrorFromGuard(
         context,
         err,
-        this.guardRedirectService.getSubdomainAndHostnameFromContext(context),
+        this.guardRedirectService.getSubdomainAndCustomDomainFromContext(
+          context,
+        ),
       );
 
       return false;

packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-request-code.guard.ts

@@ -71,7 +71,7 @@ export class GoogleAPIsOauthRequestCodeGuard extends AuthGuard('google-apis') {
       this.guardRedirectService.dispatchErrorFromGuard(
         context,
         err,
-        this.guardRedirectService.getSubdomainAndHostnameFromWorkspace(
+        this.guardRedirectService.getSubdomainAndCustomDomainFromWorkspace(
           workspace,
         ),
       );

packages/twenty-server/src/engine/core-modules/auth/guards/google-oauth.guard.ts

@@ -51,7 +51,7 @@ export class GoogleOauthGuard extends AuthGuard('google') {
       this.guardRedirectService.dispatchErrorFromGuard(
         context,
         err,
-        this.guardRedirectService.getSubdomainAndHostnameFromWorkspace(
+        this.guardRedirectService.getSubdomainAndCustomDomainFromWorkspace(
           workspace,
         ),
       );

packages/twenty-server/src/engine/core-modules/auth/guards/google-provider-enabled.guard.ts

@@ -31,7 +31,9 @@ export class GoogleProviderEnabledGuard implements CanActivate {
       this.guardRedirectService.dispatchErrorFromGuard(
         context,
         err,
-        this.guardRedirectService.getSubdomainAndHostnameFromContext(context),
+        this.guardRedirectService.getSubdomainAndCustomDomainFromContext(
+          context,
+        ),
       );
 
       return false;

packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-apis-oauth-exchange-code-for-token.guard.ts

@@ -57,7 +57,9 @@ export class MicrosoftAPIsOauthExchangeCodeForTokenGuard extends AuthGuard(
               AuthExceptionCode.INSUFFICIENT_SCOPES,
             )
           : error,
-        this.guardRedirectService.getSubdomainAndHostnameFromContext(context),
+        this.guardRedirectService.getSubdomainAndCustomDomainFromContext(
+          context,
+        ),
       );
 
       return false;

packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-apis-oauth-request-code.guard.ts

@@ -72,7 +72,7 @@ export class MicrosoftAPIsOauthRequestCodeGuard extends AuthGuard(
       this.guardRedirectService.dispatchErrorFromGuard(
         context,
         err,
-        this.guardRedirectService.getSubdomainAndHostnameFromWorkspace(
+        this.guardRedirectService.getSubdomainAndCustomDomainFromWorkspace(
           workspace,
         ),
       );

packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-oauth.guard.ts

@@ -39,7 +39,7 @@ export class MicrosoftOAuthGuard extends AuthGuard('microsoft') {
       this.guardRedirectService.dispatchErrorFromGuard(
         context,
         err,
-        this.guardRedirectService.getSubdomainAndHostnameFromWorkspace(
+        this.guardRedirectService.getSubdomainAndCustomDomainFromWorkspace(
           workspace,
         ),
       );

packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-provider-enabled.guard.ts

@@ -31,7 +31,9 @@ export class MicrosoftProviderEnabledGuard implements CanActivate {
       this.guardRedirectService.dispatchErrorFromGuard(
         context,
         err,
-        this.guardRedirectService.getSubdomainAndHostnameFromContext(context),
+        this.guardRedirectService.getSubdomainAndCustomDomainFromContext(
+          context,
+        ),
       );
 
       return false;

packages/twenty-server/src/engine/core-modules/auth/guards/oidc-auth.guard.ts

@@ -80,7 +80,7 @@ export class OIDCAuthGuard extends AuthGuard('openidconnect') {
       this.guardRedirectService.dispatchErrorFromGuard(
         context,
         err,
-        this.guardRedirectService.getSubdomainAndHostnameFromWorkspace(
+        this.guardRedirectService.getSubdomainAndCustomDomainFromWorkspace(
           identityProvider?.workspace,
         ),
       );

packages/twenty-server/src/engine/core-modules/auth/guards/saml-auth.guard.ts

@@ -14,30 +14,16 @@ import { SSOService } from 'src/engine/core-modules/sso/services/sso.service';
 import { GuardRedirectService } from 'src/engine/core-modules/guard-redirect/services/guard-redirect.service';
 import { SSOConfiguration } from 'src/engine/core-modules/sso/types/SSOConfigurations.type';
 import { WorkspaceSSOIdentityProvider } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';
-import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handler/exception-handler.service';
 
 @Injectable()
 export class SAMLAuthGuard extends AuthGuard('saml') {
   constructor(
     private readonly sSOService: SSOService,
     private readonly guardRedirectService: GuardRedirectService,
-    private readonly exceptionHandlerService: ExceptionHandlerService,
   ) {
     super();
   }
 
-  private getRelayStateByRequest(request: Request) {
-    try {
-      const relayStateRaw = request.body.RelayState || request.query.RelayState;
-
-      if (relayStateRaw) {
-        return JSON.parse(relayStateRaw);
-      }
-    } catch (error) {
-      this.exceptionHandlerService.captureExceptions(error);
-    }
-  }
-
   async canActivate(context: ExecutionContext) {
     const request = context.switchToHttp().getRequest<Request>();
 
@@ -63,7 +49,7 @@ export class SAMLAuthGuard extends AuthGuard('saml') {
       this.guardRedirectService.dispatchErrorFromGuard(
         context,
         err,
-        this.guardRedirectService.getSubdomainAndHostnameFromWorkspace(
+        this.guardRedirectService.getSubdomainAndCustomDomainFromWorkspace(
           identityProvider?.workspace,
         ),
       );

packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts

@@ -459,7 +459,7 @@ export class AuthService {
     billingCheckoutSessionState,
   }: {
     loginToken: string;
-    workspace: Pick<Workspace, 'subdomain' | 'hostname'>;
+    workspace: Pick<Workspace, 'subdomain' | 'customDomain'>;
     billingCheckoutSessionState?: string;
   }) {
     const url = this.domainManagerService.buildWorkspaceURL({

packages/twenty-server/src/engine/core-modules/domain-manager/dtos/custom-domain-details.ts

@@ -1,7 +1,7 @@
 import { Field, ObjectType } from '@nestjs/graphql';
 
 @ObjectType()
-class CustomHostnameVerification {
+class CustomDomainVerification {
   @Field(() => String)
   validationType: 'ownership' | 'ssl' | 'redirection';
 
@@ -19,13 +19,13 @@ class CustomHostnameVerification {
 }
 
 @ObjectType()
-export class CustomHostnameDetails {
+export class CustomDomainDetails {
   @Field(() => String)
   id: string;
 
   @Field(() => String)
-  hostname: string;
+  customDomain: string;
 
-  @Field(() => [CustomHostnameVerification])
+  @Field(() => [CustomDomainVerification])
-  records: Array<CustomHostnameVerification>;
+  records: Array<CustomDomainVerification>;
 }

packages/twenty-server/src/engine/core-modules/domain-manager/services/domain-manager.service.spec.ts

@@ -9,8 +9,8 @@ import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { DomainManagerService } from './domain-manager.service';
 
 describe('DomainManagerService', () => {
-  describe('getworkspaceUrls', () => {
+  describe('getWorkspaceUrls', () => {
-    it('should return a URL containing the correct hostname if hostname is provided', () => {
+    it('should return a URL containing the correct customDomain if customDomain is provided', () => {
       jest
         .spyOn(environmentService, 'get')
         .mockImplementation((key: string) => {
@@ -22,9 +22,9 @@ describe('DomainManagerService', () => {
           return env[key];
         });
 
-      const result = domainManagerService.getworkspaceUrls({
+      const result = domainManagerService.getWorkspaceUrls({
         subdomain: 'subdomain',
-        hostname: 'custom-host.com',
+        customDomain: 'custom-host.com',
       });
 
       expect(result).toEqual({
@@ -33,7 +33,7 @@ describe('DomainManagerService', () => {
       });
     });
 
-    it('should return a URL containing the correct subdomain if hostname is not provided but subdomain is', () => {
+    it('should return a URL containing the correct subdomain if customDomain is not provided but subdomain is', () => {
       jest
         .spyOn(environmentService, 'get')
         .mockImplementation((key: string) => {
@@ -45,9 +45,9 @@ describe('DomainManagerService', () => {
           return env[key];
         });
 
-      const result = domainManagerService.getworkspaceUrls({
+      const result = domainManagerService.getWorkspaceUrls({
         subdomain: 'subdomain',
-        hostname: undefined,
+        customDomain: undefined,
       });
 
       expect(result).toEqual({
@@ -155,7 +155,7 @@ describe('DomainManagerService', () => {
       const result = domainManagerService.buildWorkspaceURL({
         workspace: {
           subdomain: 'test',
-          hostname: undefined,
+          customDomain: undefined,
         },
       });
 
@@ -177,7 +177,7 @@ describe('DomainManagerService', () => {
       const result = domainManagerService.buildWorkspaceURL({
         workspace: {
           subdomain: 'test',
-          hostname: undefined,
+          customDomain: undefined,
         },
         pathname: '/path/to/resource',
       });
@@ -200,7 +200,7 @@ describe('DomainManagerService', () => {
       const result = domainManagerService.buildWorkspaceURL({
         workspace: {
           subdomain: 'test',
-          hostname: undefined,
+          customDomain: undefined,
         },
         searchParams: {
           foo: 'bar',

packages/twenty-server/src/engine/core-modules/domain-manager/services/domain-manager.service.ts

@@ -9,7 +9,7 @@ import {
   DomainManagerException,
   DomainManagerExceptionCode,
 } from 'src/engine/core-modules/domain-manager/domain-manager.exception';
-import { CustomHostnameDetails } from 'src/engine/core-modules/domain-manager/dtos/custom-hostname-details';
+import { CustomDomainDetails } from 'src/engine/core-modules/domain-manager/dtos/custom-domain-details';
 import { generateRandomSubdomain } from 'src/engine/core-modules/domain-manager/utils/generate-random-subdomain';
 import { getSubdomainFromEmail } from 'src/engine/core-modules/domain-manager/utils/get-subdomain-from-email';
 import { getSubdomainNameFromDisplayName } from 'src/engine/core-modules/domain-manager/utils/get-subdomain-name-from-display-name';
@@ -78,7 +78,7 @@ export class DomainManagerService {
   }: {
     emailVerificationToken: string;
     email: string;
-    workspace: Pick<Workspace, 'subdomain' | 'hostname'>;
+    workspace: Pick<Workspace, 'subdomain' | 'customDomain'>;
   }) {
     return this.buildWorkspaceURL({
       workspace,
@@ -92,11 +92,11 @@ export class DomainManagerService {
     pathname,
     searchParams,
   }: {
-    workspace: Pick<Workspace, 'subdomain' | 'hostname'>;
+    workspace: Pick<Workspace, 'subdomain' | 'customDomain'>;
     pathname?: string;
     searchParams?: Record<string, string | number>;
   }) {
-    const workspaceUrls = this.getworkspaceUrls(workspace);
+    const workspaceUrls = this.getWorkspaceUrls(workspace);
 
     const url = new URL(workspaceUrls.customUrl ?? workspaceUrls.subdomainUrl);
 
@@ -115,7 +115,7 @@ export class DomainManagerService {
     return url;
   }
 
-  getSubdomainAndHostnameFromUrl = (url: string) => {
+  getSubdomainAndCustomDomainFromUrl = (url: string) => {
     const { hostname: originHostname } = new URL(url);
 
     const frontDomain = this.getFrontUrl().hostname;
@@ -129,7 +129,7 @@ export class DomainManagerService {
         isFrontdomain && !this.isDefaultSubdomain(subdomain)
           ? subdomain
           : undefined,
-      hostname: isFrontdomain ? undefined : originHostname,
+      customDomain: isFrontdomain ? undefined : originHostname,
     };
   };
 
@@ -147,7 +147,7 @@ export class DomainManagerService {
 
   computeRedirectErrorUrl(
     errorMessage: string,
-    workspace: Pick<Workspace, 'subdomain' | 'hostname'>,
+    workspace: Pick<Workspace, 'subdomain' | 'customDomain'>,
   ) {
     const url = this.buildWorkspaceURL({
       workspace,
@@ -201,11 +201,12 @@ export class DomainManagerService {
       return this.getDefaultWorkspace();
     }
 
-    const { subdomain, hostname } = this.getSubdomainAndHostnameFromUrl(origin);
+    const { subdomain, customDomain } =
+      this.getSubdomainAndCustomDomainFromUrl(origin);
 
-    if (!hostname && !subdomain) return;
+    if (!customDomain && !subdomain) return;
 
-    const where = isDefined(hostname) ? { hostname } : { subdomain };
+    const where = isDefined(customDomain) ? { customDomain } : { subdomain };
 
     return (
       (await this.workspaceRepository.findOne({
@@ -236,10 +237,10 @@ export class DomainManagerService {
     return `${subdomain}${existingWorkspaceCount > 0 ? `-${Math.random().toString(36).substring(2, 10)}` : ''}`;
   }
 
-  async registerCustomHostname(hostname: string) {
+  async registerCustomDomain(customDomain: string) {
     domainManagerValidator.isCloudflareInstanceDefined(this.cloudflareClient);
 
-    if (await this.getCustomHostnameDetails(hostname)) {
+    if (await this.getCustomDomainDetails(customDomain)) {
       throw new DomainManagerException(
         'Hostname already registered',
         DomainManagerExceptionCode.HOSTNAME_ALREADY_REGISTERED,
@@ -248,7 +249,7 @@ export class DomainManagerService {
 
     return await this.cloudflareClient.customHostnames.create({
       zone_id: this.environmentService.get('CLOUDFLARE_ZONE_ID'),
-      hostname,
+      hostname: customDomain,
       ssl: {
         method: 'txt',
         type: 'dv',
@@ -265,14 +266,14 @@ export class DomainManagerService {
     });
   }
 
-  async getCustomHostnameDetails(
+  async getCustomDomainDetails(
-    hostname: string,
+    customDomain: string,
-  ): Promise<CustomHostnameDetails | undefined> {
+  ): Promise<CustomDomainDetails | undefined> {
     domainManagerValidator.isCloudflareInstanceDefined(this.cloudflareClient);
 
     const response = await this.cloudflareClient.customHostnames.list({
       zone_id: this.environmentService.get('CLOUDFLARE_ZONE_ID'),
-      hostname,
+      hostname: customDomain,
     });
 
     if (response.result.length === 0) {
@@ -282,12 +283,12 @@ export class DomainManagerService {
     if (response.result.length === 1) {
       return {
         id: response.result[0].id,
-        hostname: response.result[0].hostname,
+        customDomain: response.result[0].hostname,
         records: [
           response.result[0].ownership_verification,
           ...(response.result[0].ssl?.validation_records ?? []),
         ]
-          .map<CustomHostnameDetails['records'][0] | undefined>(
+          .map<CustomDomainDetails['records'][0] | undefined>(
             (record: Record<string, string>) => {
               if (!record) return;
 
@@ -343,24 +344,23 @@ export class DomainManagerService {
     throw new Error('More than one custom hostname found in cloudflare');
   }
 
-  async updateCustomHostname(fromHostname: string, toHostname: string) {
+  async updateCustomDomain(fromHostname: string, toHostname: string) {
     domainManagerValidator.isCloudflareInstanceDefined(this.cloudflareClient);
 
-    const fromCustomHostname =
+    const fromCustomHostname = await this.getCustomDomainDetails(fromHostname);
-      await this.getCustomHostnameDetails(fromHostname);
 
     if (fromCustomHostname) {
       await this.deleteCustomHostname(fromCustomHostname.id);
     }
 
-    return this.registerCustomHostname(toHostname);
+    return this.registerCustomDomain(toHostname);
   }
 
-  async deleteCustomHostnameByHostnameSilently(hostname: string) {
+  async deleteCustomHostnameByHostnameSilently(customDomain: string) {
     domainManagerValidator.isCloudflareInstanceDefined(this.cloudflareClient);
 
     try {
-      const customHostname = await this.getCustomHostnameDetails(hostname);
+      const customHostname = await this.getCustomDomainDetails(customDomain);
 
       if (customHostname) {
         await this.cloudflareClient.customHostnames.delete(customHostname.id, {
@@ -380,15 +380,15 @@ export class DomainManagerService {
     });
   }
 
-  private getCustomWorkspaceEndpoint(hostname: string) {
+  private getCustomWorkspaceUrl(customDomain: string) {
     const url = this.getFrontUrl();
 
-    url.hostname = hostname;
+    url.hostname = customDomain;
 
     return url.toString();
   }
 
-  private getTwentyWorkspaceEndpoint(subdomain: string) {
+  private getTwentyWorkspaceUrl(subdomain: string) {
     const url = this.getFrontUrl();
 
     url.hostname = `${subdomain}.${url.hostname}`;
@@ -396,15 +396,15 @@ export class DomainManagerService {
     return url.toString();
   }
 
-  getworkspaceUrls({
+  getWorkspaceUrls({
     subdomain,
-    hostname,
+    customDomain,
-  }: Pick<Workspace, 'subdomain' | 'hostname'>) {
+  }: Pick<Workspace, 'subdomain' | 'customDomain'>) {
     return {
-      customUrl: hostname
+      customUrl: customDomain
-        ? this.getCustomWorkspaceEndpoint(hostname)
+        ? this.getCustomWorkspaceUrl(customDomain)
         : undefined,
-      subdomainUrl: this.getTwentyWorkspaceEndpoint(subdomain),
+      subdomainUrl: this.getTwentyWorkspaceUrl(subdomain),
     };
   }
 }

packages/twenty-server/src/engine/core-modules/email-verification/services/email-verification.service.ts

@@ -39,7 +39,7 @@ export class EmailVerificationService {
   async sendVerificationEmail(
     userId: string,
     email: string,
-    workspace: Pick<Workspace, 'subdomain' | 'hostname'>,
+    workspace: Pick<Workspace, 'subdomain' | 'customDomain'>,
   ) {
     if (!this.environmentService.get('IS_EMAIL_VERIFICATION_REQUIRED')) {
       return { success: false };
@@ -83,7 +83,7 @@ export class EmailVerificationService {
 
   async resendEmailVerificationToken(
     email: string,
-    workspace: Pick<Workspace, 'subdomain' | 'hostname'>,
+    workspace: Pick<Workspace, 'subdomain' | 'customDomain'>,
   ) {
     if (!this.environmentService.get('IS_EMAIL_VERIFICATION_REQUIRED')) {
       throw new EmailVerificationException(

packages/twenty-server/src/engine/core-modules/guard-redirect/services/guard-redirect.service.ts

@@ -20,7 +20,7 @@ export class GuardRedirectService {
   dispatchErrorFromGuard(
     context: ExecutionContext,
     error: Error | CustomException,
-    workspace: { id?: string; subdomain: string; hostname?: string },
+    workspace: { id?: string; subdomain: string; customDomain?: string },
   ) {
     if ('contextType' in context && context.contextType === 'graphql') {
       throw error;
@@ -32,8 +32,8 @@ export class GuardRedirectService {
       .redirect(this.getRedirectErrorUrlAndCaptureExceptions(error, workspace));
   }
 
-  getSubdomainAndHostnameFromWorkspace(
+  getSubdomainAndCustomDomainFromWorkspace(
-    workspace?: Pick<Workspace, 'subdomain' | 'hostname'> | null,
+    workspace?: Pick<Workspace, 'subdomain' | 'customDomain'> | null,
   ) {
     if (!workspace) {
       return {
@@ -44,23 +44,23 @@ export class GuardRedirectService {
     return workspace;
   }
 
-  getSubdomainAndHostnameFromContext(context: ExecutionContext): {
+  getSubdomainAndCustomDomainFromContext(context: ExecutionContext): {
     subdomain: string;
-    hostname?: string;
+    customDomain?: string;
   } {
     const request = context.switchToHttp().getRequest<Request>();
 
-    const subdomainAndHostnameFromReferer = request.headers.referer
+    const subdomainAndCustomDomainFromReferer = request.headers.referer
-      ? this.domainManagerService.getSubdomainAndHostnameFromUrl(
+      ? this.domainManagerService.getSubdomainAndCustomDomainFromUrl(
           request.headers.referer,
         )
       : null;
 
     return {
       subdomain:
-        subdomainAndHostnameFromReferer?.subdomain ??
+        subdomainAndCustomDomainFromReferer?.subdomain ??
         this.environmentService.get('DEFAULT_SUBDOMAIN'),
-      hostname: subdomainAndHostnameFromReferer?.hostname,
+      customDomain: subdomainAndCustomDomainFromReferer?.customDomain,
     };
   }
 
@@ -76,7 +76,7 @@ export class GuardRedirectService {
 
   getRedirectErrorUrlAndCaptureExceptions(
     err: Error | CustomException,
-    workspace: { id?: string; subdomain: string; hostname?: string },
+    workspace: { id?: string; subdomain: string; customDomain?: string },
   ) {
     this.captureException(err, workspace.id);
 

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

@@ -182,7 +182,7 @@ export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspace> {
     return user.workspaces.map<AvailableWorkspaceOutput>((userWorkspace) => ({
       id: userWorkspace.workspaceId,
       displayName: userWorkspace.workspace.displayName,
-      workspaceUrls: this.domainManagerService.getworkspaceUrls(
+      workspaceUrls: this.domainManagerService.getWorkspaceUrls(
         userWorkspace.workspace,
       ),
       logo: userWorkspace.workspace.logo,

packages/twenty-server/src/engine/core-modules/workspace/dtos/public-workspace-data-output.ts

@@ -5,7 +5,7 @@ import {
   IdentityProviderType,
   SSOIdentityProviderStatus,
 } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';
-import { workspaceUrls } from 'src/engine/core-modules/workspace/dtos/workspace-endpoints.dto';
+import { workspaceUrls } from 'src/engine/core-modules/workspace/dtos/workspace-urls.dto';
 
 @ObjectType()
 export class SSOIdentityProvider {

packages/twenty-server/src/engine/core-modules/workspace/dtos/update-workspace-input.ts

@@ -143,7 +143,7 @@ export class UpdateWorkspaceInput {
   @Matches(
     /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9])$/,
   )
-  hostname?: string;
+  customDomain?: string;
 
   @Field({ nullable: true })
   @IsString()

packages/twenty-server/src/engine/core-modules/workspace/dtos/workspace-subdomain-id.dto.ts

@@ -1,9 +1,9 @@
 import { Field, ObjectType } from '@nestjs/graphql';
 
-import { workspaceUrls } from 'src/engine/core-modules/workspace/dtos/workspace-endpoints.dto';
+import { workspaceUrls } from 'src/engine/core-modules/workspace/dtos/workspace-urls.dto';
 
 @ObjectType()
-export class workspaceUrlsAndId {
+export class WorkspaceUrlsAndId {
   @Field(() => workspaceUrls)
   workspaceUrls: workspaceUrls;
 

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

@@ -80,11 +80,11 @@ export class WorkspaceService extends TypeOrmQueryService<Workspace> {
     }
   }
 
-  private async setCustomDomain(workspace: Workspace, hostname: string) {
+  private async setCustomDomain(workspace: Workspace, customDomain: string) {
     await this.isCustomDomainEnabled(workspace.id);
 
     const existingWorkspace = await this.workspaceRepository.findOne({
-      where: { hostname },
+      where: { customDomain },
     });
 
     if (existingWorkspace && existingWorkspace.id !== workspace.id) {
@@ -95,22 +95,22 @@ export class WorkspaceService extends TypeOrmQueryService<Workspace> {
     }
 
     if (
-      hostname &&
+      customDomain &&
-      workspace.hostname !== hostname &&
+      workspace.customDomain !== customDomain &&
-      isDefined(workspace.hostname)
+      isDefined(workspace.customDomain)
     ) {
-      await this.domainManagerService.updateCustomHostname(
+      await this.domainManagerService.updateCustomDomain(
-        workspace.hostname,
+        workspace.customDomain,
-        hostname,
+        customDomain,
       );
     }
 
     if (
-      hostname &&
+      customDomain &&
-      workspace.hostname !== hostname &&
+      workspace.customDomain !== customDomain &&
-      !isDefined(workspace.hostname)
+      !isDefined(workspace.customDomain)
     ) {
-      await this.domainManagerService.registerCustomHostname(hostname);
+      await this.domainManagerService.registerCustomDomain(customDomain);
     }
   }
 
@@ -127,14 +127,17 @@ export class WorkspaceService extends TypeOrmQueryService<Workspace> {
 
     let customDomainRegistered = false;
 
-    if (payload.hostname === null && isDefined(workspace.hostname)) {
+    if (payload.customDomain === null && isDefined(workspace.customDomain)) {
       await this.domainManagerService.deleteCustomHostnameByHostnameSilently(
-        workspace.hostname,
+        workspace.customDomain,
       );
     }
 
-    if (payload.hostname && workspace.hostname !== payload.hostname) {
+    if (
-      await this.setCustomDomain(workspace, payload.hostname);
+      payload.customDomain &&
+      workspace.customDomain !== payload.customDomain
+    ) {
+      await this.setCustomDomain(workspace, payload.customDomain);
       customDomainRegistered = true;
     }
 
@@ -145,9 +148,9 @@ export class WorkspaceService extends TypeOrmQueryService<Workspace> {
       });
     } catch (error) {
       // revert custom domain registration on error
-      if (payload.hostname && customDomainRegistered) {
+      if (payload.customDomain && customDomainRegistered) {
         this.domainManagerService
-          .deleteCustomHostnameByHostnameSilently(payload.hostname)
+          .deleteCustomHostnameByHostnameSilently(payload.customDomain)
           .catch((err) => {
             this.exceptionHandlerService.captureExceptions([err]);
           });

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

@@ -124,7 +124,7 @@ export class Workspace {
 
   @Field({ nullable: true })
   @Column({ unique: true, nullable: true })
-  hostname?: string;
+  customDomain?: string;
 
   @Field()
   @Column({ default: true })

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

@@ -43,8 +43,8 @@ import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 import { GraphqlValidationExceptionFilter } from 'src/filters/graphql-validation-exception.filter';
 import { assert } from 'src/utils/assert';
 import { streamToBuffer } from 'src/utils/stream-to-buffer';
-import { CustomHostnameDetails } from 'src/engine/core-modules/domain-manager/dtos/custom-hostname-details';
+import { CustomDomainDetails } from 'src/engine/core-modules/domain-manager/dtos/custom-domain-details';
-import { workspaceUrls } from 'src/engine/core-modules/workspace/dtos/workspace-endpoints.dto';
+import { workspaceUrls } from 'src/engine/core-modules/workspace/dtos/workspace-urls.dto';
 
 import { Workspace } from './workspace.entity';
 
@@ -217,17 +217,17 @@ export class WorkspaceResolver {
 
   @ResolveField(() => workspaceUrls)
   workspaceUrls(@Parent() workspace: Workspace) {
-    return this.domainManagerService.getworkspaceUrls(workspace);
+    return this.domainManagerService.getWorkspaceUrls(workspace);
   }
 
-  @Query(() => CustomHostnameDetails, { nullable: true })
+  @Query(() => CustomDomainDetails, { nullable: true })
   @UseGuards(WorkspaceAuthGuard)
-  async getCustomHostnameDetails(
+  async getCustomDomainDetails(
-    @AuthWorkspace() { hostname }: Workspace,
+    @AuthWorkspace() { customDomain }: Workspace,
-  ): Promise<CustomHostnameDetails | undefined> {
+  ): Promise<CustomDomainDetails | undefined> {
-    if (!hostname) return undefined;
+    if (!customDomain) return undefined;
 
-    return await this.domainManagerService.getCustomHostnameDetails(hostname);
+    return await this.domainManagerService.getCustomDomainDetails(customDomain);
   }
 
   @Query(() => PublicWorkspaceDataOutput)
@@ -268,7 +268,7 @@ export class WorkspaceResolver {
         id: workspace.id,
         logo: workspaceLogoWithToken,
         displayName: workspace.displayName,
-        workspaceUrls: this.domainManagerService.getworkspaceUrls(workspace),
+        workspaceUrls: this.domainManagerService.getWorkspaceUrls(workspace),
         authProviders: getAuthProvidersByWorkspace({
           workspace,
           systemEnabledProviders,