Add orgId to reuse login1/login2 logic for LDAP 2nd step login

backend/src/services/auth/auth-login-service.ts

@@ -130,10 +130,14 @@ export const authLoginServiceFactory = ({ userDAL, tokenService, smtpService }:
    */
   const loginGenServerPublicKey = async ({
     email,
+    userOrgId,
     providerAuthToken,
     clientPublicKey
   }: TLoginGenServerPublicKeyDTO) => {
-    const userEnc = await userDAL.findUserEncKeyByUsername(email);
+    const userEnc = await userDAL.findUserEncKeyByUsername({
+      username: email,
+      orgId: userOrgId
+    });
     if (!userEnc || (userEnc && !userEnc.isAccepted)) {
       throw new Error("Failed to find  user");
     }
@@ -155,12 +159,16 @@ export const authLoginServiceFactory = ({ userDAL, tokenService, smtpService }:
    */
   const loginExchangeClientProof = async ({
     email,
+    userOrgId,
     clientProof,
     providerAuthToken,
     ip,
     userAgent
   }: TLoginClientProofDTO) => {
-    const userEnc = await userDAL.findUserEncKeyByUsername(email);
+    const userEnc = await userDAL.findUserEncKeyByUsername({
+      username: email,
+      orgId: userOrgId
+    });
     if (!userEnc) throw new Error("Failed to find user");
     const cfg = getConfig();
 

backend/src/services/auth/auth-login-type.ts

@@ -2,12 +2,14 @@ import { AuthMethod } from "./auth-type";
 
 export type TLoginGenServerPublicKeyDTO = {
   email: string;
+  userOrgId?: string;
   clientPublicKey: string;
   providerAuthToken?: string;
 };
 
 export type TLoginClientProofDTO = {
   email: string;
+  userOrgId?: string;
   clientProof: string;
   providerAuthToken?: string;
   ip: string;