From bbd9fa4a5677e0b2b2bb9a833c959452969b9203 Mon Sep 17 00:00:00 2001 From: Tuan Dang Date: Wed, 21 Feb 2024 17:00:59 -0800 Subject: [PATCH] Correct SCIM Token TTL ms --- backend/src/ee/services/scim/scim-service.ts | 2 +- .../OrgSettingsPage/components/OrgAuthTab/ScimTokenModal.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/ee/services/scim/scim-service.ts b/backend/src/ee/services/scim/scim-service.ts index 8535380de..657d95a4a 100644 --- a/backend/src/ee/services/scim/scim-service.ts +++ b/backend/src/ee/services/scim/scim-service.ts @@ -403,7 +403,7 @@ export const scimServiceFactory = ({ if (Number(ttlDays) > 0) { const currentDate = new Date(); const scimTokenCreatedAt = new Date(createdAt); - const ttlInMilliseconds = Number(scimToken.ttlDays) * 86400; + const ttlInMilliseconds = Number(scimToken.ttlDays) * 86400 * 1000; const expirationDate = new Date(scimTokenCreatedAt.getTime() + ttlInMilliseconds); if (currentDate > expirationDate) diff --git a/frontend/src/views/Settings/OrgSettingsPage/components/OrgAuthTab/ScimTokenModal.tsx b/frontend/src/views/Settings/OrgSettingsPage/components/OrgAuthTab/ScimTokenModal.tsx index 6ef6c9355..e7d4b1063 100644 --- a/frontend/src/views/Settings/OrgSettingsPage/components/OrgAuthTab/ScimTokenModal.tsx +++ b/frontend/src/views/Settings/OrgSettingsPage/components/OrgAuthTab/ScimTokenModal.tsx @@ -103,7 +103,7 @@ export const ScimTokenModal = ({ const onFormSubmit = async ({ description, ttlDays }: FormData) => { try { if (!currentOrg?.id) return; - + const { scimToken } = await createScimTokenMutateAsync({ organizationId: currentOrg.id, description, @@ -283,7 +283,7 @@ export const ScimTokenModal = ({ let expiresAt; if (ttlDays > 0) { - expiresAt = new Date(new Date(createdAt).getTime() + ttlDays * 86400); + expiresAt = new Date(new Date(createdAt).getTime() + ttlDays * 86400 * 1000); } return (