From 2d9526ad8d33a65bf8adfddd94400875c420dd86 Mon Sep 17 00:00:00 2001
From: Tuan Dang <dangtony98@gmail.com>
Date: Mon, 26 Feb 2024 20:01:30 -0800
Subject: [PATCH] Fix type/lint issues

---
 backend/src/ee/routes/v1/ldap-router.ts                  | 9 ++++++---
 .../src/ee/services/ldap-config/ldap-config-service.ts   | 3 +--
 backend/src/server/lib/telemetry.ts                      | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/backend/src/ee/routes/v1/ldap-router.ts b/backend/src/ee/routes/v1/ldap-router.ts
index cec6f56a2..46750d598 100644
--- a/backend/src/ee/routes/v1/ldap-router.ts
+++ b/backend/src/ee/routes/v1/ldap-router.ts
@@ -6,6 +6,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 // All the any rules are disabled because passport typesense with fastify is really poor
 
+import { IncomingMessage } from "node:http";
+
 import { Authenticator } from "@fastify/passport";
 import fastifySession from "@fastify/session";
 import { FastifyRequest } from "fastify";
@@ -27,15 +29,16 @@ export const registerLdapRouter = async (server: FastifyZodProvider) => {
 
   passport.use(
     new LdapStrategy(
-      server.services.ldap.getLdapPassportOpts,
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
+      server.services.ldap.getLdapPassportOpts as any,
       // eslint-disable-next-line
-        async (req, user, cb) => {
+        async (req: IncomingMessage, user, cb) => {
         try {
           const { isUserCompleted, providerAuthToken } = await server.services.ldap.ldapLogin({
             username: user.uid,
             firstName: user.givenName,
             lastName: user.sn,
-            relayState: (req.body as { RelayState?: string }).RelayState,
+            relayState: ((req as unknown as FastifyRequest).body as { RelayState?: string }).RelayState,
             orgId: (req as unknown as FastifyRequest).ldapConfig.organization
           });
 
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 c452b6a3a..0036f519d 100644
--- a/backend/src/ee/services/ldap-config/ldap-config-service.ts
+++ b/backend/src/ee/services/ldap-config/ldap-config-service.ts
@@ -26,7 +26,6 @@ import { TPermissionServiceFactory } from "../permission/permission-service";
 import { TLdapConfigDALFactory } from "./ldap-config-dal";
 import { TCreateLdapCfgDTO, TLdapLoginDTO, TUpdateLdapCfgDTO } from "./ldap-config-types";
 
-// TODO: check the Picks
 type TLdapConfigServiceFactoryDep = {
   ldapConfigDAL: TLdapConfigDALFactory;
   orgDAL: Pick<
@@ -320,7 +319,7 @@ export const ldapConfigServiceFactory = ({
       } catch (err) {
         logger.error(err);
         // eslint-disable-next-line
-          done(err as Error);
+          done(err);
       }
     };
 
diff --git a/backend/src/server/lib/telemetry.ts b/backend/src/server/lib/telemetry.ts
index 5169b0e97..9d04d0357 100644
--- a/backend/src/server/lib/telemetry.ts
+++ b/backend/src/server/lib/telemetry.ts
@@ -5,7 +5,7 @@ import { ActorType } from "@app/services/auth/auth-type";
 // this is a unique id for sending posthog event
 export const getTelemetryDistinctId = (req: FastifyRequest) => {
   if (req.auth.actor === ActorType.USER) {
-    return req.auth.user.email;
+    return req.auth.user.username;
   }
   if (req.auth.actor === ActorType.IDENTITY) {
     return `identity-${req.auth.identityId}`;