Merge pull request #4936 from Infisical/feat/scim-fix

feat: switched saml to user alias verification method

backend/src/ee/services/saml-config/saml-config-service.ts

@@ -622,7 +622,7 @@ export const samlConfigServiceFactory = ({
           const uniqueUsername = await normalizeUsername(`${firstName ?? ""}-${lastName ?? ""}`, userDAL);
           newUser = await userDAL.create(
             {
-              username: serverCfg.trustSamlEmails ? email : uniqueUsername,
+              username: serverCfg.trustSamlEmails ? email.toLowerCase() : uniqueUsername,
               email,
               isEmailVerified: serverCfg.trustSamlEmails,
               firstName,
@@ -639,7 +639,7 @@ export const samlConfigServiceFactory = ({
             userId: newUser.id,
             aliasType: UserAliasType.SAML,
             externalId,
-            emails: email ? [email] : [],
+            emails: email ? [email.toLowerCase()] : [],
             orgId,
             isEmailVerified: serverCfg.trustSamlEmails
           },

backend/src/ee/services/scim/scim-service.ts

@@ -390,15 +390,13 @@ export const scimServiceFactory = ({
           );
         }
       } else {
-        if (trustScimEmails) {
+        user = await userDAL.findOne(
-          user = await userDAL.findOne(
+          {
-            {
+            email: email.toLowerCase(),
-              email: email.toLowerCase(),
+            isEmailVerified: true
-              isEmailVerified: true
+          },
-            },
+          tx
-            tx
+        );
-          );
-        }
 
         if (!user) {
           const uniqueUsername = await normalizeUsername(
@@ -426,7 +424,8 @@ export const scimServiceFactory = ({
             aliasType,
             externalId,
             emails: email ? [email.toLowerCase()] : [],
-            orgId
+            orgId,
+            isEmailVerified: trustScimEmails
           },
           tx
         );