From 164f010501431ac5e4333263dbf91465e6be53ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Malfait?= Date: Mon, 23 Dec 2024 12:04:15 +0100 Subject: [PATCH] Use uuid package instead of crypto package (#9191) Fixes #9186 --- .../src/modules/analytics/hooks/useEventTracker.ts | 3 ++- .../utils/sSOIdentityProviderDefaultValues.ts | 11 ++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/packages/twenty-front/src/modules/analytics/hooks/useEventTracker.ts b/packages/twenty-front/src/modules/analytics/hooks/useEventTracker.ts index faaa3ea5b..4e90eb16f 100644 --- a/packages/twenty-front/src/modules/analytics/hooks/useEventTracker.ts +++ b/packages/twenty-front/src/modules/analytics/hooks/useEventTracker.ts @@ -1,4 +1,5 @@ import { useCallback } from 'react'; +import { v4 } from 'uuid'; import { useTrackMutation } from '~/generated/graphql'; export interface EventData { pathname: string; @@ -19,7 +20,7 @@ export const getSessionId = (): string => { }; export const setSessionId = (domain?: string): void => { - const sessionId = getSessionId() || crypto.randomUUID(); + const sessionId = getSessionId() || v4(); const baseCookie = `${ANALYTICS_COOKIE_NAME}=${sessionId}; Max-Age=1800; path=/; secure`; const cookie = domain ? baseCookie + `; domain=${domain}` : baseCookie; diff --git a/packages/twenty-front/src/modules/settings/security/utils/sSOIdentityProviderDefaultValues.ts b/packages/twenty-front/src/modules/settings/security/utils/sSOIdentityProviderDefaultValues.ts index 319ec19b6..23b2fcbfb 100644 --- a/packages/twenty-front/src/modules/settings/security/utils/sSOIdentityProviderDefaultValues.ts +++ b/packages/twenty-front/src/modules/settings/security/utils/sSOIdentityProviderDefaultValues.ts @@ -1,6 +1,7 @@ /* @license Enterprise */ import { SettingSecurityNewSSOIdentityFormValues } from '@/settings/security/types/SSOIdentityProvider'; +import { v4 } from 'uuid'; import { IdentityProviderType } from '~/generated/graphql'; export const sSOIdentityProviderDefaultValues: Record< @@ -11,15 +12,7 @@ export const sSOIdentityProviderDefaultValues: Record< type: 'SAML', ssoURL: '', name: '', - id: - window.location.protocol === 'https:' - ? crypto.randomUUID() - : '10000000-1000-4000-8000-100000000000'.replace(/[018]/g, (c) => - ( - +c ^ - (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (+c / 4))) - ).toString(16), - ), + id: v4(), certificate: '', issuer: '', }),