The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
refactor: standardize SSO, SAML, OIDC, API and URL acronyms to PascalCase in internal identifiers (#25281)
Félix Malfait454580d56afb
diff --git a/packages/twenty-e2e-testing/lib/pom/helper/insertFieldData.ts b/packages/twenty-e2e-testing/lib/pom/helper/insertFieldData.tsindex 19918511c88..562d726d2dd 100644--- a/packages/twenty-e2e-testing/lib/pom/helper/insertFieldData.ts+++ b/packages/twenty-e2e-testing/lib/pom/helper/insertFieldData.ts@@ -21,7 +21,7 @@ export class InsertFieldData {private readonly dateInput: Locator;private readonly firstNameInput: Locator;private readonly lastNameInput: Locator;- private readonly addURLButton: Locator;+ private readonly addUrlButton: Locator;private readonly setAsPrimaryButton: Locator;private readonly addPhoneButton: Locator;private readonly addMailButton: Locator;@@ -64,7 +64,7 @@ export class InsertFieldData {this.dateInput = page.locator("//input[@placeholder='Type date and time']");this.firstNameInput = page.locator("//input[@placeholder='First name']"); // may fail if placeholder is `F‌‌irst name` instead of `First name`this.lastNameInput = page.locator("//input[@placeholder='Last name']"); // may fail if placeholder is `L‌‌ast name` instead of `Last name`- this.addURLButton = page.locator(+ this.addUrlButton = page.locator("//div[@data-testid='tooltip' and contains(., 'Add URL')]",);this.setAsPrimaryButton = page.locator(@@ -196,7 +196,7 @@ export class InsertFieldData {}async clickAddURL() {- await this.addURLButton.click();+ await this.addUrlButton.click();}// (multi-)selectdiff --git a/packages/twenty-e2e-testing/lib/pom/settings/apisSection.ts b/packages/twenty-e2e-testing/lib/pom/settings/apisSection.tsindex 0c9bd79db02..6c20ed65157 100644--- a/packages/twenty-e2e-testing/lib/pom/settings/apisSection.ts+++ b/packages/twenty-e2e-testing/lib/pom/settings/apisSection.ts@@ -1,26 +1,26 @@import { Locator, Page } from '@playwright/test';export class APIsSection {- private readonly createAPIKeyButton: Locator;- private readonly regenerateAPIKeyButton: Locator;- private readonly nameOfAPIKeyInput: Locator;- private readonly expirationDateAPIKeySelect: Locator;+ private readonly createApiKeyButton: Locator;+ private readonly regenerateApiKeyButton: Locator;+ private readonly nameOfApiKeyInput: Locator;+ private readonly expirationDateApiKeySelect: Locator;private readonly cancelButton: Locator;private readonly saveButton: Locator;private readonly deleteButton: Locator;constructor(public readonly page: Page) {this.page = page;- this.createAPIKeyButton = page.getByRole('link', {+ this.createApiKeyButton = page.getByRole('link', {name: 'Create API Key',});- this.nameOfAPIKeyInput = page+ this.nameOfApiKeyInput = page.getByPlaceholder('E.g. backoffice integration').first();- this.expirationDateAPIKeySelect = page.locator(+ this.expirationDateApiKeySelect = page.locator('div[aria-controls="object-field-type-select-options"]',);- this.regenerateAPIKeyButton = page.getByRole('button', {+ this.regenerateApiKeyButton = page.getByRole('button', {name: 'Regenerate Key',});this.cancelButton = page.getByRole('button', { name: 'Cancel' });@@ -28,25 +28,25 @@ export class APIsSection {this.deleteButton = page.getByRole('button', { name: 'Delete' });}- async createAPIKey() {- await this.createAPIKeyButton.click();+ async createApiKey() {+ await this.createApiKeyButton.click();}- async typeAPIKeyName(name: string) {- await this.nameOfAPIKeyInput.clear();- await this.nameOfAPIKeyInput.fill(name);+ async typeApiKeyName(name: string) {+ await this.nameOfApiKeyInput.clear();+ await this.nameOfApiKeyInput.fill(name);}- async selectAPIExpirationDate(date: string) {- await this.expirationDateAPIKeySelect.click();+ async selectApiExpirationDate(date: string) {+ await this.expirationDateApiKeySelect.click();await this.page.getByText(date, { exact: true }).click();}- async regenerateAPIKey() {- await this.regenerateAPIKeyButton.click();+ async regenerateApiKey() {+ await this.regenerateApiKeyButton.click();}- async deleteAPIKey() {+ async deleteApiKey() {await this.deleteButton.click();}@@ -58,7 +58,7 @@ export class APIsSection {await this.saveButton.click();}- async checkAPIKeyDetails(name: string) {+ async checkApiKeyDetails(name: string) {await this.page.locator(`//a/div[contains(.,'${name}')][first()]`).click();}}diff --git a/packages/twenty-e2e-testing/lib/pom/settings/dataModelSection.ts b/packages/twenty-e2e-testing/lib/pom/settings/dataModelSection.tsindex 0e36bd351d5..aa6123b1bf4 100644--- a/packages/twenty-e2e-testing/lib/pom/settings/dataModelSection.ts+++ b/packages/twenty-e2e-testing/lib/pom/settings/dataModelSection.ts@@ -6,9 +6,9 @@ export class DataModelSection {private readonly objectSingularNameInput: Locator;private readonly objectPluralNameInput: Locator;private readonly objectDescription: Locator;- private readonly synchronizeLabelAPIToggle: Locator;- private readonly objectAPISingularNameInput: Locator;- private readonly objectAPIPluralNameInput: Locator;+ private readonly synchronizeLabelApiToggle: Locator;+ private readonly objectApiSingularNameInput: Locator;+ private readonly objectApiPluralNameInput: Locator;private readonly objectMoreOptionsButton: Locator;private readonly editObjectButton: Locator;private readonly deleteObjectButton: Locator;@@ -36,11 +36,11 @@ export class DataModelSection {exact: true,});this.objectDescription = page.getByPlaceholder('Write a description');- this.synchronizeLabelAPIToggle = page.getByRole('checkbox').nth(1);- this.objectAPISingularNameInput = page.getByPlaceholder('listing', {+ this.synchronizeLabelApiToggle = page.getByRole('checkbox').nth(1);+ this.objectApiSingularNameInput = page.getByPlaceholder('listing', {exact: true,});- this.objectAPIPluralNameInput = page.getByPlaceholder('listings', {+ this.objectApiPluralNameInput = page.getByPlaceholder('listings', {exact: true,});this.objectMoreOptionsButton = page.getByLabel('Object Options');@@ -87,16 +87,16 @@ export class DataModelSection {await this.objectDescription.fill(name);}- async toggleSynchronizeLabelAPI() {- await this.synchronizeLabelAPIToggle.click();+ async toggleSynchronizeLabelApi() {+ await this.synchronizeLabelApiToggle.click();}- async typeObjectSingularAPIName(name: string) {- await this.objectAPISingularNameInput.fill(name);+ async typeObjectSingularApiName(name: string) {+ await this.objectApiSingularNameInput.fill(name);}- async typeObjectPluralAPIName(name: string) {- await this.objectAPIPluralNameInput.fill(name);+ async typeObjectPluralApiName(name: string) {+ await this.objectApiPluralNameInput.fill(name);}async checkObjectDetails(name: string) {diff --git a/packages/twenty-e2e-testing/lib/pom/settings/newFieldSection.ts b/packages/twenty-e2e-testing/lib/pom/settings/newFieldSection.tsindex 16fc121439e..2d79558c724 100644--- a/packages/twenty-e2e-testing/lib/pom/settings/newFieldSection.ts+++ b/packages/twenty-e2e-testing/lib/pom/settings/newFieldSection.ts@@ -187,7 +187,7 @@ export class NewFieldSection {await this.removeOptionButton.click();}- async changeOptionAPIName() {+ async changeOptionApiName() {// TODO: finish}diff --git a/packages/twenty-e2e-testing/lib/pom/settings/webhooksSection.ts b/packages/twenty-e2e-testing/lib/pom/settings/webhooksSection.tsindex 25959182797..dace3e676a0 100644--- a/packages/twenty-e2e-testing/lib/pom/settings/webhooksSection.ts+++ b/packages/twenty-e2e-testing/lib/pom/settings/webhooksSection.ts@@ -2,7 +2,7 @@ import { Locator, Page } from '@playwright/test';export class WebhooksSection {private readonly createWebhookButton: Locator;- private readonly webhookURLInput: Locator;+ private readonly webhookUrlInput: Locator;private readonly webhookDescription: Locator;private readonly deleteButton: Locator;@@ -11,7 +11,7 @@ export class WebhooksSection {this.createWebhookButton = page.getByRole('link', {name: 'Create Webhook',});- this.webhookURLInput = page.getByPlaceholder('URL');+ this.webhookUrlInput = page.getByPlaceholder('URL');this.webhookDescription = page.getByPlaceholder('Write a description');this.deleteButton = page.getByRole('button', { name: 'Delete' });}@@ -24,9 +24,9 @@ export class WebhooksSection {await this.createWebhookButton.click();}- async typeWebhookURL(url: string) {- await this.webhookURLInput.clear();- await this.webhookURLInput.fill(url);+ async typeWebhookUrl(url: string) {+ await this.webhookUrlInput.clear();+ await this.webhookUrlInput.fill(url);}async typeWebhookDescription(description: string) {diff --git a/packages/twenty-front-component-renderer/src/host/fetch/utils/createHostFetchEnforcingPolicy.ts b/packages/twenty-front-component-renderer/src/host/fetch/utils/createHostFetchEnforcingPolicy.tsindex 6d9a54d7c72..b6f715bec3e 100644--- a/packages/twenty-front-component-renderer/src/host/fetch/utils/createHostFetchEnforcingPolicy.ts+++ b/packages/twenty-front-component-renderer/src/host/fetch/utils/createHostFetchEnforcingPolicy.ts@@ -1,5 +1,5 @@import { isNonEmptyString } from '@sniptt/guards';-import { CustomError, getURLSafely, isDefined } from 'twenty-shared/utils';+import { CustomError, getUrlSafely, isDefined } from 'twenty-shared/utils';import { resolveHostFetchRedirectMode } from '@/host/fetch/utils/resolveHostFetchRedirectMode';import { serializeResponseToHostFetchResult } from '@/host/fetch/utils/serializeResponseToHostFetchResult';@@ -17,7 +17,7 @@ export const createHostFetchEnforcingPolicy = ();return async (input: HostFetchInput): Promise<HostFetchResult> => {- const requestOrigin = getURLSafely(input.url)?.origin;+ const requestOrigin = getUrlSafely(input.url)?.origin;if (!isDefined(requestOrigin) || !allowedOriginSet.has(requestOrigin)) {throw new CustomError(diff --git a/packages/twenty-front-component-renderer/src/host/fetch/utils/getUniqueHttpOriginsFromUrls.ts b/packages/twenty-front-component-renderer/src/host/fetch/utils/getUniqueHttpOriginsFromUrls.tsindex bce0d9f4c28..a3ec385bcd1 100644--- a/packages/twenty-front-component-renderer/src/host/fetch/utils/getUniqueHttpOriginsFromUrls.ts+++ b/packages/twenty-front-component-renderer/src/host/fetch/utils/getUniqueHttpOriginsFromUrls.ts@@ -1,4 +1,4 @@-import { getURLSafely, isDefined } from 'twenty-shared/utils';+import { getUrlSafely, isDefined } from 'twenty-shared/utils';export const getUniqueHttpOriginsFromUrls = (urls: (string | undefined)[],@@ -6,7 +6,7 @@ export const getUniqueHttpOriginsFromUrls = (...new Set(urls.filter(isDefined)- .map((url) => getURLSafely(url))+ .map((url) => getUrlSafely(url)).filter(isDefined).filter((url) => url.protocol === 'http:' || url.protocol === 'https:').map((url) => url.origin),diff --git a/packages/twenty-front-component-renderer/src/remote/worker/fetch-proxy/utils/isUrlFromProxiedOrigin.ts b/packages/twenty-front-component-renderer/src/remote/worker/fetch-proxy/utils/isUrlFromProxiedOrigin.tsindex a5abad3e71f..2f3bff5a6f4 100644--- a/packages/twenty-front-component-renderer/src/remote/worker/fetch-proxy/utils/isUrlFromProxiedOrigin.ts+++ b/packages/twenty-front-component-renderer/src/remote/worker/fetch-proxy/utils/isUrlFromProxiedOrigin.ts@@ -1,10 +1,10 @@-import { getURLSafely, isDefined } from 'twenty-shared/utils';+import { getUrlSafely, isDefined } from 'twenty-shared/utils';export const isUrlFromProxiedOrigin = (url: string,proxiedOrigins: string[],): boolean => {- const origin = getURLSafely(url)?.origin;+ const origin = getUrlSafely(url)?.origin;return isDefined(origin) && proxiedOrigins.includes(origin);};diff --git a/packages/twenty-front-component-renderer/src/remote/worker/module-loading/utils/__tests__/createSdkClientModuleBlobUrls.test.ts b/packages/twenty-front-component-renderer/src/remote/worker/module-loading/utils/__tests__/createSdkClientModuleBlobUrls.test.tsindex 06fd80f7e0a..41308123652 100644--- a/packages/twenty-front-component-renderer/src/remote/worker/module-loading/utils/__tests__/createSdkClientModuleBlobUrls.test.ts+++ b/packages/twenty-front-component-renderer/src/remote/worker/module-loading/utils/__tests__/createSdkClientModuleBlobUrls.test.ts@@ -1,15 +1,15 @@import { createSdkClientModuleBlobUrls } from '../createSdkClientModuleBlobUrls';describe('createSdkClientModuleBlobUrls', () => {- const createObjectURLMock = jest.fn();+ const createObjectUrlMock = jest.fn();beforeEach(() => {jest.clearAllMocks();- createObjectURLMock.mockImplementation(+ createObjectUrlMock.mockImplementation((blob: Blob) => `blob:mock/${(blob as Blob).size}`,);global.URL.createObjectURL =- createObjectURLMock as unknown as typeof URL.createObjectURL;+ createObjectUrlMock as unknown as typeof URL.createObjectURL;});it('mints a blob url for each sdk client module source', () => {@@ -18,7 +18,7 @@ describe('createSdkClientModuleBlobUrls', () => {metadata: 'export const metadata = 2;',});- expect(createObjectURLMock).toHaveBeenCalledTimes(2);+ expect(createObjectUrlMock).toHaveBeenCalledTimes(2);expect(blobUrls.core).toMatch(/^blob:mock\//);expect(blobUrls.metadata).toMatch(/^blob:mock\//);expect(blobUrls.core).not.toEqual(blobUrls.metadata);diff --git a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsxindex 9556249a4f2..5f129f979b2 100644--- a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx+++ b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx@@ -518,10 +518,10 @@ const SettingsObjectFieldEdit = lazy(() =>),);-const SettingsSecuritySSOIdentifyProvider = lazy(() =>- import('~/pages/settings/security/SettingsSecuritySSOIdentifyProvider').then(+const SettingsSecuritySsoIdentifyProvider = lazy(() =>+ import('~/pages/settings/security/SettingsSecuritySsoIdentifyProvider').then((module) => ({- default: module.SettingsSecuritySSOIdentifyProvider,+ default: module.SettingsSecuritySsoIdentifyProvider,}),),);@@ -1082,8 +1082,8 @@ const createSettingsRouteElements = ({}><Route- path={SettingsPath.NewSSOIdentityProvider}- element={<SettingsSecuritySSOIdentifyProvider />}+ path={SettingsPath.NewSsoIdentityProvider}+ element={<SettingsSecuritySsoIdentifyProvider />}/><Routepath={SettingsPath.NewApprovedAccessDomain}diff --git a/packages/twenty-front/src/modules/auth/graphql/fragments/availableSSOIdentityProvidersFragment.ts b/packages/twenty-front/src/modules/auth/graphql/fragments/availableSsoIdentityProvidersFragment.tssimilarity index 100%rename from packages/twenty-front/src/modules/auth/graphql/fragments/availableSSOIdentityProvidersFragment.tsrename to packages/twenty-front/src/modules/auth/graphql/fragments/availableSsoIdentityProvidersFragment.tsdiff --git a/packages/twenty-front/src/modules/auth/graphql/mutations/getAuthTokensFromSSOExchangeToken.ts b/packages/twenty-front/src/modules/auth/graphql/mutations/getAuthTokensFromSsoExchangeToken.tssimilarity index 100%rename from packages/twenty-front/src/modules/auth/graphql/mutations/getAuthTokensFromSSOExchangeToken.tsrename to packages/twenty-front/src/modules/auth/graphql/mutations/getAuthTokensFromSsoExchangeToken.tsdiff --git a/packages/twenty-front/src/modules/auth/hooks/__tests__/useRedeemSSOExchangeToken.test.ts b/packages/twenty-front/src/modules/auth/hooks/__tests__/useRedeemSsoExchangeToken.test.tssimilarity index 78%rename from packages/twenty-front/src/modules/auth/hooks/__tests__/useRedeemSSOExchangeToken.test.tsrename to packages/twenty-front/src/modules/auth/hooks/__tests__/useRedeemSsoExchangeToken.test.tsindex 679c8eee091..8925f83f574 100644--- a/packages/twenty-front/src/modules/auth/hooks/__tests__/useRedeemSSOExchangeToken.test.ts+++ b/packages/twenty-front/src/modules/auth/hooks/__tests__/useRedeemSsoExchangeToken.test.ts@@ -3,18 +3,18 @@ import { Provider as JotaiProvider } from 'jotai';import { isAppEffectRedirectEnabledState } from '@/app/states/isAppEffectRedirectEnabledState';import { isCookieAuthActiveState } from '@/auth/states/isCookieAuthActiveState';-import { useRedeemSSOExchangeToken } from '@/auth/hooks/useRedeemSSOExchangeToken';+import { useRedeemSsoExchangeToken } from '@/auth/hooks/useRedeemSsoExchangeToken';import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';import {jotaiStore,resetJotaiStore,} from '@/ui/utilities/state/jotai/jotaiStore';-const mockGetAuthTokensFromSSOExchangeToken = jest.fn();+const mockGetAuthTokensFromSsoExchangeToken = jest.fn();jest.mock('@apollo/client/react', () => ({...jest.requireActual('@apollo/client/react'),- useMutation: () => [mockGetAuthTokensFromSSOExchangeToken],+ useMutation: () => [mockGetAuthTokensFromSsoExchangeToken],}));jest.mock('@/ui/feedback/snack-bar-manager/hooks/useSnackBar', () => ({@@ -22,7 +22,7 @@ jest.mock('@/ui/feedback/snack-bar-manager/hooks/useSnackBar', () => ({}));const renderHooks = () => {- const { result } = renderHook(() => useRedeemSSOExchangeToken(), {+ const { result } = renderHook(() => useRedeemSsoExchangeToken(), {wrapper: ({ children }) => JotaiProvider({ store: jotaiStore, children }),});@@ -40,7 +40,7 @@ const freshTokenPair = {},};-describe('useRedeemSSOExchangeToken', () => {+describe('useRedeemSsoExchangeToken', () => {const mockEnqueueErrorSnackBar = jest.fn();beforeEach(() => {@@ -52,7 +52,7 @@ describe('useRedeemSSOExchangeToken', () => {enqueueErrorSnackBar: mockEnqueueErrorSnackBar,});- mockGetAuthTokensFromSSOExchangeToken.mockResolvedValue({+ mockGetAuthTokensFromSsoExchangeToken.mockResolvedValue({data: {getAuthTokensFromSSOExchangeToken: { tokens: freshTokenPair },},@@ -62,7 +62,7 @@ describe('useRedeemSSOExchangeToken', () => {it('should disable the redirect effect while exchanging and restore it after', async () => {const redirectFlagsAtExchangeTime: unknown[] = [];- mockGetAuthTokensFromSSOExchangeToken.mockImplementation(() => {+ mockGetAuthTokensFromSsoExchangeToken.mockImplementation(() => {redirectFlagsAtExchangeTime.push(jotaiStore.get(isAppEffectRedirectEnabledState.atom),);@@ -74,7 +74,7 @@ describe('useRedeemSSOExchangeToken', () => {const { result } = renderHooks();- await result.current.redeemSSOExchangeToken('sso-exchange-token');+ await result.current.redeemSsoExchangeToken('sso-exchange-token');expect(redirectFlagsAtExchangeTime).toEqual([false]);expect(jotaiStore.get(isAppEffectRedirectEnabledState.atom)).toBe(true);@@ -85,31 +85,31 @@ describe('useRedeemSSOExchangeToken', () => {it('should mark the session active once the exchange succeeds', async () => {const { result } = renderHooks();- await result.current.redeemSSOExchangeToken('sso-exchange-token');+ await result.current.redeemSsoExchangeToken('sso-exchange-token');expect(jotaiStore.get(isCookieAuthActiveState.atom)).toBe(true);});it('should leave the session inactive when the exchange fails', async () => {- mockGetAuthTokensFromSSOExchangeToken.mockRejectedValueOnce(+ mockGetAuthTokensFromSsoExchangeToken.mockRejectedValueOnce(new Error('Invalid SSO exchange token'),);const { result } = renderHooks();- await result.current.redeemSSOExchangeToken('sso-exchange-token');+ await result.current.redeemSsoExchangeToken('sso-exchange-token');expect(jotaiStore.get(isCookieAuthActiveState.atom)).toBe(false);});it('should snackbar when redemption fails', async () => {- mockGetAuthTokensFromSSOExchangeToken.mockRejectedValueOnce(+ mockGetAuthTokensFromSsoExchangeToken.mockRejectedValueOnce(new Error('Invalid SSO exchange token'),);const { result } = renderHooks();- await result.current.redeemSSOExchangeToken('sso-exchange-token');+ await result.current.redeemSsoExchangeToken('sso-exchange-token');expect(mockEnqueueErrorSnackBar).toHaveBeenCalledWith({message: 'Invalid SSO exchange token',diff --git a/packages/twenty-front/src/modules/auth/hooks/useRedeemSSOExchangeToken.ts b/packages/twenty-front/src/modules/auth/hooks/useRedeemSsoExchangeToken.tssimilarity index 85%rename from packages/twenty-front/src/modules/auth/hooks/useRedeemSSOExchangeToken.tsrename to packages/twenty-front/src/modules/auth/hooks/useRedeemSsoExchangeToken.tsindex 847691d2b28..a4e9e1010ff 100644--- a/packages/twenty-front/src/modules/auth/hooks/useRedeemSSOExchangeToken.ts+++ b/packages/twenty-front/src/modules/auth/hooks/useRedeemSsoExchangeToken.ts@@ -8,24 +8,24 @@ import { useCallback } from 'react';import { isDefined } from 'twenty-shared/utils';import { GetAuthTokensFromSsoExchangeTokenDocument } from '~/generated-metadata/graphql';-export const useRedeemSSOExchangeToken = () => {+export const useRedeemSsoExchangeToken = () => {const { enqueueErrorSnackBar } = useSnackBar();const markSessionActive = useMarkSessionActive();const setIsAppEffectRedirectEnabled = useSetAtomState(isAppEffectRedirectEnabledState,);- const [getAuthTokensFromSSOExchangeToken] = useMutation(+ const [getAuthTokensFromSsoExchangeToken] = useMutation(GetAuthTokensFromSsoExchangeTokenDocument,);- const redeemSSOExchangeToken = useCallback(+ const redeemSsoExchangeToken = useCallback(async (ssoExchangeToken: string) => {// Keeps PageChangeEffect from consuming returnToPath while the server// swaps the session cookiesetIsAppEffectRedirectEnabled(false);try {- const { data } = await getAuthTokensFromSSOExchangeToken({+ const { data } = await getAuthTokensFromSsoExchangeToken({variables: { ssoExchangeToken },});@@ -45,12 +45,12 @@ export const useRedeemSSOExchangeToken = () => {}},[- getAuthTokensFromSSOExchangeToken,+ getAuthTokensFromSsoExchangeToken,markSessionActive,setIsAppEffectRedirectEnabled,enqueueErrorSnackBar,],);- return { redeemSSOExchangeToken };+ return { redeemSsoExchangeToken };};diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWorkspaceScopeForm.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWorkspaceScopeForm.tsxindex b6f6c56836d..9ce761c266c 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWorkspaceScopeForm.tsx+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWorkspaceScopeForm.tsx@@ -2,7 +2,7 @@ import { StyledOnboardingContentContainer } from '@/auth/components/StyledOnboarimport { SignInUpWithCredentials } from '@/auth/sign-in-up/components/internal/SignInUpWithCredentials';import { SignInUpWithGoogle } from '@/auth/sign-in-up/components/internal/SignInUpWithGoogle';import { SignInUpWithMicrosoft } from '@/auth/sign-in-up/components/internal/SignInUpWithMicrosoft';-import { SignInUpWithSSO } from '@/auth/sign-in-up/components/internal/SignInUpWithSSO';+import { SignInUpWithSso } from '@/auth/sign-in-up/components/internal/SignInUpWithSso';import { useHandleResetPassword } from '@/auth/sign-in-up/hooks/useHandleResetPassword';import { useSignInUp } from '@/auth/sign-in-up/hooks/useSignInUp';import { useSignInUpForm } from '@/auth/sign-in-up/hooks/useSignInUpForm';@@ -50,7 +50,7 @@ export const SignInUpWorkspaceScopeForm = () => {<SignInUpWithMicrosoft action="join-workspace" />)}- {providers.sso.length > 0 && <SignInUpWithSSO />}+ {providers.sso.length > 0 && <SignInUpWithSso />}{(providers.google ||providers.microsoft ||diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSSOButtonStyles.ts b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSsoButtonStyles.tssimilarity index 61%rename from packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSSOButtonStyles.tsrename to packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSsoButtonStyles.tsindex d04418b7a5e..41630a41b66 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSSOButtonStyles.ts+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSsoButtonStyles.ts@@ -1,6 +1,6 @@import { styled } from '@linaria/react';-export const StyledSSOButtonContainer = styled.div`+export const StyledSsoButtonContainer = styled.div`position: relative;width: 100%;`;diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSSOExchangeTokenEffect.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSsoExchangeTokenEffect.tsxsimilarity index 70%rename from packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSSOExchangeTokenEffect.tsxrename to packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSsoExchangeTokenEffect.tsxindex 424e8110e4b..06a212fc1cf 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSSOExchangeTokenEffect.tsx+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSsoExchangeTokenEffect.tsx@@ -1,9 +1,9 @@-import { useRedeemSSOExchangeToken } from '@/auth/hooks/useRedeemSSOExchangeToken';+import { useRedeemSsoExchangeToken } from '@/auth/hooks/useRedeemSsoExchangeToken';import { useEffect } from 'react';import { isDefined } from 'twenty-shared/utils';-export const SignInUpSSOExchangeTokenEffect = () => {- const { redeemSSOExchangeToken } = useRedeemSSOExchangeToken();+export const SignInUpSsoExchangeTokenEffect = () => {+ const { redeemSsoExchangeToken } = useRedeemSsoExchangeToken();useEffect(() => {const ssoExchangeToken = new URLSearchParams(@@ -23,8 +23,8 @@ export const SignInUpSSOExchangeTokenEffect = () => {window.location.pathname + window.location.search,);- void redeemSSOExchangeToken(ssoExchangeToken);- }, [redeemSSOExchangeToken]);+ void redeemSsoExchangeToken(ssoExchangeToken);+ }, [redeemSsoExchangeToken]);return <></>;};diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSSOIdentityProviderSelection.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSsoIdentityProviderSelection.tsxsimilarity index 72%rename from packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSSOIdentityProviderSelection.tsxrename to packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSsoIdentityProviderSelection.tsxindex 6d5841cd84e..074e030e9cc 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSSOIdentityProviderSelection.tsx+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSsoIdentityProviderSelection.tsx@@ -1,8 +1,8 @@/* @license Enterprise */import { StyledOnboardingContentContainer } from '@/auth/components/StyledOnboardingContentContainer';-import { useSSO } from '@/auth/sign-in-up/hooks/useSSO';-import { guessSSOIdentityProviderIconByUrl } from '@/settings/security/utils/guessSSOIdentityProviderIconByUrl';+import { useSso } from '@/auth/sign-in-up/hooks/useSso';+import { guessSsoIdentityProviderIconByUrl } from '@/settings/security/utils/guessSsoIdentityProviderIconByUrl';import { workspaceAuthProvidersState } from '@/workspace/states/workspaceAuthProvidersState';import React from 'react';@@ -11,10 +11,10 @@ import { HorizontalSeparator } from 'twenty-ui/layout';import { MainButton } from 'twenty-ui/input';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-export const SignInUpSSOIdentityProviderSelection = () => {+export const SignInUpSsoIdentityProviderSelection = () => {const workspaceAuthProviders = useAtomStateValue(workspaceAuthProvidersState);- const { redirectToSSOLoginPage } = useSSO();+ const { redirectToSsoLoginPage } = useSso();return (<>@@ -24,8 +24,8 @@ export const SignInUpSSOIdentityProviderSelection = () => {<React.Fragment key={idp.id}><MainButtontitle={idp.name}- onClick={() => redirectToSSOLoginPage(idp.id)}- Icon={guessSSOIdentityProviderIconByUrl(idp.issuer)}+ onClick={() => redirectToSsoLoginPage(idp.id)}+ Icon={guessSsoIdentityProviderIconByUrl(idp.issuer)}fullWidth/><HorizontalSeparator visible={false} />diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithCredentials.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithCredentials.tsxindex 1d8d17fdb32..102987de84e 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithCredentials.tsx+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithCredentials.tsx@@ -10,7 +10,7 @@ import {import { LastUsedPill } from '@/auth/sign-in-up/components/internal/LastUsedPill';import { SignInUpEmailField } from '@/auth/sign-in-up/components/internal/SignInUpEmailField';import { SignInUpPasswordField } from '@/auth/sign-in-up/components/internal/SignInUpPasswordField';-import { StyledSSOButtonContainer } from '@/auth/sign-in-up/components/internal/SignInUpSSOButtonStyles';+import { StyledSsoButtonContainer } from '@/auth/sign-in-up/components/internal/SignInUpSsoButtonStyles';import { AuthenticatedMethod } from '@/auth/types/AuthenticatedMethod.enum';import { SignInUpMode } from '@/auth/types/signInUpMode';import { isRequestingCaptchaTokenState } from '@/captcha/states/isRequestingCaptchaTokenState';@@ -160,7 +160,7 @@ export const SignInUpWithCredentials = ({signInUpMode={signInUpMode}/>)}- <StyledSSOButtonContainer>+ <StyledSsoButtonContainer><MainButtontitle={buttonTitle}type="submit"@@ -175,7 +175,7 @@ export const SignInUpWithCredentials = ({{isSignUpBlockedByDDLLock && (<InputHint>{t`Sign-up is temporarily unavailable during maintenance.`}</InputHint>)}- </StyledSSOButtonContainer>+ </StyledSsoButtonContainer></StyledForm>)}</>diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithGoogle.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithGoogle.tsxindex 3cecd3af66b..b21c8c67323 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithGoogle.tsx+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithGoogle.tsx@@ -6,7 +6,7 @@ import {signInUpStepState,} from '@/auth/states/signInUpStepState';import { AuthenticatedMethod } from '@/auth/types/AuthenticatedMethod.enum';-import { type SocialSSOSignInUpActionType } from '@/auth/types/socialSSOSignInUp.type';+import { type SocialSsoSignInUpActionType } from '@/auth/types/socialSsoSignInUp.type';import { useLingui } from '@lingui/react/macro';import { memo, useContext } from 'react';import { IconGoogle } from 'twenty-ui/icon';@@ -15,7 +15,7 @@ import { MainButton } from 'twenty-ui/input';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { LastUsedPill } from './LastUsedPill';-import { StyledSSOButtonContainer } from './SignInUpSSOButtonStyles';+import { StyledSsoButtonContainer } from './SignInUpSsoButtonStyles';import { ThemeContext } from 'twenty-ui/theme-constants';const GoogleIcon = memo(() => {const { theme } = useContext(ThemeContext);@@ -26,7 +26,7 @@ export const SignInUpWithGoogle = ({action,isGlobalScope,}: {- action: SocialSSOSignInUpActionType;+ action: SocialSsoSignInUpActionType;isGlobalScope?: boolean;}) => {const { t } = useLingui();@@ -46,7 +46,7 @@ export const SignInUpWithGoogle = ({return (<>- <StyledSSOButtonContainer>+ <StyledSsoButtonContainer><MainButtonIcon={GoogleIcon}title={t`Continue with Google`}@@ -57,7 +57,7 @@ export const SignInUpWithGoogle = ({{isLastUsed && (isGlobalScope || hasMultipleAuthMethods) && (<LastUsedPill />)}- </StyledSSOButtonContainer>+ </StyledSsoButtonContainer><HorizontalSeparator visible={false} /></>);diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithMicrosoft.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithMicrosoft.tsxindex 50550362593..80ba5316194 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithMicrosoft.tsx+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithMicrosoft.tsx@@ -6,7 +6,7 @@ import {signInUpStepState,} from '@/auth/states/signInUpStepState';import { AuthenticatedMethod } from '@/auth/types/AuthenticatedMethod.enum';-import { type SocialSSOSignInUpActionType } from '@/auth/types/socialSSOSignInUp.type';+import { type SocialSsoSignInUpActionType } from '@/auth/types/socialSsoSignInUp.type';import { useLingui } from '@lingui/react/macro';import { useContext } from 'react';import { IconMicrosoft } from 'twenty-ui/icon';@@ -15,14 +15,14 @@ import { MainButton } from 'twenty-ui/input';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { LastUsedPill } from './LastUsedPill';-import { StyledSSOButtonContainer } from './SignInUpSSOButtonStyles';+import { StyledSsoButtonContainer } from './SignInUpSsoButtonStyles';import { ThemeContext } from 'twenty-ui/theme-constants';export const SignInUpWithMicrosoft = ({action,isGlobalScope,}: {- action: SocialSSOSignInUpActionType;+ action: SocialSsoSignInUpActionType;isGlobalScope?: boolean;}) => {const { theme } = useContext(ThemeContext);@@ -44,7 +44,7 @@ export const SignInUpWithMicrosoft = ({return (<>- <StyledSSOButtonContainer>+ <StyledSsoButtonContainer><MainButtonIcon={() => <IconMicrosoft size={theme.icon.size.md} />}title={t`Continue with Microsoft`}@@ -55,7 +55,7 @@ export const SignInUpWithMicrosoft = ({{isLastUsed && (isGlobalScope || hasMultipleAuthMethods) && (<LastUsedPill />)}- </StyledSSOButtonContainer>+ </StyledSsoButtonContainer><HorizontalSeparator visible={false} /></>);diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithSSO.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithSso.tsxsimilarity index 82%rename from packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithSSO.tsxrename to packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithSso.tsxindex 2def3c9bc6b..76bd69b3121 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithSSO.tsx+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithSso.tsx@@ -1,5 +1,5 @@import { useHasMultipleAuthMethods } from '@/auth/sign-in-up/hooks/useHasMultipleAuthMethods';-import { useSSO } from '@/auth/sign-in-up/hooks/useSSO';+import { useSso } from '@/auth/sign-in-up/hooks/useSso';import { lastAuthenticatedMethodState } from '@/auth/states/lastAuthenticatedMethodState';import {SignInUpStep,@@ -16,11 +16,11 @@ import { IconLock } from 'twenty-ui/icon';import { HorizontalSeparator } from 'twenty-ui/layout';import { MainButton } from 'twenty-ui/input';import { LastUsedPill } from './LastUsedPill';-import { StyledSSOButtonContainer } from './SignInUpSSOButtonStyles';+import { StyledSsoButtonContainer } from './SignInUpSsoButtonStyles';import { useContext } from 'react';import { ThemeContext } from 'twenty-ui/theme-constants';-export const SignInUpWithSSO = () => {+export const SignInUpWithSso = () => {const { theme } = useContext(ThemeContext);const { t } = useLingui();const setSignInUpStep = useSetAtomState(signInUpStepState);@@ -31,34 +31,34 @@ export const SignInUpWithSSO = () => {);const hasMultipleAuthMethods = useHasMultipleAuthMethods();- const { redirectToSSOLoginPage } = useSSO();+ const { redirectToSsoLoginPage } = useSso();- const signInWithSSO = () => {+ const signInWithSso = () => {setLastAuthenticatedMethod(AuthenticatedMethod.SSO);if (isDefined(workspaceAuthProviders) &&workspaceAuthProviders.sso.length === 1) {- return redirectToSSOLoginPage(workspaceAuthProviders.sso[0].id);+ return redirectToSsoLoginPage(workspaceAuthProviders.sso[0].id);}- setSignInUpStep(SignInUpStep.SSOIdentityProviderSelection);+ setSignInUpStep(SignInUpStep.SsoIdentityProviderSelection);};const isLastUsed = lastAuthenticatedMethod === AuthenticatedMethod.SSO;return (<>- <StyledSSOButtonContainer>+ <StyledSsoButtonContainer><MainButtonIcon={() => <IconLock size={theme.icon.size.md} />}title={t`Single sign-on (SSO)`}- onClick={signInWithSSO}+ onClick={signInWithSso}variant={signInUpStep === SignInUpStep.Init ? undefined : 'secondary'}fullWidth/>{isLastUsed && hasMultipleAuthMethods && <LastUsedPill />}- </StyledSSOButtonContainer>+ </StyledSsoButtonContainer><HorizontalSeparator visible={false} /></>);diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWorkspaceScopeFormEffect.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWorkspaceScopeFormEffect.tsxindex 042cdc45330..bb93780bcf6 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWorkspaceScopeFormEffect.tsx+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWorkspaceScopeFormEffect.tsx@@ -46,13 +46,13 @@ export const SignInUpWorkspaceScopeFormEffect = () => {return;}- const hasOnlySSOProvidersEnabled =+ const hasOnlySsoProvidersEnabled =!workspaceAuthProviders.google &&!workspaceAuthProviders.microsoft &&!workspaceAuthProviders.password;- if (hasOnlySSOProvidersEnabled && workspaceAuthProviders.sso.length > 1) {- return setSignInUpStep(SignInUpStep.SSOIdentityProviderSelection);+ if (hasOnlySsoProvidersEnabled && workspaceAuthProviders.sso.length > 1) {+ return setSignInUpStep(SignInUpStep.SsoIdentityProviderSelection);}}, [setSignInUpStep, workspaceAuthProviders]);diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/__tests__/SignInUpSSOExchangeTokenEffect.test.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/__tests__/SignInUpSsoExchangeTokenEffect.test.tsxsimilarity index 70%rename from packages/twenty-front/src/modules/auth/sign-in-up/components/internal/__tests__/SignInUpSSOExchangeTokenEffect.test.tsxrename to packages/twenty-front/src/modules/auth/sign-in-up/components/internal/__tests__/SignInUpSsoExchangeTokenEffect.test.tsxindex 6013512e0c0..7975dc5afb4 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/__tests__/SignInUpSSOExchangeTokenEffect.test.tsx+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/__tests__/SignInUpSsoExchangeTokenEffect.test.tsx@@ -2,13 +2,13 @@ import { render, screen, waitFor } from '@testing-library/react';import { StrictMode } from 'react';import { BrowserRouter, useSearchParams } from 'react-router-dom';-import { SignInUpSSOExchangeTokenEffect } from '@/auth/sign-in-up/components/internal/SignInUpSSOExchangeTokenEffect';+import { SignInUpSsoExchangeTokenEffect } from '@/auth/sign-in-up/components/internal/SignInUpSsoExchangeTokenEffect';-const redeemSSOExchangeTokenMock = jest.fn();+const redeemSsoExchangeTokenMock = jest.fn();-jest.mock('@/auth/hooks/useRedeemSSOExchangeToken', () => ({- useRedeemSSOExchangeToken: () => ({- redeemSSOExchangeToken: redeemSSOExchangeTokenMock,+jest.mock('@/auth/hooks/useRedeemSsoExchangeToken', () => ({+ useRedeemSsoExchangeToken: () => ({+ redeemSsoExchangeToken: redeemSsoExchangeTokenMock,}),}));@@ -26,7 +26,7 @@ const renderEffect = (initialUrl: string) => {return render(<StrictMode><BrowserRouter>- <SignInUpSSOExchangeTokenEffect />+ <SignInUpSsoExchangeTokenEffect /><SearchParamsProbe /></BrowserRouter></StrictMode>,@@ -35,7 +35,7 @@ const renderEffect = (initialUrl: string) => {const getSearchParams = () => screen.getByTestId('search-params').textContent;-describe('SignInUpSSOExchangeTokenEffect', () => {+describe('SignInUpSsoExchangeTokenEffect', () => {beforeEach(() => {jest.clearAllMocks();window.history.replaceState(null, '', '/');@@ -45,11 +45,11 @@ describe('SignInUpSSOExchangeTokenEffect', () => {renderEffect('/sign-in-up#ssoExchangeToken=sso-exchange-token');await waitFor(() => {- expect(redeemSSOExchangeTokenMock).toHaveBeenCalledWith(+ expect(redeemSsoExchangeTokenMock).toHaveBeenCalledWith('sso-exchange-token',);});- expect(redeemSSOExchangeTokenMock).toHaveBeenCalledTimes(1);+ expect(redeemSsoExchangeTokenMock).toHaveBeenCalledTimes(1);});it('strips the token from the url while keeping returnToPath', async () => {@@ -61,13 +61,13 @@ describe('SignInUpSSOExchangeTokenEffect', () => {expect(window.location.hash).toBe('');});expect(getSearchParams()).toBe('returnToPath=%2Fsettings%2Fprofile');- expect(redeemSSOExchangeTokenMock).toHaveBeenCalledTimes(1);+ expect(redeemSsoExchangeTokenMock).toHaveBeenCalledTimes(1);});it('does nothing when the url carries no token', () => {renderEffect('/sign-in-up');- expect(redeemSSOExchangeTokenMock).not.toHaveBeenCalled();+ expect(redeemSsoExchangeTokenMock).not.toHaveBeenCalled();expect(getSearchParams()).toBe('');});});diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSSO.test.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSso.test.tsxsimilarity index 87%rename from packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSSO.test.tsxrename to packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSso.test.tsxindex da14325736c..44207b4007c 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSSO.test.tsx+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSso.test.tsx@@ -1,5 +1,5 @@import { GET_AUTHORIZATION_URL_FOR_SSO } from '@/auth/graphql/mutations/getAuthorizationUrlForSSO';-import { useSSO } from '@/auth/sign-in-up/hooks/useSSO';+import { useSso } from '@/auth/sign-in-up/hooks/useSso';import { useRedirect } from '@/domain-manager/hooks/useRedirect';import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';import { CombinedGraphQLErrors } from '@apollo/client/errors';@@ -59,29 +59,29 @@ const Wrapper = ({ children }: { children: React.ReactNode }) => (</MemoryRouter>);-describe('useSSO', () => {+describe('useSso', () => {beforeEach(() => {jest.clearAllMocks();});it('should call getAuthorizationUrlForSSO with correct parameters', async () => {- const { result } = renderHook(() => useSSO(), {+ const { result } = renderHook(() => useSso(), {wrapper: Wrapper,});const identityProviderId = 'success-id';- await result.current.redirectToSSOLoginPage(identityProviderId);+ await result.current.redirectToSsoLoginPage(identityProviderId);expect(mockRedirect).toHaveBeenCalledWith('http://example.com');});it('should enqueue error snackbar when URL retrieval fails', async () => {- const { result } = renderHook(() => useSSO(), {+ const { result } = renderHook(() => useSso(), {wrapper: Wrapper,});const identityProviderId = 'error-id';- await result.current.redirectToSSOLoginPage(identityProviderId);+ await result.current.redirectToSsoLoginPage(identityProviderId);expect(mockEnqueueErrorSnackBar).toHaveBeenCalledWith({apolloError: new CombinedGraphQLErrors({diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInWithGoogle.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInWithGoogle.tsindex a8ad23af787..9e769e4865d 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInWithGoogle.ts+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInWithGoogle.ts@@ -2,7 +2,7 @@ import { useParams, useSearchParams } from 'react-router-dom';import { useAuth } from '@/auth/hooks/useAuth';import { type BillingCheckoutSession } from '@/auth/types/billingCheckoutSession.type';-import { type SocialSSOSignInUpActionType } from '@/auth/types/socialSSOSignInUp.type';+import { type SocialSsoSignInUpActionType } from '@/auth/types/socialSsoSignInUp.type';import {BillingPlanKey,SubscriptionInterval,@@ -22,7 +22,7 @@ export const useSignInWithGoogle = () => {const { signInWithGoogle } = useAuth();return {- signInWithGoogle: ({ action }: { action: SocialSSOSignInUpActionType }) =>+ signInWithGoogle: ({ action }: { action: SocialSsoSignInUpActionType }) =>signInWithGoogle({workspaceInviteHash,workspacePersonalInviteToken,diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInWithMicrosoft.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInWithMicrosoft.tsindex dfd1a9d5f05..f501a66e0df 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInWithMicrosoft.ts+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInWithMicrosoft.ts@@ -2,7 +2,7 @@ import { useParams, useSearchParams } from 'react-router-dom';import { useAuth } from '@/auth/hooks/useAuth';import { billingCheckoutSessionState } from '@/auth/states/billingCheckoutSessionState';-import { type SocialSSOSignInUpActionType } from '@/auth/types/socialSSOSignInUp.type';+import { type SocialSsoSignInUpActionType } from '@/auth/types/socialSsoSignInUp.type';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';export const useSignInWithMicrosoft = () => {@@ -17,7 +17,7 @@ export const useSignInWithMicrosoft = () => {signInWithMicrosoft: ({action,}: {- action: SocialSSOSignInUpActionType;+ action: SocialSsoSignInUpActionType;}) =>signInWithMicrosoft({workspaceInviteHash,diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSSO.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSso.tssimilarity index 80%rename from packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSSO.tsrename to packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSso.tsindex bcf4ca030d4..baf3b5dfaa1 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSSO.ts+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSso.ts@@ -7,16 +7,16 @@ import { CombinedGraphQLErrors } from '@apollo/client/errors';import { useParams } from 'react-router-dom';import { GetAuthorizationUrlForSsoDocument } from '~/generated-metadata/graphql';-export const useSSO = () => {+export const useSso = () => {const apolloClient = useApolloClient();const workspaceInviteHash = useParams().workspaceInviteHash;const { enqueueErrorSnackBar } = useSnackBar();const { redirect } = useRedirect();- const redirectToSSOLoginPage = async (identityProviderId: string) => {- let authorizationUrlForSSOResult;+ const redirectToSsoLoginPage = async (identityProviderId: string) => {+ let authorizationUrlForSsoResult;try {- authorizationUrlForSSOResult = await apolloClient.mutate({+ authorizationUrlForSsoResult = await apolloClient.mutate({mutation: GetAuthorizationUrlForSsoDocument,variables: {input: {@@ -34,7 +34,7 @@ export const useSSO = () => {}const authorizationURL =- authorizationUrlForSSOResult.data?.getAuthorizationUrlForSSO+ authorizationUrlForSsoResult.data?.getAuthorizationUrlForSSO?.authorizationURL;if (authorizationURL) {@@ -43,6 +43,6 @@ export const useSSO = () => {};return {- redirectToSSOLoginPage,+ redirectToSsoLoginPage,};};diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useWorkspaceBypass.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useWorkspaceBypass.tsindex 5b05bca5f57..48043129e80 100644--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useWorkspaceBypass.ts+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useWorkspaceBypass.ts@@ -16,7 +16,7 @@ export const useWorkspaceBypass = () => {const { isOnAWorkspace } = useIsCurrentLocationOnAWorkspace();- const hasOnlySSOProvidersEnabled = (() => {+ const hasOnlySsoProvidersEnabled = (() => {if (!workspaceAuthProviders) {return false;}@@ -37,7 +37,7 @@ export const useWorkspaceBypass = () => {})();const shouldOfferBypass =- isOnAWorkspace && hasOnlySSOProvidersEnabled && hasBypassProvidersAvailable;+ isOnAWorkspace && hasOnlySsoProvidersEnabled && hasBypassProvidersAvailable;const shouldUseBypass = shouldOfferBypass ? workspaceBypassMode : false;diff --git a/packages/twenty-front/src/modules/auth/states/signInUpStepState.ts b/packages/twenty-front/src/modules/auth/states/signInUpStepState.tsindex bca7a4ddefc..b1f91b07631 100644--- a/packages/twenty-front/src/modules/auth/states/signInUpStepState.ts+++ b/packages/twenty-front/src/modules/auth/states/signInUpStepState.ts@@ -6,7 +6,7 @@ export enum SignInUpStep {EmailVerification = 'emailVerification',WorkspaceSelection = 'workspaceSelection',WorkspaceCreation = 'workspaceCreation',- SSOIdentityProviderSelection = 'SSOIdentityProviderSelection',+ SsoIdentityProviderSelection = 'SSOIdentityProviderSelection',TwoFactorAuthenticationVerification = 'TwoFactorAuthenticationVerification',TwoFactorAuthenticationProvision = 'TwoFactorAuthenticationProvision',}diff --git a/packages/twenty-front/src/modules/auth/types/socialSSOSignInUp.type.ts b/packages/twenty-front/src/modules/auth/types/socialSsoSignInUp.type.tssimilarity index 65%rename from packages/twenty-front/src/modules/auth/types/socialSSOSignInUp.type.tsrename to packages/twenty-front/src/modules/auth/types/socialSsoSignInUp.type.tsindex d23bfda1f37..b25eccb9a61 100644--- a/packages/twenty-front/src/modules/auth/types/socialSSOSignInUp.type.ts+++ b/packages/twenty-front/src/modules/auth/types/socialSsoSignInUp.type.ts@@ -1,4 +1,4 @@-export type SocialSSOSignInUpActionType =+export type SocialSsoSignInUpActionType =| 'create-new-workspace'| 'list-available-workspaces'| 'join-workspace';diff --git a/packages/twenty-front/src/modules/object-record/record-group/hooks/useAddRecordGroup.ts b/packages/twenty-front/src/modules/object-record/record-group/hooks/useAddRecordGroup.tsindex 693eb7ce819..caaf80cdbb2 100644--- a/packages/twenty-front/src/modules/object-record/record-group/hooks/useAddRecordGroup.ts+++ b/packages/twenty-front/src/modules/object-record/record-group/hooks/useAddRecordGroup.ts@@ -2,7 +2,7 @@ import { useContextStoreObjectMetadataItemOrThrow } from '@/context-store/hooks/import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState';import { useSetRecordGroups } from '@/object-record/record-group/hooks/useSetRecordGroups';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';-import { usePerformViewGroupAPIPersist } from '@/views/hooks/internal/usePerformViewGroupAPIPersist';+import { usePerformViewGroupApiPersist } from '@/views/hooks/internal/usePerformViewGroupApiPersist';import { useCanPersistViewChanges } from '@/views/hooks/useCanPersistViewChanges';import { useGetViewFromState } from '@/views/hooks/useGetViewFromState';import { type ViewGroup } from '@/views/types/ViewGroup';@@ -13,7 +13,7 @@ import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';export const useAddRecordGroup = () => {const { canPersistChanges } = useCanPersistViewChanges();- const { performViewGroupAPICreate } = usePerformViewGroupAPIPersist();+ const { performViewGroupApiCreate } = usePerformViewGroupApiPersist();const { getViewFromState } = useGetViewFromState();const { objectMetadataItem } = useContextStoreObjectMetadataItemOrThrow();const { setRecordGroupsFromViewGroups } = useSetRecordGroups();@@ -64,7 +64,7 @@ export const useAddRecordGroup = () => {position: maxPosition + 1,};- const result = await performViewGroupAPICreate({+ const result = await performViewGroupApiCreate({inputs: [{id: newViewGroup.id,diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleRecordGroupField.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleRecordGroupField.tsindex a9ff3944c0b..d7b380ddef9 100644--- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleRecordGroupField.ts+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleRecordGroupField.ts@@ -4,7 +4,7 @@ import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataIteimport { isManyToOneRelationField } from '@/object-metadata/utils/isManyToOneRelationField';import { useLoadRecordIndexStates } from '@/object-record/record-index/hooks/useLoadRecordIndexStates';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';-import { usePerformViewAPIUpdate } from '@/views/hooks/internal/usePerformViewAPIUpdate';+import { usePerformViewApiUpdate } from '@/views/hooks/internal/usePerformViewApiUpdate';import { useGetViewFromState } from '@/views/hooks/useGetViewFromState';import { useStore } from 'jotai';import { useCallback } from 'react';@@ -20,7 +20,7 @@ export const useHandleRecordGroupField = () => {const { getViewFromState } = useGetViewFromState();- const { performViewAPIUpdate } = usePerformViewAPIUpdate();+ const { performViewApiUpdate } = usePerformViewApiUpdate();const { loadRecordIndexStates } = useLoadRecordIndexStates();const store = useStore();@@ -33,7 +33,7 @@ export const useHandleRecordGroupField = () => {viewId: string;mainGroupByFieldMetadataId: string | null;}) => {- const updatedViewResult = await performViewAPIUpdate({+ const updatedViewResult = await performViewApiUpdate({id: viewId,input: {mainGroupByFieldMetadataId,@@ -52,7 +52,7 @@ export const useHandleRecordGroupField = () => {loadRecordIndexStates(updatedView, objectMetadataItem);},- [performViewAPIUpdate, loadRecordIndexStates, objectMetadataItem],+ [performViewApiUpdate, loadRecordIndexStates, objectMetadataItem],);const handleRecordGroupFieldChange = useCallback(diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useViewFieldAggregateOperation.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useViewFieldAggregateOperation.tsxindex 0740353e862..3276d930543 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useViewFieldAggregateOperation.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useViewFieldAggregateOperation.tsx@@ -9,7 +9,7 @@ import { recordTableWidgetViewDraftComponentState } from '@/page-layout/states/rimport { constructViewFromRecordTableWidgetViewSnapshot } from '@/page-layout/widgets/record-table/utils/constructViewFromRecordTableWidgetViewSnapshot';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';-import { usePerformViewFieldAPIPersist } from '@/views/hooks/internal/usePerformViewFieldAPIPersist';+import { usePerformViewFieldApiPersist } from '@/views/hooks/internal/usePerformViewFieldApiPersist';import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';import { useContext } from 'react';import { isDefined } from 'twenty-shared/utils';@@ -44,7 +44,7 @@ export const useViewFieldAggregateOperation = () => {(viewField) => viewField.fieldMetadataId === fieldMetadataId,);- const { performViewFieldAPIUpdate } = usePerformViewFieldAPIPersist();+ const { performViewFieldApiUpdate } = usePerformViewFieldApiPersist();const updateViewFieldAggregateOperation = async (aggregateOperation: ExtendedAggregateOperations | null,@@ -74,7 +74,7 @@ export const useViewFieldAggregateOperation = () => {return;}- await performViewFieldAPIUpdate([+ await performViewFieldApiUpdate([{input: {id: currentViewField.id,diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useCreatePendingFieldsWidgetViews.ts b/packages/twenty-front/src/modules/page-layout/hooks/useCreatePendingFieldsWidgetViews.tsindex d5e44dd032d..ef2f3fbe7d7 100644--- a/packages/twenty-front/src/modules/page-layout/hooks/useCreatePendingFieldsWidgetViews.ts+++ b/packages/twenty-front/src/modules/page-layout/hooks/useCreatePendingFieldsWidgetViews.ts@@ -2,14 +2,14 @@ import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetaimport { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';import { pageLayoutPersistedComponentState } from '@/page-layout/states/pageLayoutPersistedComponentState';import { getWidgetConfigurationViewId } from '@/page-layout/utils/getWidgetConfigurationViewId';-import { usePerformViewAPIPersist } from '@/views/hooks/internal/usePerformViewAPIPersist';+import { usePerformViewApiPersist } from '@/views/hooks/internal/usePerformViewApiPersist';import { useStore } from 'jotai';import { useCallback } from 'react';import { isDefined } from 'twenty-shared/utils';import { ViewType, WidgetType } from '~/generated-metadata/graphql';export const useCreatePendingFieldsWidgetViews = () => {- const { performViewAPICreate } = usePerformViewAPIPersist();+ const { performViewApiCreate } = usePerformViewApiPersist();const store = useStore();const createPendingFieldsWidgetViews = useCallback(@@ -66,7 +66,7 @@ export const useCreatePendingFieldsWidgetViews = () => {? `${objectMetadataItem.labelSingular} Fields`: 'Fields';- const result = await performViewAPICreate(+ const result = await performViewApiCreate({input: {id: viewId,@@ -86,7 +86,7 @@ export const useCreatePendingFieldsWidgetViews = () => {}}},- [performViewAPICreate, store],+ [performViewApiCreate, store],);return { createPendingFieldsWidgetViews };diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useCreatePendingRecordTableWidgetViews.ts b/packages/twenty-front/src/modules/page-layout/hooks/useCreatePendingRecordTableWidgetViews.tsindex f3668a16602..35d97b52c6a 100644--- a/packages/twenty-front/src/modules/page-layout/hooks/useCreatePendingRecordTableWidgetViews.ts+++ b/packages/twenty-front/src/modules/page-layout/hooks/useCreatePendingRecordTableWidgetViews.ts@@ -3,15 +3,15 @@ import { pageLayoutPersistedComponentState } from '@/page-layout/states/pageLayoimport { recordTableWidgetViewDraftComponentState } from '@/page-layout/states/recordTableWidgetViewDraftComponentState';import { getWidgetConfigurationViewId } from '@/page-layout/utils/getWidgetConfigurationViewId';import { widgetUsesRecordTableView } from '@/page-layout/utils/widgetUsesRecordTableView';-import { usePerformViewAPIPersist } from '@/views/hooks/internal/usePerformViewAPIPersist';+import { usePerformViewApiPersist } from '@/views/hooks/internal/usePerformViewApiPersist';import { viewsSelector } from '@/views/states/selectors/viewsSelector';import { useStore } from 'jotai';import { useCallback } from 'react';import { isDefined } from 'twenty-shared/utils';export const useCreatePendingRecordTableWidgetViews = () => {- const { performViewAPICreate, performViewAPIDestroy } =- usePerformViewAPIPersist();+ const { performViewApiCreate, performViewApiDestroy } =+ usePerformViewApiPersist();const store = useStore();const createPendingRecordTableWidgetViews = useCallback(@@ -72,7 +72,7 @@ export const useCreatePendingRecordTableWidgetViews = () => {isDefined(persistedViewId) &&existingViewIds.has(persistedViewId)) {- await performViewAPIDestroy({ id: persistedViewId });+ await performViewApiDestroy({ id: persistedViewId });}const widgetViewDraft = recordTableWidgetViewDraft[widget.id];@@ -83,7 +83,7 @@ export const useCreatePendingRecordTableWidgetViews = () => {const { view } = widgetViewDraft;- const result = await performViewAPICreate(+ const result = await performViewApiCreate({input: {id: view.id,@@ -125,11 +125,11 @@ export const useCreatePendingRecordTableWidgetViews = () => {isDefined(viewId) &&existingViewIds.has(viewId)) {- await performViewAPIDestroy({ id: viewId });+ await performViewApiDestroy({ id: viewId });}}},- [performViewAPICreate, performViewAPIDestroy, store],+ [performViewApiCreate, performViewApiDestroy, store],);return { createPendingRecordTableWidgetViews };diff --git a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentitiesProvidersListCardWrapper.tsx b/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentitiesProvidersListCardWrapper.tsxdeleted file mode 100644index bc14275d200..00000000000--- a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentitiesProvidersListCardWrapper.tsx+++ /dev/null@@ -1,34 +0,0 @@-/* @license Enterprise */--import { t } from '@lingui/core/macro';-import { SettingsListCard } from '@/settings/components/SettingsListCard';-import { SettingsSSOIdentityProviderRowRightContainer } from '@/settings/security/components/SSO/SettingsSSOIdentityProviderRowRightContainer';-import { SSOIdentitiesProvidersState } from '@/settings/security/states/SSOIdentitiesProvidersState';-import { guessSSOIdentityProviderIconByUrl } from '@/settings/security/utils/guessSSOIdentityProviderIconByUrl';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { SettingsPath } from 'twenty-shared/types';-import { useNavigateSettings } from '~/hooks/useNavigateSettings';--export const SettingsSSOIdentitiesProvidersListCardWrapper = () => {- const navigate = useNavigateSettings();-- const SSOIdentitiesProviders = useAtomStateValue(SSOIdentitiesProvidersState);-- return (- <SettingsListCard- items={SSOIdentitiesProviders}- getItemLabel={(SSOIdentityProvider) =>- `${SSOIdentityProvider.name} - ${SSOIdentityProvider.type}`- }- RowIconFn={(SSOIdentityProvider) =>- guessSSOIdentityProviderIconByUrl(SSOIdentityProvider.issuer)- }- RowRightComponent={({ item: SSOIdp }) => (- <SettingsSSOIdentityProviderRowRightContainer SSOIdp={SSOIdp} />- )}- hasFooter- footerButtonLabel={t`Add SSO Identity Provider`}- onFooterButtonClick={() => navigate(SettingsPath.NewSSOIdentityProvider)}- />- );-};diff --git a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentityProviderRowRightContainer.tsx b/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentityProviderRowRightContainer.tsxdeleted file mode 100644index 927e413ee88..00000000000--- a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentityProviderRowRightContainer.tsx+++ /dev/null@@ -1,31 +0,0 @@-/* @license Enterprise */--import { SettingsSecuritySSORowDropdownMenu } from '@/settings/security/components/SSO/SettingsSecuritySSORowDropdownMenu';-import { type SSOIdentityProvider } from '@/settings/security/types/SSOIdentityProvider';-import { getColorBySSOIdentityProviderStatus } from '@/settings/security/utils/getColorBySSOIdentityProviderStatus';-import { styled } from '@linaria/react';-import { Status } from 'twenty-ui/data-display';-import { themeCssVariables } from 'twenty-ui/theme-constants';--const StyledRowRightContainer = styled.div`- align-items: center;- display: flex;- gap: ${themeCssVariables.spacing[1]};-`;--export const SettingsSSOIdentityProviderRowRightContainer = ({- SSOIdp,-}: {- SSOIdp: Omit<SSOIdentityProvider, '__typename'>;-}) => {- return (- <StyledRowRightContainer>- <Status- color={getColorBySSOIdentityProviderStatus[SSOIdp.status]}- text={SSOIdp.status}- weight="medium"- />- <SettingsSecuritySSORowDropdownMenu SSOIdp={SSOIdp} />- </StyledRowRightContainer>- );-};diff --git a/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityAuthProvidersOptionsList.tsx b/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityAuthProvidersOptionsList.tsxindex 5bc0a259df7..b86c68eaed5 100644--- a/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityAuthProvidersOptionsList.tsx+++ b/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityAuthProvidersOptionsList.tsx@@ -4,7 +4,7 @@ import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkimport { useReadDefaultDomainFromConfiguration } from '@/domain-manager/hooks/useReadDefaultDomainFromConfiguration';import { SettingsOptionCardContentSelect } from '@/settings/components/SettingsOptions/SettingsOptionCardContentSelect';import { SettingsOptionCardContentToggle } from '@/settings/components/SettingsOptions/SettingsOptionCardContentToggle';-import { SSOIdentitiesProvidersState } from '@/settings/security/states/SSOIdentitiesProvidersState';+import { ssoIdentitiesProvidersState } from '@/settings/security/states/ssoIdentitiesProvidersState';import { Select } from '@/ui/input/components/Select';import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';import { CombinedGraphQLErrors } from '@apollo/client/errors';@@ -42,7 +42,7 @@ export const SettingsSecurityAuthProvidersOptionsList = () => {const { t } = useLingui();const { enqueueErrorSnackBar } = useSnackBar();- const SSOIdentitiesProviders = useAtomStateValue(SSOIdentitiesProvidersState);+ const ssoIdentitiesProviders = useAtomStateValue(ssoIdentitiesProvidersState);const authProviders = useAtomStateValue(authProvidersState);const isMultiWorkspaceEnabled = useAtomStateValue(isMultiWorkspaceEnabledState,@@ -79,7 +79,7 @@ export const SettingsSecurityAuthProvidersOptionsList = () => {currentWorkspace.isGoogleAuthEnabled,currentWorkspace.isMicrosoftAuthEnabled,currentWorkspace.isPasswordAuthEnabled,- (SSOIdentitiesProviders?.length ?? 0) > 0,+ (ssoIdentitiesProviders?.length ?? 0) > 0,];if (diff --git a/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsx b/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsxindex 299016e01ef..da03f73b350 100644--- a/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsx+++ b/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsx@@ -14,11 +14,11 @@ import { SettingsOptionCardContentToggle } from '@/settings/components/SettingsOimport { SettingsRoleDefaultRole } from '@/settings/roles/components/SettingsRolesDefaultRole';import { SettingsRolesQueryEffect } from '@/settings/roles/components/SettingsRolesQueryEffect';import { useSettingsAllRoles } from '@/settings/roles/hooks/useSettingsAllRoles';-import { SettingsSSOIdentitiesProvidersListCard } from '@/settings/security/components/SSO/SettingsSSOIdentitiesProvidersListCard';+import { SettingsSsoIdentitiesProvidersListCard } from '@/settings/security/components/sso/SettingsSsoIdentitiesProvidersListCard';import { SettingsSecurityAuthBypassOptionsList } from '@/settings/security/components/SettingsSecurityAuthBypassOptionsList';import { SettingsSecurityAuthProvidersOptionsList } from '@/settings/security/components/SettingsSecurityAuthProvidersOptionsList';import { SettingsSecurityEditableProfileFields } from '@/settings/security/components/SettingsSecurityEditableProfileFields';-import { SSOIdentitiesProvidersState } from '@/settings/security/states/SSOIdentitiesProvidersState';+import { ssoIdentitiesProvidersState } from '@/settings/security/states/ssoIdentitiesProvidersState';import { ToggleImpersonate } from '@/settings/workspace/components/ToggleImpersonate';import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';@@ -62,7 +62,7 @@ export const SettingsSecuritySettings = () => {);const isClickHouseConfigured = useAtomStateValue(isClickHouseConfiguredState);const authProviders = useAtomStateValue(authProvidersState);- const SSOIdentitiesProviders = useAtomStateValue(SSOIdentitiesProvidersState);+ const ssoIdentitiesProviders = useAtomStateValue(ssoIdentitiesProvidersState);const [currentWorkspace, setCurrentWorkspace] = useAtomState(currentWorkspaceState,);@@ -163,7 +163,7 @@ export const SettingsSecuritySettings = () => {const roles = useSettingsAllRoles();- const hasSsoIdentityProviders = SSOIdentitiesProviders.length > 0;+ const hasSsoIdentityProviders = ssoIdentitiesProviders.length > 0;const hasDirectAuthEnabled =currentWorkspace?.isGoogleAuthEnabled ||currentWorkspace?.isMicrosoftAuthEnabled ||@@ -192,7 +192,7 @@ export const SettingsSecuritySettings = () => {description={t`Configure an SSO connection`}adornment={<OrganizationAdornment />}/>- <SettingsSSOIdentitiesProvidersListCard />+ <SettingsSsoIdentitiesProvidersListCard /></Section></StyledSectionContainer>diff --git a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSecuritySSORowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSecuritySsoRowDropdownMenu.tsxsimilarity index 68%rename from packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSecuritySSORowDropdownMenu.tsxrename to packages/twenty-front/src/modules/settings/security/components/sso/SettingsSecuritySsoRowDropdownMenu.tsxindex 048464ab475..b46f25b0d02 100644--- a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSecuritySSORowDropdownMenu.tsx+++ b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSecuritySsoRowDropdownMenu.tsx@@ -1,6 +1,6 @@-import { useDeleteSSOIdentityProvider } from '@/settings/security/hooks/useDeleteSSOIdentityProvider';-import { useUpdateSSOIdentityProvider } from '@/settings/security/hooks/useUpdateSSOIdentityProvider';-import { type SSOIdentityProvider } from '@/settings/security/types/SSOIdentityProvider';+import { useDeleteSsoIdentityProvider } from '@/settings/security/hooks/useDeleteSsoIdentityProvider';+import { useUpdateSsoIdentityProvider } from '@/settings/security/hooks/useUpdateSsoIdentityProvider';+import { type SsoIdentityProvider } from '@/settings/security/types/SsoIdentityProvider';import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';@@ -13,28 +13,28 @@ import { LightIconButton } from 'twenty-ui/input';import { MenuItem } from 'twenty-ui/navigation';import { SsoIdentityProviderStatus } from '~/generated-metadata/graphql';-type SettingsSecuritySSORowDropdownMenuProps = {- SSOIdp: Omit<SSOIdentityProvider, '__typename'>;+type SettingsSecuritySsoRowDropdownMenuProps = {+ ssoIdp: Omit<SsoIdentityProvider, '__typename'>;};-export const SettingsSecuritySSORowDropdownMenu = ({- SSOIdp,-}: SettingsSecuritySSORowDropdownMenuProps) => {- const dropdownId = `settings-account-row-${SSOIdp.id}`;+export const SettingsSecuritySsoRowDropdownMenu = ({+ ssoIdp,+}: SettingsSecuritySsoRowDropdownMenuProps) => {+ const dropdownId = `settings-account-row-${ssoIdp.id}`;const { enqueueErrorSnackBar } = useSnackBar();const { closeDropdown } = useCloseDropdown();- const { deleteSSOIdentityProvider } = useDeleteSSOIdentityProvider();- const { updateSSOIdentityProvider } = useUpdateSSOIdentityProvider();+ const { deleteSsoIdentityProvider } = useDeleteSsoIdentityProvider();+ const { updateSsoIdentityProvider } = useUpdateSsoIdentityProvider();const { t } = useLingui();- const handleDeleteSSOIdentityProvider = async (+ const handleDeleteSsoIdentityProvider = async (identityProviderId: string,) => {- const result = await deleteSSOIdentityProvider({+ const result = await deleteSsoIdentityProvider({identityProviderId,});if (isDefined(result.error)) {@@ -47,13 +47,13 @@ export const SettingsSecuritySSORowDropdownMenu = ({}};- const toggleSSOIdentityProviderStatus = async (+ const toggleSsoIdentityProviderStatus = async (identityProviderId: string,) => {- const result = await updateSSOIdentityProvider({+ const result = await updateSsoIdentityProvider({id: identityProviderId,status:- SSOIdp.status === 'Active'+ ssoIdp.status === 'Active'? SsoIdentityProviderStatus.Inactive: SsoIdentityProviderStatus.Active,});@@ -84,9 +84,9 @@ export const SettingsSecuritySSORowDropdownMenu = ({<MenuItemaccent="default"LeftIcon={IconArchive}- text={SSOIdp.status === 'Active' ? t`Deactivate` : t`Activate`}+ text={ssoIdp.status === 'Active' ? t`Deactivate` : t`Activate`}onClick={() => {- toggleSSOIdentityProviderStatus(SSOIdp.id);+ toggleSsoIdentityProviderStatus(ssoIdp.id);closeDropdown(dropdownId);}}/>@@ -95,7 +95,7 @@ export const SettingsSecuritySSORowDropdownMenu = ({LeftIcon={IconTrash}text={t`Delete`}onClick={() => {- handleDeleteSSOIdentityProvider(SSOIdp.id);+ handleDeleteSsoIdentityProvider(ssoIdp.id);closeDropdown(dropdownId);}}/>diff --git a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentitiesProvidersForm.tsx b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoIdentitiesProvidersForm.tsxsimilarity index 86%rename from packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentitiesProvidersForm.tsxrename to packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoIdentitiesProvidersForm.tsxindex ba96cdc12cc..23d1bda1475 100644--- a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentitiesProvidersForm.tsx+++ b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoIdentitiesProvidersForm.tsx@@ -2,9 +2,9 @@import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';import { SettingsRadioCardContainer } from '@/settings/components/SettingsRadioCardContainer';-import { SettingsSSOOIDCForm } from '@/settings/security/components/SSO/SettingsSSOOIDCForm';-import { SettingsSSOSAMLForm } from '@/settings/security/components/SSO/SettingsSSOSAMLForm';-import { type SettingSecurityNewSSOIdentityFormValues } from '@/settings/security/types/SSOIdentityProvider';+import { SettingsSsoOidcForm } from '@/settings/security/components/sso/SettingsSsoOidcForm';+import { SettingsSsoSamlForm } from '@/settings/security/components/sso/SettingsSsoSamlForm';+import { type SettingSecurityNewSsoIdentityFormValues } from '@/settings/security/types/SsoIdentityProvider';import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';@@ -27,9 +27,9 @@ const StyledInputsContainer = styled.div`}`;-export const SettingsSSOIdentitiesProvidersForm = () => {+export const SettingsSsoIdentitiesProvidersForm = () => {const { control, watch } =- useFormContext<SettingSecurityNewSSOIdentityFormValues>();+ useFormContext<SettingSecurityNewSsoIdentityFormValues>();const IdentitiesProvidersMap: Record<IdentityProviderType,@@ -50,7 +50,7 @@ export const SettingsSSOIdentitiesProvidersForm = () => {value: 'OIDC',description: '',},- form: <SettingsSSOOIDCForm />,+ form: <SettingsSsoOidcForm />,},SAML: {option: {@@ -59,7 +59,7 @@ export const SettingsSSOIdentitiesProvidersForm = () => {value: 'SAML',description: '',},- form: <SettingsSSOSAMLForm />,+ form: <SettingsSsoSamlForm />,},};@@ -128,4 +128,4 @@ export const SettingsSSOIdentitiesProvidersForm = () => {);};-export default SettingsSSOIdentitiesProvidersForm;+export default SettingsSsoIdentitiesProvidersForm;diff --git a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentitiesProvidersListCard.tsx b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoIdentitiesProvidersListCard.tsxsimilarity index 73%rename from packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentitiesProvidersListCard.tsxrename to packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoIdentitiesProvidersListCard.tsxindex 5aad8f19b68..e8e4b05be07 100644--- a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOIdentitiesProvidersListCard.tsx+++ b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoIdentitiesProvidersListCard.tsx@@ -7,8 +7,8 @@ import { SettingsPath } from 'twenty-shared/types';import { useSnackBarOnQueryError } from '@/apollo/hooks/useSnackBarOnQueryError';import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';import { SettingsCard } from '@/settings/components/SettingsCard';-import { SettingsSSOIdentitiesProvidersListCardWrapper } from '@/settings/security/components/SSO/SettingsSSOIdentitiesProvidersListCardWrapper';-import { SSOIdentitiesProvidersState } from '@/settings/security/states/SSOIdentitiesProvidersState';+import { SettingsSsoIdentitiesProvidersListCardWrapper } from '@/settings/security/components/sso/SettingsSsoIdentitiesProvidersListCardWrapper';+import { ssoIdentitiesProvidersState } from '@/settings/security/states/ssoIdentitiesProvidersState';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useQuery } from '@apollo/client/react';@@ -27,13 +27,13 @@ const StyledLinkContainer = styled.div<{ isDisabled: boolean }>`}`;-export const SettingsSSOIdentitiesProvidersListCard = () => {+export const SettingsSsoIdentitiesProvidersListCard = () => {const currentWorkspace = useAtomStateValue(currentWorkspaceState);const { t } = useLingui();- const [SSOIdentitiesProviders, setSSOIdentitiesProviders] = useAtomState(- SSOIdentitiesProvidersState,+ const [ssoIdentitiesProviders, setSsoIdentitiesProviders] = useAtomState(+ ssoIdentitiesProvidersState,);const {@@ -47,17 +47,17 @@ export const SettingsSSOIdentitiesProvidersListCard = () => {useEffect(() => {if (ssoData) {- setSSOIdentitiesProviders(ssoData?.getSSOIdentityProviders ?? []);+ setSsoIdentitiesProviders(ssoData?.getSSOIdentityProviders ?? []);}- }, [ssoData, setSSOIdentitiesProviders]);+ }, [ssoData, setSsoIdentitiesProviders]);useSnackBarOnQueryError(ssoError);- return loading || !SSOIdentitiesProviders.length ? (+ return loading || !ssoIdentitiesProviders.length ? (<StyledLinkContainerisDisabled={currentWorkspace?.hasValidEnterpriseValidityToken !== true}>- <Link to={getSettingsPath(SettingsPath.NewSSOIdentityProvider)}>+ <Link to={getSettingsPath(SettingsPath.NewSsoIdentityProvider)}><SettingsCardtitle={t`Add SSO Identity Provider`}disabled={currentWorkspace?.hasValidEnterpriseValidityToken !== true}@@ -66,6 +66,6 @@ export const SettingsSSOIdentitiesProvidersListCard = () => {</Link></StyledLinkContainer>) : (- <SettingsSSOIdentitiesProvidersListCardWrapper />+ <SettingsSsoIdentitiesProvidersListCardWrapper />);};diff --git a/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoIdentitiesProvidersListCardWrapper.tsx b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoIdentitiesProvidersListCardWrapper.tsxnew file mode 100644index 00000000000..725bb547b2b--- /dev/null+++ b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoIdentitiesProvidersListCardWrapper.tsx@@ -0,0 +1,34 @@+/* @license Enterprise */++import { t } from '@lingui/core/macro';+import { SettingsListCard } from '@/settings/components/SettingsListCard';+import { SettingsSsoIdentityProviderRowRightContainer } from '@/settings/security/components/sso/SettingsSsoIdentityProviderRowRightContainer';+import { ssoIdentitiesProvidersState } from '@/settings/security/states/ssoIdentitiesProvidersState';+import { guessSsoIdentityProviderIconByUrl } from '@/settings/security/utils/guessSsoIdentityProviderIconByUrl';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { SettingsPath } from 'twenty-shared/types';+import { useNavigateSettings } from '~/hooks/useNavigateSettings';++export const SettingsSsoIdentitiesProvidersListCardWrapper = () => {+ const navigate = useNavigateSettings();++ const ssoIdentitiesProviders = useAtomStateValue(ssoIdentitiesProvidersState);++ return (+ <SettingsListCard+ items={ssoIdentitiesProviders}+ getItemLabel={(ssoIdentityProvider) =>+ `${ssoIdentityProvider.name} - ${ssoIdentityProvider.type}`+ }+ RowIconFn={(ssoIdentityProvider) =>+ guessSsoIdentityProviderIconByUrl(ssoIdentityProvider.issuer)+ }+ RowRightComponent={({ item: ssoIdp }) => (+ <SettingsSsoIdentityProviderRowRightContainer ssoIdp={ssoIdp} />+ )}+ hasFooter+ footerButtonLabel={t`Add SSO Identity Provider`}+ onFooterButtonClick={() => navigate(SettingsPath.NewSsoIdentityProvider)}+ />+ );+};diff --git a/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoIdentityProviderRowRightContainer.tsx b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoIdentityProviderRowRightContainer.tsxnew file mode 100644index 00000000000..a4b96b571f0--- /dev/null+++ b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoIdentityProviderRowRightContainer.tsx@@ -0,0 +1,31 @@+/* @license Enterprise */++import { SettingsSecuritySsoRowDropdownMenu } from '@/settings/security/components/sso/SettingsSecuritySsoRowDropdownMenu';+import { type SsoIdentityProvider } from '@/settings/security/types/SsoIdentityProvider';+import { getColorBySsoIdentityProviderStatus } from '@/settings/security/utils/getColorBySsoIdentityProviderStatus';+import { styled } from '@linaria/react';+import { Status } from 'twenty-ui/data-display';+import { themeCssVariables } from 'twenty-ui/theme-constants';++const StyledRowRightContainer = styled.div`+ align-items: center;+ display: flex;+ gap: ${themeCssVariables.spacing[1]};+`;++export const SettingsSsoIdentityProviderRowRightContainer = ({+ ssoIdp,+}: {+ ssoIdp: Omit<SsoIdentityProvider, '__typename'>;+}) => {+ return (+ <StyledRowRightContainer>+ <Status+ color={getColorBySsoIdentityProviderStatus[ssoIdp.status]}+ text={ssoIdp.status}+ weight="medium"+ />+ <SettingsSecuritySsoRowDropdownMenu ssoIdp={ssoIdp} />+ </StyledRowRightContainer>+ );+};diff --git a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOOIDCForm.tsx b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoOidcForm.tsxsimilarity index 99%rename from packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOOIDCForm.tsxrename to packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoOidcForm.tsxindex 31584edc02f..eae77f4c4aa 100644--- a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOOIDCForm.tsx+++ b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoOidcForm.tsx@@ -35,7 +35,7 @@ const StyledButtonCopy = styled.div`margin-bottom: ${themeCssVariables.spacing[1]};`;-export const SettingsSSOOIDCForm = () => {+export const SettingsSsoOidcForm = () => {const { control } = useFormContext();const { copyToClipboard } = useCopyToClipboard();const { t } = useLingui();diff --git a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOSAMLForm.tsx b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoSamlForm.tsxsimilarity index 96%rename from packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOSAMLForm.tsxrename to packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoSamlForm.tsxindex eb5d9bc46db..cf92d3f4f47 100644--- a/packages/twenty-front/src/modules/settings/security/components/SSO/SettingsSSOSAMLForm.tsx+++ b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoSamlForm.tsx@@ -1,6 +1,6 @@/* @license Enterprise */-import { parseSAMLMetadataFromXMLFile } from '@/settings/security/utils/parseSAMLMetadataFromXMLFile';+import { parseSamlMetadataFromXmlFile } from '@/settings/security/utils/parseSamlMetadataFromXmlFile';import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';import { type ChangeEvent, useContext, useRef } from 'react';@@ -49,7 +49,7 @@ const StyledButtonCopy = styled.div`margin-bottom: ${themeCssVariables.spacing[1]};`;-export const SettingsSSOSAMLForm = () => {+export const SettingsSsoSamlForm = () => {const { theme } = useContext(ThemeContext);const { enqueueErrorSnackBar } = useSnackBar();const { setValue, getValues, watch, trigger } = useFormContext();@@ -59,7 +59,7 @@ export const SettingsSSOSAMLForm = () => {const handleFileChange = async (e: ChangeEvent<HTMLInputElement>) => {if (isDefined(e.target.files)) {const text = await e.target.files[0].text();- const samlMetadataParsed = parseSAMLMetadataFromXMLFile(text);+ const samlMetadataParsed = parseSamlMetadataFromXmlFile(text);e.target.value = '';if (!samlMetadataParsed.success) {return enqueueErrorSnackBar({diff --git a/packages/twenty-front/src/modules/settings/security/graphql/mutations/createOIDCSSOIdentityProvider.ts b/packages/twenty-front/src/modules/settings/security/graphql/mutations/createOidcSsoIdentityProvider.tssimilarity index 100%rename from packages/twenty-front/src/modules/settings/security/graphql/mutations/createOIDCSSOIdentityProvider.tsrename to packages/twenty-front/src/modules/settings/security/graphql/mutations/createOidcSsoIdentityProvider.tsdiff --git a/packages/twenty-front/src/modules/settings/security/graphql/mutations/createSAMLSSOIdentityProvider.ts b/packages/twenty-front/src/modules/settings/security/graphql/mutations/createSamlSsoIdentityProvider.tssimilarity index 100%rename from packages/twenty-front/src/modules/settings/security/graphql/mutations/createSAMLSSOIdentityProvider.tsrename to packages/twenty-front/src/modules/settings/security/graphql/mutations/createSamlSsoIdentityProvider.tsdiff --git a/packages/twenty-front/src/modules/settings/security/graphql/mutations/deleteSSOIdentityProvider.ts b/packages/twenty-front/src/modules/settings/security/graphql/mutations/deleteSsoIdentityProvider.tssimilarity index 100%rename from packages/twenty-front/src/modules/settings/security/graphql/mutations/deleteSSOIdentityProvider.tsrename to packages/twenty-front/src/modules/settings/security/graphql/mutations/deleteSsoIdentityProvider.tsdiff --git a/packages/twenty-front/src/modules/settings/security/graphql/mutations/editSSOIdentityProvider.ts b/packages/twenty-front/src/modules/settings/security/graphql/mutations/editSsoIdentityProvider.tssimilarity index 100%rename from packages/twenty-front/src/modules/settings/security/graphql/mutations/editSSOIdentityProvider.tsrename to packages/twenty-front/src/modules/settings/security/graphql/mutations/editSsoIdentityProvider.tsdiff --git a/packages/twenty-front/src/modules/settings/security/graphql/queries/getWorkspaceSSOIdentitiesProviders.ts b/packages/twenty-front/src/modules/settings/security/graphql/queries/getWorkspaceSsoIdentitiesProviders.tssimilarity index 100%rename from packages/twenty-front/src/modules/settings/security/graphql/queries/getWorkspaceSSOIdentitiesProviders.tsrename to packages/twenty-front/src/modules/settings/security/graphql/queries/getWorkspaceSsoIdentitiesProviders.tsdiff --git a/packages/twenty-front/src/modules/settings/security/hooks/__tests__/useCreateSSOIdentityProvider.test.tsx b/packages/twenty-front/src/modules/settings/security/hooks/__tests__/useCreateSsoIdentityProvider.test.tsxsimilarity index 67%rename from packages/twenty-front/src/modules/settings/security/hooks/__tests__/useCreateSSOIdentityProvider.test.tsxrename to packages/twenty-front/src/modules/settings/security/hooks/__tests__/useCreateSsoIdentityProvider.test.tsxindex 620db1499ea..d95b4a280cd 100644--- a/packages/twenty-front/src/modules/settings/security/hooks/__tests__/useCreateSSOIdentityProvider.test.tsx+++ b/packages/twenty-front/src/modules/settings/security/hooks/__tests__/useCreateSsoIdentityProvider.test.tsx@@ -2,24 +2,24 @@import { renderHook } from '@testing-library/react';-import { useCreateSSOIdentityProvider } from '@/settings/security/hooks/useCreateSSOIdentityProvider';+import { useCreateSsoIdentityProvider } from '@/settings/security/hooks/useCreateSsoIdentityProvider';import {CreateOidcIdentityProviderDocument,CreateSamlIdentityProviderDocument,} from '~/generated-metadata/graphql';import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';-const mutationOIDCCallSpy = jest.fn();-const mutationSAMLCallSpy = jest.fn();+const mutationOidcCallSpy = jest.fn();+const mutationSamlCallSpy = jest.fn();jest.mock('@apollo/client/react', () => ({...jest.requireActual('@apollo/client/react'),useMutation: (document: unknown) => {if (document === CreateOidcIdentityProviderDocument) {- return [mutationOIDCCallSpy];+ return [mutationOidcCallSpy];}if (document === CreateSamlIdentityProviderDocument) {- return [mutationSAMLCallSpy];+ return [mutationSamlCallSpy];}return [jest.fn()];},@@ -29,13 +29,13 @@ const Wrapper = getJestMetadataAndApolloMocksWrapper({apolloMocks: [],});-describe('useCreateSSOIdentityProvider', () => {+describe('useCreateSsoIdentityProvider', () => {afterEach(() => {jest.clearAllMocks();});it('create OIDC sso identity provider', async () => {- const OIDCParams = {+ const OidcParams = {type: 'OIDC' as const,name: 'test',clientID: 'test',@@ -44,15 +44,15 @@ describe('useCreateSSOIdentityProvider', () => {};renderHook(() => {- const { createSSOIdentityProvider } = useCreateSSOIdentityProvider();- createSSOIdentityProvider(OIDCParams);+ const { createSsoIdentityProvider } = useCreateSsoIdentityProvider();+ createSsoIdentityProvider(OidcParams);},{ wrapper: Wrapper },);// oxlint-disable-next-line unused-imports/no-unused-vars- const { type, ...input } = OIDCParams;- expect(mutationOIDCCallSpy).toHaveBeenCalledWith({+ const { type, ...input } = OidcParams;+ expect(mutationOidcCallSpy).toHaveBeenCalledWith({onCompleted: expect.any(Function),variables: {input,@@ -60,7 +60,7 @@ describe('useCreateSSOIdentityProvider', () => {});});it('create SAML sso identity provider', async () => {- const SAMLParams = {+ const SamlParams = {type: 'SAML' as const,name: 'test',metadata: 'test',@@ -71,16 +71,16 @@ describe('useCreateSSOIdentityProvider', () => {};renderHook(() => {- const { createSSOIdentityProvider } = useCreateSSOIdentityProvider();- createSSOIdentityProvider(SAMLParams);+ const { createSsoIdentityProvider } = useCreateSsoIdentityProvider();+ createSsoIdentityProvider(SamlParams);},{ wrapper: Wrapper },);// oxlint-disable-next-line unused-imports/no-unused-vars- const { type, ...input } = SAMLParams;- expect(mutationOIDCCallSpy).not.toHaveBeenCalled();- expect(mutationSAMLCallSpy).toHaveBeenCalledWith({+ const { type, ...input } = SamlParams;+ expect(mutationOidcCallSpy).not.toHaveBeenCalled();+ expect(mutationSamlCallSpy).toHaveBeenCalledWith({onCompleted: expect.any(Function),variables: {input,@@ -91,13 +91,13 @@ describe('useCreateSSOIdentityProvider', () => {const OTHERParams = {type: 'OTHER' as const,};- const { result } = renderHook(() => useCreateSSOIdentityProvider(), {+ const { result } = renderHook(() => useCreateSsoIdentityProvider(), {wrapper: Wrapper,});await expect(// @ts-expect-error - It's expected to throw an error- result.current.createSSOIdentityProvider(OTHERParams),+ result.current.createSsoIdentityProvider(OTHERParams),).rejects.toThrow('Invalid IdpType');});});diff --git a/packages/twenty-front/src/modules/settings/security/hooks/__tests__/useDeleteSSOIdentityProvider.test.tsx b/packages/twenty-front/src/modules/settings/security/hooks/__tests__/useDeleteSsoIdentityProvider.test.tsxsimilarity index 67%rename from packages/twenty-front/src/modules/settings/security/hooks/__tests__/useDeleteSSOIdentityProvider.test.tsxrename to packages/twenty-front/src/modules/settings/security/hooks/__tests__/useDeleteSsoIdentityProvider.test.tsxindex 84dead8808c..658bb8d2577 100644--- a/packages/twenty-front/src/modules/settings/security/hooks/__tests__/useDeleteSSOIdentityProvider.test.tsx+++ b/packages/twenty-front/src/modules/settings/security/hooks/__tests__/useDeleteSsoIdentityProvider.test.tsx@@ -2,14 +2,14 @@import { renderHook } from '@testing-library/react';-import { useDeleteSSOIdentityProvider } from '@/settings/security/hooks/useDeleteSSOIdentityProvider';+import { useDeleteSsoIdentityProvider } from '@/settings/security/hooks/useDeleteSsoIdentityProvider';import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';-const mutationDeleteSSOIDPCallSpy = jest.fn();+const mutationDeleteSsoIdpCallSpy = jest.fn();jest.mock('@apollo/client/react', () => ({...jest.requireActual('@apollo/client/react'),- useMutation: () => [mutationDeleteSSOIDPCallSpy],+ useMutation: () => [mutationDeleteSsoIdpCallSpy],}));const Wrapper = getJestMetadataAndApolloMocksWrapper({@@ -25,13 +25,13 @@ describe('useDeleteSsoIdentityProvider', () => {const params = { identityProviderId: 'test' };renderHook(() => {- const { deleteSSOIdentityProvider } = useDeleteSSOIdentityProvider();- deleteSSOIdentityProvider(params);+ const { deleteSsoIdentityProvider } = useDeleteSsoIdentityProvider();+ deleteSsoIdentityProvider(params);},{ wrapper: Wrapper },);- expect(mutationDeleteSSOIDPCallSpy).toHaveBeenCalledWith({+ expect(mutationDeleteSsoIdpCallSpy).toHaveBeenCalledWith({onCompleted: expect.any(Function),variables: {input: params,diff --git a/packages/twenty-front/src/modules/settings/security/hooks/__tests__/useEditSSOIdentityProvider.test.tsx b/packages/twenty-front/src/modules/settings/security/hooks/__tests__/useEditSsoIdentityProvider.test.tsxsimilarity index 70%rename from packages/twenty-front/src/modules/settings/security/hooks/__tests__/useEditSSOIdentityProvider.test.tsxrename to packages/twenty-front/src/modules/settings/security/hooks/__tests__/useEditSsoIdentityProvider.test.tsxindex 3bc2b5cd231..5af4d795ccc 100644--- a/packages/twenty-front/src/modules/settings/security/hooks/__tests__/useEditSSOIdentityProvider.test.tsx+++ b/packages/twenty-front/src/modules/settings/security/hooks/__tests__/useEditSsoIdentityProvider.test.tsx@@ -2,15 +2,15 @@import { renderHook } from '@testing-library/react';-import { useUpdateSSOIdentityProvider } from '@/settings/security/hooks/useUpdateSSOIdentityProvider';+import { useUpdateSsoIdentityProvider } from '@/settings/security/hooks/useUpdateSsoIdentityProvider';import { SsoIdentityProviderStatus } from '~/generated-metadata/graphql';import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';-const mutationEditSSOIDPCallSpy = jest.fn();+const mutationEditSsoIdpCallSpy = jest.fn();jest.mock('@apollo/client/react', () => ({...jest.requireActual('@apollo/client/react'),- useMutation: () => [mutationEditSSOIDPCallSpy],+ useMutation: () => [mutationEditSsoIdpCallSpy],}));const Wrapper = getJestMetadataAndApolloMocksWrapper({@@ -29,13 +29,13 @@ describe('useEditSsoIdentityProvider', () => {};renderHook(() => {- const { updateSSOIdentityProvider } = useUpdateSSOIdentityProvider();- updateSSOIdentityProvider(params);+ const { updateSsoIdentityProvider } = useUpdateSsoIdentityProvider();+ updateSsoIdentityProvider(params);},{ wrapper: Wrapper },);- expect(mutationEditSSOIDPCallSpy).toHaveBeenCalledWith({+ expect(mutationEditSsoIdpCallSpy).toHaveBeenCalledWith({onCompleted: expect.any(Function),variables: {input: params,diff --git a/packages/twenty-front/src/modules/settings/security/hooks/useCreateSSOIdentityProvider.ts b/packages/twenty-front/src/modules/settings/security/hooks/useCreateSsoIdentityProvider.tssimilarity index 79%rename from packages/twenty-front/src/modules/settings/security/hooks/useCreateSSOIdentityProvider.tsrename to packages/twenty-front/src/modules/settings/security/hooks/useCreateSsoIdentityProvider.tsindex dd32bee9ea8..27582d43907 100644--- a/packages/twenty-front/src/modules/settings/security/hooks/useCreateSSOIdentityProvider.ts+++ b/packages/twenty-front/src/modules/settings/security/hooks/useCreateSsoIdentityProvider.ts@@ -1,6 +1,6 @@/* @license Enterprise */-import { SSOIdentitiesProvidersState } from '@/settings/security/states/SSOIdentitiesProvidersState';+import { ssoIdentitiesProvidersState } from '@/settings/security/states/ssoIdentitiesProvidersState';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { useMutation } from '@apollo/client/react';import {@@ -10,7 +10,7 @@ import {CreateSamlIdentityProviderDocument,} from '~/generated-metadata/graphql';-export const useCreateSSOIdentityProvider = () => {+export const useCreateSsoIdentityProvider = () => {const [createOidcIdentityProviderMutation] = useMutation(CreateOidcIdentityProviderDocument,);@@ -18,11 +18,11 @@ export const useCreateSSOIdentityProvider = () => {CreateSamlIdentityProviderDocument,);- const setSSOIdentitiesProviders = useSetAtomState(- SSOIdentitiesProvidersState,+ const setSsoIdentitiesProviders = useSetAtomState(+ ssoIdentitiesProvidersState,);- const createSSOIdentityProvider = async (+ const createSsoIdentityProvider = async (input:| ({type: 'OIDC';@@ -37,7 +37,7 @@ export const useCreateSSOIdentityProvider = () => {return await createOidcIdentityProviderMutation({variables: { input: params },onCompleted: (data) => {- setSSOIdentitiesProviders((existingProvider) => [+ setSsoIdentitiesProviders((existingProvider) => [...existingProvider,data.createOIDCIdentityProvider,]);@@ -49,7 +49,7 @@ export const useCreateSSOIdentityProvider = () => {return await createSamlIdentityProviderMutation({variables: { input: params },onCompleted: (data) => {- setSSOIdentitiesProviders((existingProvider) => [+ setSsoIdentitiesProviders((existingProvider) => [...existingProvider,data.createSAMLIdentityProvider,]);@@ -61,6 +61,6 @@ export const useCreateSSOIdentityProvider = () => {};return {- createSSOIdentityProvider,+ createSsoIdentityProvider,};};diff --git a/packages/twenty-front/src/modules/settings/security/hooks/useDeleteSSOIdentityProvider.ts b/packages/twenty-front/src/modules/settings/security/hooks/useDeleteSsoIdentityProvider.tssimilarity index 67%rename from packages/twenty-front/src/modules/settings/security/hooks/useDeleteSSOIdentityProvider.tsrename to packages/twenty-front/src/modules/settings/security/hooks/useDeleteSsoIdentityProvider.tsindex 16c77813f87..7fb1941e5ae 100644--- a/packages/twenty-front/src/modules/settings/security/hooks/useDeleteSSOIdentityProvider.ts+++ b/packages/twenty-front/src/modules/settings/security/hooks/useDeleteSsoIdentityProvider.ts@@ -1,6 +1,6 @@/* @license Enterprise */-import { SSOIdentitiesProvidersState } from '@/settings/security/states/SSOIdentitiesProvidersState';+import { ssoIdentitiesProvidersState } from '@/settings/security/states/ssoIdentitiesProvidersState';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { useMutation } from '@apollo/client/react';import {@@ -8,16 +8,16 @@ import {DeleteSsoIdentityProviderDocument,} from '~/generated-metadata/graphql';-export const useDeleteSSOIdentityProvider = () => {+export const useDeleteSsoIdentityProvider = () => {const [deleteSsoIdentityProviderMutation] = useMutation(DeleteSsoIdentityProviderDocument,);- const setSSOIdentitiesProviders = useSetAtomState(- SSOIdentitiesProvidersState,+ const setSsoIdentitiesProviders = useSetAtomState(+ ssoIdentitiesProvidersState,);- const deleteSSOIdentityProvider = async ({+ const deleteSsoIdentityProvider = async ({identityProviderId,}: DeleteSsoIdentityProviderMutationVariables['input']) => {return await deleteSsoIdentityProviderMutation({@@ -25,8 +25,8 @@ export const useDeleteSSOIdentityProvider = () => {input: { identityProviderId },},onCompleted: (data) => {- setSSOIdentitiesProviders((SSOIdentitiesProviders) =>- SSOIdentitiesProviders.filter(+ setSsoIdentitiesProviders((ssoIdentitiesProviders) =>+ ssoIdentitiesProviders.filter((identityProvider) =>identityProvider.id !==data.deleteSSOIdentityProvider.identityProviderId,@@ -37,6 +37,6 @@ export const useDeleteSSOIdentityProvider = () => {};return {- deleteSSOIdentityProvider,+ deleteSsoIdentityProvider,};};diff --git a/packages/twenty-front/src/modules/settings/security/hooks/useUpdateSSOIdentityProvider.ts b/packages/twenty-front/src/modules/settings/security/hooks/useUpdateSsoIdentityProvider.tssimilarity index 65%rename from packages/twenty-front/src/modules/settings/security/hooks/useUpdateSSOIdentityProvider.tsrename to packages/twenty-front/src/modules/settings/security/hooks/useUpdateSsoIdentityProvider.tsindex a8ab375e6ef..75f10fcf6ce 100644--- a/packages/twenty-front/src/modules/settings/security/hooks/useUpdateSSOIdentityProvider.ts+++ b/packages/twenty-front/src/modules/settings/security/hooks/useUpdateSsoIdentityProvider.ts@@ -1,6 +1,6 @@/* @license Enterprise */-import { SSOIdentitiesProvidersState } from '@/settings/security/states/SSOIdentitiesProvidersState';+import { ssoIdentitiesProvidersState } from '@/settings/security/states/ssoIdentitiesProvidersState';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { useMutation } from '@apollo/client/react';import {@@ -8,16 +8,16 @@ import {EditSsoIdentityProviderDocument,} from '~/generated-metadata/graphql';-export const useUpdateSSOIdentityProvider = () => {+export const useUpdateSsoIdentityProvider = () => {const [editSsoIdentityProviderMutation] = useMutation(EditSsoIdentityProviderDocument,);- const setSSOIdentitiesProviders = useSetAtomState(- SSOIdentitiesProvidersState,+ const setSsoIdentitiesProviders = useSetAtomState(+ ssoIdentitiesProvidersState,);- const updateSSOIdentityProvider = async (+ const updateSsoIdentityProvider = async (payload: EditSsoIdentityProviderMutationVariables['input'],) => {return await editSsoIdentityProviderMutation({@@ -25,8 +25,8 @@ export const useUpdateSSOIdentityProvider = () => {input: payload,},onCompleted: (data) => {- setSSOIdentitiesProviders((SSOIdentitiesProviders) =>- SSOIdentitiesProviders.map((identityProvider) =>+ setSsoIdentitiesProviders((ssoIdentitiesProviders) =>+ ssoIdentitiesProviders.map((identityProvider) =>identityProvider.id === data.editSSOIdentityProvider.id? data.editSSOIdentityProvider: identityProvider,@@ -37,6 +37,6 @@ export const useUpdateSSOIdentityProvider = () => {};return {- updateSSOIdentityProvider,+ updateSsoIdentityProvider,};};diff --git a/packages/twenty-front/src/modules/settings/security/states/SSOIdentitiesProvidersState.ts b/packages/twenty-front/src/modules/settings/security/states/SSOIdentitiesProvidersState.tsdeleted file mode 100644index da85b5849de..00000000000--- a/packages/twenty-front/src/modules/settings/security/states/SSOIdentitiesProvidersState.ts+++ /dev/null@@ -1,11 +0,0 @@-/* @license Enterprise */--import { type SSOIdentityProvider } from '@/settings/security/types/SSOIdentityProvider';-import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';--export const SSOIdentitiesProvidersState = createAtomState<- Omit<SSOIdentityProvider, '__typename'>[]->({- key: 'SSOIdentitiesProvidersState',- defaultValue: [],-});diff --git a/packages/twenty-front/src/modules/settings/security/states/ssoIdentitiesProvidersState.ts b/packages/twenty-front/src/modules/settings/security/states/ssoIdentitiesProvidersState.tsnew file mode 100644index 00000000000..f2b08a13e16--- /dev/null+++ b/packages/twenty-front/src/modules/settings/security/states/ssoIdentitiesProvidersState.ts@@ -0,0 +1,11 @@+/* @license Enterprise */++import { type SsoIdentityProvider } from '@/settings/security/types/SsoIdentityProvider';+import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';++export const ssoIdentitiesProvidersState = createAtomState<+ Omit<SsoIdentityProvider, '__typename'>[]+>({+ key: 'ssoIdentitiesProvidersState',+ defaultValue: [],+});diff --git a/packages/twenty-front/src/modules/settings/security/types/SSOIdentityProvider.ts b/packages/twenty-front/src/modules/settings/security/types/SsoIdentityProvider.tssimilarity index 55%rename from packages/twenty-front/src/modules/settings/security/types/SSOIdentityProvider.tsrename to packages/twenty-front/src/modules/settings/security/types/SsoIdentityProvider.tsindex ae882fe1b74..eff72cea4bc 100644--- a/packages/twenty-front/src/modules/settings/security/types/SSOIdentityProvider.ts+++ b/packages/twenty-front/src/modules/settings/security/types/SsoIdentityProvider.ts@@ -1,13 +1,13 @@/* @license Enterprise */-import { type SSOIdentitiesProvidersParamsSchema } from '@/settings/security/validation-schemas/SSOIdentityProviderSchema';+import { type ssoIdentitiesProvidersParamsSchema } from '@/settings/security/validation-schemas/ssoIdentityProviderSchema';import { type z } from 'zod';import {type IdentityProviderType,type SsoIdentityProviderStatus,} from '~/generated-metadata/graphql';-export type SSOIdentityProvider = {+export type SsoIdentityProvider = {__typename: 'SSOIdentityProvider';id: string;type: IdentityProviderType;@@ -16,6 +16,6 @@ export type SSOIdentityProvider = {status: SsoIdentityProviderStatus;};-export type SettingSecurityNewSSOIdentityFormValues = z.infer<- typeof SSOIdentitiesProvidersParamsSchema+export type SettingSecurityNewSsoIdentityFormValues = z.infer<+ typeof ssoIdentitiesProvidersParamsSchema>;diff --git a/packages/twenty-front/src/modules/settings/security/utils/__tests__/parseSAMLMetadataFromXMLFile.test.ts b/packages/twenty-front/src/modules/settings/security/utils/__tests__/parseSamlMetadataFromXmlFile.test.tssimilarity index 91%rename from packages/twenty-front/src/modules/settings/security/utils/__tests__/parseSAMLMetadataFromXMLFile.test.tsrename to packages/twenty-front/src/modules/settings/security/utils/__tests__/parseSamlMetadataFromXmlFile.test.tsindex 8d0c87fec11..87f5fdd21c0 100644--- a/packages/twenty-front/src/modules/settings/security/utils/__tests__/parseSAMLMetadataFromXMLFile.test.ts+++ b/packages/twenty-front/src/modules/settings/security/utils/__tests__/parseSamlMetadataFromXmlFile.test.ts@@ -1,8 +1,8 @@/* @license Enterprise */-import { parseSAMLMetadataFromXMLFile } from '@/settings/security/utils/parseSAMLMetadataFromXMLFile';+import { parseSamlMetadataFromXmlFile } from '@/settings/security/utils/parseSamlMetadataFromXmlFile';-describe('parseSAMLMetadataFromXMLFile', () => {+describe('parseSamlMetadataFromXmlFile', () => {it('should parse SAML metadata from XML file', () => {const xmlString = `<?xml version="1.0" encoding="UTF-8"?><md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.com" validUntil="2026-02-04T17:46:23.000Z"><md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">@@ -18,7 +18,7 @@ describe('parseSAMLMetadataFromXMLFile', () => {<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.com"/></md:IDPSSODescriptor></md:EntityDescriptor>`;- const result = parseSAMLMetadataFromXMLFile(xmlString);+ const result = parseSamlMetadataFromXmlFile(xmlString);expect(result).toEqual({success: true,data: {@@ -43,7 +43,7 @@ describe('parseSAMLMetadataFromXMLFile', () => {<ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.com"/></ns0:IDPSSODescriptor></ns0:EntityDescriptor>`;- const result = parseSAMLMetadataFromXMLFile(xmlString);+ const result = parseSamlMetadataFromXmlFile(xmlString);expect(result).toEqual({success: true,data: {@@ -66,7 +66,7 @@ describe('parseSAMLMetadataFromXMLFile', () => {<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.jumpcloud.com/saml2/twenty"/></md:IDPSSODescriptor></md:EntityDescriptor>`;- const result = parseSAMLMetadataFromXMLFile(xmlString);+ const result = parseSamlMetadataFromXmlFile(xmlString);expect(result).toEqual({success: true,data: {@@ -90,7 +90,7 @@ describe('parseSAMLMetadataFromXMLFile', () => {<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.com/redirect"/></md:IDPSSODescriptor></md:EntityDescriptor>`;- const result = parseSAMLMetadataFromXMLFile(xmlString);+ const result = parseSamlMetadataFromXmlFile(xmlString);expect(result).toEqual({success: true,data: {@@ -113,7 +113,7 @@ describe('parseSAMLMetadataFromXMLFile', () => {<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.com/soap"/></md:IDPSSODescriptor></md:EntityDescriptor>`;- const result = parseSAMLMetadataFromXMLFile(xmlString);+ const result = parseSamlMetadataFromXmlFile(xmlString);expect(result).toEqual({success: false,reason:@@ -133,7 +133,7 @@ describe('parseSAMLMetadataFromXMLFile', () => {<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.jumpcloud.com/saml2/twenty"/></md:IDPSSODescriptor></md:EntityDescriptor>`;- const result = parseSAMLMetadataFromXMLFile(xmlString);+ const result = parseSamlMetadataFromXmlFile(xmlString);expect(result).toEqual({success: false,reason: 'entityID: entityID is not a valid URL',@@ -141,7 +141,7 @@ describe('parseSAMLMetadataFromXMLFile', () => {});it('should return a descriptive reason when EntityDescriptor is missing', () => {const xmlString = `<?xml version="1.0" encoding="UTF-8"?><root />`;- const result = parseSAMLMetadataFromXMLFile(xmlString);+ const result = parseSamlMetadataFromXmlFile(xmlString);expect(result).toEqual({success: false,reason: 'EntityDescriptor element is missing',@@ -149,7 +149,7 @@ describe('parseSAMLMetadataFromXMLFile', () => {});it('should return error if XML is invalid', () => {const xmlString = 'invalid xml';- const result = parseSAMLMetadataFromXMLFile(xmlString);+ const result = parseSamlMetadataFromXmlFile(xmlString);expect(result).toEqual({success: false,reason: 'File is not valid XML',diff --git a/packages/twenty-front/src/modules/settings/security/utils/getColorBySSOIdentityProviderStatus.ts b/packages/twenty-front/src/modules/settings/security/utils/getColorBySsoIdentityProviderStatus.tssimilarity index 80%rename from packages/twenty-front/src/modules/settings/security/utils/getColorBySSOIdentityProviderStatus.tsrename to packages/twenty-front/src/modules/settings/security/utils/getColorBySsoIdentityProviderStatus.tsindex 9ddd16a1976..b44c7a46e6c 100644--- a/packages/twenty-front/src/modules/settings/security/utils/getColorBySSOIdentityProviderStatus.ts+++ b/packages/twenty-front/src/modules/settings/security/utils/getColorBySsoIdentityProviderStatus.ts@@ -1,7 +1,7 @@import { type SsoIdentityProviderStatus } from '~/generated-metadata/graphql';import { type ThemeColor } from 'twenty-ui/theme';-export const getColorBySSOIdentityProviderStatus: Record<+export const getColorBySsoIdentityProviderStatus: Record<SsoIdentityProviderStatus,ThemeColor> = {diff --git a/packages/twenty-front/src/modules/settings/security/utils/guessSSOIdentityProviderIconByUrl.ts b/packages/twenty-front/src/modules/settings/security/utils/guessSsoIdentityProviderIconByUrl.tssimilarity index 85%rename from packages/twenty-front/src/modules/settings/security/utils/guessSSOIdentityProviderIconByUrl.tsrename to packages/twenty-front/src/modules/settings/security/utils/guessSsoIdentityProviderIconByUrl.tsindex a415002cf37..a88bfdb4cc7 100644--- a/packages/twenty-front/src/modules/settings/security/utils/guessSSOIdentityProviderIconByUrl.ts+++ b/packages/twenty-front/src/modules/settings/security/utils/guessSsoIdentityProviderIconByUrl.ts@@ -4,7 +4,7 @@ import {IconKey,IconMicrosoftOutlook,} from 'twenty-ui/icon';-export const guessSSOIdentityProviderIconByUrl = (+export const guessSsoIdentityProviderIconByUrl = (url: string,): IconComponent => {if (url.includes('google')) {diff --git a/packages/twenty-front/src/modules/settings/security/utils/parseSAMLMetadataFromXMLFile.ts b/packages/twenty-front/src/modules/settings/security/utils/parseSamlMetadataFromXmlFile.tssimilarity index 98%rename from packages/twenty-front/src/modules/settings/security/utils/parseSAMLMetadataFromXMLFile.tsrename to packages/twenty-front/src/modules/settings/security/utils/parseSamlMetadataFromXmlFile.tsindex a9383293d96..aed4a41e9d8 100644--- a/packages/twenty-front/src/modules/settings/security/utils/parseSAMLMetadataFromXMLFile.ts+++ b/packages/twenty-front/src/modules/settings/security/utils/parseSamlMetadataFromXmlFile.ts@@ -58,7 +58,7 @@ const formatErrorReason = (error: unknown): string => {return 'Unknown parsing error';};-export const parseSAMLMetadataFromXMLFile = (+export const parseSamlMetadataFromXmlFile = (xmlString: string,):| { success: true; data: z.infer<typeof validator> }diff --git a/packages/twenty-front/src/modules/settings/security/utils/sSOIdentityProviderDefaultValues.ts b/packages/twenty-front/src/modules/settings/security/utils/ssoIdentityProviderDefaultValues.tssimilarity index 64%rename from packages/twenty-front/src/modules/settings/security/utils/sSOIdentityProviderDefaultValues.tsrename to packages/twenty-front/src/modules/settings/security/utils/ssoIdentityProviderDefaultValues.tsindex 7a08ef94f6c..074efb16b97 100644--- a/packages/twenty-front/src/modules/settings/security/utils/sSOIdentityProviderDefaultValues.ts+++ b/packages/twenty-front/src/modules/settings/security/utils/ssoIdentityProviderDefaultValues.ts@@ -1,12 +1,12 @@/* @license Enterprise */-import { type SettingSecurityNewSSOIdentityFormValues } from '@/settings/security/types/SSOIdentityProvider';+import { type SettingSecurityNewSsoIdentityFormValues } from '@/settings/security/types/SsoIdentityProvider';import { v4 } from 'uuid';import { type IdentityProviderType } from '~/generated-metadata/graphql';-export const sSOIdentityProviderDefaultValues: Record<+export const ssoIdentityProviderDefaultValues: Record<IdentityProviderType,- () => SettingSecurityNewSSOIdentityFormValues+ () => SettingSecurityNewSsoIdentityFormValues> = {SAML: () => ({type: 'SAML',diff --git a/packages/twenty-front/src/modules/settings/security/validation-schemas/SSOIdentityProviderSchema.ts b/packages/twenty-front/src/modules/settings/security/validation-schemas/ssoIdentityProviderSchema.tssimilarity index 67%rename from packages/twenty-front/src/modules/settings/security/validation-schemas/SSOIdentityProviderSchema.tsrename to packages/twenty-front/src/modules/settings/security/validation-schemas/ssoIdentityProviderSchema.tsindex a8dbc63a83b..c59e8afcbb9 100644--- a/packages/twenty-front/src/modules/settings/security/validation-schemas/SSOIdentityProviderSchema.ts+++ b/packages/twenty-front/src/modules/settings/security/validation-schemas/ssoIdentityProviderSchema.ts@@ -2,7 +2,7 @@import { z } from 'zod';-export const SSOIdentitiesProvidersOIDCParamsSchema = z+export const ssoIdentitiesProvidersOidcParamsSchema = z.object({type: z.literal('OIDC'),clientID: z.string().nonempty(),@@ -10,7 +10,7 @@ export const SSOIdentitiesProvidersOIDCParamsSchema = z}).required();-export const SSOIdentitiesProvidersSAMLParamsSchema = z+export const ssoIdentitiesProvidersSamlParamsSchema = z.object({type: z.literal('SAML'),id: z.string().nonempty(),@@ -19,10 +19,10 @@ export const SSOIdentitiesProvidersSAMLParamsSchema = z}).required();-export const SSOIdentitiesProvidersParamsSchema = z+export const ssoIdentitiesProvidersParamsSchema = z.discriminatedUnion('type', [- SSOIdentitiesProvidersOIDCParamsSchema,- SSOIdentitiesProvidersSAMLParamsSchema,+ ssoIdentitiesProvidersOidcParamsSchema,+ ssoIdentitiesProvidersSamlParamsSchema,]).and(zdiff --git a/packages/twenty-front/src/modules/ui/input/components/ImageInput.tsx b/packages/twenty-front/src/modules/ui/input/components/ImageInput.tsxindex 9cfde9b76ed..bdcd2de99af 100644--- a/packages/twenty-front/src/modules/ui/input/components/ImageInput.tsx+++ b/packages/twenty-front/src/modules/ui/input/components/ImageInput.tsx@@ -110,7 +110,7 @@ export const ImageInput = ({const onUploadButtonClick = () => {hiddenFileInput.current?.click();};- const [isPictureURLError, setIsPictureURLError] = useState(false);+ const [isPictureUrlError, setIsPictureUrlError] = useState(false);const pictureURI = isNonEmptyString(picture)? getImageAbsoluteURI({@@ -126,12 +126,12 @@ export const ImageInput = ({disabled={disabled}onClick={onUploadButtonClick}>- {pictureURI && !isPictureURLError ? (+ {pictureURI && !isPictureUrlError ? (<imgsrc={pictureURI}alt="profile"onError={() => {- setIsPictureURLError(true);+ setIsPictureUrlError(true);}}/>) : (diff --git a/packages/twenty-front/src/modules/views/components/QueryParamsCleanupEffect.tsx b/packages/twenty-front/src/modules/views/components/QueryParamsCleanupEffect.tsxindex 4071745c117..fca8b577ecc 100644--- a/packages/twenty-front/src/modules/views/components/QueryParamsCleanupEffect.tsx+++ b/packages/twenty-front/src/modules/views/components/QueryParamsCleanupEffect.tsx@@ -15,12 +15,12 @@ export const QueryParamsCleanupEffect = () => {const [hasCleanedQueryParams, setHasCleanedQueryParams] = useState(false);- const currentViewObjectMetadataItemIsDifferentFromURLObjectMetadataItem =+ const currentViewObjectMetadataItemIsDifferentFromUrlObjectMetadataItem =currentView?.objectMetadataId !== objectMetadataItem.id;useEffect(() => {if (- currentViewObjectMetadataItemIsDifferentFromURLObjectMetadataItem ||+ currentViewObjectMetadataItemIsDifferentFromUrlObjectMetadataItem ||hasCleanedQueryParams) {return;@@ -45,7 +45,7 @@ export const QueryParamsCleanupEffect = () => {setSearchParams(newParams, { replace: true });setHasCleanedQueryParams(true);}, [- currentViewObjectMetadataItemIsDifferentFromURLObjectMetadataItem,+ currentViewObjectMetadataItemIsDifferentFromUrlObjectMetadataItem,hasFiltersQueryParams,hasSortsQueryParams,hasCleanedQueryParams,diff --git a/packages/twenty-front/src/modules/views/components/QueryParamsFiltersEffect.tsx b/packages/twenty-front/src/modules/views/components/QueryParamsFiltersEffect.tsxindex 62b23b4c4e8..44f6ebaee5f 100644--- a/packages/twenty-front/src/modules/views/components/QueryParamsFiltersEffect.tsx+++ b/packages/twenty-front/src/modules/views/components/QueryParamsFiltersEffect.tsx@@ -40,13 +40,13 @@ export const QueryParamsFiltersEffect = () => {recordIndexId,);- const currentViewObjectMetadataItemIsDifferentFromURLObjectMetadataItem =+ const currentViewObjectMetadataItemIsDifferentFromUrlObjectMetadataItem =currentView?.objectMetadataId !== objectMetadataItem.id;useEffect(() => {if (!hasFiltersQueryParams ||- currentViewObjectMetadataItemIsDifferentFromURLObjectMetadataItem+ currentViewObjectMetadataItemIsDifferentFromUrlObjectMetadataItem) {return;}@@ -86,7 +86,7 @@ export const QueryParamsFiltersEffect = () => {loadFiltersFromQueryParams();}, [- currentViewObjectMetadataItemIsDifferentFromURLObjectMetadataItem,+ currentViewObjectMetadataItemIsDifferentFromUrlObjectMetadataItem,mapViewFiltersToRecordFilters,getFiltersFromQueryParams,getFilterGroupsFromQueryParams,diff --git a/packages/twenty-front/src/modules/views/components/QueryParamsSortsEffect.tsx b/packages/twenty-front/src/modules/views/components/QueryParamsSortsEffect.tsxindex 38e58fc9659..5b5ea574bd3 100644--- a/packages/twenty-front/src/modules/views/components/QueryParamsSortsEffect.tsx+++ b/packages/twenty-front/src/modules/views/components/QueryParamsSortsEffect.tsx@@ -13,13 +13,13 @@ export const QueryParamsSortsEffect = () => {const { applyViewSortsToCurrentRecordSorts } =useApplyViewSortsToCurrentRecordSorts();- const currentViewObjectMetadataItemIsDifferentFromURLObjectMetadataItem =+ const currentViewObjectMetadataItemIsDifferentFromUrlObjectMetadataItem =currentView?.objectMetadataId !== objectMetadataItem.id;useEffect(() => {if (!hasSortsQueryParams ||- currentViewObjectMetadataItemIsDifferentFromURLObjectMetadataItem+ currentViewObjectMetadataItemIsDifferentFromUrlObjectMetadataItem) {return;}@@ -37,7 +37,7 @@ export const QueryParamsSortsEffect = () => {hasSortsQueryParams,getSortsFromQueryParams,applyViewSortsToCurrentRecordSorts,- currentViewObjectMetadataItemIsDifferentFromURLObjectMetadataItem,+ currentViewObjectMetadataItemIsDifferentFromUrlObjectMetadataItem,currentView?.id,]);diff --git a/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewAPIPersist.ts b/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewApiPersist.tssimilarity index 84%rename from packages/twenty-front/src/modules/views/hooks/internal/usePerformViewAPIPersist.tsrename to packages/twenty-front/src/modules/views/hooks/internal/usePerformViewApiPersist.tsindex f9850869516..1a3e5abd318 100644--- a/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewAPIPersist.ts+++ b/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewApiPersist.ts@@ -3,7 +3,7 @@ import { useCallback } from 'react';import { type FlatView } from '@/metadata-store/types/FlatView';import { type FlatViewGroup } from '@/metadata-store/types/FlatViewGroup';import { type MetadataRequestResult } from '@/object-metadata/types/MetadataRequestResult.type';-import { usePerformViewEntityAPIPersistOperation } from '@/views/hooks/internal/usePerformViewEntityAPIPersistOperation';+import { usePerformViewEntityApiPersistOperation } from '@/views/hooks/internal/usePerformViewEntityApiPersistOperation';import { useViewsSideEffectsOnViewGroups } from '@/views/hooks/useViewsSideEffectsOnViewGroups';import { useMutation } from '@apollo/client/react';import { CrudOperationType } from 'twenty-shared/types';@@ -17,23 +17,23 @@ import {ViewType,} from '~/generated-metadata/graphql';-export const usePerformViewAPIPersist = () => {+export const usePerformViewApiPersist = () => {const [createViewMutation] = useMutation(CreateViewDocument);const [destroyViewMutation] = useMutation(DestroyViewDocument);const { triggerViewGroupOptimisticEffectAtViewCreation } =useViewsSideEffectsOnViewGroups();- const { performViewEntityAPIPersistOperation } =- usePerformViewEntityAPIPersistOperation('view');+ const { performViewEntityApiPersistOperation } =+ usePerformViewEntityApiPersistOperation('view');- const performViewAPICreate = useCallback(+ const performViewApiCreate = useCallback(async (variables: CreateViewMutationVariables,objectMetadataItemId: string,): Promise<MetadataRequestResult<Awaited<ReturnType<typeof createViewMutation>>>> => {- const result = await performViewEntityAPIPersistOperation({+ const result = await performViewEntityApiPersistOperation({persist: () => {const newViewId = variables.input.id ?? v4();if (variables.input.type === ViewType.KANBAN) {@@ -90,17 +90,17 @@ export const usePerformViewAPIPersist = () => {[createViewMutation,triggerViewGroupOptimisticEffectAtViewCreation,- performViewEntityAPIPersistOperation,+ performViewEntityApiPersistOperation,],);- const performViewAPIDestroy = useCallback(+ const performViewApiDestroy = useCallback(async (variables: DestroyViewMutationVariables,): Promise<MetadataRequestResult<Awaited<ReturnType<typeof destroyViewMutation>>>> =>- performViewEntityAPIPersistOperation({+ performViewEntityApiPersistOperation({persist: () =>destroyViewMutation({variables,@@ -109,11 +109,11 @@ export const usePerformViewAPIPersist = () => {removeFromDraft({ key: 'views', itemIds: [variables.id] }),operationType: CrudOperationType.DELETE,}),- [destroyViewMutation, performViewEntityAPIPersistOperation],+ [destroyViewMutation, performViewEntityApiPersistOperation],);return {- performViewAPICreate,- performViewAPIDestroy,+ performViewApiCreate,+ performViewApiDestroy,};};diff --git a/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewAPIUpdate.ts b/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewApiUpdate.tssimilarity index 97%rename from packages/twenty-front/src/modules/views/hooks/internal/usePerformViewAPIUpdate.tsrename to packages/twenty-front/src/modules/views/hooks/internal/usePerformViewApiUpdate.tsindex e6d80a20427..037b49bba89 100644--- a/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewAPIUpdate.ts+++ b/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewApiUpdate.ts@@ -20,7 +20,7 @@ import {UpdateViewDocument,} from '~/generated-metadata/graphql';-export const usePerformViewAPIUpdate = () => {+export const usePerformViewApiUpdate = () => {const [updateViewMutation] = useMutation(UpdateViewDocument);const { updateInDraft, addToDraft, removeFromDraft, applyChanges } =@@ -67,7 +67,7 @@ export const usePerformViewAPIUpdate = () => {[store, addToDraft, removeFromDraft, applyChanges],);- const performViewAPIUpdate = useCallback(+ const performViewApiUpdate = useCallback(async (variables: UpdateViewMutationVariables,): Promise<@@ -134,5 +134,5 @@ export const usePerformViewAPIUpdate = () => {],);- return { performViewAPIUpdate };+ return { performViewApiUpdate };};diff --git a/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewEntityAPIPersistOperation.ts b/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewEntityApiPersistOperation.tssimilarity index 88%rename from packages/twenty-front/src/modules/views/hooks/internal/usePerformViewEntityAPIPersistOperation.tsrename to packages/twenty-front/src/modules/views/hooks/internal/usePerformViewEntityApiPersistOperation.tsindex 892217d9c30..06ffb1fec6e 100644--- a/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewEntityAPIPersistOperation.ts+++ b/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewEntityApiPersistOperation.ts@@ -15,7 +15,7 @@ type MetadataStoreDraftUtils = Pick<'addToDraft' | 'updateInDraft' | 'removeFromDraft'>;-type PerformViewEntityAPIPersistOperationArgs<TResponse> = {+type PerformViewEntityApiPersistOperationArgs<TResponse> = {persist: () => Promise<TResponse>;applyResultToDraft: (response: TResponse,@@ -24,7 +24,7 @@ type PerformViewEntityAPIPersistOperationArgs<TResponse> = {operationType: CrudOperationType;};-type PerformViewEntityAPIPersistBatchOperationArgs<TInput, TResult> = {+type PerformViewEntityApiPersistBatchOperationArgs<TInput, TResult> = {inputs: TInput[];mutate: (input: TInput) => Promise<TResult>;applyResultToDraft: (@@ -34,7 +34,7 @@ type PerformViewEntityAPIPersistBatchOperationArgs<TInput, TResult> = {operationType: CrudOperationType;};-export const usePerformViewEntityAPIPersistOperation = (+export const usePerformViewEntityApiPersistOperation = (metadataName: AllMetadataName,) => {const { addToDraft, updateInDraft, removeFromDraft, applyChanges } =@@ -57,12 +57,12 @@ export const usePerformViewEntityAPIPersistOperation = ([handleMetadataError, enqueueErrorSnackBar, metadataName],);- const performViewEntityAPIPersistOperation = useCallback(+ const performViewEntityApiPersistOperation = useCallback(async <TResponse>({persist,applyResultToDraft,operationType,- }: PerformViewEntityAPIPersistOperationArgs<TResponse>): Promise<+ }: PerformViewEntityApiPersistOperationArgs<TResponse>): Promise<MetadataRequestResult<TResponse>> => {try {@@ -97,13 +97,13 @@ export const usePerformViewEntityAPIPersistOperation = (],);- const performViewEntityAPIPersistBatchOperation = useCallback(+ const performViewEntityApiPersistBatchOperation = useCallback(async <TInput, TResult>({inputs,mutate,applyResultToDraft,operationType,- }: PerformViewEntityAPIPersistBatchOperationArgs<TInput, TResult>): Promise<+ }: PerformViewEntityApiPersistBatchOperationArgs<TInput, TResult>): Promise<MetadataRequestResult<TResult[]>> => {if (inputs.length === 0) {@@ -159,7 +159,7 @@ export const usePerformViewEntityAPIPersistOperation = ();return {- performViewEntityAPIPersistOperation,- performViewEntityAPIPersistBatchOperation,+ performViewEntityApiPersistOperation,+ performViewEntityApiPersistBatchOperation,};};diff --git a/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewFieldAPIPersist.ts b/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewFieldApiPersist.tssimilarity index 78%rename from packages/twenty-front/src/modules/views/hooks/internal/usePerformViewFieldAPIPersist.tsrename to packages/twenty-front/src/modules/views/hooks/internal/usePerformViewFieldApiPersist.tsindex f5bf1458dfb..bfd6cd93ec9 100644--- a/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewFieldAPIPersist.ts+++ b/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewFieldApiPersist.ts@@ -2,7 +2,7 @@ import { useCallback } from 'react';import { type FlatViewField } from '@/metadata-store/types/FlatViewField';import { type MetadataRequestResult } from '@/object-metadata/types/MetadataRequestResult.type';-import { usePerformViewEntityAPIPersistOperation } from '@/views/hooks/internal/usePerformViewEntityAPIPersistOperation';+import { usePerformViewEntityApiPersistOperation } from '@/views/hooks/internal/usePerformViewEntityApiPersistOperation';import { useMutation } from '@apollo/client/react';import { CrudOperationType } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';@@ -17,7 +17,7 @@ import {UpdateViewFieldDocument,} from '~/generated-metadata/graphql';-export const usePerformViewFieldAPIPersist = () => {+export const usePerformViewFieldApiPersist = () => {const [createManyViewFieldsMutation] = useMutation(CreateManyViewFieldsDocument,);@@ -26,11 +26,11 @@ export const usePerformViewFieldAPIPersist = () => {const [destroyViewFieldMutation] = useMutation(DestroyViewFieldDocument);const {- performViewEntityAPIPersistOperation,- performViewEntityAPIPersistBatchOperation,- } = usePerformViewEntityAPIPersistOperation('viewField');+ performViewEntityApiPersistOperation,+ performViewEntityApiPersistBatchOperation,+ } = usePerformViewEntityApiPersistOperation('viewField');- const performViewFieldAPICreate = useCallback(+ const performViewFieldApiCreate = useCallback(async (createViewFieldInputs: CreateManyViewFieldsMutationVariables,): Promise<@@ -48,7 +48,7 @@ export const usePerformViewFieldAPIPersist = () => {};}- return performViewEntityAPIPersistOperation({+ return performViewEntityApiPersistOperation({persist: () =>createManyViewFieldsMutation({variables: createViewFieldInputs,@@ -63,10 +63,10 @@ export const usePerformViewFieldAPIPersist = () => {operationType: CrudOperationType.CREATE,});},- [createManyViewFieldsMutation, performViewEntityAPIPersistOperation],+ [createManyViewFieldsMutation, performViewEntityApiPersistOperation],);- const performViewFieldAPIUpdate = useCallback(+ const performViewFieldApiUpdate = useCallback(async (updateViewFieldInputs: UpdateViewFieldMutationVariables[],): Promise<@@ -74,7 +74,7 @@ export const usePerformViewFieldAPIPersist = () => {Awaited<ReturnType<typeof updateViewFieldMutation>>[]>> =>- performViewEntityAPIPersistBatchOperation({+ performViewEntityApiPersistBatchOperation({inputs: updateViewFieldInputs,mutate: (variables) => updateViewFieldMutation({ variables }),applyResultToDraft: (fulfilledMutations, { updateInDraft }) =>@@ -89,10 +89,10 @@ export const usePerformViewFieldAPIPersist = () => {),operationType: CrudOperationType.UPDATE,}),- [updateViewFieldMutation, performViewEntityAPIPersistBatchOperation],+ [updateViewFieldMutation, performViewEntityApiPersistBatchOperation],);- const performViewFieldAPIDelete = useCallback(+ const performViewFieldApiDelete = useCallback(async (deleteViewFieldInputs: DeleteViewFieldMutationVariables[],): Promise<@@ -100,7 +100,7 @@ export const usePerformViewFieldAPIPersist = () => {Awaited<ReturnType<typeof deleteViewFieldMutation>>[]>> =>- performViewEntityAPIPersistBatchOperation({+ performViewEntityApiPersistBatchOperation({inputs: deleteViewFieldInputs,mutate: (variables) => deleteViewFieldMutation({ variables }),applyResultToDraft: (fulfilledMutations, { removeFromDraft }) =>@@ -110,10 +110,10 @@ export const usePerformViewFieldAPIPersist = () => {}),operationType: CrudOperationType.DELETE,}),- [deleteViewFieldMutation, performViewEntityAPIPersistBatchOperation],+ [deleteViewFieldMutation, performViewEntityApiPersistBatchOperation],);- const performViewFieldAPIDestroy = useCallback(+ const performViewFieldApiDestroy = useCallback(async (destroyViewFieldInputs: DestroyViewFieldMutationVariables[],): Promise<@@ -121,7 +121,7 @@ export const usePerformViewFieldAPIPersist = () => {Awaited<ReturnType<typeof destroyViewFieldMutation>>[]>> =>- performViewEntityAPIPersistBatchOperation({+ performViewEntityApiPersistBatchOperation({inputs: destroyViewFieldInputs,mutate: (variables) => destroyViewFieldMutation({ variables }),applyResultToDraft: (fulfilledMutations, { removeFromDraft }) =>@@ -131,13 +131,13 @@ export const usePerformViewFieldAPIPersist = () => {}),operationType: CrudOperationType.DESTROY,}),- [destroyViewFieldMutation, performViewEntityAPIPersistBatchOperation],+ [destroyViewFieldMutation, performViewEntityApiPersistBatchOperation],);return {- performViewFieldAPICreate,- performViewFieldAPIUpdate,- performViewFieldAPIDelete,- performViewFieldAPIDestroy,+ performViewFieldApiCreate,+ performViewFieldApiUpdate,+ performViewFieldApiDelete,+ performViewFieldApiDestroy,};};diff --git a/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewFilterAPIPersist.ts b/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewFilterApiPersist.tssimilarity index 79%rename from packages/twenty-front/src/modules/views/hooks/internal/usePerformViewFilterAPIPersist.tsrename to packages/twenty-front/src/modules/views/hooks/internal/usePerformViewFilterApiPersist.tsindex 79248eba012..90aa23644c5 100644--- a/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewFilterAPIPersist.ts+++ b/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewFilterApiPersist.ts@@ -2,7 +2,7 @@ import { useCallback } from 'react';import { type FlatViewFilter } from '@/metadata-store/types/FlatViewFilter';import { type MetadataRequestResult } from '@/object-metadata/types/MetadataRequestResult.type';-import { usePerformViewEntityAPIPersistOperation } from '@/views/hooks/internal/usePerformViewEntityAPIPersistOperation';+import { usePerformViewEntityApiPersistOperation } from '@/views/hooks/internal/usePerformViewEntityApiPersistOperation';import { useMutation } from '@apollo/client/react';import { CrudOperationType } from 'twenty-shared/types';import { convertViewFilterValueToString, isDefined } from 'twenty-shared/utils';@@ -29,16 +29,16 @@ const toFlatViewFilter = ({value: convertViewFilterValueToString(viewFilter.value),}) as FlatViewFilter;-export const usePerformViewFilterAPIPersist = () => {+export const usePerformViewFilterApiPersist = () => {const [createViewFilterMutation] = useMutation(CreateViewFilterDocument);const [updateViewFilterMutation] = useMutation(UpdateViewFilterDocument);const [deleteViewFilterMutation] = useMutation(DeleteViewFilterDocument);const [destroyViewFilterMutation] = useMutation(DestroyViewFilterDocument);- const { performViewEntityAPIPersistBatchOperation } =- usePerformViewEntityAPIPersistOperation('viewFilter');+ const { performViewEntityApiPersistBatchOperation } =+ usePerformViewEntityApiPersistOperation('viewFilter');- const performViewFilterAPICreate = useCallback(+ const performViewFilterApiCreate = useCallback(async (createViewFilterInputs: CreateViewFilterMutationVariables[],): Promise<@@ -46,7 +46,7 @@ export const usePerformViewFilterAPIPersist = () => {Awaited<ReturnType<typeof createViewFilterMutation>>[]>> =>- performViewEntityAPIPersistBatchOperation({+ performViewEntityApiPersistBatchOperation({inputs: createViewFilterInputs,mutate: (variables) => createViewFilterMutation({ variables }),applyResultToDraft: (fulfilledMutations, { addToDraft }) =>@@ -59,10 +59,10 @@ export const usePerformViewFilterAPIPersist = () => {}),operationType: CrudOperationType.CREATE,}),- [createViewFilterMutation, performViewEntityAPIPersistBatchOperation],+ [createViewFilterMutation, performViewEntityApiPersistBatchOperation],);- const performViewFilterAPIUpdate = useCallback(+ const performViewFilterApiUpdate = useCallback(async (updateViewFilterInputs: UpdateViewFilterMutationVariables[],): Promise<@@ -70,7 +70,7 @@ export const usePerformViewFilterAPIPersist = () => {Awaited<ReturnType<typeof updateViewFilterMutation>>[]>> =>- performViewEntityAPIPersistBatchOperation({+ performViewEntityApiPersistBatchOperation({inputs: updateViewFilterInputs,mutate: (variables) => updateViewFilterMutation({ variables }),applyResultToDraft: (fulfilledMutations, { updateInDraft }) =>@@ -83,10 +83,10 @@ export const usePerformViewFilterAPIPersist = () => {),operationType: CrudOperationType.UPDATE,}),- [updateViewFilterMutation, performViewEntityAPIPersistBatchOperation],+ [updateViewFilterMutation, performViewEntityApiPersistBatchOperation],);- const performViewFilterAPIDelete = useCallback(+ const performViewFilterApiDelete = useCallback(async (deleteViewFilterInputs: DeleteViewFilterMutationVariables[],): Promise<@@ -94,7 +94,7 @@ export const usePerformViewFilterAPIPersist = () => {Awaited<ReturnType<typeof deleteViewFilterMutation>>[]>> =>- performViewEntityAPIPersistBatchOperation({+ performViewEntityApiPersistBatchOperation({inputs: deleteViewFilterInputs,mutate: (variables) => deleteViewFilterMutation({ variables }),applyResultToDraft: (fulfilledMutations, { removeFromDraft }) =>@@ -104,10 +104,10 @@ export const usePerformViewFilterAPIPersist = () => {}),operationType: CrudOperationType.DELETE,}),- [deleteViewFilterMutation, performViewEntityAPIPersistBatchOperation],+ [deleteViewFilterMutation, performViewEntityApiPersistBatchOperation],);- const performViewFilterAPIDestroy = useCallback(+ const performViewFilterApiDestroy = useCallback(async (destroyViewFilterInputs: DestroyViewFilterMutationVariables[],): Promise<@@ -115,7 +115,7 @@ export const usePerformViewFilterAPIPersist = () => {Awaited<ReturnType<typeof destroyViewFilterMutation>>[]>> =>- performViewEntityAPIPersistBatchOperation({+ performViewEntityApiPersistBatchOperation({inputs: destroyViewFilterInputs,mutate: (variables) => destroyViewFilterMutation({ variables }),applyResultToDraft: (fulfilledMutations, { removeFromDraft }) =>@@ -125,13 +125,13 @@ export const usePerformViewFilterAPIPersist = () => {}),operationType: CrudOperationType.DESTROY,}),- [destroyViewFilterMutation, performViewEntityAPIPersistBatchOperation],+ [destroyViewFilterMutation, performViewEntityApiPersistBatchOperation],);return {- performViewFilterAPICreate,- performViewFilterAPIUpdate,- performViewFilterAPIDelete,- performViewFilterAPIDestroy,+ performViewFilterApiCreate,+ performViewFilterApiUpdate,+ performViewFilterApiDelete,+ performViewFilterApiDestroy,};};diff --git a/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewFilterGroupAPIPersist.ts b/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewFilterGroupApiPersist.tssimilarity index 83%rename from packages/twenty-front/src/modules/views/hooks/internal/usePerformViewFilterGroupAPIPersist.tsrename to packages/twenty-front/src/modules/views/hooks/internal/usePerformViewFilterGroupApiPersist.tsindex 19ea9d7c0b8..9e82858130d 100644--- a/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewFilterGroupAPIPersist.ts+++ b/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewFilterGroupApiPersist.ts@@ -2,7 +2,7 @@ import { useCallback } from 'react';import { type FlatViewFilterGroup } from '@/metadata-store/types/FlatViewFilterGroup';import { type MetadataRequestResult } from '@/object-metadata/types/MetadataRequestResult.type';-import { usePerformViewEntityAPIPersistOperation } from '@/views/hooks/internal/usePerformViewEntityAPIPersistOperation';+import { usePerformViewEntityApiPersistOperation } from '@/views/hooks/internal/usePerformViewEntityApiPersistOperation';import { type GraphQLView } from '@/views/types/GraphQLView';import { type ViewFilterGroup } from '@/views/types/ViewFilterGroup';import { useMutation } from '@apollo/client/react';@@ -14,7 +14,7 @@ import {UpdateViewFilterGroupDocument,} from '~/generated-metadata/graphql';-export const usePerformViewFilterGroupAPIPersist = () => {+export const usePerformViewFilterGroupApiPersist = () => {const [createViewFilterGroupMutation] = useMutation(CreateViewFilterGroupDocument,);@@ -26,9 +26,9 @@ export const usePerformViewFilterGroupAPIPersist = () => {);const {- performViewEntityAPIPersistOperation,- performViewEntityAPIPersistBatchOperation,- } = usePerformViewEntityAPIPersistOperation('viewFilterGroup');+ performViewEntityApiPersistOperation,+ performViewEntityApiPersistBatchOperation,+ } = usePerformViewEntityApiPersistOperation('viewFilterGroup');const createViewFilterGroupRecord = useCallback(async (viewFilterGroup: ViewFilterGroup, view: Pick<GraphQLView, 'id'>) => {@@ -54,7 +54,7 @@ export const usePerformViewFilterGroupAPIPersist = () => {[createViewFilterGroupMutation],);- const performViewFilterGroupAPICreate = useCallback(+ const performViewFilterGroupApiCreate = useCallback(async (viewFilterGroupsToCreate: ViewFilterGroup[],view: Pick<GraphQLView, 'id'>,@@ -70,7 +70,7 @@ export const usePerformViewFilterGroupAPIPersist = () => {viewFilterGroupToCreate.parentViewFilterGroupId): undefined;- const result = await performViewEntityAPIPersistOperation({+ const result = await performViewEntityApiPersistOperation({persist: () =>createViewFilterGroupRecord({@@ -105,12 +105,12 @@ export const usePerformViewFilterGroupAPIPersist = () => {response: newRecordIds,};},- [createViewFilterGroupRecord, performViewEntityAPIPersistOperation],+ [createViewFilterGroupRecord, performViewEntityApiPersistOperation],);- const performViewFilterGroupAPIUpdate = useCallback(+ const performViewFilterGroupApiUpdate = useCallback((viewFilterGroupsToUpdate: ViewFilterGroup[]) =>- performViewEntityAPIPersistBatchOperation({+ performViewEntityApiPersistBatchOperation({inputs: viewFilterGroupsToUpdate,mutate: (viewFilterGroup) =>updateViewFilterGroupMutation({@@ -138,12 +138,12 @@ export const usePerformViewFilterGroupAPIPersist = () => {),operationType: CrudOperationType.UPDATE,}),- [updateViewFilterGroupMutation, performViewEntityAPIPersistBatchOperation],+ [updateViewFilterGroupMutation, performViewEntityApiPersistBatchOperation],);- const performViewFilterGroupAPIDestroy = useCallback(+ const performViewFilterGroupApiDestroy = useCallback((viewFilterGroupIdsToDestroy: string[]) =>- performViewEntityAPIPersistBatchOperation({+ performViewEntityApiPersistBatchOperation({inputs: viewFilterGroupIdsToDestroy,mutate: (viewFilterGroupId) =>destroyViewFilterGroupMutation({@@ -158,12 +158,12 @@ export const usePerformViewFilterGroupAPIPersist = () => {}),operationType: CrudOperationType.DESTROY,}),- [destroyViewFilterGroupMutation, performViewEntityAPIPersistBatchOperation],+ [destroyViewFilterGroupMutation, performViewEntityApiPersistBatchOperation],);return {- performViewFilterGroupAPICreate,- performViewFilterGroupAPIUpdate,- performViewFilterGroupAPIDestroy,+ performViewFilterGroupApiCreate,+ performViewFilterGroupApiUpdate,+ performViewFilterGroupApiDestroy,};};diff --git a/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewGroupAPIPersist.ts b/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewGroupApiPersist.tssimilarity index 78%rename from packages/twenty-front/src/modules/views/hooks/internal/usePerformViewGroupAPIPersist.tsrename to packages/twenty-front/src/modules/views/hooks/internal/usePerformViewGroupApiPersist.tsindex 6d26734eb56..59fb8057259 100644--- a/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewGroupAPIPersist.ts+++ b/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewGroupApiPersist.ts@@ -2,7 +2,7 @@ import { useCallback } from 'react';import { type FlatViewGroup } from '@/metadata-store/types/FlatViewGroup';import { type MetadataRequestResult } from '@/object-metadata/types/MetadataRequestResult.type';-import { usePerformViewEntityAPIPersistOperation } from '@/views/hooks/internal/usePerformViewEntityAPIPersistOperation';+import { usePerformViewEntityApiPersistOperation } from '@/views/hooks/internal/usePerformViewEntityApiPersistOperation';import { useMutation } from '@apollo/client/react';import { isNonEmptyArray } from '@sniptt/guards';import { CrudOperationType } from 'twenty-shared/types';@@ -13,7 +13,7 @@ import {UpdateManyViewGroupsDocument,} from '~/generated-metadata/graphql';-export const usePerformViewGroupAPIPersist = () => {+export const usePerformViewGroupApiPersist = () => {const [updateManyViewGroupsMutation] = useMutation(UpdateManyViewGroupsDocument,);@@ -22,10 +22,10 @@ export const usePerformViewGroupAPIPersist = () => {CreateManyViewGroupsDocument,);- const { performViewEntityAPIPersistOperation } =- usePerformViewEntityAPIPersistOperation('viewGroup');+ const { performViewEntityApiPersistOperation } =+ usePerformViewEntityApiPersistOperation('viewGroup');- const performViewGroupAPIUpdate = useCallback(+ const performViewGroupApiUpdate = useCallback(async (updateViewGroupInputs: UpdateManyViewGroupsMutationVariables,): Promise<@@ -40,7 +40,7 @@ export const usePerformViewGroupAPIPersist = () => {};}- return performViewEntityAPIPersistOperation({+ return performViewEntityApiPersistOperation({persist: () =>updateManyViewGroupsMutation({variables: updateViewGroupInputs,@@ -55,10 +55,10 @@ export const usePerformViewGroupAPIPersist = () => {operationType: CrudOperationType.UPDATE,});},- [updateManyViewGroupsMutation, performViewEntityAPIPersistOperation],+ [updateManyViewGroupsMutation, performViewEntityApiPersistOperation],);- const performViewGroupAPICreate = useCallback(+ const performViewGroupApiCreate = useCallback(async (createViewGroupInputs: CreateManyViewGroupsMutationVariables,): Promise<@@ -73,7 +73,7 @@ export const usePerformViewGroupAPIPersist = () => {};}- return performViewEntityAPIPersistOperation({+ return performViewEntityApiPersistOperation({persist: () =>createManyViewGroupsMutation({variables: createViewGroupInputs,@@ -88,11 +88,11 @@ export const usePerformViewGroupAPIPersist = () => {operationType: CrudOperationType.CREATE,});},- [createManyViewGroupsMutation, performViewEntityAPIPersistOperation],+ [createManyViewGroupsMutation, performViewEntityApiPersistOperation],);return {- performViewGroupAPIUpdate,- performViewGroupAPICreate,+ performViewGroupApiUpdate,+ performViewGroupApiCreate,};};diff --git a/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewSortAPIPersist.ts b/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewSortApiPersist.tssimilarity index 77%rename from packages/twenty-front/src/modules/views/hooks/internal/usePerformViewSortAPIPersist.tsrename to packages/twenty-front/src/modules/views/hooks/internal/usePerformViewSortApiPersist.tsindex cd08e445c9e..72e661cc622 100644--- a/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewSortAPIPersist.ts+++ b/packages/twenty-front/src/modules/views/hooks/internal/usePerformViewSortApiPersist.ts@@ -2,7 +2,7 @@ import { useCallback } from 'react';import { type FlatViewSort } from '@/metadata-store/types/FlatViewSort';import { type MetadataRequestResult } from '@/object-metadata/types/MetadataRequestResult.type';-import { usePerformViewEntityAPIPersistOperation } from '@/views/hooks/internal/usePerformViewEntityAPIPersistOperation';+import { usePerformViewEntityApiPersistOperation } from '@/views/hooks/internal/usePerformViewEntityApiPersistOperation';import { useMutation } from '@apollo/client/react';import { CrudOperationType } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';@@ -17,16 +17,16 @@ import {UpdateViewSortDocument,} from '~/generated-metadata/graphql';-export const usePerformViewSortAPIPersist = () => {+export const usePerformViewSortApiPersist = () => {const [createViewSortMutation] = useMutation(CreateViewSortDocument);const [updateViewSortMutation] = useMutation(UpdateViewSortDocument);const [deleteViewSortMutation] = useMutation(DeleteViewSortDocument);const [destroyViewSortMutation] = useMutation(DestroyViewSortDocument);- const { performViewEntityAPIPersistBatchOperation } =- usePerformViewEntityAPIPersistOperation('viewSort');+ const { performViewEntityApiPersistBatchOperation } =+ usePerformViewEntityApiPersistOperation('viewSort');- const performViewSortAPICreate = useCallback(+ const performViewSortApiCreate = useCallback(async (createViewSortInputs: CreateViewSortMutationVariables[],): Promise<@@ -34,7 +34,7 @@ export const usePerformViewSortAPIPersist = () => {Awaited<ReturnType<typeof createViewSortMutation>>[]>> =>- performViewEntityAPIPersistBatchOperation({+ performViewEntityApiPersistBatchOperation({inputs: createViewSortInputs,mutate: (variables) => createViewSortMutation({ variables }),applyResultToDraft: (fulfilledMutations, { addToDraft }) =>@@ -47,10 +47,10 @@ export const usePerformViewSortAPIPersist = () => {}),operationType: CrudOperationType.CREATE,}),- [createViewSortMutation, performViewEntityAPIPersistBatchOperation],+ [createViewSortMutation, performViewEntityApiPersistBatchOperation],);- const performViewSortAPIUpdate = useCallback(+ const performViewSortApiUpdate = useCallback(async (updateViewSortInputs: UpdateViewSortMutationVariables[],): Promise<@@ -58,7 +58,7 @@ export const usePerformViewSortAPIPersist = () => {Awaited<ReturnType<typeof updateViewSortMutation>>[]>> =>- performViewEntityAPIPersistBatchOperation({+ performViewEntityApiPersistBatchOperation({inputs: updateViewSortInputs,mutate: (variables) => updateViewSortMutation({ variables }),applyResultToDraft: (fulfilledMutations, { updateInDraft }) =>@@ -71,10 +71,10 @@ export const usePerformViewSortAPIPersist = () => {),operationType: CrudOperationType.UPDATE,}),- [updateViewSortMutation, performViewEntityAPIPersistBatchOperation],+ [updateViewSortMutation, performViewEntityApiPersistBatchOperation],);- const performViewSortAPIDelete = useCallback(+ const performViewSortApiDelete = useCallback(async (deleteViewSortInputs: DeleteViewSortMutationVariables[],): Promise<@@ -82,7 +82,7 @@ export const usePerformViewSortAPIPersist = () => {Awaited<ReturnType<typeof deleteViewSortMutation>>[]>> =>- performViewEntityAPIPersistBatchOperation({+ performViewEntityApiPersistBatchOperation({inputs: deleteViewSortInputs,mutate: (variables) => deleteViewSortMutation({ variables }),applyResultToDraft: (fulfilledMutations, { removeFromDraft }) =>@@ -92,10 +92,10 @@ export const usePerformViewSortAPIPersist = () => {}),operationType: CrudOperationType.DELETE,}),- [deleteViewSortMutation, performViewEntityAPIPersistBatchOperation],+ [deleteViewSortMutation, performViewEntityApiPersistBatchOperation],);- const performViewSortAPIDestroy = useCallback(+ const performViewSortApiDestroy = useCallback(async (destroyViewSortInputs: DestroyViewSortMutationVariables[],): Promise<@@ -103,7 +103,7 @@ export const usePerformViewSortAPIPersist = () => {Awaited<ReturnType<typeof destroyViewSortMutation>>[]>> =>- performViewEntityAPIPersistBatchOperation({+ performViewEntityApiPersistBatchOperation({inputs: destroyViewSortInputs,mutate: (variables) => destroyViewSortMutation({ variables }),applyResultToDraft: (fulfilledMutations, { removeFromDraft }) =>@@ -113,13 +113,13 @@ export const usePerformViewSortAPIPersist = () => {}),operationType: CrudOperationType.DESTROY,}),- [destroyViewSortMutation, performViewEntityAPIPersistBatchOperation],+ [destroyViewSortMutation, performViewEntityApiPersistBatchOperation],);return {- performViewSortAPICreate,- performViewSortAPIUpdate,- performViewSortAPIDelete,- performViewSortAPIDestroy,+ performViewSortApiCreate,+ performViewSortApiUpdate,+ performViewSortApiDelete,+ performViewSortApiDestroy,};};diff --git a/packages/twenty-front/src/modules/views/hooks/useCreateViewFromCurrentView.ts b/packages/twenty-front/src/modules/views/hooks/useCreateViewFromCurrentView.tsindex 02c0fa71ac1..330060c6a95 100644--- a/packages/twenty-front/src/modules/views/hooks/useCreateViewFromCurrentView.ts+++ b/packages/twenty-front/src/modules/views/hooks/useCreateViewFromCurrentView.ts@@ -6,11 +6,11 @@ import { useRecordIndexContextOrThrow } from '@/object-record/record-index/conteimport { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { usePerformViewAPIPersist } from '@/views/hooks/internal/usePerformViewAPIPersist';-import { usePerformViewFieldAPIPersist } from '@/views/hooks/internal/usePerformViewFieldAPIPersist';-import { usePerformViewFilterAPIPersist } from '@/views/hooks/internal/usePerformViewFilterAPIPersist';-import { usePerformViewFilterGroupAPIPersist } from '@/views/hooks/internal/usePerformViewFilterGroupAPIPersist';-import { usePerformViewSortAPIPersist } from '@/views/hooks/internal/usePerformViewSortAPIPersist';+import { usePerformViewApiPersist } from '@/views/hooks/internal/usePerformViewApiPersist';+import { usePerformViewFieldApiPersist } from '@/views/hooks/internal/usePerformViewFieldApiPersist';+import { usePerformViewFilterApiPersist } from '@/views/hooks/internal/usePerformViewFilterApiPersist';+import { usePerformViewFilterGroupApiPersist } from '@/views/hooks/internal/usePerformViewFilterGroupApiPersist';+import { usePerformViewSortApiPersist } from '@/views/hooks/internal/usePerformViewSortApiPersist';import { viewFromViewIdFamilySelector } from '@/views/states/selectors/viewFromViewIdFamilySelector';import { type GraphQLView } from '@/views/types/GraphQLView';import { ViewType } from '@/views/types/ViewType';@@ -26,7 +26,7 @@ import { ViewCalendarLayout } from '~/generated-metadata/graphql';import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';export const useCreateViewFromCurrentView = (viewBarComponentId?: string) => {- const { performViewAPICreate } = usePerformViewAPIPersist();+ const { performViewApiCreate } = usePerformViewApiPersist();const { objectMetadataItem, recordIndexId } = useRecordIndexContextOrThrow();@@ -40,14 +40,14 @@ export const useCreateViewFromCurrentView = (viewBarComponentId?: string) => {recordIndexId,);- const { performViewFieldAPICreate } = usePerformViewFieldAPIPersist();+ const { performViewFieldApiCreate } = usePerformViewFieldApiPersist();- const { performViewSortAPICreate } = usePerformViewSortAPIPersist();+ const { performViewSortApiCreate } = usePerformViewSortApiPersist();- const { performViewFilterAPICreate } = usePerformViewFilterAPIPersist();+ const { performViewFilterApiCreate } = usePerformViewFilterApiPersist();- const { performViewFilterGroupAPICreate } =- usePerformViewFilterGroupAPIPersist();+ const { performViewFilterGroupApiCreate } =+ usePerformViewFilterGroupApiPersist();const store = useStore();@@ -110,7 +110,7 @@ export const useCreateViewFromCurrentView = (viewBarComponentId?: string) => {const viewType = type ?? sourceView.type;- const result = await performViewAPICreate(+ const result = await performViewApiCreate({input: {id: id ?? v4(),@@ -161,7 +161,7 @@ export const useCreateViewFromCurrentView = (viewBarComponentId?: string) => {throw new Error('Failed to create view');}- const fieldResult = await performViewFieldAPICreate({+ const fieldResult = await performViewFieldApiCreate({inputs: sourceView.viewFields.map((viewField) => ({id: v4(),fieldMetadataId: viewField.fieldMetadataId,@@ -206,7 +206,7 @@ export const useCreateViewFromCurrentView = (viewBarComponentId?: string) => {id: v4(),}));- const filterGroupResult = await performViewFilterGroupAPICreate(+ const filterGroupResult = await performViewFilterGroupApiCreate(viewFilterGroupsToCreate,{id: newViewId,@@ -234,7 +234,7 @@ export const useCreateViewFromCurrentView = (viewBarComponentId?: string) => {}),);- const filterResult = await performViewFilterAPICreate(+ const filterResult = await performViewFilterApiCreate(createViewFilterInputs,);@@ -251,7 +251,7 @@ export const useCreateViewFromCurrentView = (viewBarComponentId?: string) => {},}));- const sortResult = await performViewSortAPICreate(createViewSortInputs);+ const sortResult = await performViewSortApiCreate(createViewSortInputs);if (sortResult.status === 'failed') {return undefined;@@ -262,17 +262,17 @@ export const useCreateViewFromCurrentView = (viewBarComponentId?: string) => {},[currentViewId,- performViewAPICreate,+ performViewApiCreate,anyFieldFilterValue,objectMetadataItem,- performViewFieldAPICreate,+ performViewFieldApiCreate,store,currentRecordFilterGroups,currentRecordFilters,currentRecordSorts,- performViewFilterGroupAPICreate,- performViewFilterAPICreate,- performViewSortAPICreate,+ performViewFilterGroupApiCreate,+ performViewFilterApiCreate,+ performViewSortApiCreate,],);diff --git a/packages/twenty-front/src/modules/views/hooks/useSaveAnyFieldFilterToView.ts b/packages/twenty-front/src/modules/views/hooks/useSaveAnyFieldFilterToView.tsindex 501eeb3ac0d..fd0cbf48cb5 100644--- a/packages/twenty-front/src/modules/views/hooks/useSaveAnyFieldFilterToView.ts+++ b/packages/twenty-front/src/modules/views/hooks/useSaveAnyFieldFilterToView.ts@@ -1,6 +1,6 @@import { anyFieldFilterValueComponentState } from '@/object-record/record-filter/states/anyFieldFilterValueComponentState';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';-import { usePerformViewAPIUpdate } from '@/views/hooks/internal/usePerformViewAPIUpdate';+import { usePerformViewApiUpdate } from '@/views/hooks/internal/usePerformViewApiUpdate';import { useCanPersistViewChanges } from '@/views/hooks/useCanPersistViewChanges';import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';import { convertUpdateViewInputToGql } from '@/views/utils/convertUpdateViewInputToGql';@@ -10,7 +10,7 @@ import { isDefined } from 'twenty-shared/utils';export const useSaveAnyFieldFilterToView = () => {const { canPersistChanges } = useCanPersistViewChanges();- const { performViewAPIUpdate } = usePerformViewAPIUpdate();+ const { performViewApiUpdate } = usePerformViewApiUpdate();const { currentView } = useGetCurrentViewOnly();@@ -32,7 +32,7 @@ export const useSaveAnyFieldFilterToView = () => {);if (currentAnyFieldFilterValue !== currentViewAnyFieldFilterValue) {- await performViewAPIUpdate({+ await performViewApiUpdate({id: currentView.id,input: convertUpdateViewInputToGql({...currentView,@@ -43,7 +43,7 @@ export const useSaveAnyFieldFilterToView = () => {}, [store,canPersistChanges,- performViewAPIUpdate,+ performViewApiUpdate,anyFieldFilterValueCallbackState,currentView,]);diff --git a/packages/twenty-front/src/modules/views/hooks/useSaveCurrentViewFields.ts b/packages/twenty-front/src/modules/views/hooks/useSaveCurrentViewFields.tsindex 7dd84e94678..1fa9243b54c 100644--- a/packages/twenty-front/src/modules/views/hooks/useSaveCurrentViewFields.ts+++ b/packages/twenty-front/src/modules/views/hooks/useSaveCurrentViewFields.ts@@ -3,7 +3,7 @@ import { useCallback } from 'react';import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';-import { usePerformViewFieldAPIPersist } from '@/views/hooks/internal/usePerformViewFieldAPIPersist';+import { usePerformViewFieldApiPersist } from '@/views/hooks/internal/usePerformViewFieldApiPersist';import { useCanPersistViewChanges } from '@/views/hooks/useCanPersistViewChanges';import { useGetViewFromState } from '@/views/hooks/useGetViewFromState';import { type ViewField } from '@/views/types/ViewField';@@ -16,8 +16,8 @@ import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';export const useSaveCurrentViewFields = () => {const { canPersistChanges } = useCanPersistViewChanges();- const { performViewFieldAPICreate, performViewFieldAPIUpdate } =- usePerformViewFieldAPIPersist();+ const { performViewFieldApiCreate, performViewFieldApiUpdate } =+ usePerformViewFieldApiPersist();const { getViewFromState } = useGetViewFromState();@@ -129,17 +129,17 @@ export const useSaveCurrentViewFields = () => {);await Promise.all([- performViewFieldAPICreate({ inputs: viewFieldsToCreate }),- performViewFieldAPIUpdate(viewFieldsToUpdate),+ performViewFieldApiCreate({ inputs: viewFieldsToCreate }),+ performViewFieldApiUpdate(viewFieldsToUpdate),]);},[store,canPersistChanges,- performViewFieldAPICreate,+ performViewFieldApiCreate,currentViewIdCallbackState,getViewFromState,- performViewFieldAPIUpdate,+ performViewFieldApiUpdate,],);diff --git a/packages/twenty-front/src/modules/views/hooks/useSaveCurrentViewGroups.ts b/packages/twenty-front/src/modules/views/hooks/useSaveCurrentViewGroups.tsindex fc3f349eb5d..bbdfc515d27 100644--- a/packages/twenty-front/src/modules/views/hooks/useSaveCurrentViewGroups.ts+++ b/packages/twenty-front/src/modules/views/hooks/useSaveCurrentViewGroups.ts@@ -3,7 +3,7 @@ import { useCallback } from 'react';import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';-import { usePerformViewGroupAPIPersist } from '@/views/hooks/internal/usePerformViewGroupAPIPersist';+import { usePerformViewGroupApiPersist } from '@/views/hooks/internal/usePerformViewGroupApiPersist';import { useCanPersistViewChanges } from '@/views/hooks/useCanPersistViewChanges';import { useGetViewFromState } from '@/views/hooks/useGetViewFromState';import { type ViewGroup } from '@/views/types/ViewGroup';@@ -13,7 +13,7 @@ import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';export const useSaveCurrentViewGroups = () => {const { canPersistChanges } = useCanPersistViewChanges();- const { performViewGroupAPIUpdate } = usePerformViewGroupAPIPersist();+ const { performViewGroupApiUpdate } = usePerformViewGroupApiPersist();const { getViewFromState } = useGetViewFromState();@@ -67,7 +67,7 @@ export const useSaveCurrentViewGroups = () => {return;}- await performViewGroupAPIUpdate({+ await performViewGroupApiUpdate({inputs: [{id: existingField.id,@@ -85,7 +85,7 @@ export const useSaveCurrentViewGroups = () => {canPersistChanges,currentViewIdCallbackState,getViewFromState,- performViewGroupAPIUpdate,+ performViewGroupApiUpdate,],);@@ -150,14 +150,14 @@ export const useSaveCurrentViewGroups = () => {throw new Error('mainGroupByFieldMetadataId is required');}- await performViewGroupAPIUpdate({ inputs: viewGroupInputsToUpdate });+ await performViewGroupApiUpdate({ inputs: viewGroupInputsToUpdate });},[store,canPersistChanges,currentViewIdCallbackState,getViewFromState,- performViewGroupAPIUpdate,+ performViewGroupApiUpdate,],);diff --git a/packages/twenty-front/src/modules/views/hooks/useSaveRecordFiltersAndGroupFiltersToViewFiltersAndGroupFilters.ts b/packages/twenty-front/src/modules/views/hooks/useSaveRecordFiltersAndGroupFiltersToViewFiltersAndGroupFilters.tsindex 6e98c0f0dfa..673f974f5dc 100644--- a/packages/twenty-front/src/modules/views/hooks/useSaveRecordFiltersAndGroupFiltersToViewFiltersAndGroupFilters.ts+++ b/packages/twenty-front/src/modules/views/hooks/useSaveRecordFiltersAndGroupFiltersToViewFiltersAndGroupFilters.ts@@ -3,8 +3,8 @@ import { type FlatViewFilter } from '@/metadata-store/types/FlatViewFilter';import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState';import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';-import { usePerformViewFilterAPIPersist } from '@/views/hooks/internal/usePerformViewFilterAPIPersist';-import { usePerformViewFilterGroupAPIPersist } from '@/views/hooks/internal/usePerformViewFilterGroupAPIPersist';+import { usePerformViewFilterApiPersist } from '@/views/hooks/internal/usePerformViewFilterApiPersist';+import { usePerformViewFilterGroupApiPersist } from '@/views/hooks/internal/usePerformViewFilterGroupApiPersist';import { useCanPersistViewChanges } from '@/views/hooks/useCanPersistViewChanges';import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';import { getViewFilterGroupsToCreate } from '@/views/utils/getViewFilterGroupsToCreate';@@ -27,16 +27,16 @@ export const useSaveRecordFiltersAndGroupFiltersToViewFiltersAndGroupFilters =const store = useStore();const {- performViewFilterGroupAPICreate,- performViewFilterGroupAPIUpdate,- performViewFilterGroupAPIDestroy,- } = usePerformViewFilterGroupAPIPersist();+ performViewFilterGroupApiCreate,+ performViewFilterGroupApiUpdate,+ performViewFilterGroupApiDestroy,+ } = usePerformViewFilterGroupApiPersist();const {- performViewFilterAPICreate,- performViewFilterAPIUpdate,- performViewFilterAPIDestroy,- } = usePerformViewFilterAPIPersist();+ performViewFilterApiCreate,+ performViewFilterApiUpdate,+ performViewFilterApiDestroy,+ } = usePerformViewFilterApiPersist();const currentRecordFilterGroupsCallbackState =useAtomComponentStateCallbackState(@@ -84,7 +84,7 @@ export const useSaveRecordFiltersAndGroupFiltersToViewFiltersAndGroupFilters =(viewFilterGroup) => viewFilterGroup.id,);- const createFilterGroupResult = await performViewFilterGroupAPICreate(+ const createFilterGroupResult = await performViewFilterGroupApiCreate(viewFilterGroupsToCreate,currentView,);@@ -92,7 +92,7 @@ export const useSaveRecordFiltersAndGroupFiltersToViewFiltersAndGroupFilters =return;}- const updateFilterGroupResult = await performViewFilterGroupAPIUpdate(+ const updateFilterGroupResult = await performViewFilterGroupApiUpdate(viewFilterGroupsToUpdate,);if (updateFilterGroupResult.status === 'failed') {@@ -169,28 +169,28 @@ export const useSaveRecordFiltersAndGroupFiltersToViewFiltersAndGroupFilters =}),);- const createResult = await performViewFilterAPICreate(+ const createResult = await performViewFilterApiCreate(createViewFilterInputs,);if (createResult.status === 'failed') {return;}- const updateResult = await performViewFilterAPIUpdate(+ const updateResult = await performViewFilterApiUpdate(updateViewFilterInputs,);if (updateResult.status === 'failed') {return;}- const deleteResult = await performViewFilterAPIDestroy(+ const deleteResult = await performViewFilterApiDestroy(destroyViewFilterInputs,);if (deleteResult.status === 'failed') {return;}- const destroyFilterGroupResult = await performViewFilterGroupAPIDestroy(+ const destroyFilterGroupResult = await performViewFilterGroupApiDestroy(viewFilterGroupIdsToDestroy,);if (destroyFilterGroupResult.status === 'failed') {@@ -216,12 +216,12 @@ export const useSaveRecordFiltersAndGroupFiltersToViewFiltersAndGroupFilters =store,currentRecordFilterGroupsCallbackState,currentRecordFiltersCallbackState,- performViewFilterGroupAPICreate,- performViewFilterGroupAPIUpdate,- performViewFilterGroupAPIDestroy,- performViewFilterAPICreate,- performViewFilterAPIUpdate,- performViewFilterAPIDestroy,+ performViewFilterGroupApiCreate,+ performViewFilterGroupApiUpdate,+ performViewFilterGroupApiDestroy,+ performViewFilterApiCreate,+ performViewFilterApiUpdate,+ performViewFilterApiDestroy,]);return {diff --git a/packages/twenty-front/src/modules/views/hooks/useSaveRecordSortsToViewSorts.ts b/packages/twenty-front/src/modules/views/hooks/useSaveRecordSortsToViewSorts.tsindex 44d1204bab8..a9608a547b7 100644--- a/packages/twenty-front/src/modules/views/hooks/useSaveRecordSortsToViewSorts.ts+++ b/packages/twenty-front/src/modules/views/hooks/useSaveRecordSortsToViewSorts.ts@@ -1,6 +1,6 @@import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';-import { usePerformViewSortAPIPersist } from '@/views/hooks/internal/usePerformViewSortAPIPersist';+import { usePerformViewSortApiPersist } from '@/views/hooks/internal/usePerformViewSortApiPersist';import { useCanPersistViewChanges } from '@/views/hooks/useCanPersistViewChanges';import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';import { getViewSortsToCreate } from '@/views/utils/getViewSortsToCreate';@@ -14,10 +14,10 @@ import { isDefined } from 'twenty-shared/utils';export const useSaveRecordSortsToViewSorts = () => {const { canPersistChanges } = useCanPersistViewChanges();const {- performViewSortAPICreate,- performViewSortAPIUpdate,- performViewSortAPIDestroy,- } = usePerformViewSortAPIPersist();+ performViewSortApiCreate,+ performViewSortApiUpdate,+ performViewSortApiDestroy,+ } = usePerformViewSortApiPersist();const { currentView } = useGetCurrentViewOnly();@@ -79,17 +79,17 @@ export const useSaveRecordSortsToViewSorts = () => {},}));- const createResult = await performViewSortAPICreate(createViewSortInputs);+ const createResult = await performViewSortApiCreate(createViewSortInputs);if (createResult.status === 'failed') {return;}- const updateResult = await performViewSortAPIUpdate(updateViewSortInputs);+ const updateResult = await performViewSortApiUpdate(updateViewSortInputs);if (updateResult.status === 'failed') {return;}- const deleteResult = await performViewSortAPIDestroy(destroyViewSortInputs);+ const deleteResult = await performViewSortApiDestroy(destroyViewSortInputs);if (deleteResult.status === 'failed') {return;}@@ -98,9 +98,9 @@ export const useSaveRecordSortsToViewSorts = () => {currentView,store,currentRecordSortsCallbackState,- performViewSortAPICreate,- performViewSortAPIUpdate,- performViewSortAPIDestroy,+ performViewSortApiCreate,+ performViewSortApiUpdate,+ performViewSortApiDestroy,]);return {diff --git a/packages/twenty-front/src/modules/views/hooks/useUpdateViewAggregate.ts b/packages/twenty-front/src/modules/views/hooks/useUpdateViewAggregate.tsindex ea164096aa1..e0b845d33d7 100644--- a/packages/twenty-front/src/modules/views/hooks/useUpdateViewAggregate.ts+++ b/packages/twenty-front/src/modules/views/hooks/useUpdateViewAggregate.ts@@ -6,7 +6,7 @@ import { getViewPersistTarget } from '@/object-record/record-table-widget/utils/import { type ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';import { convertExtendedAggregateOperationToAggregateOperation } from '@/object-record/utils/convertExtendedAggregateOperationToAggregateOperation';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { usePerformViewAPIUpdate } from '@/views/hooks/internal/usePerformViewAPIUpdate';+import { usePerformViewApiUpdate } from '@/views/hooks/internal/usePerformViewApiUpdate';import { useCanPersistViewChanges } from '@/views/hooks/useCanPersistViewChanges';import { useCallback, useContext } from 'react';import { isDefined } from 'twenty-shared/utils';@@ -17,7 +17,7 @@ export const useUpdateViewAggregate = () => {const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,);- const { performViewAPIUpdate } = usePerformViewAPIUpdate();+ const { performViewApiUpdate } = usePerformViewApiUpdate();const { loadRecordIndexStates } = useLoadRecordIndexStates();const recordTableWidgetContext = useContext(RecordTableWidgetContext);@@ -62,7 +62,7 @@ export const useUpdateViewAggregate = () => {return;}- const updatedViewResult = await performViewAPIUpdate({+ const updatedViewResult = await performViewApiUpdate({id: contextStoreCurrentViewId,input: {kanbanAggregateOperationFieldMetadataId,@@ -84,7 +84,7 @@ export const useUpdateViewAggregate = () => {[canPersistChanges,contextStoreCurrentViewId,- performViewAPIUpdate,+ performViewApiUpdate,loadRecordIndexStates,recordTableWidgetContext,],diff --git a/packages/twenty-front/src/modules/views/hooks/useUpdateViewKanbanColumnWidth.ts b/packages/twenty-front/src/modules/views/hooks/useUpdateViewKanbanColumnWidth.tsindex ed9089a9957..9049520f18d 100644--- a/packages/twenty-front/src/modules/views/hooks/useUpdateViewKanbanColumnWidth.ts+++ b/packages/twenty-front/src/modules/views/hooks/useUpdateViewKanbanColumnWidth.ts@@ -2,7 +2,7 @@ import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/import { RecordTableWidgetContext } from '@/object-record/record-table-widget/contexts/RecordTableWidgetContext';import { getViewPersistTarget } from '@/object-record/record-table-widget/utils/getViewPersistTarget';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { usePerformViewAPIUpdate } from '@/views/hooks/internal/usePerformViewAPIUpdate';+import { usePerformViewApiUpdate } from '@/views/hooks/internal/usePerformViewApiUpdate';import { useCanPersistViewChanges } from '@/views/hooks/useCanPersistViewChanges';import { useCallback, useContext } from 'react';import { isDefined } from 'twenty-shared/utils';@@ -12,7 +12,7 @@ export const useUpdateViewKanbanColumnWidth = () => {const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,);- const { performViewAPIUpdate } = usePerformViewAPIUpdate();+ const { performViewApiUpdate } = usePerformViewApiUpdate();const recordTableWidgetContext = useContext(RecordTableWidgetContext);const updateViewKanbanColumnWidth = useCallback(@@ -32,7 +32,7 @@ export const useUpdateViewKanbanColumnWidth = () => {return;}- await performViewAPIUpdate({+ await performViewApiUpdate({id: contextStoreCurrentViewId,input: {kanbanColumnWidth,@@ -42,7 +42,7 @@ export const useUpdateViewKanbanColumnWidth = () => {[canPersistChanges,contextStoreCurrentViewId,- performViewAPIUpdate,+ performViewApiUpdate,recordTableWidgetContext,],);diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsxindex 4d98189fba5..e43949d42b6 100644--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx@@ -12,7 +12,7 @@ import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMimport { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';-import { usePerformViewAPIUpdate } from '@/views/hooks/internal/usePerformViewAPIUpdate';+import { usePerformViewApiUpdate } from '@/views/hooks/internal/usePerformViewApiUpdate';import { useChangeView } from '@/views/hooks/useChangeView';import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';import { useOpenCreateViewDropdown } from '@/views/hooks/useOpenCreateViewDropown';@@ -63,7 +63,7 @@ export const ViewPickerListContent = () => {const { setViewPickerMode } = useViewPickerMode();- const { performViewAPIUpdate } = usePerformViewAPIUpdate();+ const { performViewApiUpdate } = usePerformViewApiUpdate();const { changeView } = useChangeView();const { closeDropdown } = useCloseDropdown();@@ -100,7 +100,7 @@ export const ViewPickerListContent = () => {Promise.all(viewsReordered.map(async (view, index) => {if (view.position !== index) {- await performViewAPIUpdate({+ await performViewApiUpdate({id: view.id,input: { position: index },});@@ -108,7 +108,7 @@ export const ViewPickerListContent = () => {}),);},- [performViewAPIUpdate, workspaceViews],+ [performViewApiUpdate, workspaceViews],);const handleUnlistedDragEnd = useCallback(@@ -123,7 +123,7 @@ export const ViewPickerListContent = () => {Promise.all(viewsReordered.map(async (view, index) => {if (view.position !== index) {- await performViewAPIUpdate({+ await performViewApiUpdate({id: view.id,input: { position: index },});@@ -131,7 +131,7 @@ export const ViewPickerListContent = () => {}),);},- [performViewAPIUpdate, unlistedViews],+ [performViewApiUpdate, unlistedViews],);return (diff --git a/packages/twenty-front/src/modules/views/view-picker/hooks/useDestroyViewFromCurrentState.ts b/packages/twenty-front/src/modules/views/view-picker/hooks/useDestroyViewFromCurrentState.tsindex 4bdde840f0e..81cd29e5b56 100644--- a/packages/twenty-front/src/modules/views/view-picker/hooks/useDestroyViewFromCurrentState.ts+++ b/packages/twenty-front/src/modules/views/view-picker/hooks/useDestroyViewFromCurrentState.ts@@ -5,7 +5,7 @@ import { useContextStoreObjectMetadataItemOrThrow } from '@/context-store/hooks/import { useOptimisticRemoveNavigationMenuItemsByViewId } from '@/navigation-menu-item/edit/hooks/useOptimisticRemoveNavigationMenuItemsByViewId';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';-import { usePerformViewAPIPersist } from '@/views/hooks/internal/usePerformViewAPIPersist';+import { usePerformViewApiPersist } from '@/views/hooks/internal/usePerformViewApiPersist';import { useChangeView } from '@/views/hooks/useChangeView';import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';import { viewsFromObjectMetadataItemFamilySelector } from '@/views/states/selectors/viewsFromObjectMetadataItemFamilySelector';@@ -45,7 +45,7 @@ export const useDestroyViewFromCurrentState = (viewBarInstanceId?: string) => {const { changeView } = useChangeView();- const { performViewAPIDestroy } = usePerformViewAPIPersist();+ const { performViewApiDestroy } = usePerformViewApiPersist();const { removeNavigationMenuItemsByViewIds } =useOptimisticRemoveNavigationMenuItemsByViewId();@@ -74,13 +74,13 @@ export const useDestroyViewFromCurrentState = (viewBarInstanceId?: string) => {changeView(remainingViews[0].id);}- await performViewAPIDestroy({ id: viewPickerReferenceViewId });+ await performViewApiDestroy({ id: viewPickerReferenceViewId });removeNavigationMenuItemsByViewIds([viewPickerReferenceViewId]);}, [currentView,closeAndResetViewPicker,changeView,- performViewAPIDestroy,+ performViewApiDestroy,removeNavigationMenuItemsByViewIds,store,viewPickerIsDirtyCallbackState,diff --git a/packages/twenty-front/src/modules/views/view-picker/hooks/useUpdateViewFromCurrentState.ts b/packages/twenty-front/src/modules/views/view-picker/hooks/useUpdateViewFromCurrentState.tsindex fb54c8140b0..d6085490ac1 100644--- a/packages/twenty-front/src/modules/views/view-picker/hooks/useUpdateViewFromCurrentState.ts+++ b/packages/twenty-front/src/modules/views/view-picker/hooks/useUpdateViewFromCurrentState.ts@@ -2,7 +2,7 @@ import { useCallback } from 'react';import { useStore } from 'jotai';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';-import { usePerformViewAPIUpdate } from '@/views/hooks/internal/usePerformViewAPIUpdate';+import { usePerformViewApiUpdate } from '@/views/hooks/internal/usePerformViewApiUpdate';import { useCanPersistViewChanges } from '@/views/hooks/useCanPersistViewChanges';import { useCloseAndResetViewPicker } from '@/views/view-picker/hooks/useCloseAndResetViewPicker';import { viewPickerInputNameComponentState } from '@/views/view-picker/states/viewPickerInputNameComponentState';@@ -42,7 +42,7 @@ export const useUpdateViewFromCurrentState = () => {viewPickerVisibilityComponentState,);- const { performViewAPIUpdate } = usePerformViewAPIUpdate();+ const { performViewApiUpdate } = usePerformViewApiUpdate();const store = useStore();@@ -66,7 +66,7 @@ export const useUpdateViewFromCurrentState = () => {const visibility = store.get(viewPickerVisibilityCallbackState);try {- await performViewAPIUpdate({+ await performViewApiUpdate({id: viewPickerReferenceViewId,input: {name: viewPickerInputName,@@ -87,7 +87,7 @@ export const useUpdateViewFromCurrentState = () => {viewPickerInputNameCallbackState,viewPickerSelectedIconCallbackState,viewPickerVisibilityCallbackState,- performViewAPIUpdate,+ performViewApiUpdate,store,]);diff --git a/packages/twenty-front/src/pages/auth/SignInUp.tsx b/packages/twenty-front/src/pages/auth/SignInUp.tsxindex 8cec9ad8257..123ccc8192b 100644--- a/packages/twenty-front/src/pages/auth/SignInUp.tsx+++ b/packages/twenty-front/src/pages/auth/SignInUp.tsx@@ -15,7 +15,7 @@ import { EmailVerificationSent } from '@/auth/sign-in-up/components/EmailVerificimport { SignInUpGlobalScopeForm } from '@/auth/sign-in-up/components/SignInUpGlobalScopeForm';import { SignInUpStandardContent } from '@/auth/sign-in-up/components/SignInUpStandardContent';import { SignInUpWorkspaceScopeForm } from '@/auth/sign-in-up/components/SignInUpWorkspaceScopeForm';-import { SignInUpSSOIdentityProviderSelection } from '@/auth/sign-in-up/components/internal/SignInUpSSOIdentityProviderSelection';+import { SignInUpSsoIdentityProviderSelection } from '@/auth/sign-in-up/components/internal/SignInUpSsoIdentityProviderSelection';import { OnboardingLayout } from '@/onboarding/components/OnboardingLayout';import { StyledOnboardingStepPage } from '@/onboarding/components/StyledOnboardingStepPage';import { SignInUpWorkspaceCreationForm } from '@/auth/sign-in-up/components/internal/SignInUpWorkspaceCreationForm';@@ -27,7 +27,7 @@ import { useIsCurrentLocationOnDefaultDomain } from '@/domain-manager/hooks/useIimport { useMemo } from 'react';import { SignInUpGlobalScopeFormEffect } from '@/auth/sign-in-up/components/internal/SignInUpGlobalScopeFormEffect';-import { SignInUpSSOExchangeTokenEffect } from '@/auth/sign-in-up/components/internal/SignInUpSSOExchangeTokenEffect';+import { SignInUpSsoExchangeTokenEffect } from '@/auth/sign-in-up/components/internal/SignInUpSsoExchangeTokenEffect';import { SignInUpTwoFactorAuthenticationProvision } from '@/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationProvision';import { SignInUpTOTPVerification } from '@/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationVerification';import { useWorkspaceFromInviteHash } from '@/auth/sign-in-up/hooks/useWorkspaceFromInviteHash';@@ -155,7 +155,7 @@ export const SignInUp = () => {if (isDefaultDomain && isMultiWorkspaceEnabled) {return (<>- <SignInUpSSOExchangeTokenEffect />+ <SignInUpSsoExchangeTokenEffect /><SignInUpGlobalScopeFormEffect /><SignInUpGlobalScopeForm /></>@@ -164,9 +164,9 @@ export const SignInUp = () => {if (isOnAWorkspace &&- signInUpStep === SignInUpStep.SSOIdentityProviderSelection+ signInUpStep === SignInUpStep.SsoIdentityProviderSelection) {- return <SignInUpSSOIdentityProviderSelection />;+ return <SignInUpSsoIdentityProviderSelection />;}if (signInUpStep === SignInUpStep.TwoFactorAuthenticationProvision) {@@ -188,7 +188,7 @@ export const SignInUp = () => {return (<>- <SignInUpSSOExchangeTokenEffect />+ <SignInUpSsoExchangeTokenEffect /><SignInUpGlobalScopeFormEffect /><SignInUpGlobalScopeForm /></>diff --git a/packages/twenty-front/src/pages/settings/security/SettingsSecuritySSOIdentifyProvider.tsx b/packages/twenty-front/src/pages/settings/security/SettingsSecuritySsoIdentifyProvider.tsxsimilarity index 68%rename from packages/twenty-front/src/pages/settings/security/SettingsSecuritySSOIdentifyProvider.tsxrename to packages/twenty-front/src/pages/settings/security/SettingsSecuritySsoIdentifyProvider.tsxindex 0434251047f..e0aa2c20ea9 100644--- a/packages/twenty-front/src/pages/settings/security/SettingsSecuritySSOIdentifyProvider.tsx+++ b/packages/twenty-front/src/pages/settings/security/SettingsSecuritySsoIdentifyProvider.tsx@@ -1,11 +1,11 @@/* @license Enterprise */import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';-import SettingsSSOIdentitiesProvidersForm from '@/settings/security/components/SSO/SettingsSSOIdentitiesProvidersForm';-import { useCreateSSOIdentityProvider } from '@/settings/security/hooks/useCreateSSOIdentityProvider';-import { type SettingSecurityNewSSOIdentityFormValues } from '@/settings/security/types/SSOIdentityProvider';-import { sSOIdentityProviderDefaultValues } from '@/settings/security/utils/sSOIdentityProviderDefaultValues';-import { SSOIdentitiesProvidersParamsSchema } from '@/settings/security/validation-schemas/SSOIdentityProviderSchema';+import SettingsSsoIdentitiesProvidersForm from '@/settings/security/components/sso/SettingsSsoIdentitiesProvidersForm';+import { useCreateSsoIdentityProvider } from '@/settings/security/hooks/useCreateSsoIdentityProvider';+import { type SettingSecurityNewSsoIdentityFormValues } from '@/settings/security/types/SsoIdentityProvider';+import { ssoIdentityProviderDefaultValues } from '@/settings/security/utils/ssoIdentityProviderDefaultValues';+import { ssoIdentitiesProvidersParamsSchema } from '@/settings/security/validation-schemas/ssoIdentityProviderSchema';import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';import { CombinedGraphQLErrors } from '@apollo/client/errors';@@ -17,16 +17,16 @@ import { SettingsPath } from 'twenty-shared/types';import { getSettingsPath } from 'twenty-shared/utils';import { useNavigateSettings } from '~/hooks/useNavigateSettings';-export const SettingsSecuritySSOIdentifyProvider = () => {+export const SettingsSecuritySsoIdentifyProvider = () => {const navigate = useNavigateSettings();const { enqueueErrorSnackBar } = useSnackBar();- const { createSSOIdentityProvider } = useCreateSSOIdentityProvider();+ const { createSsoIdentityProvider } = useCreateSsoIdentityProvider();- const form = useForm<SettingSecurityNewSSOIdentityFormValues>({+ const form = useForm<SettingSecurityNewSsoIdentityFormValues>({mode: 'onSubmit',- resolver: zodResolver(SSOIdentitiesProvidersParamsSchema),- defaultValues: Object.values(sSOIdentityProviderDefaultValues).reduce(+ resolver: zodResolver(ssoIdentitiesProvidersParamsSchema),+ defaultValues: Object.values(ssoIdentityProviderDefaultValues).reduce((acc, fn) => ({ ...acc, ...fn() }),{},),@@ -38,15 +38,15 @@ export const SettingsSecuritySSOIdentifyProvider = () => {const values = form.getValues();const providerKeys = Object.keys(- sSOIdentityProviderDefaultValues[type](),+ ssoIdentityProviderDefaultValues[type](),);const filteredValues = Object.fromEntries(Object.entries(values).filter(([key]) => providerKeys.includes(key)),);- await createSSOIdentityProvider(- SSOIdentitiesProvidersParamsSchema.parse(filteredValues),+ await createSsoIdentityProvider(+ ssoIdentitiesProvidersParamsSchema.parse(filteredValues),);navigate(SettingsPath.Security);@@ -83,7 +83,7 @@ export const SettingsSecuritySSOIdentifyProvider = () => {{ children: <Trans>New SSO provider</Trans> },]}>- <SettingsSSOIdentitiesProvidersForm />+ <SettingsSsoIdentitiesProvidersForm /></SettingsPageLayout></FormProvider></form>diff --git a/packages/twenty-oxlint-rules/rules/prefer-workspace-scoped-repository.ts b/packages/twenty-oxlint-rules/rules/prefer-workspace-scoped-repository.tsindex 4db1c5b2ead..45f23ae86c1 100644--- a/packages/twenty-oxlint-rules/rules/prefer-workspace-scoped-repository.ts+++ b/packages/twenty-oxlint-rules/rules/prefer-workspace-scoped-repository.ts@@ -31,7 +31,7 @@ const STRUCTURAL_EXEMPTIONS = new Set<string>(['RolePermissionFlagEntity','SigningKeyEntity','UserEntity',- 'WorkspaceSSOIdentityProviderEntity',+ 'WorkspaceSsoIdentityProviderEntity',]);// Workspace-scoped entities the wrapper could technically wrap, but wherediff --git a/packages/twenty-server/src/database/commands/list-and-delete-orphaned-workspace-entities.command.ts b/packages/twenty-server/src/database/commands/list-and-delete-orphaned-workspace-entities.command.tsindex 600970ab895..a2c60da4d98 100644--- a/packages/twenty-server/src/database/commands/list-and-delete-orphaned-workspace-entities.command.ts+++ b/packages/twenty-server/src/database/commands/list-and-delete-orphaned-workspace-entities.command.ts@@ -19,7 +19,7 @@ import { MessageSuppressionEntity } from 'src/engine/core-modules/emailing-domaiimport { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';import { PublicDomainEntity } from 'src/engine/core-modules/public-domain/public-domain.entity';-import { WorkspaceSSOIdentityProviderEntity } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';+import { WorkspaceSsoIdentityProviderEntity } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';import { WebhookEntity } from 'src/engine/metadata-modules/webhook/entities/webhook.entity';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';@@ -108,7 +108,7 @@ const WORKSPACE_RELATED_ENTITIES: EntityTarget<ObjectLiteral>[] = [FileEntity,PublicDomainEntity,WebhookEntity,- WorkspaceSSOIdentityProviderEntity,+ WorkspaceSsoIdentityProviderEntity,];type OrphanedRecord = {diff --git a/packages/twenty-server/src/engine/core-modules/app-token/app-token.entity.ts b/packages/twenty-server/src/engine/core-modules/app-token/app-token.entity.tsindex 444bb7687d2..dc6475bf924 100644--- a/packages/twenty-server/src/engine/core-modules/app-token/app-token.entity.ts+++ b/packages/twenty-server/src/engine/core-modules/app-token/app-token.entity.ts@@ -26,7 +26,7 @@ export enum AppTokenType {OnboardingInvitationToken = 'ONBOARDING_INVITATION_TOKEN',EmailVerificationToken = 'EMAIL_VERIFICATION_TOKEN',EnterpriseValidityToken = 'ENTERPRISE_VALIDITY_TOKEN',- SSOExchangeToken = 'SSO_EXCHANGE_TOKEN',+ SsoExchangeToken = 'SSO_EXCHANGE_TOKEN',}@Entity({ name: 'appToken', schema: 'core' })diff --git a/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.service.ts b/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.service.tsindex fd80a80ccac..e75815099f8 100644--- a/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.service.ts+++ b/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.service.ts@@ -303,13 +303,13 @@ export class ApprovedAccessDomainService {return this.approvedAccessDomainRepository.find(workspace.id);}- async findValidatedApprovedAccessDomainWithWorkspacesAndSSOIdentityProvidersDomain(+ async findValidatedApprovedAccessDomainWithWorkspacesAndSsoIdentityProvidersDomain(domain: string,) {return this.approvedAccessDomainRepositoryUnscoped.find({relations: ['workspace',- 'workspace.workspaceSSOIdentityProviders',+ 'workspace.workspaceSsoIdentityProviders','workspace.approvedAccessDomains',],where: {diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.module.tsindex d9c2782f8d2..469b9285f14 100644--- a/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts@@ -15,13 +15,13 @@ import { GoogleAuthController } from 'src/engine/core-modules/auth/controllers/gimport { MicrosoftAPIsAuthController } from 'src/engine/core-modules/auth/controllers/microsoft-apis-auth.controller';import { MicrosoftAuthController } from 'src/engine/core-modules/auth/controllers/microsoft-auth.controller';import { OAuthPropagatorController } from 'src/engine/core-modules/auth/controllers/oauth-propagator.controller';-import { SSOAuthController } from 'src/engine/core-modules/auth/controllers/sso-auth.controller';+import { SsoAuthController } from 'src/engine/core-modules/auth/controllers/sso-auth.controller';import { AuthSsoService } from 'src/engine/core-modules/auth/services/auth-sso.service';import { CreateCalendarChannelService } from 'src/engine/core-modules/auth/services/create-calendar-channel.service';import { CreateConnectedAccountService } from 'src/engine/core-modules/auth/services/create-connected-account.service';import { CreateMessageChannelService } from 'src/engine/core-modules/auth/services/create-message-channel.service';-import { CreateSSOConnectedAccountService } from 'src/engine/core-modules/auth/services/create-sso-connected-account.service';-import { GoogleAPIScopesService } from 'src/engine/core-modules/auth/services/google-apis-scopes';+import { CreateSsoConnectedAccountService } from 'src/engine/core-modules/auth/services/create-sso-connected-account.service';+import { GoogleApiScopesService } from 'src/engine/core-modules/auth/services/google-apis-scopes';import { GoogleApisServiceAvailabilityService } from 'src/engine/core-modules/auth/services/google-apis-service-availability.service';import { GoogleAPIsService } from 'src/engine/core-modules/auth/services/google-apis.service';import { MicrosoftAPIsService } from 'src/engine/core-modules/auth/services/microsoft-apis.service';@@ -51,8 +51,8 @@ import { KeyValuePairEntity } from 'src/engine/core-modules/key-value-pair/key-vimport { MetricsModule } from 'src/engine/core-modules/metrics/metrics.module';import { OnboardingModule } from 'src/engine/core-modules/onboarding/onboarding.module';import { SecureHttpClientModule } from 'src/engine/core-modules/secure-http-client/secure-http-client.module';-import { WorkspaceSSOModule } from 'src/engine/core-modules/sso/sso.module';-import { WorkspaceSSOIdentityProviderEntity } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';+import { WorkspaceSsoModule } from 'src/engine/core-modules/sso/sso.module';+import { WorkspaceSsoIdentityProviderEntity } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';import { TwoFactorAuthenticationMethodEntity } from 'src/engine/core-modules/two-factor-authentication/entities/two-factor-authentication-method.entity';import { ThrottlerModule } from 'src/engine/core-modules/throttler/throttler.module';import { TwoFactorAuthenticationModule } from 'src/engine/core-modules/two-factor-authentication/two-factor-authentication.module';@@ -95,7 +95,7 @@ import { JwtAuthStrategy } from './strategies/jwt.auth.strategy';AppTokenEntity,ApiKeyEntity,FeatureFlagEntity,- WorkspaceSSOIdentityProviderEntity,+ WorkspaceSsoIdentityProviderEntity,KeyValuePairEntity,UserWorkspaceEntity,TwoFactorAuthenticationMethodEntity,@@ -110,7 +110,7 @@ import { JwtAuthStrategy } from './strategies/jwt.auth.strategy';MessagingCommonModule,OnboardingRecentMessagesImportModule,MessagingFolderSyncManagerModule,- WorkspaceSSOModule,+ WorkspaceSsoModule,FeatureFlagModule,WorkspaceInvitationModule,EmailVerificationModule,@@ -143,7 +143,7 @@ import { JwtAuthStrategy } from './strategies/jwt.auth.strategy';GoogleAPIsAuthController,MicrosoftAPIsAuthController,OAuthPropagatorController,- SSOAuthController,+ SsoAuthController,ConnectionProviderOAuthController,],providers: [@@ -153,7 +153,7 @@ import { JwtAuthStrategy } from './strategies/jwt.auth.strategy';SamlAuthStrategy,AuthResolver,GoogleAPIsService,- GoogleAPIScopesService,+ GoogleApiScopesService,GoogleApisServiceAvailabilityService,MicrosoftAPIsService,AccessTokenService,@@ -167,7 +167,7 @@ import { JwtAuthStrategy } from './strategies/jwt.auth.strategy';CreateMessageChannelService,CreateCalendarChannelService,CreateConnectedAccountService,- CreateSSOConnectedAccountService,+ CreateSsoConnectedAccountService,UpdateConnectedAccountOnReconnectService,TransientTokenService,AuthSsoService,diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.tsindex 9bada853b33..4f472ca0a3a 100644--- a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.ts@@ -10,7 +10,7 @@ import { ImpersonationAuthorizationService } from 'src/engine/core-modules/imperimport { SignInUpService } from 'src/engine/core-modules/auth/services/sign-in-up.service';import { AccessTokenService } from 'src/engine/core-modules/auth/token/services/access-token.service';import { RefreshTokenService } from 'src/engine/core-modules/auth/token/services/refresh-token.service';-import { SSOExchangeTokenService } from 'src/engine/core-modules/auth/token/services/sso-exchange-token.service';+import { SsoExchangeTokenService } from 'src/engine/core-modules/auth/token/services/sso-exchange-token.service';import { WorkspaceAgnosticTokenService } from 'src/engine/core-modules/auth/token/services/workspace-agnostic-token.service';import { CaptchaGuard } from 'src/engine/core-modules/captcha/captcha.guard';import { EmailPasswordResetLinkInput } from 'src/engine/core-modules/auth/dto/email-password-reset-link.input';@@ -27,7 +27,7 @@ import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/serviceimport { FileCorePictureService } from 'src/engine/core-modules/file/file-core-picture/services/file-core-picture.service';import { UserSessionCookieService } from 'src/engine/core-modules/user-session/services/user-session-cookie.service';import { UserSessionService } from 'src/engine/core-modules/user-session/services/user-session.service';-import { SSOService } from 'src/engine/core-modules/sso/services/sso.service';+import { SsoService } from 'src/engine/core-modules/sso/services/sso.service';import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';import { TwoFactorAuthenticationService } from 'src/engine/core-modules/two-factor-authentication/two-factor-authentication.service';import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';@@ -195,7 +195,7 @@ describe('AuthResolver', () => {},},{- provide: SSOExchangeTokenService,+ provide: SsoExchangeTokenService,useValue: {},},{@@ -227,7 +227,7 @@ describe('AuthResolver', () => {useValue: {},},{- provide: SSOService,+ provide: SsoService,useValue: {},},{diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.tsindex 47a99ca2354..8824543c9cd 100644--- a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts@@ -32,8 +32,8 @@ import { AvailableWorkspacesAndAccessTokensDTO } from 'src/engine/core-modules/aimport { EmailPasswordResetLinkDTO } from 'src/engine/core-modules/auth/dto/email-password-reset-link.dto';import { EmailPasswordResetLinkInput } from 'src/engine/core-modules/auth/dto/email-password-reset-link.input';import { GetAuthTokenFromEmailVerificationTokenInput } from 'src/engine/core-modules/auth/dto/get-auth-token-from-email-verification-token.input';-import { GetAuthorizationUrlForSSODTO } from 'src/engine/core-modules/auth/dto/get-authorization-url-for-sso.dto';-import { GetAuthorizationUrlForSSOInput } from 'src/engine/core-modules/auth/dto/get-authorization-url-for-sso.input';+import { GetAuthorizationUrlForSsoDTO } from 'src/engine/core-modules/auth/dto/get-authorization-url-for-sso.dto';+import { GetAuthorizationUrlForSsoInput } from 'src/engine/core-modules/auth/dto/get-authorization-url-for-sso.input';import { InvalidatePasswordDTO } from 'src/engine/core-modules/auth/dto/invalidate-password.dto';import { SignUpDTO } from 'src/engine/core-modules/auth/dto/sign-up.dto';import { TransientTokenDTO } from 'src/engine/core-modules/auth/dto/transient-token.dto';@@ -51,7 +51,7 @@ import { EmailVerificationTokenService } from 'src/engine/core-modules/auth/tokeimport { LoginTokenService } from 'src/engine/core-modules/auth/token/services/login-token.service';import { RefreshTokenService } from 'src/engine/core-modules/auth/token/services/refresh-token.service';import { RenewTokenService } from 'src/engine/core-modules/auth/token/services/renew-token.service';-import { SSOExchangeTokenService } from 'src/engine/core-modules/auth/token/services/sso-exchange-token.service';+import { SsoExchangeTokenService } from 'src/engine/core-modules/auth/token/services/sso-exchange-token.service';import { TransientTokenService } from 'src/engine/core-modules/auth/token/services/transient-token.service';import { WorkspaceAgnosticTokenService } from 'src/engine/core-modules/auth/token/services/workspace-agnostic-token.service';import { AuthContextUser } from 'src/engine/core-modules/auth/types/auth-context.type';@@ -74,7 +74,7 @@ import { I18nContext } from 'src/engine/core-modules/i18n/types/i18n-context.typimport { IMPERSONATION_DENIAL_BY_REASON } from 'src/engine/core-modules/impersonation/constants/impersonation-denial-by-reason.constant';import { IMPERSONATION_DENIAL_LOG_MESSAGE_BY_REASON } from 'src/engine/core-modules/impersonation/constants/impersonation-denial-log-message-by-reason.constant';import { ImpersonationAuthorizationService } from 'src/engine/core-modules/impersonation/services/impersonation-authorization.service';-import { SSOService } from 'src/engine/core-modules/sso/services/sso.service';+import { SsoService } from 'src/engine/core-modules/sso/services/sso.service';import { TwoFactorAuthenticationVerificationInput } from 'src/engine/core-modules/two-factor-authentication/dto/two-factor-authentication-verification.input';import { TwoFactorAuthenticationExceptionFilter } from 'src/engine/core-modules/two-factor-authentication/two-factor-authentication-exception.filter';import { TwoFactorAuthenticationService } from 'src/engine/core-modules/two-factor-authentication/two-factor-authentication.service';@@ -104,7 +104,7 @@ import { ApiKeyToken } from './dto/api-key-token.dto';import { AuthToken } from './dto/auth-token.dto';import { AuthTokens } from './dto/auth-tokens.dto';import { GetAuthTokensFromLoginTokenInput } from './dto/get-auth-tokens-from-login-token.input';-import { GetAuthTokensFromSSOExchangeTokenInput } from './dto/get-auth-tokens-from-sso-exchange-token.input';+import { GetAuthTokensFromSsoExchangeTokenInput } from './dto/get-auth-tokens-from-sso-exchange-token.input';import { LoginTokenDTO } from './dto/login-token.dto';import { SignUpInNewWorkspaceInput } from './dto/sign-up-in-new-workspace.input';import { SignUpInput } from './dto/sign-up.input';@@ -148,7 +148,7 @@ export class AuthResolver {private resetPasswordService: ResetPasswordService,private loginTokenService: LoginTokenService,private workspaceAgnosticTokenService: WorkspaceAgnosticTokenService,- private ssoExchangeTokenService: SSOExchangeTokenService,+ private ssoExchangeTokenService: SsoExchangeTokenService,private refreshTokenService: RefreshTokenService,private signInUpService: SignInUpService,private transientTokenService: TransientTokenService,@@ -156,7 +156,7 @@ export class AuthResolver {private workspaceDomainsService: WorkspaceDomainsService,private userWorkspaceService: UserWorkspaceService,private emailVerificationTokenService: EmailVerificationTokenService,- private ssoService: SSOService,+ private ssoService: SsoService,private readonly eventLogEmitterService: EventLogEmitterService,private readonly impersonationAuthorizationService: ImpersonationAuthorizationService,private readonly subdomainManagerService: SubdomainManagerService,@@ -175,10 +175,10 @@ export class AuthResolver {);}- @Mutation(() => GetAuthorizationUrlForSSODTO)+ @Mutation(() => GetAuthorizationUrlForSsoDTO)@UseGuards(PublicEndpointGuard, NoPermissionGuard)async getAuthorizationUrlForSSO(- @Args('input') params: GetAuthorizationUrlForSSOInput,+ @Args('input') params: GetAuthorizationUrlForSsoInput,) {return await this.ssoService.getAuthorizationUrlForSSO(params.identityProviderId,@@ -749,11 +749,11 @@ export class AuthResolver {@UseGuards(PublicEndpointGuard, NoPermissionGuard)async getAuthTokensFromSSOExchangeToken(@Args()- { ssoExchangeToken }: GetAuthTokensFromSSOExchangeTokenInput,+ { ssoExchangeToken }: GetAuthTokensFromSsoExchangeTokenInput,@Context() context: { req: Request },): Promise<AuthTokens> {const { userId, authProvider } =- await this.ssoExchangeTokenService.validateAndConsumeSSOExchangeTokenOrThrow(+ await this.ssoExchangeTokenService.validateAndConsumeSsoExchangeTokenOrThrow(ssoExchangeToken,);diff --git a/packages/twenty-server/src/engine/core-modules/auth/controllers/google-auth.controller.ts b/packages/twenty-server/src/engine/core-modules/auth/controllers/google-auth.controller.tsindex 1e5a97df07f..47c9e248e0a 100644--- a/packages/twenty-server/src/engine/core-modules/auth/controllers/google-auth.controller.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/controllers/google-auth.controller.ts@@ -47,7 +47,7 @@ export class GoogleAuthController {@UseFilters(AuthOAuthExceptionFilter)async googleAuthRedirect(@Req() req: GoogleRequest, @Res() res: Response) {return res.redirect(- await this.authService.signInUpWithSocialSSO(+ await this.authService.signInUpWithSocialSso(req.user,AuthProviderEnum.Google,),diff --git a/packages/twenty-server/src/engine/core-modules/auth/controllers/microsoft-auth.controller.ts b/packages/twenty-server/src/engine/core-modules/auth/controllers/microsoft-auth.controller.tsindex 463249bce0d..e845be9a306 100644--- a/packages/twenty-server/src/engine/core-modules/auth/controllers/microsoft-auth.controller.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/controllers/microsoft-auth.controller.ts@@ -48,7 +48,7 @@ export class MicrosoftAuthController {@Res() res: Response,) {return res.redirect(- await this.authService.signInUpWithSocialSSO(+ await this.authService.signInUpWithSocialSso(req.user,AuthProviderEnum.Microsoft,),diff --git a/packages/twenty-server/src/engine/core-modules/auth/controllers/sso-auth.controller.ts b/packages/twenty-server/src/engine/core-modules/auth/controllers/sso-auth.controller.tsindex fbdf442fedb..4464c60a421 100644--- a/packages/twenty-server/src/engine/core-modules/auth/controllers/sso-auth.controller.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/controllers/sso-auth.controller.ts@@ -27,19 +27,19 @@ import {} from 'src/engine/core-modules/auth/auth.exception';import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';import { EnterpriseFeaturesEnabledGuard } from 'src/engine/core-modules/auth/guards/enterprise-features-enabled.guard';-import { OIDCAuthGuard } from 'src/engine/core-modules/auth/guards/oidc-auth.guard';-import { SAMLAuthGuard } from 'src/engine/core-modules/auth/guards/saml-auth.guard';+import { OidcAuthGuard } from 'src/engine/core-modules/auth/guards/oidc-auth.guard';+import { SamlAuthGuard } from 'src/engine/core-modules/auth/guards/saml-auth.guard';import { AuthService } from 'src/engine/core-modules/auth/services/auth.service';-import { OIDCRequest } from 'src/engine/core-modules/auth/strategies/oidc.auth.strategy';-import { SAMLRequest } from 'src/engine/core-modules/auth/strategies/saml.auth.strategy';+import { OidcRequest } from 'src/engine/core-modules/auth/strategies/oidc.auth.strategy';+import { SamlRequest } from 'src/engine/core-modules/auth/strategies/saml.auth.strategy';import { LoginTokenService } from 'src/engine/core-modules/auth/token/services/login-token.service';import { WorkspaceDomainsService } from 'src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service';import { GuardRedirectService } from 'src/engine/core-modules/guard-redirect/services/guard-redirect.service';-import { SSOService } from 'src/engine/core-modules/sso/services/sso.service';+import { SsoService } from 'src/engine/core-modules/sso/services/sso.service';import {IdentityProviderType,- SSOIdentityProviderStatus,- WorkspaceSSOIdentityProviderEntity,+ SsoIdentityProviderStatus,+ WorkspaceSsoIdentityProviderEntity,} from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';import { UserService } from 'src/engine/core-modules/user/services/user.service';import { AuthProviderEnum } from 'src/engine/core-modules/workspace/types/workspace.type';@@ -49,16 +49,16 @@ import { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';@Controller(ApiPath.Auth)@UseFilters(AuthRestApiExceptionFilter)-export class SSOAuthController {+export class SsoAuthController {constructor(private readonly loginTokenService: LoginTokenService,private readonly authService: AuthService,private readonly guardRedirectService: GuardRedirectService,private readonly workspaceDomainsService: WorkspaceDomainsService,private readonly userService: UserService,- private readonly ssoService: SSOService,- @InjectRepository(WorkspaceSSOIdentityProviderEntity)- private readonly workspaceSSOIdentityProviderRepository: Repository<WorkspaceSSOIdentityProviderEntity>,+ private readonly ssoService: SsoService,+ @InjectRepository(WorkspaceSsoIdentityProviderEntity)+ private readonly workspaceSsoIdentityProviderRepository: Repository<WorkspaceSsoIdentityProviderEntity>,) {}@Get('saml/metadata/:identityProviderId')@@ -85,7 +85,7 @@ export class SSOAuthController {@Get('oidc/login/:identityProviderId')@UseGuards(EnterpriseFeaturesEnabledGuard,- OIDCAuthGuard,+ OidcAuthGuard,PublicEndpointGuard,NoPermissionGuard,)@@ -97,7 +97,7 @@ export class SSOAuthController {@Get('saml/login/:identityProviderId')@UseGuards(EnterpriseFeaturesEnabledGuard,- SAMLAuthGuard,+ SamlAuthGuard,PublicEndpointGuard,NoPermissionGuard,)@@ -109,22 +109,22 @@ export class SSOAuthController {@Get('oidc/callback')@UseGuards(EnterpriseFeaturesEnabledGuard,- OIDCAuthGuard,+ OidcAuthGuard,PublicEndpointGuard,NoPermissionGuard,)- async oidcAuthCallback(@Req() req: OIDCRequest, @Res() res: Response) {+ async oidcAuthCallback(@Req() req: OidcRequest, @Res() res: Response) {return await this.authCallback(req, res);}@Post('saml/callback/:identityProviderId')@UseGuards(EnterpriseFeaturesEnabledGuard,- SAMLAuthGuard,+ SamlAuthGuard,PublicEndpointGuard,NoPermissionGuard,)- async samlAuthCallback(@Req() req: SAMLRequest, @Res() res: Response) {+ async samlAuthCallback(@Req() req: SamlRequest, @Res() res: Response) {try {return await this.authCallback(req, res);} catch (err) {@@ -135,9 +135,9 @@ export class SSOAuthController {}}- private async authCallback(req: OIDCRequest | SAMLRequest, res: Response) {+ private async authCallback(req: OidcRequest | SamlRequest, res: Response) {const workspaceIdentityProvider =- await this.workspaceSSOIdentityProviderRepository.findOne({+ await this.workspaceSsoIdentityProviderRepository.findOne({where: { id: req.user.identityProviderId },relations: { workspace: true },});@@ -145,7 +145,7 @@ export class SSOAuthController {try {if (!workspaceIdentityProvider ||- workspaceIdentityProvider.status !== SSOIdentityProviderStatus.Active+ workspaceIdentityProvider.status !== SsoIdentityProviderStatus.Active) {throw new AuthException('Identity provider not found',@@ -255,7 +255,7 @@ export class SSOAuthController {});if (ssoContext) {- await this.authService.createSSOConnectedAccountIfFeatureFlagIsOn({+ await this.authService.createSsoConnectedAccountIfFeatureFlagIsOn({workspaceId: workspace.id,userId: user.id,handle: payload.email.toLowerCase(),diff --git a/packages/twenty-server/src/engine/core-modules/auth/dto/available-workspaces.dto.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/available-workspaces.dto.tsindex 641de6bf441..d79db0202b4 100644--- a/packages/twenty-server/src/engine/core-modules/auth/dto/available-workspaces.dto.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/dto/available-workspaces.dto.ts@@ -3,17 +3,17 @@import { Field, ObjectType } from '@nestjs/graphql';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';-import { type SSOConfiguration } from 'src/engine/core-modules/sso/types/SSOConfigurations.type';+import { type SsoConfiguration } from 'src/engine/core-modules/sso/types/sso-configurations.type';import {IdentityProviderType,- SSOIdentityProviderStatus,+ SsoIdentityProviderStatus,} from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';import { WorkspaceUrlsDTO } from 'src/engine/core-modules/workspace/dtos/workspace-urls.dto';@ObjectType('SSOConnection')-class SSOConnectionDTO {+class SsoConnectionDTO {@Field(() => IdentityProviderType)- type: SSOConfiguration['type'];+ type: SsoConfiguration['type'];@Field(() => UUIDScalarType)id: string;@@ -24,8 +24,8 @@ class SSOConnectionDTO {@Field(() => String)name: string;- @Field(() => SSOIdentityProviderStatus)- status: SSOConfiguration['status'];+ @Field(() => SsoIdentityProviderStatus)+ status: SsoConfiguration['status'];}@ObjectType('AvailableWorkspace')@@ -51,8 +51,8 @@ export class AvailableWorkspace {@Field(() => String, { nullable: true })logo?: string;- @Field(() => [SSOConnectionDTO])- sso: SSOConnectionDTO[];+ @Field(() => [SsoConnectionDTO])+ sso: SsoConnectionDTO[];}@ObjectType('AvailableWorkspaces')diff --git a/packages/twenty-server/src/engine/core-modules/auth/dto/get-auth-tokens-from-sso-exchange-token.input.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/get-auth-tokens-from-sso-exchange-token.input.tsindex f9421a78d77..c884ee5af20 100644--- a/packages/twenty-server/src/engine/core-modules/auth/dto/get-auth-tokens-from-sso-exchange-token.input.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/dto/get-auth-tokens-from-sso-exchange-token.input.ts@@ -3,7 +3,7 @@ import { ArgsType, Field } from '@nestjs/graphql';import { IsNotEmpty, IsString } from 'class-validator';@ArgsType()-export class GetAuthTokensFromSSOExchangeTokenInput {+export class GetAuthTokensFromSsoExchangeTokenInput {@Field(() => String)@IsNotEmpty()@IsString()diff --git a/packages/twenty-server/src/engine/core-modules/auth/dto/get-authorization-url-for-sso.dto.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/get-authorization-url-for-sso.dto.tsindex 8cf30e641b6..278dc717c2f 100644--- a/packages/twenty-server/src/engine/core-modules/auth/dto/get-authorization-url-for-sso.dto.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/dto/get-authorization-url-for-sso.dto.ts@@ -3,15 +3,15 @@import { Field, ObjectType } from '@nestjs/graphql';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';-import { type SSOConfiguration } from 'src/engine/core-modules/sso/types/SSOConfigurations.type';+import { type SsoConfiguration } from 'src/engine/core-modules/sso/types/sso-configurations.type';@ObjectType('GetAuthorizationUrlForSSO')-export class GetAuthorizationUrlForSSODTO {+export class GetAuthorizationUrlForSsoDTO {@Field(() => String)authorizationURL: string;@Field(() => String)- type: SSOConfiguration['type'];+ type: SsoConfiguration['type'];@Field(() => UUIDScalarType)id: string;diff --git a/packages/twenty-server/src/engine/core-modules/auth/dto/get-authorization-url-for-sso.input.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/get-authorization-url-for-sso.input.tsindex abd32b8f68d..517c1347899 100644--- a/packages/twenty-server/src/engine/core-modules/auth/dto/get-authorization-url-for-sso.input.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/dto/get-authorization-url-for-sso.input.ts@@ -6,8 +6,8 @@ import { IsOptional, IsString, IsUUID } from 'class-validator';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';-@InputType()-export class GetAuthorizationUrlForSSOInput {+@InputType('GetAuthorizationUrlForSSOInput')+export class GetAuthorizationUrlForSsoInput {@Field(() => UUIDScalarType)@IsUUID()identityProviderId: string;diff --git a/packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-oauth.guard.ts b/packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-oauth.guard.tsindex 35079e274e5..fc91f6041d0 100644--- a/packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-oauth.guard.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-oauth.guard.ts@@ -8,13 +8,13 @@ import { parseJson } from 'twenty-shared/utils';import { Repository } from 'typeorm';import { MICROSOFT_OAUTH_MAX_RETRY_ATTEMPTS } from 'src/engine/core-modules/auth/constants/microsoft-oauth-max-retry-attempts.constants';-import { type SocialSSOState } from 'src/engine/core-modules/auth/types/social-sso-state.type';+import { type SocialSsoState } from 'src/engine/core-modules/auth/types/social-sso-state.type';import { isMicrosoftOAuthTransientError } from 'src/engine/core-modules/auth/utils/is-microsoft-oauth-transient-error.util';import { WorkspaceDomainsService } from 'src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service';import { GuardRedirectService } from 'src/engine/core-modules/guard-redirect/services/guard-redirect.service';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';-type SocialSSOStateWithRetry = SocialSSOState & {+type SocialSsoStateWithRetry = SocialSsoState & {oauthRetryCount?: number;};@@ -73,7 +73,7 @@ export class MicrosoftOAuthGuard extends AuthGuard('microsoft') {return false;}- const state = parseJson<SocialSSOStateWithRetry>(+ const state = parseJson<SocialSsoStateWithRetry>(request.query.state as string,);diff --git a/packages/twenty-server/src/engine/core-modules/auth/guards/oidc-auth.guard.ts b/packages/twenty-server/src/engine/core-modules/auth/guards/oidc-auth.guard.tsindex 04753a93f46..61e9b32ddab 100644--- a/packages/twenty-server/src/engine/core-modules/auth/guards/oidc-auth.guard.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/guards/oidc-auth.guard.ts@@ -9,17 +9,17 @@ import {AuthException,AuthExceptionCode,} from 'src/engine/core-modules/auth/auth.exception';-import { OIDCAuthStrategy } from 'src/engine/core-modules/auth/strategies/oidc.auth.strategy';+import { OidcAuthStrategy } from 'src/engine/core-modules/auth/strategies/oidc.auth.strategy';import { WorkspaceDomainsService } from 'src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service';import { GuardRedirectService } from 'src/engine/core-modules/guard-redirect/services/guard-redirect.service';-import { SSOService } from 'src/engine/core-modules/sso/services/sso.service';-import { type SSOConfiguration } from 'src/engine/core-modules/sso/types/SSOConfigurations.type';-import { type WorkspaceSSOIdentityProviderEntity } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';+import { SsoService } from 'src/engine/core-modules/sso/services/sso.service';+import { type SsoConfiguration } from 'src/engine/core-modules/sso/types/sso-configurations.type';+import { type WorkspaceSsoIdentityProviderEntity } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';@Injectable()-export class OIDCAuthGuard extends AuthGuard('openidconnect') {+export class OidcAuthGuard extends AuthGuard('openidconnect') {constructor(- private readonly ssoService: SSOService,+ private readonly ssoService: SsoService,private readonly guardRedirectService: GuardRedirectService,private readonly workspaceDomainsService: WorkspaceDomainsService,) {@@ -56,7 +56,7 @@ export class OIDCAuthGuard extends AuthGuard('openidconnect') {const request = context.switchToHttp().getRequest<Request>();let identityProvider:- | (SSOConfiguration & WorkspaceSSOIdentityProviderEntity)+ | (SsoConfiguration & WorkspaceSsoIdentityProviderEntity)| null = null;try {@@ -69,7 +69,7 @@ export class OIDCAuthGuard extends AuthGuard('openidconnect') {);}- identityProvider = await this.ssoService.findSSOIdentityProviderById(+ identityProvider = await this.ssoService.findSsoIdentityProviderById(state.identityProviderId,);@@ -81,8 +81,8 @@ export class OIDCAuthGuard extends AuthGuard('openidconnect') {}const issuer = await Issuer.discover(identityProvider.issuer);- new OIDCAuthStrategy(- this.ssoService.getOIDCClient(identityProvider, issuer),+ new OidcAuthStrategy(+ this.ssoService.getOidcClient(identityProvider, issuer),identityProvider.id,);diff --git a/packages/twenty-server/src/engine/core-modules/auth/guards/oidc-auth.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/guards/oidc-auth.spec.tsindex 7cef1ef262d..4de52e95436 100644--- a/packages/twenty-server/src/engine/core-modules/auth/guards/oidc-auth.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/guards/oidc-auth.spec.ts@@ -4,12 +4,12 @@ import { Test, type TestingModule } from '@nestjs/testing';import { type Issuer } from 'openid-client';-import { OIDCAuthGuard } from 'src/engine/core-modules/auth/guards/oidc-auth.guard';+import { OidcAuthGuard } from 'src/engine/core-modules/auth/guards/oidc-auth.guard';import { WorkspaceDomainsService } from 'src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service';import { GuardRedirectService } from 'src/engine/core-modules/guard-redirect/services/guard-redirect.service';-import { SSOService } from 'src/engine/core-modules/sso/services/sso.service';-import { type SSOConfiguration } from 'src/engine/core-modules/sso/types/SSOConfigurations.type';-import { type WorkspaceSSOIdentityProviderEntity } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';+import { SsoService } from 'src/engine/core-modules/sso/services/sso.service';+import { type SsoConfiguration } from 'src/engine/core-modules/sso/types/sso-configurations.type';+import { type WorkspaceSsoIdentityProviderEntity } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';const createMockExecutionContext = (mockedRequest: any): ExecutionContext => {return {@@ -36,20 +36,20 @@ jest.mock('openid-client', () => ({}));describe('OIDCAuthGuard', () => {- let guard: OIDCAuthGuard;- let ssoService: SSOService;+ let guard: OidcAuthGuard;+ let ssoService: SsoService;let guardRedirectService: GuardRedirectService;let mockExecutionContext: ExecutionContext;beforeEach(async () => {const module: TestingModule = await Test.createTestingModule({providers: [- OIDCAuthGuard,+ OidcAuthGuard,{- provide: SSOService,+ provide: SsoService,useValue: {- findSSOIdentityProviderById: jest.fn(),- getOIDCClient: jest.fn(),+ findSsoIdentityProviderById: jest.fn(),+ getOidcClient: jest.fn(),},},{@@ -69,8 +69,8 @@ describe('OIDCAuthGuard', () => {],}).compile();- guard = module.get<OIDCAuthGuard>(OIDCAuthGuard);- ssoService = module.get<SSOService>(SSOService);+ guard = module.get<OidcAuthGuard>(OidcAuthGuard);+ ssoService = module.get<SsoService>(SsoService);guardRedirectService =module.get<GuardRedirectService>(GuardRedirectService);@@ -88,17 +88,17 @@ describe('OIDCAuthGuard', () => {mockExecutionContext = createMockExecutionContext(mockedRequest);- jest.spyOn(ssoService, 'findSSOIdentityProviderById').mockResolvedValue({+ jest.spyOn(ssoService, 'findSsoIdentityProviderById').mockResolvedValue({id: 'test-id',issuer: 'https://issuer.example.com',workspace: {},- } as SSOConfiguration & WorkspaceSSOIdentityProviderEntity);+ } as SsoConfiguration & WorkspaceSsoIdentityProviderEntity);const result = await guard.canActivate(mockExecutionContext);expect(result).toBe(true);expect(guardRedirectService.dispatchErrorFromGuard).not.toHaveBeenCalled();- expect(ssoService.findSSOIdentityProviderById).toHaveBeenCalledWith(+ expect(ssoService.findSsoIdentityProviderById).toHaveBeenCalledWith('test-id',);});@@ -111,11 +111,11 @@ describe('OIDCAuthGuard', () => {mockExecutionContext = createMockExecutionContext(mockedRequest);jest- .spyOn(ssoService, 'findSSOIdentityProviderById')+ .spyOn(ssoService, 'findSsoIdentityProviderById').mockResolvedValue(null);await expect(guard.canActivate(mockExecutionContext)).resolves.toBe(false);- expect(ssoService.findSSOIdentityProviderById).toHaveBeenCalledWith(+ expect(ssoService.findSsoIdentityProviderById).toHaveBeenCalledWith('non-existent-id',);expect(guardRedirectService.dispatchErrorFromGuard).toHaveBeenCalled();@@ -129,7 +129,7 @@ describe('OIDCAuthGuard', () => {mockExecutionContext = createMockExecutionContext(mockedRequest);jest- .spyOn(ssoService, 'findSSOIdentityProviderById')+ .spyOn(ssoService, 'findSsoIdentityProviderById').mockResolvedValue(null);await expect(guard.canActivate(mockExecutionContext)).resolves.toBe(false);diff --git a/packages/twenty-server/src/engine/core-modules/auth/guards/saml-auth.guard.ts b/packages/twenty-server/src/engine/core-modules/auth/guards/saml-auth.guard.tsindex 7e66ef8b9b8..9cd3d7891b0 100644--- a/packages/twenty-server/src/engine/core-modules/auth/guards/saml-auth.guard.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/guards/saml-auth.guard.ts@@ -12,14 +12,14 @@ import {import { SamlAuthStrategy } from 'src/engine/core-modules/auth/strategies/saml.auth.strategy';import { WorkspaceDomainsService } from 'src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service';import { GuardRedirectService } from 'src/engine/core-modules/guard-redirect/services/guard-redirect.service';-import { SSOService } from 'src/engine/core-modules/sso/services/sso.service';-import { type SSOConfiguration } from 'src/engine/core-modules/sso/types/SSOConfigurations.type';-import { type WorkspaceSSOIdentityProviderEntity } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';+import { SsoService } from 'src/engine/core-modules/sso/services/sso.service';+import { type SsoConfiguration } from 'src/engine/core-modules/sso/types/sso-configurations.type';+import { type WorkspaceSsoIdentityProviderEntity } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';@Injectable()-export class SAMLAuthGuard extends AuthGuard('saml') {+export class SamlAuthGuard extends AuthGuard('saml') {constructor(- private readonly ssoService: SSOService,+ private readonly ssoService: SsoService,private readonly guardRedirectService: GuardRedirectService,private readonly workspaceDomainsService: WorkspaceDomainsService,) {@@ -30,11 +30,11 @@ export class SAMLAuthGuard extends AuthGuard('saml') {const request = context.switchToHttp().getRequest<Request>();let identityProvider:- | (SSOConfiguration & WorkspaceSSOIdentityProviderEntity)+ | (SsoConfiguration & WorkspaceSsoIdentityProviderEntity)| null = null;try {- identityProvider = await this.ssoService.findSSOIdentityProviderById(+ identityProvider = await this.ssoService.findSsoIdentityProviderById(request.params.identityProviderId,);diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.tsindex 65bbcd37854..4f3d28d704f 100644--- a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts@@ -38,14 +38,14 @@ import { type UserCredentialsInput } from 'src/engine/core-modules/auth/dto/userimport { type CheckUserExistDTO } from 'src/engine/core-modules/auth/dto/user-exists.dto';import { type WorkspaceInviteHashValidDTO } from 'src/engine/core-modules/auth/dto/workspace-invite-hash-valid.dto';import { AuthSsoService } from 'src/engine/core-modules/auth/services/auth-sso.service';-import { CreateSSOConnectedAccountService } from 'src/engine/core-modules/auth/services/create-sso-connected-account.service';+import { CreateSsoConnectedAccountService } from 'src/engine/core-modules/auth/services/create-sso-connected-account.service';import { SignInUpService } from 'src/engine/core-modules/auth/services/sign-in-up.service';import { type GoogleRequest } from 'src/engine/core-modules/auth/strategies/google.auth.strategy';import { type MicrosoftRequest } from 'src/engine/core-modules/auth/strategies/microsoft.auth.strategy';import { AccessTokenService } from 'src/engine/core-modules/auth/token/services/access-token.service';import { LoginTokenService } from 'src/engine/core-modules/auth/token/services/login-token.service';import { RefreshTokenService } from 'src/engine/core-modules/auth/token/services/refresh-token.service';-import { SSOExchangeTokenService } from 'src/engine/core-modules/auth/token/services/sso-exchange-token.service';+import { SsoExchangeTokenService } from 'src/engine/core-modules/auth/token/services/sso-exchange-token.service';import { AuthContextUser } from 'src/engine/core-modules/auth/types/auth-context.type';import { JwtTokenTypeEnum } from 'src/engine/core-modules/auth/types/jwt-token-type.enum';import {@@ -81,7 +81,7 @@ import { isEmailInApprovedAccessDomains } from 'src/engine/core-modules/approvedexport class AuthService {constructor(private readonly accessTokenService: AccessTokenService,- private readonly ssoExchangeTokenService: SSOExchangeTokenService,+ private readonly ssoExchangeTokenService: SsoExchangeTokenService,private readonly workspaceDomainsService: WorkspaceDomainsService,private readonly domainServerConfigService: DomainServerConfigService,private readonly refreshTokenService: RefreshTokenService,@@ -105,7 +105,7 @@ export class AuthService {private readonly eventLogEmitterService: EventLogEmitterService,private readonly applicationRegistrationService: ApplicationRegistrationService,private readonly featureFlagService: FeatureFlagService,- private readonly createSSOConnectedAccountService: CreateSSOConnectedAccountService,+ private readonly createSsoConnectedAccountService: CreateSsoConnectedAccountService,private readonly userSessionService: UserSessionService,) {}@@ -971,7 +971,7 @@ export class AuthService {}}- async signInUpWithSocialSSO(+ async signInUpWithSocialSso({firstName,lastName,@@ -1010,7 +1010,7 @@ export class AuthService {));const ssoExchangeToken =- await this.ssoExchangeTokenService.generateSSOExchangeToken({+ await this.ssoExchangeTokenService.generateSsoExchangeToken({userId: user.id,authProvider,});@@ -1075,7 +1075,7 @@ export class AuthService {billingCheckoutSessionState,});- await this.createSSOConnectedAccountIfFeatureFlagIsOn({+ await this.createSsoConnectedAccountIfFeatureFlagIsOn({workspaceId: workspace.id,userId: user.id,handle: email,@@ -1106,7 +1106,7 @@ export class AuthService {}}- async createSSOConnectedAccountIfFeatureFlagIsOn(input: {+ async createSsoConnectedAccountIfFeatureFlagIsOn(input: {workspaceId: string;userId: string;handle: string;@@ -1121,9 +1121,9 @@ export class AuthService {input.connectedAccountProvider ??this.mapAuthProviderToConnectedAccountProvider(input.authProvider);- const scopes = this.getSSOScopes(provider);+ const scopes = this.getSsoScopes(provider);- await this.createSSOConnectedAccountService.createOrUpdateSSOConnectedAccount(+ await this.createSsoConnectedAccountService.createOrUpdateSsoConnectedAccount({workspaceId: input.workspaceId,userId: input.userId,@@ -1155,7 +1155,7 @@ export class AuthService {}}- private getSSOScopes(provider: ConnectedAccountProvider): string[] {+ private getSsoScopes(provider: ConnectedAccountProvider): string[] {switch (provider) {case ConnectedAccountProvider.GOOGLE:return ['email', 'profile'];diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/create-sso-connected-account.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/create-sso-connected-account.service.tsindex 1195d147b46..23cbec16df1 100644--- a/packages/twenty-server/src/engine/core-modules/auth/services/create-sso-connected-account.service.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/services/create-sso-connected-account.service.ts@@ -7,7 +7,7 @@ import { Repository } from 'typeorm';import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';-type CreateSSOConnectedAccountParams = {+type CreateSsoConnectedAccountParams = {workspaceId: string;userId: string;handle: string;@@ -17,8 +17,8 @@ type CreateSSOConnectedAccountParams = {};@Injectable()-export class CreateSSOConnectedAccountService {- private readonly logger = new Logger(CreateSSOConnectedAccountService.name);+export class CreateSsoConnectedAccountService {+ private readonly logger = new Logger(CreateSsoConnectedAccountService.name);constructor(@InjectRepository(ConnectedAccountEntity)@@ -27,8 +27,8 @@ export class CreateSSOConnectedAccountService {private readonly userWorkspaceRepository: Repository<UserWorkspaceEntity>,) {}- async createOrUpdateSSOConnectedAccount(- params: CreateSSOConnectedAccountParams,+ async createOrUpdateSsoConnectedAccount(+ params: CreateSsoConnectedAccountParams,): Promise<void> {const { workspaceId, userId, handle, provider, scopes, oidcTokenClaims } =params;diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/google-apis-scopes.service.util.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/services/google-apis-scopes.service.util.spec.tsindex c49739cdfd2..a4e1f082edb 100644--- a/packages/twenty-server/src/engine/core-modules/auth/services/google-apis-scopes.service.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/services/google-apis-scopes.service.util.spec.ts@@ -2,7 +2,7 @@ import { getGoogleApisOauthScopes } from 'src/engine/core-modules/auth/utils/getimport { includesExpectedScopes } from './google-apis-scopes.service.util';-describe('GoogleAPIScopesService', () => {+describe('GoogleApiScopesService', () => {describe('includesExpectedScopes', () => {it('should return true when all expected scopes are present', () => {const scopes = [diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/google-apis-scopes.ts b/packages/twenty-server/src/engine/core-modules/auth/services/google-apis-scopes.tsindex b3849a25635..5cf8636984b 100644--- a/packages/twenty-server/src/engine/core-modules/auth/services/google-apis-scopes.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/services/google-apis-scopes.ts@@ -23,7 +23,7 @@ interface TokenInfoResponse {}@Injectable()-export class GoogleAPIScopesService {+export class GoogleApiScopesService {constructor(private readonly secureHttpClientService: SecureHttpClientService,) {}diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.tsindex 9cb99c88527..da2f61ba1a7 100644--- a/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.ts@@ -20,7 +20,7 @@ import { type PlaintextString } from 'src/engine/core-modules/secret-encryption/import { CreateCalendarChannelService } from 'src/engine/core-modules/auth/services/create-calendar-channel.service';import { CreateConnectedAccountService } from 'src/engine/core-modules/auth/services/create-connected-account.service';import { CreateMessageChannelService } from 'src/engine/core-modules/auth/services/create-message-channel.service';-import { GoogleAPIScopesService } from 'src/engine/core-modules/auth/services/google-apis-scopes';+import { GoogleApiScopesService } from 'src/engine/core-modules/auth/services/google-apis-scopes';import { GoogleApisServiceAvailabilityService } from 'src/engine/core-modules/auth/services/google-apis-service-availability.service';import { UpdateConnectedAccountOnReconnectService } from 'src/engine/core-modules/auth/services/update-connected-account-on-reconnect.service';import { SyncMessageFoldersService } from 'src/modules/messaging/message-folder-manager/services/sync-message-folders.service';@@ -66,7 +66,7 @@ export class GoogleAPIsService {private readonly createCalendarChannelService: CreateCalendarChannelService,private readonly createConnectedAccountService: CreateConnectedAccountService,private readonly updateConnectedAccountOnReconnectService: UpdateConnectedAccountOnReconnectService,- private readonly googleAPIScopesService: GoogleAPIScopesService,+ private readonly googleApiScopesService: GoogleApiScopesService,private readonly googleApisServiceAvailabilityService: GoogleApisServiceAvailabilityService,private readonly onboardingRecentMessagesImportService: OnboardingRecentMessagesImportService,private readonly syncMessageFoldersService: SyncMessageFoldersService,@@ -111,7 +111,7 @@ export class GoogleAPIsService {);const { scopes, isValid } =- await this.googleAPIScopesService.getScopesFromGoogleAccessTokenAndCheckIfExpectedScopesArePresent(+ await this.googleApiScopesService.getScopesFromGoogleAccessTokenAndCheckIfExpectedScopesArePresent(input.accessToken,);diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-common.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-common.auth.strategy.tsindex d21df7ae6fa..4731c596a33 100644--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-common.auth.strategy.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-common.auth.strategy.ts@@ -5,7 +5,7 @@ import { Strategy, type VerifyCallback } from 'passport-google-oauth20';import { getGoogleApisOauthScopes } from 'src/engine/core-modules/auth/utils/get-google-apis-oauth-scopes';import { type TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';-export type GoogleAPIScopeConfig = {+export type GoogleApiScopeConfig = {isCalendarEnabled?: boolean;isMessagingAliasFetchingEnabled?: boolean;};diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-request-code.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-request-code.auth.strategy.tsindex 4534295866f..b40d65d604b 100644--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-request-code.auth.strategy.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-request-code.auth.strategy.ts@@ -5,7 +5,7 @@ import { type VerifyCallback } from 'passport-google-oauth20';import { GoogleAPIsOauthCommonStrategy } from 'src/engine/core-modules/auth/strategies/google-apis-oauth-common.auth.strategy';import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';-export type GoogleAPIScopeConfig = {+export type GoogleApiScopeConfig = {isCalendarEnabled?: boolean;isMessagingAliasFetchingEnabled?: boolean;};diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/google.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/google.auth.strategy.tsindex 195756e6cbb..563323a68a9 100644--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/google.auth.strategy.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/google.auth.strategy.ts@@ -14,8 +14,8 @@ import {AuthException,AuthExceptionCode,} from 'src/engine/core-modules/auth/auth.exception';-import { type SocialSSOSignInUpActionType } from 'src/engine/core-modules/auth/types/signInUp.type';-import { type SocialSSOState } from 'src/engine/core-modules/auth/types/social-sso-state.type';+import { type SocialSsoSignInUpActionType } from 'src/engine/core-modules/auth/types/signInUp.type';+import { type SocialSsoState } from 'src/engine/core-modules/auth/types/social-sso-state.type';import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';export type GoogleRequest = Omit<@@ -29,7 +29,7 @@ export type GoogleRequest = Omit<picture: string | null;locale?: keyof typeof APP_LOCALES | null;workspaceInviteHash?: string;- action: SocialSSOSignInUpActionType;+ action: SocialSsoSignInUpActionType;workspaceId?: string;billingCheckoutSessionState?: string;returnToPath?: string;@@ -73,7 +73,7 @@ export class GoogleStrategy extends PassportStrategy(Strategy, 'google') {done: VerifyCallback,): Promise<void> {const { name, emails, photos } = profile;- const state = parseJson<SocialSSOState>(request.query.state as string);+ const state = parseJson<SocialSsoState>(request.query.state as string);const firstVerifiedEmail = emails?.find((email) => email?.verified === true,diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.tsindex 479539696f7..f75483649d2 100644--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.ts@@ -66,7 +66,7 @@ export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') {});}- private async validateAPIKey(+ private async validateApiKey(payload: ApiKeyTokenJwtPayload,): Promise<AuthContext> {const workspace = await this.coreEntityCacheService.get(@@ -477,7 +477,7 @@ export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') {payload.type === JwtTokenTypeEnum.API_KEY ||this.isLegacyApiKeyPayload(payload)) {- return await this.validateAPIKey(payload);+ return await this.validateApiKey(payload);}if (payload.type === JwtTokenTypeEnum.WORKSPACE_AGNOSTIC) {diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft-apis-oauth-common.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft-apis-oauth-common.auth.strategy.tsindex bae7843df9b..5b37763c6e1 100644--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft-apis-oauth-common.auth.strategy.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft-apis-oauth-common.auth.strategy.ts@@ -6,7 +6,7 @@ import { type VerifyCallback } from 'passport-google-oauth20';import { getMicrosoftApisOauthScopes } from 'src/engine/core-modules/auth/utils/get-microsoft-apis-oauth-scopes';import { type TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';-export type MicrosoftAPIScopeConfig = {+export type MicrosoftApiScopeConfig = {isCalendarEnabled?: boolean;isMessagingAliasFetchingEnabled?: boolean;};diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft.auth.strategy.tsindex b22913bbd0a..284e1ae2932 100644--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft.auth.strategy.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft.auth.strategy.ts@@ -12,8 +12,8 @@ import {AuthExceptionCode,} from 'src/engine/core-modules/auth/auth.exception';import { type MicrosoftPassportProfile } from 'src/engine/core-modules/auth/types/microsoft-passport-profile.type';-import { type SocialSSOSignInUpActionType } from 'src/engine/core-modules/auth/types/signInUp.type';-import { type SocialSSOState } from 'src/engine/core-modules/auth/types/social-sso-state.type';+import { type SocialSsoSignInUpActionType } from 'src/engine/core-modules/auth/types/signInUp.type';+import { type SocialSsoState } from 'src/engine/core-modules/auth/types/social-sso-state.type';import { type TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';export type MicrosoftRequest = Omit<@@ -29,7 +29,7 @@ export type MicrosoftRequest = Omit<workspaceInviteHash?: string;workspaceId?: string;billingCheckoutSessionState?: string;- action: SocialSSOSignInUpActionType;+ action: SocialSsoSignInUpActionType;returnToPath?: string;};};@@ -75,7 +75,7 @@ export class MicrosoftStrategy extends PassportStrategy(Strategy, 'microsoft') {done: VerifyCallback,): Promise<void> {const { name, userPrincipalName, photos } = profile;- const state = parseJson<SocialSSOState>(request.query.state as string);+ const state = parseJson<SocialSsoState>(request.query.state as string);if (!userPrincipalName) {throw new AuthException(diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/oidc.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/oidc.auth.strategy.tsindex 1e82dc9183e..1898db039e3 100644--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/oidc.auth.strategy.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/oidc.auth.strategy.ts@@ -11,7 +11,7 @@ import {AuthExceptionCode,} from 'src/engine/core-modules/auth/auth.exception';-export type OIDCRequest = Omit<+export type OidcRequest = Omit<Request,'user' | 'workspace' | 'workspaceMetadataVersion'> & {@@ -26,7 +26,7 @@ export type OIDCRequest = Omit<};@Injectable()-export class OIDCAuthStrategy extends PassportStrategy(+export class OidcAuthStrategy extends PassportStrategy(Strategy,'openidconnect',) {@@ -87,7 +87,7 @@ export class OIDCAuthStrategy extends PassportStrategy(req: Request,tokenset: TokenSet,// oxlint-disable-next-line typescript/no-explicit-any- done: (err: any, user?: OIDCRequest['user']) => void,+ done: (err: any, user?: OidcRequest['user']) => void,) {try {const state = this.extractState(req);diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/saml.auth.strategy.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/saml.auth.strategy.spec.tsindex c0665ac4b24..87ed97083a2 100644--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/saml.auth.strategy.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/saml.auth.strategy.spec.ts@@ -2,7 +2,7 @@import { type Request } from 'express';-import { type SSOService } from 'src/engine/core-modules/sso/services/sso.service';+import { type SsoService } from 'src/engine/core-modules/sso/services/sso.service';import { SamlAuthStrategy } from './saml.auth.strategy';@@ -48,11 +48,11 @@ describe('SamlAuthStrategy.validate', () => {beforeEach(() => {const ssoService = {- findSSOIdentityProviderById: jest.fn(),- isSAMLIdentityProvider: jest.fn(),+ findSsoIdentityProviderById: jest.fn(),+ isSamlIdentityProvider: jest.fn(),buildIssuerURL: jest.fn(),buildCallbackUrl: jest.fn(),- } as unknown as SSOService;+ } as unknown as SsoService;strategy = new SamlAuthStrategy(ssoService);});diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/saml.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/saml.auth.strategy.tsindex ed035a08c57..9eb1e8657b5 100644--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/saml.auth.strategy.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/saml.auth.strategy.ts@@ -15,7 +15,7 @@ import { isEmail } from 'class-validator';import { type Request } from 'express';import { z } from 'zod';-import { SSOService } from 'src/engine/core-modules/sso/services/sso.service';+import { SsoService } from 'src/engine/core-modules/sso/services/sso.service';const WORKSPACE_INVITE_HASH_PAYLOAD_SCHEMA = z.object({workspaceInviteHash: z.string().optional(),@@ -39,7 +39,7 @@ const RELAY_STATE_BODY_SCHEMA = z.object({.pipe(WORKSPACE_INVITE_HASH_PAYLOAD_SCHEMA),});-export type SAMLRequest = Omit<+export type SamlRequest = Omit<Request,'user' | 'workspace' | 'workspaceMetadataVersion'> & {@@ -55,16 +55,16 @@ export class SamlAuthStrategy extends PassportStrategy(MultiSamlStrategy,'saml',) {- constructor(private readonly ssoService: SSOService) {+ constructor(private readonly ssoService: SsoService) {super({getSamlOptions: (req, callback) => {this.ssoService- .findSSOIdentityProviderById(req.params.identityProviderId)+ .findSsoIdentityProviderById(req.params.identityProviderId).then((identityProvider) => {if (identityProvider &&- this.ssoService.isSAMLIdentityProvider(identityProvider)+ this.ssoService.isSamlIdentityProvider(identityProvider)) {// IdP metadata XML typically has whitespace-formatted certificatesconst sanitizedCertificate =diff --git a/packages/twenty-server/src/engine/core-modules/auth/token/services/sso-exchange-token.service.ts b/packages/twenty-server/src/engine/core-modules/auth/token/services/sso-exchange-token.service.tsindex debdc56fcfa..ddabeaaec1a 100644--- a/packages/twenty-server/src/engine/core-modules/auth/token/services/sso-exchange-token.service.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/token/services/sso-exchange-token.service.ts@@ -21,12 +21,12 @@ import { type AuthToken } from 'src/engine/core-modules/auth/dto/auth-token.dto'import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';import { type AuthProviderEnum } from 'src/engine/core-modules/workspace/types/workspace.type';-const hashSSOExchangeToken = (ssoExchangeToken: string) =>+const hashSsoExchangeToken = (ssoExchangeToken: string) =>crypto.createHash('sha256').update(ssoExchangeToken).digest('hex');// A single opaque error for missing, expired and already-consumed tokens:// distinguishing them would turn this endpoint into a redemption oracle.-const buildInvalidSSOExchangeTokenException = () =>+const buildInvalidSsoExchangeTokenException = () =>new AuthException('Invalid SSO exchange token',AuthExceptionCode.INVALID_INPUT,@@ -34,14 +34,14 @@ const buildInvalidSSOExchangeTokenException = () =>);@Injectable()-export class SSOExchangeTokenService {+export class SsoExchangeTokenService {constructor(@InjectRepository(AppTokenEntity)private readonly appTokenRepository: Repository<AppTokenEntity>,private readonly twentyConfigService: TwentyConfigService,) {}- async generateSSOExchangeToken({+ async generateSsoExchangeToken({userId,authProvider,}: {@@ -59,8 +59,8 @@ export class SSOExchangeTokenService {this.appTokenRepository.create({userId,expiresAt,- type: AppTokenType.SSOExchangeToken,- value: hashSSOExchangeToken(plainToken),+ type: AppTokenType.SsoExchangeToken,+ value: hashSsoExchangeToken(plainToken),context: { authProvider },}),);@@ -71,18 +71,18 @@ export class SSOExchangeTokenService {};}- async validateAndConsumeSSOExchangeTokenOrThrow(+ async validateAndConsumeSsoExchangeTokenOrThrow(ssoExchangeToken: string,): Promise<{ userId: string; authProvider: AuthProviderEnum }> {const appToken = await this.appTokenRepository.findOneBy({- value: hashSSOExchangeToken(ssoExchangeToken),- type: AppTokenType.SSOExchangeToken,+ value: hashSsoExchangeToken(ssoExchangeToken),+ type: AppTokenType.SsoExchangeToken,revokedAt: IsNull(),deletedAt: IsNull(),});if (!isDefined(appToken)) {- throw buildInvalidSSOExchangeTokenException();+ throw buildInvalidSsoExchangeTokenException();}// Deleting the row is the single-use claim: under concurrent redemption@@ -96,18 +96,18 @@ export class SSOExchangeTokenService {});if (affected !== 1) {- throw buildInvalidSSOExchangeTokenException();+ throw buildInvalidSsoExchangeTokenException();}if (new Date() > appToken.expiresAt) {- throw buildInvalidSSOExchangeTokenException();+ throw buildInvalidSsoExchangeTokenException();}if (!isDefined(appToken.userId) ||!isDefined(appToken.context?.authProvider)) {- throw buildInvalidSSOExchangeTokenException();+ throw buildInvalidSsoExchangeTokenException();}return {diff --git a/packages/twenty-server/src/engine/core-modules/auth/token/token.module.ts b/packages/twenty-server/src/engine/core-modules/auth/token/token.module.tsindex b02c0c81556..440eff6b538 100644--- a/packages/twenty-server/src/engine/core-modules/auth/token/token.module.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/token/token.module.ts@@ -10,7 +10,7 @@ import { ApplicationTokenService } from 'src/engine/core-modules/auth/token/servimport { LoginTokenService } from 'src/engine/core-modules/auth/token/services/login-token.service';import { RefreshTokenService } from 'src/engine/core-modules/auth/token/services/refresh-token.service';import { RenewTokenService } from 'src/engine/core-modules/auth/token/services/renew-token.service';-import { SSOExchangeTokenService } from 'src/engine/core-modules/auth/token/services/sso-exchange-token.service';+import { SsoExchangeTokenService } from 'src/engine/core-modules/auth/token/services/sso-exchange-token.service';import { WorkspaceAgnosticTokenService } from 'src/engine/core-modules/auth/token/services/workspace-agnostic-token.service';import { ImpersonationAuthorizationModule } from 'src/engine/core-modules/impersonation/impersonation-authorization.module';import { JwtModule } from 'src/engine/core-modules/jwt/jwt.module';@@ -47,7 +47,7 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cacheRefreshTokenService,WorkspaceAgnosticTokenService,ApplicationTokenService,- SSOExchangeTokenService,+ SsoExchangeTokenService,],exports: [RenewTokenService,@@ -56,7 +56,7 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cacheRefreshTokenService,WorkspaceAgnosticTokenService,ApplicationTokenService,- SSOExchangeTokenService,+ SsoExchangeTokenService,],})export class TokenModule {}diff --git a/packages/twenty-server/src/engine/core-modules/auth/types/signInUp.type.ts b/packages/twenty-server/src/engine/core-modules/auth/types/signInUp.type.tsindex c8241969032..1c2926b2e66 100644--- a/packages/twenty-server/src/engine/core-modules/auth/types/signInUp.type.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/types/signInUp.type.ts@@ -5,7 +5,7 @@ import { type UserEntity } from 'src/engine/core-modules/user/user.entity';import { type AuthProviderEnum } from 'src/engine/core-modules/workspace/types/workspace.type';import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';-export type SocialSSOSignInUpActionType =+export type SocialSsoSignInUpActionType =| 'create-new-workspace'| 'list-available-workspaces'| 'join-workspace';diff --git a/packages/twenty-server/src/engine/core-modules/auth/types/social-sso-state.type.ts b/packages/twenty-server/src/engine/core-modules/auth/types/social-sso-state.type.tsindex af96fc760c9..cefa83dd061 100644--- a/packages/twenty-server/src/engine/core-modules/auth/types/social-sso-state.type.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/types/social-sso-state.type.ts@@ -1,12 +1,12 @@import { type APP_LOCALES } from 'twenty-shared/translations';-import { type SocialSSOSignInUpActionType } from 'src/engine/core-modules/auth/types/signInUp.type';+import { type SocialSsoSignInUpActionType } from 'src/engine/core-modules/auth/types/signInUp.type';-export type SocialSSOState = {+export type SocialSsoState = {workspaceInviteHash?: string;workspaceId?: string;billingCheckoutSessionState?: string;- action?: SocialSSOSignInUpActionType;+ action?: SocialSsoSignInUpActionType;locale?: keyof typeof APP_LOCALES;returnToPath?: string;};diff --git a/packages/twenty-server/src/engine/core-modules/billing/billing.resolver.ts b/packages/twenty-server/src/engine/core-modules/billing/billing.resolver.tsindex a082f9d952a..9f5f9f40cdf 100644--- a/packages/twenty-server/src/engine/core-modules/billing/billing.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/billing/billing.resolver.ts@@ -75,7 +75,7 @@ export class BillingResolver {@Args() { returnUrlPath, forPaymentMethodUpdate }: BillingSessionInput,) {return {- url: await this.billingPortalWorkspaceService.computeBillingPortalSessionURLOrThrow(+ url: await this.billingPortalWorkspaceService.computeBillingPortalSessionUrlOrThrow(workspace,returnUrlPath,forPaymentMethodUpdate,@@ -324,7 +324,7 @@ export class BillingResolver {if (!result.hasPaymentMethod && result.stripeCustomerId) {const billingPortalUrl =- await this.billingPortalWorkspaceService.computeBillingPortalSessionURLForPaymentMethodUpdate(+ await this.billingPortalWorkspaceService.computeBillingPortalSessionUrlForPaymentMethodUpdate(workspace,result.stripeCustomerId,'/settings/billing',diff --git a/packages/twenty-server/src/engine/core-modules/billing/services/billing-portal.workspace-service.ts b/packages/twenty-server/src/engine/core-modules/billing/services/billing-portal.workspace-service.tsindex 8aef3045d36..928fd22f777 100644--- a/packages/twenty-server/src/engine/core-modules/billing/services/billing-portal.workspace-service.ts+++ b/packages/twenty-server/src/engine/core-modules/billing/services/billing-portal.workspace-service.ts@@ -369,7 +369,7 @@ export class BillingPortalWorkspaceService {};}- async computeBillingPortalSessionURLOrThrow(+ async computeBillingPortalSessionUrlOrThrow(workspace: WorkspaceEntity,returnUrlPath?: string,forPaymentMethodUpdate?: boolean,@@ -415,7 +415,7 @@ export class BillingPortalWorkspaceService {return session.url;}- async computeBillingPortalSessionURLForPaymentMethodUpdate(+ async computeBillingPortalSessionUrlForPaymentMethodUpdate(workspace: WorkspaceEntity,stripeCustomerId: string,returnUrlPath?: string,diff --git a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts b/packages/twenty-server/src/engine/core-modules/core-engine.module.tsindex 17519098e8b..a3e89da4dc2 100644--- a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts+++ b/packages/twenty-server/src/engine/core-modules/core-engine.module.ts@@ -58,7 +58,7 @@ import { PublicDomainModule } from 'src/engine/core-modules/public-domain/publicimport { RedisClientModule } from 'src/engine/core-modules/redis-client/redis-client.module';import { RedisClientService } from 'src/engine/core-modules/redis-client/redis-client.service';import { SearchModule } from 'src/engine/core-modules/search/search.module';-import { WorkspaceSSOModule } from 'src/engine/core-modules/sso/sso.module';+import { WorkspaceSsoModule } from 'src/engine/core-modules/sso/sso.module';import { WellKnownModule } from 'src/engine/core-modules/well-known/well-known.module';import { TelemetryModule } from 'src/engine/core-modules/telemetry/telemetry.module';import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';@@ -117,7 +117,7 @@ import { FileModule } from './file/file.module';UserModule,WorkspaceModule,WorkspaceInvitationModule,- WorkspaceSSOModule,+ WorkspaceSsoModule,ApprovedAccessDomainModule,EmailingDomainModule,EmailingModule,@@ -195,7 +195,7 @@ import { FileModule } from './file/file.module';UserModule,WorkspaceModule,WorkspaceInvitationModule,- WorkspaceSSOModule,+ WorkspaceSsoModule,ImapSmtpCaldavModule,],})diff --git a/packages/twenty-server/src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service.ts b/packages/twenty-server/src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service.tsindex cfcc76461f8..5229b6a0ffc 100644--- a/packages/twenty-server/src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service.ts+++ b/packages/twenty-server/src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service.ts@@ -75,7 +75,7 @@ export class WorkspaceDomainsService {order: {createdAt: 'DESC',},- relations: ['workspaceSSOIdentityProviders'],+ relations: ['workspaceSsoIdentityProviders'],});if (workspaces.length > 1) {@@ -127,7 +127,7 @@ export class WorkspaceDomainsService {const registeredPublicDomain = await this.publicDomainRepository.findOne({where: { domain: hostname },- relations: ['workspace', 'workspace.workspaceSSOIdentityProviders'],+ relations: ['workspace', 'workspace.workspaceSsoIdentityProviders'],});if (isDefined(registeredPublicDomain)) {@@ -141,7 +141,7 @@ export class WorkspaceDomainsService {const workspaceFromSubdomain = isDefined(subdomain)? ((await this.workspaceRepository.findOne({where: { subdomain },- relations: ['workspaceSSOIdentityProviders'],+ relations: ['workspaceSsoIdentityProviders'],})) ?? undefined): undefined;@@ -165,7 +165,7 @@ export class WorkspaceDomainsService {const workspaceFromCustomDomainOrSubdomain =(await this.workspaceRepository.findOne({where,- relations: ['workspaceSSOIdentityProviders'],+ relations: ['workspaceSsoIdentityProviders'],})) ?? undefined;if (isDefined(workspaceFromCustomDomainOrSubdomain) || !isDefined(domain)) {@@ -178,7 +178,7 @@ export class WorkspaceDomainsService {const publicDomain = await this.publicDomainRepository.findOne({where: { domain },- relations: ['workspace', 'workspace.workspaceSSOIdentityProviders'],+ relations: ['workspace', 'workspace.workspaceSsoIdentityProviders'],});return {diff --git a/packages/twenty-server/src/engine/core-modules/imap-smtp-caldav-connection/imap-smtp-caldav-connection.resolver.ts b/packages/twenty-server/src/engine/core-modules/imap-smtp-caldav-connection/imap-smtp-caldav-connection.resolver.tsindex 090b1ef9848..d4414df1f22 100644--- a/packages/twenty-server/src/engine/core-modules/imap-smtp-caldav-connection/imap-smtp-caldav-connection.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/imap-smtp-caldav-connection/imap-smtp-caldav-connection.resolver.ts@@ -23,7 +23,7 @@ import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';import { ConnectedAccountMetadataService } from 'src/engine/metadata-modules/connected-account/connected-account-metadata.service';import { ConnectedAccountTokenEncryptionService } from 'src/engine/metadata-modules/connected-account/services/connected-account-token-encryption.service';import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';-import { ImapSmtpCalDavAPIService } from 'src/modules/connected-account/services/imap-smtp-caldav-apis.service';+import { ImapSmtpCalDavApiService } from 'src/modules/connected-account/services/imap-smtp-caldav-apis.service';@MetadataResolver()@UsePipes(ResolverValidationPipe)@@ -31,7 +31,7 @@ import { ImapSmtpCalDavAPIService } from 'src/modules/connected-account/servicesexport class ImapSmtpCaldavResolver {constructor(private readonly imapSmtpCaldavService: ImapSmtpCaldavService,- private readonly imapSmtpCaldavApisService: ImapSmtpCalDavAPIService,+ private readonly imapSmtpCaldavApisService: ImapSmtpCalDavApiService,private readonly connectedAccountMetadataService: ConnectedAccountMetadataService,private readonly connectedAccountTokenEncryptionService: ConnectedAccountTokenEncryptionService,) {}diff --git a/packages/twenty-server/src/engine/core-modules/sso/dtos/edit-sso.dto.ts b/packages/twenty-server/src/engine/core-modules/sso/dtos/edit-sso.dto.tsindex 042fd9f5aae..19f41d4cd6a 100644--- a/packages/twenty-server/src/engine/core-modules/sso/dtos/edit-sso.dto.ts+++ b/packages/twenty-server/src/engine/core-modules/sso/dtos/edit-sso.dto.ts@@ -3,10 +3,10 @@import { Field, ObjectType } from '@nestjs/graphql';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';-import { type SSOConfiguration } from 'src/engine/core-modules/sso/types/SSOConfigurations.type';+import { type SsoConfiguration } from 'src/engine/core-modules/sso/types/sso-configurations.type';import {IdentityProviderType,- SSOIdentityProviderStatus,+ SsoIdentityProviderStatus,} from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';@ObjectType('EditSso')@@ -23,6 +23,6 @@ export class EditSsoDTO {@Field(() => String)name: string;- @Field(() => SSOIdentityProviderStatus)- status: SSOConfiguration['status'];+ @Field(() => SsoIdentityProviderStatus)+ status: SsoConfiguration['status'];}diff --git a/packages/twenty-server/src/engine/core-modules/sso/dtos/edit-sso.input.ts b/packages/twenty-server/src/engine/core-modules/sso/dtos/edit-sso.input.tsindex 940f8aca1c8..1cdc82be377 100644--- a/packages/twenty-server/src/engine/core-modules/sso/dtos/edit-sso.input.ts+++ b/packages/twenty-server/src/engine/core-modules/sso/dtos/edit-sso.input.ts@@ -5,8 +5,8 @@ import { Field, InputType } from '@nestjs/graphql';import { IsString, IsUUID } from 'class-validator';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';-import { type SSOConfiguration } from 'src/engine/core-modules/sso/types/SSOConfigurations.type';-import { SSOIdentityProviderStatus } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';+import { type SsoConfiguration } from 'src/engine/core-modules/sso/types/sso-configurations.type';+import { SsoIdentityProviderStatus } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';@InputType()export class EditSsoInput {@@ -14,7 +14,7 @@ export class EditSsoInput {@IsUUID()id: string;- @Field(() => SSOIdentityProviderStatus)+ @Field(() => SsoIdentityProviderStatus)@IsString()- status: SSOConfiguration['status'];+ status: SsoConfiguration['status'];}diff --git a/packages/twenty-server/src/engine/core-modules/sso/dtos/find-available-SSO-IDP.dto.ts b/packages/twenty-server/src/engine/core-modules/sso/dtos/find-available-sso-idp.dto.tssimilarity index 72%rename from packages/twenty-server/src/engine/core-modules/sso/dtos/find-available-SSO-IDP.dto.tsrename to packages/twenty-server/src/engine/core-modules/sso/dtos/find-available-sso-idp.dto.tsindex 79c5186c66d..af243d82daf 100644--- a/packages/twenty-server/src/engine/core-modules/sso/dtos/find-available-SSO-IDP.dto.ts+++ b/packages/twenty-server/src/engine/core-modules/sso/dtos/find-available-sso-idp.dto.ts@@ -3,10 +3,10 @@import { Field, ObjectType } from '@nestjs/graphql';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';-import { type SSOConfiguration } from 'src/engine/core-modules/sso/types/SSOConfigurations.type';+import { type SsoConfiguration } from 'src/engine/core-modules/sso/types/sso-configurations.type';import {IdentityProviderType,- SSOIdentityProviderStatus,+ SsoIdentityProviderStatus,} from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';@ObjectType()@@ -19,9 +19,9 @@ class WorkspaceNameAndId {}@ObjectType('FindAvailableSSOIDP')-export class FindAvailableSSOIDPDTO {+export class FindAvailableSsoIdpDTO {@Field(() => IdentityProviderType)- type: SSOConfiguration['type'];+ type: SsoConfiguration['type'];@Field(() => UUIDScalarType)id: string;@@ -32,8 +32,8 @@ export class FindAvailableSSOIDPDTO {@Field(() => String)name: string;- @Field(() => SSOIdentityProviderStatus)- status: SSOConfiguration['status'];+ @Field(() => SsoIdentityProviderStatus)+ status: SsoConfiguration['status'];@Field(() => WorkspaceNameAndId)workspace: WorkspaceNameAndId;diff --git a/packages/twenty-server/src/engine/core-modules/sso/dtos/setup-sso.dto.ts b/packages/twenty-server/src/engine/core-modules/sso/dtos/setup-sso.dto.tsindex 8e365bdfc83..6974f383451 100644--- a/packages/twenty-server/src/engine/core-modules/sso/dtos/setup-sso.dto.ts+++ b/packages/twenty-server/src/engine/core-modules/sso/dtos/setup-sso.dto.ts@@ -3,10 +3,10 @@import { Field, ObjectType } from '@nestjs/graphql';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';-import { type SSOConfiguration } from 'src/engine/core-modules/sso/types/SSOConfigurations.type';+import { type SsoConfiguration } from 'src/engine/core-modules/sso/types/sso-configurations.type';import {IdentityProviderType,- SSOIdentityProviderStatus,+ SsoIdentityProviderStatus,} from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';@ObjectType('SetupSso')@@ -23,6 +23,6 @@ export class SetupSsoDTO {@Field(() => String)name: string;- @Field(() => SSOIdentityProviderStatus)- status: SSOConfiguration['status'];+ @Field(() => SsoIdentityProviderStatus)+ status: SsoConfiguration['status'];}diff --git a/packages/twenty-server/src/engine/core-modules/sso/dtos/setup-sso.input.ts b/packages/twenty-server/src/engine/core-modules/sso/dtos/setup-sso.input.tsindex 11864cade61..2ccd932c8e4 100644--- a/packages/twenty-server/src/engine/core-modules/sso/dtos/setup-sso.input.ts+++ b/packages/twenty-server/src/engine/core-modules/sso/dtos/setup-sso.input.ts@@ -19,8 +19,8 @@ class SetupSsoInputCommon {issuer: string;}-@InputType()-export class SetupOIDCSsoInput extends SetupSsoInputCommon {+@InputType('SetupOIDCSsoInput')+export class SetupOidcSsoInput extends SetupSsoInputCommon {@Field(() => String)@IsString()clientID: string;@@ -30,8 +30,8 @@ export class SetupOIDCSsoInput extends SetupSsoInputCommon {clientSecret: string;}-@InputType()-export class SetupSAMLSsoInput extends SetupSsoInputCommon {+@InputType('SetupSAMLSsoInput')+export class SetupSamlSsoInput extends SetupSsoInputCommon {@Field(() => UUIDScalarType)@IsUUID()id: string;diff --git a/packages/twenty-server/src/engine/core-modules/sso/services/sso.service.ts b/packages/twenty-server/src/engine/core-modules/sso/services/sso.service.tsindex 6a743d24146..9556850474d 100644--- a/packages/twenty-server/src/engine/core-modules/sso/services/sso.service.ts+++ b/packages/twenty-server/src/engine/core-modules/sso/services/sso.service.ts@@ -7,74 +7,74 @@ import { Issuer } from 'openid-client';import { Repository } from 'typeorm';import {- WorkspaceSSOIdentityProviderEntity,+ WorkspaceSsoIdentityProviderEntity,IdentityProviderType,- OIDCResponseType,+ OidcResponseType,} from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';import { BillingEntitlementKey } from 'src/engine/core-modules/billing/enums/billing-entitlement-key.enum';import { BillingService } from 'src/engine/core-modules/billing/services/billing.service';import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handler/exception-handler.service';import {- SSOException,- SSOExceptionCode,+ SsoException,+ SsoExceptionCode,} from 'src/engine/core-modules/sso/sso.exception';import {- type OIDCConfiguration,- type SAMLConfiguration,- type SSOConfiguration,-} from 'src/engine/core-modules/sso/types/SSOConfigurations.type';+ type OidcConfiguration,+ type SamlConfiguration,+ type SsoConfiguration,+} from 'src/engine/core-modules/sso/types/sso-configurations.type';import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';@Injectable()-export class SSOService {+export class SsoService {private readonly featureLookUpKey = BillingEntitlementKey.SSO;constructor(- @InjectRepository(WorkspaceSSOIdentityProviderEntity)- private readonly workspaceSSOIdentityProviderRepository: Repository<WorkspaceSSOIdentityProviderEntity>,+ @InjectRepository(WorkspaceSsoIdentityProviderEntity)+ private readonly workspaceSsoIdentityProviderRepository: Repository<WorkspaceSsoIdentityProviderEntity>,private readonly twentyConfigService: TwentyConfigService,private readonly billingService: BillingService,private readonly exceptionHandlerService: ExceptionHandlerService,) {}- private async isSSOEnabled(workspaceId: string) {- const isSSOBillingEnabled = await this.billingService.hasEntitlement(+ private async isSsoEnabled(workspaceId: string) {+ const isSsoBillingEnabled = await this.billingService.hasEntitlement(workspaceId,this.featureLookUpKey,);- if (!isSSOBillingEnabled) {- throw new SSOException(+ if (!isSsoBillingEnabled) {+ throw new SsoException(`No entitlement found for this workspace`,- SSOExceptionCode.SSO_DISABLE,+ SsoExceptionCode.SSO_DISABLE,);}}- private async getIssuerForOIDC(issuerUrl: string) {+ private async getIssuerForOidc(issuerUrl: string) {try {return await Issuer.discover(issuerUrl);} catch {- throw new SSOException(+ throw new SsoException('Invalid issuer',- SSOExceptionCode.INVALID_ISSUER_URL,+ SsoExceptionCode.INVALID_ISSUER_URL,);}}- async createOIDCIdentityProvider(+ async createOidcIdentityProvider(data: Pick<- WorkspaceSSOIdentityProviderEntity,+ WorkspaceSsoIdentityProviderEntity,'issuer' | 'clientID' | 'clientSecret' | 'name'>,workspaceId: string,) {try {- await this.isSSOEnabled(workspaceId);+ await this.isSsoEnabled(workspaceId);- const issuer = await this.getIssuerForOIDC(data.issuer);+ const issuer = await this.getIssuerForOidc(data.issuer);const identityProvider =- await this.workspaceSSOIdentityProviderRepository.save({+ await this.workspaceSsoIdentityProviderRepository.save({type: IdentityProviderType.OIDC,clientID: data.clientID,clientSecret: data.clientSecret,@@ -91,30 +91,30 @@ export class SSOService {issuer: identityProvider.issuer,};} catch (err) {- if (err instanceof SSOException) {+ if (err instanceof SsoException) {return err;}this.exceptionHandlerService.captureExceptions([err]);- return new SSOException(+ return new SsoException('Unknown SSO configuration error',- SSOExceptionCode.UNKNOWN_SSO_CONFIGURATION_ERROR,+ SsoExceptionCode.UNKNOWN_SSO_CONFIGURATION_ERROR,);}}- async createSAMLIdentityProvider(+ async createSamlIdentityProvider(data: Pick<- WorkspaceSSOIdentityProviderEntity,+ WorkspaceSsoIdentityProviderEntity,'ssoURL' | 'certificate' | 'fingerprint' | 'id'>,workspaceId: string,) {- await this.isSSOEnabled(workspaceId);+ await this.isSsoEnabled(workspaceId);const identityProvider =- await this.workspaceSSOIdentityProviderRepository.save({+ await this.workspaceSsoIdentityProviderRepository.save({...data,type: IdentityProviderType.SAML,workspaceId,@@ -129,15 +129,15 @@ export class SSOService {};}- async findSSOIdentityProviderById(identityProviderId: string) {- return (await this.workspaceSSOIdentityProviderRepository.findOne({+ async findSsoIdentityProviderById(identityProviderId: string) {+ return (await this.workspaceSsoIdentityProviderRepository.findOne({where: { id: identityProviderId },relations: { workspace: true },- })) as (SSOConfiguration & WorkspaceSSOIdentityProviderEntity) | null;+ })) as (SsoConfiguration & WorkspaceSsoIdentityProviderEntity) | null;}buildCallbackUrl(- identityProvider: Pick<WorkspaceSSOIdentityProviderEntity, 'type' | 'id'>,+ identityProvider: Pick<WorkspaceSsoIdentityProviderEntity, 'type' | 'id'>,) {const callbackURL = new URL(this.twentyConfigService.get('SERVER_URL'));@@ -151,7 +151,7 @@ export class SSOService {}buildIssuerURL(- identityProvider: Pick<WorkspaceSSOIdentityProviderEntity, 'id' | 'type'>,+ identityProvider: Pick<WorkspaceSsoIdentityProviderEntity, 'id' | 'type'>,searchParams?: Record<string, string | boolean>,) {const authorizationUrl = new URL(@@ -169,28 +169,28 @@ export class SSOService {return authorizationUrl.toString();}- private isOIDCIdentityProvider(- identityProvider: WorkspaceSSOIdentityProviderEntity,- ): identityProvider is OIDCConfiguration &- WorkspaceSSOIdentityProviderEntity {+ private isOidcIdentityProvider(+ identityProvider: WorkspaceSsoIdentityProviderEntity,+ ): identityProvider is OidcConfiguration &+ WorkspaceSsoIdentityProviderEntity {return identityProvider.type === IdentityProviderType.OIDC;}- isSAMLIdentityProvider(- identityProvider: WorkspaceSSOIdentityProviderEntity,- ): identityProvider is SAMLConfiguration &- WorkspaceSSOIdentityProviderEntity {+ isSamlIdentityProvider(+ identityProvider: WorkspaceSsoIdentityProviderEntity,+ ): identityProvider is SamlConfiguration &+ WorkspaceSsoIdentityProviderEntity {return identityProvider.type === IdentityProviderType.SAML;}- getOIDCClient(- identityProvider: WorkspaceSSOIdentityProviderEntity,+ getOidcClient(+ identityProvider: WorkspaceSsoIdentityProviderEntity,issuer: Issuer,) {- if (!this.isOIDCIdentityProvider(identityProvider)) {- throw new SSOException(+ if (!this.isOidcIdentityProvider(identityProvider)) {+ throw new SsoException('Invalid Identity Provider type',- SSOExceptionCode.INVALID_IDP_TYPE,+ SsoExceptionCode.INVALID_IDP_TYPE,);}@@ -198,7 +198,7 @@ export class SSOService {client_id: identityProvider.clientID,client_secret: identityProvider.clientSecret,redirect_uris: [this.buildCallbackUrl(identityProvider)],- response_types: [OIDCResponseType.CODE],+ response_types: [OidcResponseType.CODE],});}@@ -207,16 +207,16 @@ export class SSOService {searchParams: Record<string, string | boolean>,) {const identityProvider =- (await this.workspaceSSOIdentityProviderRepository.findOne({+ (await this.workspaceSsoIdentityProviderRepository.findOne({where: {id: identityProviderId,},- })) as WorkspaceSSOIdentityProviderEntity & SSOConfiguration;+ })) as WorkspaceSsoIdentityProviderEntity & SsoConfiguration;if (!identityProvider) {- throw new SSOException(+ throw new SsoException('Identity Provider not found',- SSOExceptionCode.USER_NOT_FOUND,+ SsoExceptionCode.USER_NOT_FOUND,);}@@ -227,24 +227,24 @@ export class SSOService {};}- async getSSOIdentityProviders(workspaceId: string) {- return (await this.workspaceSSOIdentityProviderRepository.find({+ async getSsoIdentityProviders(workspaceId: string) {+ return (await this.workspaceSsoIdentityProviderRepository.find({where: { workspaceId },select: ['id', 'name', 'type', 'issuer', 'status'],})) as Array<Pick<- WorkspaceSSOIdentityProviderEntity,+ WorkspaceSsoIdentityProviderEntity,'id' | 'name' | 'type' | 'issuer' | 'status'>>;}- async deleteSSOIdentityProvider(+ async deleteSsoIdentityProvider(identityProviderId: string,workspaceId: string,) {const identityProvider =- await this.workspaceSSOIdentityProviderRepository.findOne({+ await this.workspaceSsoIdentityProviderRepository.findOne({where: {id: identityProviderId,workspaceId,@@ -252,24 +252,24 @@ export class SSOService {});if (!identityProvider) {- throw new SSOException(+ throw new SsoException('Identity Provider not found',- SSOExceptionCode.IDENTITY_PROVIDER_NOT_FOUND,+ SsoExceptionCode.IDENTITY_PROVIDER_NOT_FOUND,);}- await this.workspaceSSOIdentityProviderRepository.delete({+ await this.workspaceSsoIdentityProviderRepository.delete({id: identityProvider.id,});return { identityProviderId: identityProvider.id };}- async editSSOIdentityProvider(- payload: Partial<WorkspaceSSOIdentityProviderEntity>,+ async editSsoIdentityProvider(+ payload: Partial<WorkspaceSsoIdentityProviderEntity>,workspaceId: string,) {- const ssoIdp = await this.workspaceSSOIdentityProviderRepository.findOne({+ const ssoIdp = await this.workspaceSsoIdentityProviderRepository.findOne({where: {id: payload.id,workspaceId,@@ -277,13 +277,13 @@ export class SSOService {});if (!ssoIdp) {- throw new SSOException(+ throw new SsoException('Identity Provider not found',- SSOExceptionCode.IDENTITY_PROVIDER_NOT_FOUND,+ SsoExceptionCode.IDENTITY_PROVIDER_NOT_FOUND,);}- const result = await this.workspaceSSOIdentityProviderRepository.save({+ const result = await this.workspaceSsoIdentityProviderRepository.save({...ssoIdp,...payload,});diff --git a/packages/twenty-server/src/engine/core-modules/sso/sso.exception.ts b/packages/twenty-server/src/engine/core-modules/sso/sso.exception.tsindex 2ef3ed0ca45..d5428f54ab0 100644--- a/packages/twenty-server/src/engine/core-modules/sso/sso.exception.ts+++ b/packages/twenty-server/src/engine/core-modules/sso/sso.exception.ts@@ -6,7 +6,7 @@ import { assertUnreachable } from 'twenty-shared/utils';import { CustomException } from 'src/utils/custom-exception';-export enum SSOExceptionCode {+export enum SsoExceptionCode {USER_NOT_FOUND = 'USER_NOT_FOUND',IDENTITY_PROVIDER_NOT_FOUND = 'IDENTITY_PROVIDER_NOT_FOUND',INVALID_ISSUER_URL = 'INVALID_ISSUER_URL',@@ -15,34 +15,34 @@ export enum SSOExceptionCode {SSO_DISABLE = 'SSO_DISABLE',}-const getSSOExceptionUserFriendlyMessage = (code: SSOExceptionCode) => {+const getSsoExceptionUserFriendlyMessage = (code: SsoExceptionCode) => {switch (code) {- case SSOExceptionCode.USER_NOT_FOUND:+ case SsoExceptionCode.USER_NOT_FOUND:return msg`User not found.`;- case SSOExceptionCode.IDENTITY_PROVIDER_NOT_FOUND:+ case SsoExceptionCode.IDENTITY_PROVIDER_NOT_FOUND:return msg`Identity provider not found.`;- case SSOExceptionCode.INVALID_ISSUER_URL:+ case SsoExceptionCode.INVALID_ISSUER_URL:return msg`Invalid issuer URL.`;- case SSOExceptionCode.INVALID_IDP_TYPE:+ case SsoExceptionCode.INVALID_IDP_TYPE:return msg`Invalid identity provider type.`;- case SSOExceptionCode.UNKNOWN_SSO_CONFIGURATION_ERROR:+ case SsoExceptionCode.UNKNOWN_SSO_CONFIGURATION_ERROR:return msg`SSO configuration error.`;- case SSOExceptionCode.SSO_DISABLE:+ case SsoExceptionCode.SSO_DISABLE:return msg`SSO is disabled.`;default:assertUnreachable(code);}};-export class SSOException extends CustomException<SSOExceptionCode> {+export class SsoException extends CustomException<SsoExceptionCode> {constructor(message: string,- code: SSOExceptionCode,+ code: SsoExceptionCode,{ userFriendlyMessage }: { userFriendlyMessage?: MessageDescriptor } = {},) {super(message, code, {userFriendlyMessage:- userFriendlyMessage ?? getSSOExceptionUserFriendlyMessage(code),+ userFriendlyMessage ?? getSsoExceptionUserFriendlyMessage(code),});}}diff --git a/packages/twenty-server/src/engine/core-modules/sso/sso.module.ts b/packages/twenty-server/src/engine/core-modules/sso/sso.module.tsindex 32d097abfaa..3999e34119e 100644--- a/packages/twenty-server/src/engine/core-modules/sso/sso.module.ts+++ b/packages/twenty-server/src/engine/core-modules/sso/sso.module.ts@@ -7,20 +7,20 @@ import { BillingModule } from 'src/engine/core-modules/billing/billing.module';import { EnterpriseModule } from 'src/engine/core-modules/enterprise/enterprise.module';import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';import { GuardRedirectModule } from 'src/engine/core-modules/guard-redirect/guard-redirect.module';-import { SSOService } from 'src/engine/core-modules/sso/services/sso.service';-import { SSOResolver } from 'src/engine/core-modules/sso/sso.resolver';-import { WorkspaceSSOIdentityProviderEntity } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';+import { SsoService } from 'src/engine/core-modules/sso/services/sso.service';+import { SsoResolver } from 'src/engine/core-modules/sso/sso.resolver';+import { WorkspaceSsoIdentityProviderEntity } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';@Module({imports: [- TypeOrmModule.forFeature([WorkspaceSSOIdentityProviderEntity]),+ TypeOrmModule.forFeature([WorkspaceSsoIdentityProviderEntity]),BillingModule,EnterpriseModule,GuardRedirectModule,PermissionsModule,FeatureFlagModule,],- exports: [SSOService],- providers: [SSOService, SSOResolver],+ exports: [SsoService],+ providers: [SsoService, SsoResolver],})-export class WorkspaceSSOModule {}+export class WorkspaceSsoModule {}diff --git a/packages/twenty-server/src/engine/core-modules/sso/sso.resolver.ts b/packages/twenty-server/src/engine/core-modules/sso/sso.resolver.tsindex 520397b868c..5a887f723ca 100644--- a/packages/twenty-server/src/engine/core-modules/sso/sso.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/sso/sso.resolver.ts@@ -13,14 +13,14 @@ import { DeleteSsoInput } from 'src/engine/core-modules/sso/dtos/delete-sso.inpuimport { DeleteSsoDTO } from 'src/engine/core-modules/sso/dtos/delete-sso.dto';import { EditSsoInput } from 'src/engine/core-modules/sso/dtos/edit-sso.input';import { EditSsoDTO } from 'src/engine/core-modules/sso/dtos/edit-sso.dto';-import { FindAvailableSSOIDPDTO } from 'src/engine/core-modules/sso/dtos/find-available-SSO-IDP.dto';+import { FindAvailableSsoIdpDTO } from 'src/engine/core-modules/sso/dtos/find-available-sso-idp.dto';import {- SetupOIDCSsoInput,- SetupSAMLSsoInput,+ SetupOidcSsoInput,+ SetupSamlSsoInput,} from 'src/engine/core-modules/sso/dtos/setup-sso.input';import { SetupSsoDTO } from 'src/engine/core-modules/sso/dtos/setup-sso.dto';-import { SSOService } from 'src/engine/core-modules/sso/services/sso.service';-import { type SSOException } from 'src/engine/core-modules/sso/sso.exception';+import { SsoService } from 'src/engine/core-modules/sso/services/sso.service';+import { type SsoException } from 'src/engine/core-modules/sso/sso.exception';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';@@ -34,36 +34,36 @@ import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-module)@UsePipes(ResolverValidationPipe)@UseGuards(SettingsPermissionGuard(PermissionFlagType.SECURITY))-export class SSOResolver {- constructor(private readonly ssoService: SSOService) {}+export class SsoResolver {+ constructor(private readonly ssoService: SsoService) {}@UseGuards(WorkspaceAuthGuard, EnterpriseFeaturesEnabledGuard)@Mutation(() => SetupSsoDTO)async createOIDCIdentityProvider(- @Args('input') setupSsoInput: SetupOIDCSsoInput,+ @Args('input') setupSsoInput: SetupOidcSsoInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,- ): Promise<SetupSsoDTO | SSOException> {- return this.ssoService.createOIDCIdentityProvider(+ ): Promise<SetupSsoDTO | SsoException> {+ return this.ssoService.createOidcIdentityProvider(setupSsoInput,workspaceId,);}@UseGuards(WorkspaceAuthGuard, EnterpriseFeaturesEnabledGuard)- @Query(() => [FindAvailableSSOIDPDTO])+ @Query(() => [FindAvailableSsoIdpDTO])async getSSOIdentityProviders(@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,) {- return this.ssoService.getSSOIdentityProviders(workspaceId);+ return this.ssoService.getSsoIdentityProviders(workspaceId);}@UseGuards(WorkspaceAuthGuard, EnterpriseFeaturesEnabledGuard)@Mutation(() => SetupSsoDTO)async createSAMLIdentityProvider(- @Args('input') setupSsoInput: SetupSAMLSsoInput,+ @Args('input') setupSsoInput: SetupSamlSsoInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,- ): Promise<SetupSsoDTO | SSOException> {- return this.ssoService.createSAMLIdentityProvider(+ ): Promise<SetupSsoDTO | SsoException> {+ return this.ssoService.createSamlIdentityProvider(setupSsoInput,workspaceId,);@@ -75,7 +75,7 @@ export class SSOResolver {@Args('input') { identityProviderId }: DeleteSsoInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,) {- return this.ssoService.deleteSSOIdentityProvider(+ return this.ssoService.deleteSsoIdentityProvider(identityProviderId,workspaceId,);@@ -87,6 +87,6 @@ export class SSOResolver {@Args('input') input: EditSsoInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,) {- return this.ssoService.editSSOIdentityProvider(input, workspaceId);+ return this.ssoService.editSsoIdentityProvider(input, workspaceId);}}diff --git a/packages/twenty-server/src/engine/core-modules/sso/types/SSOConfigurations.type.ts b/packages/twenty-server/src/engine/core-modules/sso/types/sso-configurations.type.tssimilarity index 56%rename from packages/twenty-server/src/engine/core-modules/sso/types/SSOConfigurations.type.tsrename to packages/twenty-server/src/engine/core-modules/sso/types/sso-configurations.type.tsindex a6099b73e6f..5685a09b7bb 100644--- a/packages/twenty-server/src/engine/core-modules/sso/types/SSOConfigurations.type.ts+++ b/packages/twenty-server/src/engine/core-modules/sso/types/sso-configurations.type.ts@@ -2,27 +2,27 @@import {type IdentityProviderType,- type SSOIdentityProviderStatus,+ type SsoIdentityProviderStatus,} from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';-type CommonSSOConfiguration = {+type CommonSsoConfiguration = {id: string;issuer: string;name?: string;- status: SSOIdentityProviderStatus;+ status: SsoIdentityProviderStatus;};-export type OIDCConfiguration = {+export type OidcConfiguration = {type: IdentityProviderType.OIDC;clientID: string;clientSecret: string;-} & CommonSSOConfiguration;+} & CommonSsoConfiguration;-export type SAMLConfiguration = {+export type SamlConfiguration = {type: IdentityProviderType.SAML;ssoURL: string;certificate: string;fingerprint?: string;-} & CommonSSOConfiguration;+} & CommonSsoConfiguration;-export type SSOConfiguration = OIDCConfiguration | SAMLConfiguration;+export type SsoConfiguration = OidcConfiguration | SamlConfiguration;diff --git a/packages/twenty-server/src/engine/core-modules/sso/workspace-sso-identity-provider.entity.ts b/packages/twenty-server/src/engine/core-modules/sso/workspace-sso-identity-provider.entity.tsindex 64740fc6879..77dd6e25212 100644--- a/packages/twenty-server/src/engine/core-modules/sso/workspace-sso-identity-provider.entity.ts+++ b/packages/twenty-server/src/engine/core-modules/sso/workspace-sso-identity-provider.entity.ts@@ -17,7 +17,7 @@ export enum IdentityProviderType {SAML = 'SAML',}-export enum OIDCResponseType {+export enum OidcResponseType {// Only Authorization Code is used for nowCODE = 'code',ID_TOKEN = 'id_token',@@ -29,19 +29,19 @@ registerEnumType(IdentityProviderType, {name: 'IdentityProviderType',});-export enum SSOIdentityProviderStatus {+export enum SsoIdentityProviderStatus {Active = 'Active',Inactive = 'Inactive',Error = 'Error',}-registerEnumType(SSOIdentityProviderStatus, {+registerEnumType(SsoIdentityProviderStatus, {name: 'SSOIdentityProviderStatus',});@Entity({ name: 'workspaceSSOIdentityProvider', schema: 'core' })@ObjectType('WorkspaceSSOIdentityProvider')-export class WorkspaceSSOIdentityProviderEntity extends WorkspaceRelatedEntity {+export class WorkspaceSsoIdentityProviderEntity extends WorkspaceRelatedEntity {// COMMON@Field(() => UUIDScalarType)@PrimaryGeneratedColumn('uuid')@@ -52,10 +52,10 @@ export class WorkspaceSSOIdentityProviderEntity extends WorkspaceRelatedEntity {@Column({type: 'enum',- enum: SSOIdentityProviderStatus,- default: SSOIdentityProviderStatus.Active,+ enum: SsoIdentityProviderStatus,+ default: SsoIdentityProviderStatus.Active,})- status: SSOIdentityProviderStatus;+ status: SsoIdentityProviderStatus;@CreateDateColumn({ type: 'timestamptz' })createdAt: Date;diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.tsindex 69fde7c08da..57d55ca3fc2 100644--- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts@@ -374,7 +374,7 @@ export class UserWorkspaceService {relations: {userWorkspaces: {workspace: {- workspaceSSOIdentityProviders: true,+ workspaceSsoIdentityProviders: true,approvedAccessDomains: true,},},@@ -403,7 +403,7 @@ export class UserWorkspaceService {)? getJoinableWorkspacesFromApprovedAccessDomains({approvedAccessDomains:- await this.approvedAccessDomainService.findValidatedApprovedAccessDomainWithWorkspacesAndSSOIdentityProvidersDomain(+ await this.approvedAccessDomainService.findValidatedApprovedAccessDomainWithWorkspacesAndSsoIdentityProvidersDomain(getDomainFromEmailOrThrow(email),),alreadyMemberWorkspaceIds: alreadyMemberWorkspacesIds,@@ -628,7 +628,7 @@ export class UserWorkspaceService {}): '',sso:- workspace.workspaceSSOIdentityProviders?.reduce(+ workspace.workspaceSsoIdentityProviders?.reduce((acc, identityProvider) =>acc.concat(identityProvider.status === 'Inactive'diff --git a/packages/twenty-server/src/engine/core-modules/workspace/constants/workspace-entity-non-cached-properties.constant.ts b/packages/twenty-server/src/engine/core-modules/workspace/constants/workspace-entity-non-cached-properties.constant.tsindex 213c0ff4cf4..f9e25b2e0ad 100644--- a/packages/twenty-server/src/engine/core-modules/workspace/constants/workspace-entity-non-cached-properties.constant.ts+++ b/packages/twenty-server/src/engine/core-modules/workspace/constants/workspace-entity-non-cached-properties.constant.ts@@ -10,7 +10,7 @@ export const WORKSPACE_ENTITY_NON_CACHED_PROPERTIES = ['emailingDomains','publicDomains','workspaceMembersCount',- 'workspaceSSOIdentityProviders',+ 'workspaceSsoIdentityProviders','agents','webhooks','apiKeys',diff --git a/packages/twenty-server/src/engine/core-modules/workspace/dtos/public-workspace-data.dto.ts b/packages/twenty-server/src/engine/core-modules/workspace/dtos/public-workspace-data.dto.tsindex ef37e56d11f..e6a95bbedcc 100644--- a/packages/twenty-server/src/engine/core-modules/workspace/dtos/public-workspace-data.dto.ts+++ b/packages/twenty-server/src/engine/core-modules/workspace/dtos/public-workspace-data.dto.ts@@ -3,13 +3,13 @@ import { Field, ObjectType } from '@nestjs/graphql';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';import {IdentityProviderType,- SSOIdentityProviderStatus,+ SsoIdentityProviderStatus,} from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';import { WorkspaceUrlsDTO } from 'src/engine/core-modules/workspace/dtos/workspace-urls.dto';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';@ObjectType('SSOIdentityProvider')-export class SSOIdentityProviderDTO {+export class SsoIdentityProviderDTO {@Field(() => UUIDScalarType)id: string;@@ -19,8 +19,8 @@ export class SSOIdentityProviderDTO {@Field(() => IdentityProviderType)type: IdentityProviderType;- @Field(() => SSOIdentityProviderStatus)- status: SSOIdentityProviderStatus;+ @Field(() => SsoIdentityProviderStatus)+ status: SsoIdentityProviderStatus;@Field(() => String)issuer: string;@@ -28,8 +28,8 @@ export class SSOIdentityProviderDTO {@ObjectType('AuthProviders')export class AuthProvidersDTO {- @Field(() => [SSOIdentityProviderDTO])- sso: Array<SSOIdentityProviderDTO>;+ @Field(() => [SsoIdentityProviderDTO])+ sso: Array<SsoIdentityProviderDTO>;@Field(() => Boolean)google: boolean;diff --git a/packages/twenty-server/src/engine/core-modules/workspace/utils/__tests__/get-auth-providers-by-workspace.util.spec.ts b/packages/twenty-server/src/engine/core-modules/workspace/utils/__tests__/get-auth-providers-by-workspace.util.spec.tsindex fd4014c48dc..58e5edb0eb3 100644--- a/packages/twenty-server/src/engine/core-modules/workspace/utils/__tests__/get-auth-providers-by-workspace.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/workspace/utils/__tests__/get-auth-providers-by-workspace.util.spec.ts@@ -1,7 +1,7 @@import {- type WorkspaceSSOIdentityProviderEntity,+ type WorkspaceSsoIdentityProviderEntity,IdentityProviderType,- SSOIdentityProviderStatus,+ SsoIdentityProviderStatus,} from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';import { getAuthProvidersByWorkspace } from 'src/engine/core-modules/workspace/utils/get-auth-providers-by-workspace.util';import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';@@ -11,13 +11,13 @@ describe('getAuthProvidersByWorkspace', () => {isGoogleAuthEnabled: true,isPasswordAuthEnabled: true,isMicrosoftAuthEnabled: false,- workspaceSSOIdentityProviders: [+ workspaceSsoIdentityProviders: [{id: 'sso1',name: 'SSO Provider 1',type: IdentityProviderType.SAML,- status: SSOIdentityProviderStatus.Active,+ status: SsoIdentityProviderStatus.Active,issuer: 'sso1.example.com',},],@@ -46,7 +46,7 @@ describe('getAuthProvidersByWorkspace', () => {name: 'SSO Provider 1',type: IdentityProviderType.SAML,- status: SSOIdentityProviderStatus.Active,+ status: SsoIdentityProviderStatus.Active,issuer: 'sso1.example.com',},],@@ -55,7 +55,7 @@ describe('getAuthProvidersByWorkspace', () => {it('should handle workspace with no SSO providers', () => {const result = getAuthProvidersByWorkspace({- workspace: { ...mockWorkspace, workspaceSSOIdentityProviders: [] },+ workspace: { ...mockWorkspace, workspaceSsoIdentityProviders: [] },systemEnabledProviders: {google: true,magicLink: false,@@ -77,14 +77,14 @@ describe('getAuthProvidersByWorkspace', () => {const result = getAuthProvidersByWorkspace({workspace: {...mockWorkspace,- workspaceSSOIdentityProviders: [+ workspaceSsoIdentityProviders: [{id: 'sso1',name: 'SSO Provider 1',type: IdentityProviderType.SAML,- status: SSOIdentityProviderStatus.Inactive,+ status: SsoIdentityProviderStatus.Inactive,issuer: 'sso1.example.com',- } as WorkspaceSSOIdentityProviderEntity,+ } as WorkspaceSsoIdentityProviderEntity,],},systemEnabledProviders: {@@ -128,7 +128,7 @@ describe('getAuthProvidersByWorkspace', () => {name: 'SSO Provider 1',type: IdentityProviderType.SAML,- status: SSOIdentityProviderStatus.Active,+ status: SsoIdentityProviderStatus.Active,issuer: 'sso1.example.com',},],diff --git a/packages/twenty-server/src/engine/core-modules/workspace/utils/get-auth-providers-by-workspace.util.ts b/packages/twenty-server/src/engine/core-modules/workspace/utils/get-auth-providers-by-workspace.util.tsindex 89027a6d7cd..088ff9edfc0 100644--- a/packages/twenty-server/src/engine/core-modules/workspace/utils/get-auth-providers-by-workspace.util.ts+++ b/packages/twenty-server/src/engine/core-modules/workspace/utils/get-auth-providers-by-workspace.util.ts@@ -1,8 +1,8 @@import { isDefined } from 'twenty-shared/utils';import {- SSOIdentityProviderStatus,- type WorkspaceSSOIdentityProviderEntity,+ SsoIdentityProviderStatus,+ type WorkspaceSsoIdentityProviderEntity,} from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';import { type AuthProvidersDTO } from 'src/engine/core-modules/workspace/dtos/public-workspace-data.dto';import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';@@ -16,7 +16,7 @@ export const getAuthProvidersByWorkspace = ({| 'isGoogleAuthEnabled'| 'isPasswordAuthEnabled'| 'isMicrosoftAuthEnabled'- | 'workspaceSSOIdentityProviders'+ | 'workspaceSsoIdentityProviders'>;systemEnabledProviders: AuthProvidersDTO;}) => {@@ -27,9 +27,9 @@ export const getAuthProvidersByWorkspace = ({workspace.isPasswordAuthEnabled && systemEnabledProviders.password,microsoft:workspace.isMicrosoftAuthEnabled && systemEnabledProviders.microsoft,- sso: workspace.workspaceSSOIdentityProviders- .map((identityProvider: WorkspaceSSOIdentityProviderEntity) =>- identityProvider.status === SSOIdentityProviderStatus.Active+ sso: workspace.workspaceSsoIdentityProviders+ .map((identityProvider: WorkspaceSsoIdentityProviderEntity) =>+ identityProvider.status === SsoIdentityProviderStatus.Active? {id: identityProvider.id,name: identityProvider.name,diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.tsindex efece966bfa..b5b2d53b69c 100644--- a/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts@@ -30,7 +30,7 @@ import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';import { KeyValuePairEntity } from 'src/engine/core-modules/key-value-pair/key-value-pair.entity';import { PublicDomainEntity } from 'src/engine/core-modules/public-domain/public-domain.entity';-import { WorkspaceSSOIdentityProviderEntity } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';+import { WorkspaceSsoIdentityProviderEntity } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';import { WasIntroducedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-introduced-in-upgrade.decorator';import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';import { WorkspaceDiscoverability } from 'src/engine/core-modules/workspace/types/workspace-discoverability.type';@@ -201,10 +201,10 @@ export class WorkspaceEntity {suspendedAt: Date | null;@OneToMany(- () => WorkspaceSSOIdentityProviderEntity,- (workspaceSSOIdentityProviders) => workspaceSSOIdentityProviders.workspace,+ () => WorkspaceSsoIdentityProviderEntity,+ (workspaceSsoIdentityProviders) => workspaceSsoIdentityProviders.workspace,)- workspaceSSOIdentityProviders: Relation<WorkspaceSSOIdentityProviderEntity[]>;+ workspaceSsoIdentityProviders: Relation<WorkspaceSsoIdentityProviderEntity[]>;@OneToMany(() => AgentEntity, (agent) => agent.workspace, {onDelete: 'CASCADE',diff --git a/packages/twenty-server/src/modules/connected-account/imap-api/imap-apis.module.ts b/packages/twenty-server/src/modules/connected-account/imap-api/imap-apis.module.tsindex 01af957afdf..7d3bdbddcde 100644--- a/packages/twenty-server/src/modules/connected-account/imap-api/imap-apis.module.ts+++ b/packages/twenty-server/src/modules/connected-account/imap-api/imap-apis.module.ts@@ -14,7 +14,7 @@ import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadatimport { WorkspaceEventEmitterModule } from 'src/engine/workspace-event-emitter/workspace-event-emitter.module';import { CalendarCommonModule } from 'src/modules/calendar/common/calendar-common.module';import { ConnectedAccountModule } from 'src/modules/connected-account/connected-account.module';-import { ImapSmtpCalDavAPIService } from 'src/modules/connected-account/services/imap-smtp-caldav-apis.service';+import { ImapSmtpCalDavApiService } from 'src/modules/connected-account/services/imap-smtp-caldav-apis.service';import { MessagingCommonModule } from 'src/modules/messaging/common/messaging-common.module';import { MessagingFolderSyncManagerModule } from 'src/modules/messaging/message-folder-manager/messaging-folder-sync-manager.module';@@ -38,7 +38,7 @@ import { MessagingFolderSyncManagerModule } from 'src/modules/messaging/message-MessagingCommonModule,MessagingFolderSyncManagerModule,],- providers: [ImapSmtpCalDavAPIService],- exports: [ImapSmtpCalDavAPIService],+ providers: [ImapSmtpCalDavApiService],+ exports: [ImapSmtpCalDavApiService],})export class IMAPAPIsModule {}diff --git a/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/connected-account-refresh-tokens-manager.module.ts b/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/connected-account-refresh-tokens-manager.module.tsindex bd5d775f5f6..05730c1ac90 100644--- a/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/connected-account-refresh-tokens-manager.module.ts+++ b/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/connected-account-refresh-tokens-manager.module.ts@@ -5,16 +5,16 @@ import { AppOAuthRefreshModule } from 'src/engine/core-modules/application/conneimport { JwtModule } from 'src/engine/core-modules/jwt/jwt.module';import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';import { ConnectedAccountTokenEncryptionModule } from 'src/engine/metadata-modules/connected-account/services/connected-account-token-encryption.module';-import { GoogleAPIRefreshAccessTokenModule } from 'src/modules/connected-account/refresh-tokens-manager/drivers/google/google-api-refresh-access-token.module';-import { MicrosoftAPIRefreshAccessTokenModule } from 'src/modules/connected-account/refresh-tokens-manager/drivers/microsoft/microsoft-api-refresh-access-token.module';+import { GoogleApiRefreshAccessTokenModule } from 'src/modules/connected-account/refresh-tokens-manager/drivers/google/google-api-refresh-access-token.module';+import { MicrosoftApiRefreshAccessTokenModule } from 'src/modules/connected-account/refresh-tokens-manager/drivers/microsoft/microsoft-api-refresh-access-token.module';import { ConnectedAccountRefreshTokensService } from 'src/modules/connected-account/refresh-tokens-manager/services/connected-account-refresh-tokens.service';@Module({imports: [JwtModule,TypeOrmModule.forFeature([ConnectedAccountEntity]),- GoogleAPIRefreshAccessTokenModule,- MicrosoftAPIRefreshAccessTokenModule,+ GoogleApiRefreshAccessTokenModule,+ MicrosoftApiRefreshAccessTokenModule,AppOAuthRefreshModule,ConnectedAccountTokenEncryptionModule,],diff --git a/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/drivers/google/google-api-refresh-access-token.module.ts b/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/drivers/google/google-api-refresh-access-token.module.tsindex 1743eae296e..aee562ffbfa 100644--- a/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/drivers/google/google-api-refresh-access-token.module.ts+++ b/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/drivers/google/google-api-refresh-access-token.module.ts@@ -1,11 +1,11 @@import { Module } from '@nestjs/common';import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';-import { GoogleAPIRefreshAccessTokenService } from 'src/modules/connected-account/refresh-tokens-manager/drivers/google/services/google-api-refresh-tokens.service';+import { GoogleApiRefreshAccessTokenService } from 'src/modules/connected-account/refresh-tokens-manager/drivers/google/services/google-api-refresh-tokens.service';@Module({imports: [TwentyConfigModule],- providers: [GoogleAPIRefreshAccessTokenService],- exports: [GoogleAPIRefreshAccessTokenService],+ providers: [GoogleApiRefreshAccessTokenService],+ exports: [GoogleApiRefreshAccessTokenService],})-export class GoogleAPIRefreshAccessTokenModule {}+export class GoogleApiRefreshAccessTokenModule {}diff --git a/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/drivers/google/services/google-api-refresh-tokens.service.ts b/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/drivers/google/services/google-api-refresh-tokens.service.tsindex 1e93b04bb97..a738be440f0 100644--- a/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/drivers/google/services/google-api-refresh-tokens.service.ts+++ b/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/drivers/google/services/google-api-refresh-tokens.service.ts@@ -13,7 +13,7 @@ import { parseGoogleOAuthError } from 'src/modules/connected-account/refresh-tokimport { type ConnectedAccountPlaintextTokens } from 'src/modules/connected-account/refresh-tokens-manager/services/connected-account-refresh-tokens.service';@Injectable()-export class GoogleAPIRefreshAccessTokenService {+export class GoogleApiRefreshAccessTokenService {constructor(private readonly twentyConfigService: TwentyConfigService) {}async refreshTokens(diff --git a/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/drivers/microsoft/microsoft-api-refresh-access-token.module.ts b/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/drivers/microsoft/microsoft-api-refresh-access-token.module.tsindex f4580ee2075..7020f5955b5 100644--- a/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/drivers/microsoft/microsoft-api-refresh-access-token.module.ts+++ b/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/drivers/microsoft/microsoft-api-refresh-access-token.module.ts@@ -2,11 +2,11 @@ import { Module } from '@nestjs/common';import { JwtModule } from 'src/engine/core-modules/jwt/jwt.module';import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';-import { MicrosoftAPIRefreshAccessTokenService } from 'src/modules/connected-account/refresh-tokens-manager/drivers/microsoft/services/microsoft-api-refresh-tokens.service';+import { MicrosoftApiRefreshAccessTokenService } from 'src/modules/connected-account/refresh-tokens-manager/drivers/microsoft/services/microsoft-api-refresh-tokens.service';@Module({imports: [TwentyConfigModule, JwtModule],- providers: [MicrosoftAPIRefreshAccessTokenService],- exports: [MicrosoftAPIRefreshAccessTokenService],+ providers: [MicrosoftApiRefreshAccessTokenService],+ exports: [MicrosoftApiRefreshAccessTokenService],})-export class MicrosoftAPIRefreshAccessTokenModule {}+export class MicrosoftApiRefreshAccessTokenModule {}diff --git a/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/drivers/microsoft/services/microsoft-api-refresh-tokens.service.ts b/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/drivers/microsoft/services/microsoft-api-refresh-tokens.service.tsindex a1d0ca58769..c51dc8ace79 100644--- a/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/drivers/microsoft/services/microsoft-api-refresh-tokens.service.ts+++ b/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/drivers/microsoft/services/microsoft-api-refresh-tokens.service.ts@@ -12,7 +12,7 @@ import { parseMsalError } from 'src/modules/connected-account/refresh-tokens-manimport type { ConnectedAccountPlaintextTokens } from 'src/modules/connected-account/refresh-tokens-manager/services/connected-account-refresh-tokens.service';@Injectable()-export class MicrosoftAPIRefreshAccessTokenService {+export class MicrosoftApiRefreshAccessTokenService {constructor(private readonly config: TwentyConfigService) {}async refreshTokens(diff --git a/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/services/connected-account-refresh-tokens.service.ts b/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/services/connected-account-refresh-tokens.service.tsindex dd80069d739..89d4216e3c4 100644--- a/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/services/connected-account-refresh-tokens.service.ts+++ b/packages/twenty-server/src/modules/connected-account/refresh-tokens-manager/services/connected-account-refresh-tokens.service.ts@@ -14,8 +14,8 @@ import {ConnectedAccountRefreshAccessTokenExceptionCode,} from 'src/engine/metadata-modules/connected-account/exceptions/connected-account-refresh-tokens.exception';import { ConnectedAccountTokenEncryptionService } from 'src/engine/metadata-modules/connected-account/services/connected-account-token-encryption.service';-import { GoogleAPIRefreshAccessTokenService } from 'src/modules/connected-account/refresh-tokens-manager/drivers/google/services/google-api-refresh-tokens.service';-import { MicrosoftAPIRefreshAccessTokenService } from 'src/modules/connected-account/refresh-tokens-manager/drivers/microsoft/services/microsoft-api-refresh-tokens.service';+import { GoogleApiRefreshAccessTokenService } from 'src/modules/connected-account/refresh-tokens-manager/drivers/google/services/google-api-refresh-tokens.service';+import { MicrosoftApiRefreshAccessTokenService } from 'src/modules/connected-account/refresh-tokens-manager/drivers/microsoft/services/microsoft-api-refresh-tokens.service';// Tokens flowing through this service can be in two states depending on// where they enter the pipeline. We model both shapes explicitly so the@@ -44,8 +44,8 @@ export class ConnectedAccountRefreshTokensService {);constructor(- private readonly googleAPIRefreshAccessTokenService: GoogleAPIRefreshAccessTokenService,- private readonly microsoftAPIRefreshAccessTokenService: MicrosoftAPIRefreshAccessTokenService,+ private readonly googleApiRefreshAccessTokenService: GoogleApiRefreshAccessTokenService,+ private readonly microsoftApiRefreshAccessTokenService: MicrosoftApiRefreshAccessTokenService,private readonly appOAuthRefreshAccessTokenService: AppOAuthRefreshAccessTokenService,private readonly connectedAccountTokenEncryptionService: ConnectedAccountTokenEncryptionService,@InjectRepository(ConnectedAccountEntity)@@ -195,11 +195,11 @@ export class ConnectedAccountRefreshTokensService {try {switch (connectedAccount.provider) {case ConnectedAccountProvider.GOOGLE:- return await this.googleAPIRefreshAccessTokenService.refreshTokens(+ return await this.googleApiRefreshAccessTokenService.refreshTokens(refreshToken,);case ConnectedAccountProvider.MICROSOFT:- return await this.microsoftAPIRefreshAccessTokenService.refreshTokens(+ return await this.microsoftApiRefreshAccessTokenService.refreshTokens(refreshToken,);case ConnectedAccountProvider.APP:diff --git a/packages/twenty-server/src/modules/connected-account/services/imap-smtp-caldav-apis.service.ts b/packages/twenty-server/src/modules/connected-account/services/imap-smtp-caldav-apis.service.tsindex efdcdb78116..fe49aeab73c 100644--- a/packages/twenty-server/src/modules/connected-account/services/imap-smtp-caldav-apis.service.ts+++ b/packages/twenty-server/src/modules/connected-account/services/imap-smtp-caldav-apis.service.ts@@ -36,8 +36,8 @@ import {} from 'src/modules/messaging/message-import-manager/jobs/messaging-message-list-fetch.job';@Injectable()-export class ImapSmtpCalDavAPIService {- private readonly logger = new Logger(ImapSmtpCalDavAPIService.name);+export class ImapSmtpCalDavApiService {+ private readonly logger = new Logger(ImapSmtpCalDavApiService.name);constructor(@InjectRepository(CalendarChannelEntity)diff --git a/packages/twenty-server/test/integration/graphql/suites/auth/sso-exchange-token/single-use-sso-exchange-token.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/auth/sso-exchange-token/single-use-sso-exchange-token.integration-spec.tsindex cf7c78d6cac..876e3ad9100 100644--- a/packages/twenty-server/test/integration/graphql/suites/auth/sso-exchange-token/single-use-sso-exchange-token.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/auth/sso-exchange-token/single-use-sso-exchange-token.integration-spec.ts@@ -1,7 +1,7 @@import crypto from 'crypto';import { type DataSource } from 'typeorm';-import { getAuthTokensFromSSOExchangeToken } from 'test/integration/graphql/utils/get-auth-tokens-from-sso-exchange-token.util';+import { getAuthTokensFromSsoExchangeToken } from 'test/integration/graphql/utils/get-auth-tokens-from-sso-exchange-token.util';import { AppTokenType } from 'src/engine/core-modules/app-token/app-token.entity';import { AuthExceptionCode } from 'src/engine/core-modules/auth/auth.exception';@@ -22,9 +22,9 @@ const expectUniformInvalidTokenError = (errors: { message: string }[]) => {describe('SSO exchange token redemption (integration)', () => {let dataSource: DataSource;- const seedSSOExchangeToken = async ({+ const seedSsoExchangeToken = async ({expiresAt = new Date(Date.now() + 5 * 60 * 1000),- type = AppTokenType.SSOExchangeToken,+ type = AppTokenType.SsoExchangeToken,revokedAt = null,}: {expiresAt?: Date;@@ -51,7 +51,7 @@ describe('SSO exchange token redemption (integration)', () => {const countRemainingRows = async (plainToken: string,- type: AppTokenType = AppTokenType.SSOExchangeToken,+ type: AppTokenType = AppTokenType.SsoExchangeToken,): Promise<number> => {const rows = await dataSource.query(`SELECT 1 FROM core."appToken" WHERE "value" = $1 AND "type" = $2`,@@ -66,9 +66,9 @@ describe('SSO exchange token redemption (integration)', () => {});it('should exchange a valid token for a token pair and consume it', async () => {- const plainToken = await seedSSOExchangeToken();+ const plainToken = await seedSsoExchangeToken();- const { data } = await getAuthTokensFromSSOExchangeToken({+ const { data } = await getAuthTokensFromSsoExchangeToken({ssoExchangeToken: plainToken,expectToFail: false,});@@ -84,14 +84,14 @@ describe('SSO exchange token redemption (integration)', () => {});it('should reject a second redemption of the same token', async () => {- const plainToken = await seedSSOExchangeToken();+ const plainToken = await seedSsoExchangeToken();- await getAuthTokensFromSSOExchangeToken({+ await getAuthTokensFromSsoExchangeToken({ssoExchangeToken: plainToken,expectToFail: false,});- const { errors } = await getAuthTokensFromSSOExchangeToken({+ const { errors } = await getAuthTokensFromSsoExchangeToken({ssoExchangeToken: plainToken,expectToFail: true,});@@ -100,11 +100,11 @@ describe('SSO exchange token redemption (integration)', () => {});it('should reject an expired token', async () => {- const plainToken = await seedSSOExchangeToken({+ const plainToken = await seedSsoExchangeToken({expiresAt: new Date(Date.now() - 1000),});- const { errors } = await getAuthTokensFromSSOExchangeToken({+ const { errors } = await getAuthTokensFromSsoExchangeToken({ssoExchangeToken: plainToken,expectToFail: true,});@@ -114,11 +114,11 @@ describe('SSO exchange token redemption (integration)', () => {});it('should reject a revoked token without consuming it', async () => {- const plainToken = await seedSSOExchangeToken({+ const plainToken = await seedSsoExchangeToken({revokedAt: new Date(),});- const { errors } = await getAuthTokensFromSSOExchangeToken({+ const { errors } = await getAuthTokensFromSsoExchangeToken({ssoExchangeToken: plainToken,expectToFail: true,});@@ -128,11 +128,11 @@ describe('SSO exchange token redemption (integration)', () => {});it('should not redeem an app token of another type sharing the same value', async () => {- const plainToken = await seedSSOExchangeToken({+ const plainToken = await seedSsoExchangeToken({type: AppTokenType.EmailVerificationToken,});- const { errors } = await getAuthTokensFromSSOExchangeToken({+ const { errors } = await getAuthTokensFromSsoExchangeToken({ssoExchangeToken: plainToken,expectToFail: true,});@@ -144,7 +144,7 @@ describe('SSO exchange token redemption (integration)', () => {});it('should reject an unknown token', async () => {- const { errors } = await getAuthTokensFromSSOExchangeToken({+ const { errors } = await getAuthTokensFromSsoExchangeToken({ssoExchangeToken: crypto.randomBytes(32).toString('hex'),expectToFail: true,});@@ -153,11 +153,11 @@ describe('SSO exchange token redemption (integration)', () => {});it('should let exactly one of several concurrent redemptions succeed', async () => {- const plainToken = await seedSSOExchangeToken();+ const plainToken = await seedSsoExchangeToken();const responses = await Promise.all(Array.from({ length: 5 }, () =>- getAuthTokensFromSSOExchangeToken({ ssoExchangeToken: plainToken }),+ getAuthTokensFromSsoExchangeToken({ ssoExchangeToken: plainToken }),),);diff --git a/packages/twenty-server/test/integration/graphql/utils/get-auth-tokens-from-sso-exchange-token.util.ts b/packages/twenty-server/test/integration/graphql/utils/get-auth-tokens-from-sso-exchange-token.util.tsindex 824df23e8a6..46bb519c328 100644--- a/packages/twenty-server/test/integration/graphql/utils/get-auth-tokens-from-sso-exchange-token.util.ts+++ b/packages/twenty-server/test/integration/graphql/utils/get-auth-tokens-from-sso-exchange-token.util.ts@@ -6,15 +6,15 @@ import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/import { type AuthTokens } from 'src/engine/core-modules/auth/dto/auth-tokens.dto';-type GetAuthTokensFromSSOExchangeTokenUtilArgs = {+type GetAuthTokensFromSsoExchangeTokenUtilArgs = {ssoExchangeToken: string;expectToFail?: boolean;};-export const getAuthTokensFromSSOExchangeToken = async ({+export const getAuthTokensFromSsoExchangeToken = async ({ssoExchangeToken,expectToFail,-}: GetAuthTokensFromSSOExchangeTokenUtilArgs): CommonResponseBody<{+}: GetAuthTokensFromSsoExchangeTokenUtilArgs): CommonResponseBody<{getAuthTokensFromSSOExchangeToken: AuthTokens;}> => {const mutation = gql`diff --git a/packages/twenty-shared/src/types/RecordGqlOperationFilter.ts b/packages/twenty-shared/src/types/RecordGqlOperationFilter.tsindex d189fbd9f68..4d1f773f60b 100644--- a/packages/twenty-shared/src/types/RecordGqlOperationFilter.ts+++ b/packages/twenty-shared/src/types/RecordGqlOperationFilter.ts@@ -87,7 +87,7 @@ export type CurrencyFilter = {currencyCode?: SelectFilter;};-export type URLFilter = {+export type UrlFilter = {url?: StringFilter;label?: StringFilter;};@@ -182,7 +182,7 @@ export type LeafFilter =| DateFilter| DateTimeFilter| CurrencyFilter- | URLFilter+ | UrlFilter| FullNameFilter| BooleanFilter| AddressFilterdiff --git a/packages/twenty-shared/src/types/SettingsPath.ts b/packages/twenty-shared/src/types/SettingsPath.tsindex 9e2a5a4f7a5..d898e7e9e87 100644--- a/packages/twenty-shared/src/types/SettingsPath.ts+++ b/packages/twenty-shared/src/types/SettingsPath.ts@@ -70,7 +70,7 @@ export enum SettingsPath {Integrations = 'integrations',Security = 'general#security',Logs = 'general#logs',- NewSSOIdentityProvider = 'security/sso/new',+ NewSsoIdentityProvider = 'security/sso/new',AdminPanel = 'admin-panel',AdminPanelEnterprise = 'admin-panel#enterprise',diff --git a/packages/twenty-shared/src/types/index.ts b/packages/twenty-shared/src/types/index.tsindex 5ba8bb3119e..92b93f47e24 100644--- a/packages/twenty-shared/src/types/index.ts+++ b/packages/twenty-shared/src/types/index.ts@@ -265,7 +265,7 @@ export type {DateFilter,DateTimeFilter,CurrencyFilter,- URLFilter,+ UrlFilter,FullNameFilter,AddressFilter,LinksFilter,diff --git a/packages/twenty-shared/src/utils/__tests__/getURLSafely.test.ts b/packages/twenty-shared/src/utils/__tests__/getUrlSafely.test.tssimilarity index 57%rename from packages/twenty-shared/src/utils/__tests__/getURLSafely.test.tsrename to packages/twenty-shared/src/utils/__tests__/getUrlSafely.test.tsindex 23af1528cff..72ed7145526 100644--- a/packages/twenty-shared/src/utils/__tests__/getURLSafely.test.ts+++ b/packages/twenty-shared/src/utils/__tests__/getUrlSafely.test.ts@@ -1,15 +1,15 @@-import { getURLSafely } from '@/utils/getURLSafely';+import { getUrlSafely } from '@/utils/getUrlSafely';-describe('getURLSafely', () => {+describe('getUrlSafely', () => {it('should return a URL object for a valid URL', () => {- const result = getURLSafely('https://example.com');+ const result = getUrlSafely('https://example.com');expect(result).toBeInstanceOf(URL);expect(result?.hostname).toBe('example.com');});it('should return null for an invalid URL', () => {- const result = getURLSafely('not-a-url');+ const result = getUrlSafely('not-a-url');expect(result).toBeNull();});diff --git a/packages/twenty-shared/src/utils/getURLSafely.ts b/packages/twenty-shared/src/utils/getUrlSafely.tssimilarity index 59%rename from packages/twenty-shared/src/utils/getURLSafely.tsrename to packages/twenty-shared/src/utils/getUrlSafely.tsindex 9a636c4f920..99427436707 100644--- a/packages/twenty-shared/src/utils/getURLSafely.ts+++ b/packages/twenty-shared/src/utils/getUrlSafely.ts@@ -1,4 +1,4 @@-export const getURLSafely = (url: string) => {+export const getUrlSafely = (url: string) => {try {return new URL(url);} catch {diff --git a/packages/twenty-shared/src/utils/index.ts b/packages/twenty-shared/src/utils/index.tsindex 5c03152b66d..ea25fbf3668 100644--- a/packages/twenty-shared/src/utils/index.ts+++ b/packages/twenty-shared/src/utils/index.ts@@ -185,7 +185,7 @@ export {export { formatToShortNumber } from './format/formatToShortNumber';export { fromArrayToUniqueKeyRecord } from './from-array-to-unique-key-record.util';export { fromArrayToValuesByKeyRecord } from './fromArrayToValuesByKeyRecord.util';-export { getURLSafely } from './getURLSafely';+export { getUrlSafely } from './getUrlSafely';export {getNodeTypename,getConnectionTypename,diff --git a/packages/twenty-shared/src/utils/url/normalizeUrlOrigin.ts b/packages/twenty-shared/src/utils/url/normalizeUrlOrigin.tsindex fb6b1b056eb..6f102eeffe4 100644--- a/packages/twenty-shared/src/utils/url/normalizeUrlOrigin.ts+++ b/packages/twenty-shared/src/utils/url/normalizeUrlOrigin.ts@@ -1,11 +1,11 @@-import { getURLSafely } from '@/utils/getURLSafely';+import { getUrlSafely } from '@/utils/getUrlSafely';import { isDefined } from '@/utils/validation';// Lowercases the URL origin (scheme + host) and removes a trailing slash.// URL() already lowercases the origin and preserves percent-encoded sequences// in the path, query, and hash (e.g. %2F stays %2F, %2520 stays %2520).export const normalizeUrlOrigin = (rawUrl: string) => {- const url = getURLSafely(rawUrl);+ const url = getUrlSafely(rawUrl);if (!isDefined(url)) {return rawUrl;