From e0793559dc0fd8f5a4ec8d6f02b8dfd58c67a74e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Georget?= Date: Fri, 16 Feb 2024 18:31:43 +0100 Subject: [PATCH] Move getSSOProvidersList to EE folder --- packages/core/admin/ee/server/src/services/index.ts | 2 ++ .../core/admin/ee/server/src/services/metrics.ts | 11 +++++++++++ packages/core/admin/server/src/services/metrics.ts | 13 ++++--------- 3 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 packages/core/admin/ee/server/src/services/metrics.ts diff --git a/packages/core/admin/ee/server/src/services/index.ts b/packages/core/admin/ee/server/src/services/index.ts index f026498a2d..1eb920f8dd 100644 --- a/packages/core/admin/ee/server/src/services/index.ts +++ b/packages/core/admin/ee/server/src/services/index.ts @@ -2,6 +2,7 @@ import auth from './auth'; import passport from './passport'; import role from './role'; import user from './user'; +import metrics from './metrics'; import seatEnforcement from './seat-enforcement'; import workflows from './review-workflows/workflows'; import stages from './review-workflows/stages'; @@ -18,6 +19,7 @@ export default { passport, role, user, + metrics, 'seat-enforcement': seatEnforcement, workflows, stages, diff --git a/packages/core/admin/ee/server/src/services/metrics.ts b/packages/core/admin/ee/server/src/services/metrics.ts new file mode 100644 index 0000000000..4066fa8bdd --- /dev/null +++ b/packages/core/admin/ee/server/src/services/metrics.ts @@ -0,0 +1,11 @@ +const getSSOProvidersList = async () => { + const { providerRegistry } = strapi.admin.services.passport; + + return providerRegistry.getAll().map(({ uid }) => uid); +} + +export default { + getSSOProvidersList, +}; + + \ No newline at end of file diff --git a/packages/core/admin/server/src/services/metrics.ts b/packages/core/admin/server/src/services/metrics.ts index 5b792390c6..6b95c6c1ed 100644 --- a/packages/core/admin/server/src/services/metrics.ts +++ b/packages/core/admin/server/src/services/metrics.ts @@ -2,7 +2,7 @@ import EE from '@strapi/strapi/dist/utils/ee'; import type { Strapi } from '@strapi/types'; import { assign } from 'lodash/fp'; import { getService } from '../utils'; - +import metrics from '../../../ee/server/src/services/metrics'; const sendDidInviteUser = async () => { const numberOfUsers = await getService('user').count(); @@ -22,12 +22,6 @@ const sendDidChangeInterfaceLanguage = async () => { strapi.telemetry.send('didChangeInterfaceLanguage', { userProperties: { languagesInUse } }); }; -const getSSOProvidersList = async () => { - const { providerRegistry } = strapi.admin.services.passport; - - return providerRegistry.getAll().map(({ uid }) => uid); -} - const sendUpdateProjectInformation = async () => { let groupProperties = {}; @@ -35,7 +29,7 @@ const sendUpdateProjectInformation = async () => { const numberOfAdminUsers = await getService('user').count(); if (EE.features.isEnabled('sso')) { - const SSOProviders = await getSSOProvidersList(); + const SSOProviders = await metrics.getSSOProvidersList(); groupProperties = assign(groupProperties, { SSOProviders, isSSOConfigured: SSOProviders.length !== 0 }); } @@ -51,6 +45,8 @@ const sendUpdateProjectInformation = async () => { groupProperties = assign(groupProperties, { numberOfActiveAdminUsers, numberOfAdminUsers }); + console.log(groupProperties); + strapi.telemetry.send('didUpdateProjectInformation', { groupProperties }); @@ -67,6 +63,5 @@ export { sendDidUpdateRolePermissions, sendDidChangeInterfaceLanguage, sendUpdateProjectInformation, - getSSOProvidersList, startCron, };