Finish preliminary email validation, merge user flow w saml/ldap

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

@@ -135,6 +135,11 @@ export const authSignupServiceFactory = ({
     userAgent,
     authorization
   }: TCompleteAccountSignupDTO) => {
+    console.log("completeEmailAccountSignup args: ", {
+      email,
+      firstName,
+      lastName
+    });
     const user = await userDAL.findOne({ username: email });
     if (!user || (user && user.isAccepted)) {
       throw new Error("Failed to complete account for complete user");
@@ -169,9 +174,8 @@ export const authSignupServiceFactory = ({
         tx
       );
       // If it's SAML Auth and the organization ID is present, we should check if the user has a pending invite for this org, and accept it
-      if (isAuthMethodSaml(authMethod) && organizationId) {
+      if ((isAuthMethodSaml(authMethod) || authMethod === AuthMethod.LDAP) && organizationId) {
         const [pendingOrgMembership] = await orgDAL.findMembership({
-          inviteEmail: email,
           userId: user.id,
           status: OrgMembershipStatus.Invited,
           orgId: organizationId

backend/src/services/super-admin/super-admin-service.ts

@@ -102,7 +102,8 @@ export const superAdminServiceFactory = ({
           superAdmin: true,
           isGhost: false,
           isAccepted: true,
-          authMethods: [AuthMethod.EMAIL]
+          authMethods: [AuthMethod.EMAIL],
+          isEmailVerified: true
         },
         tx
       );

backend/src/services/user-alias/user-alias-types.ts

@@ -1,4 +1,4 @@
-export enum UserAliasType {
+export enum TUserAliasType {
   LDAP = "ldap",
   SAML = "saml"
 }

backend/src/services/user/user-service.ts

@@ -1,7 +1,6 @@
 import { BadRequestError } from "@app/lib/errors";
 import { TAuthTokenServiceFactory } from "@app/services/auth-token/auth-token-service";
 import { TokenType } from "@app/services/auth-token/auth-token-types";
-import { TOrgDALFactory } from "@app/services/org/org-dal";
 import { TOrgMembershipDALFactory } from "@app/services/org-membership/org-membership-dal";
 import { SmtpTemplates, TSmtpService } from "@app/services/smtp/smtp-service";
 import { TUserAliasDALFactory } from "@app/services/user-alias/user-alias-dal";
@@ -9,14 +8,23 @@ import { TUserAliasDALFactory } from "@app/services/user-alias/user-alias-dal";
 import { AuthMethod } from "../auth/auth-type";
 import { TUserDALFactory } from "./user-dal";
 
-// TODO: Pick all of these
 type TUserServiceFactoryDep = {
-  userDAL: TUserDALFactory;
-  userAliasDAL: TUserAliasDALFactory;
-  orgDAL: TOrgDALFactory;
-  orgMembershipDAL: TOrgMembershipDALFactory;
-  tokenService: TAuthTokenServiceFactory;
-  smtpService: TSmtpService;
+  userDAL: Pick<
+    TUserDALFactory,
+    | "find"
+    | "findOne"
+    | "findById"
+    | "transaction"
+    | "updateById"
+    | "deleteById"
+    | "findOneUserAction"
+    | "createUserAction"
+    | "findUserEncKeyByUserId"
+  >;
+  userAliasDAL: Pick<TUserAliasDALFactory, "find" | "insertMany">;
+  orgMembershipDAL: Pick<TOrgMembershipDALFactory, "find" | "insertMany">;
+  tokenService: Pick<TAuthTokenServiceFactory, "createTokenForUser" | "validateTokenForUser">;
+  smtpService: Pick<TSmtpService, "sendMail">;
 };
 
 export type TUserServiceFactory = ReturnType<typeof userServiceFactory>;
@@ -24,13 +32,11 @@ export type TUserServiceFactory = ReturnType<typeof userServiceFactory>;
 export const userServiceFactory = ({
   userDAL,
   userAliasDAL,
-  // orgDAL,
   orgMembershipDAL,
   tokenService,
   smtpService
 }: TUserServiceFactoryDep) => {
   const sendEmailVerificationCode = async (userId: string) => {
-    console.log("sendEmailVerificationCode userId: ", userId);
     const user = await userDAL.findById(userId);
     if (!user) throw new BadRequestError({ name: "Failed to find user" });
     if (!user.email)
@@ -38,13 +44,11 @@ export const userServiceFactory = ({
     if (user.isEmailVerified)
       throw new BadRequestError({ name: "Failed to send email verification code due to email already verified" });
 
-    console.log("sendEmailVerificationCode user: ", user);
     const token = await tokenService.createTokenForUser({
       type: TokenType.TOKEN_EMAIL_VERIFICATION,
       userId: user.id
     });
 
-    console.log("sendEmailVerificationCode 2");
     await smtpService.sendMail({
       template: SmtpTemplates.EmailVerification,
       subjectLine: "Infisical confirmation code",
@@ -56,11 +60,6 @@ export const userServiceFactory = ({
   };
 
   const verifyEmailVerificationCode = async (userId: string, code: string) => {
-    console.log("verifyEmailVerificationCode args: ", {
-      userId,
-      code
-    });
-
     const user = await userDAL.findById(userId);
     if (!user) throw new BadRequestError({ name: "Failed to find user" });
     if (user.isEmailVerified)