From 35a5c9a67fc49d47e58842cfd2fd125644ba566e Mon Sep 17 00:00:00 2001 From: Tuan Dang Date: Wed, 6 Mar 2024 13:28:29 -0800 Subject: [PATCH] Fix lint issue --- backend/src/ee/services/ldap-config/ldap-config-service.ts | 2 -- backend/src/ee/services/license/__mocks__/licence-fns.ts | 2 +- backend/src/ee/services/license/licence-fns.ts | 2 +- backend/src/ee/services/license/license-types.ts | 2 +- backend/src/server/routes/v3/signup-router.ts | 1 + 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/backend/src/ee/services/ldap-config/ldap-config-service.ts b/backend/src/ee/services/ldap-config/ldap-config-service.ts index 7e3623c1f..7c1f475b1 100644 --- a/backend/src/ee/services/ldap-config/ldap-config-service.ts +++ b/backend/src/ee/services/ldap-config/ldap-config-service.ts @@ -335,7 +335,6 @@ export const ldapConfigServiceFactory = ({ }; const ldapLogin = async ({ externalId, username, firstName, lastName, emails, orgId, relayState }: TLdapLoginDTO) => { - // externalId + username const appCfg = getConfig(); let userAlias = await userAliasDAL.findOne({ externalId, @@ -409,7 +408,6 @@ export const ldapConfigServiceFactory = ({ }); } - // query for user here const user = await userDAL.findOne({ id: userAlias.userId }); const isUserCompleted = Boolean(user.isAccepted); diff --git a/backend/src/ee/services/license/__mocks__/licence-fns.ts b/backend/src/ee/services/license/__mocks__/licence-fns.ts index 3f00d7ad5..8f52939c5 100644 --- a/backend/src/ee/services/license/__mocks__/licence-fns.ts +++ b/backend/src/ee/services/license/__mocks__/licence-fns.ts @@ -19,7 +19,7 @@ export const getDefaultOnPremFeatures = () => { auditLogsRetentionDays: 0, samlSSO: false, scim: false, - ldap: true, + ldap: false, status: null, trial_end: null, has_used_trial: true, diff --git a/backend/src/ee/services/license/licence-fns.ts b/backend/src/ee/services/license/licence-fns.ts index fa23664f4..8dca96737 100644 --- a/backend/src/ee/services/license/licence-fns.ts +++ b/backend/src/ee/services/license/licence-fns.ts @@ -25,7 +25,7 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({ auditLogsRetentionDays: 0, samlSSO: false, scim: false, - ldap: true, + ldap: false, status: null, trial_end: null, has_used_trial: true, diff --git a/backend/src/ee/services/license/license-types.ts b/backend/src/ee/services/license/license-types.ts index 33ed2ba0b..80f422380 100644 --- a/backend/src/ee/services/license/license-types.ts +++ b/backend/src/ee/services/license/license-types.ts @@ -26,7 +26,7 @@ export type TFeatureSet = { auditLogsRetentionDays: 0; samlSSO: false; scim: false; - ldap: true; + ldap: false; status: null; trial_end: null; has_used_trial: true; diff --git a/backend/src/server/routes/v3/signup-router.ts b/backend/src/server/routes/v3/signup-router.ts index 225c96a27..17787be84 100644 --- a/backend/src/server/routes/v3/signup-router.ts +++ b/backend/src/server/routes/v3/signup-router.ts @@ -205,6 +205,7 @@ export const registerSignupRouter = async (server: FastifyZodProvider) => { event: PostHogEventTypes.UserSignedUp, distinctId: user.username ?? "", properties: { + username: user.username, email: user.email ?? "", attributionSource: "Team Invite" }