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

feat: switched saml to user alias verification method
This commit is contained in:
Akhil Mohan
2025-12-01 01:24:41 +05:30
committed by GitHub
2 changed files with 11 additions and 12 deletions

View File

@@ -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
},

View File

@@ -390,15 +390,13 @@ export const scimServiceFactory = ({
);
}
} else {
if (trustScimEmails) {
user = await userDAL.findOne(
{
email: email.toLowerCase(),
isEmailVerified: true
},
tx
);
}
user = await userDAL.findOne(
{
email: email.toLowerCase(),
isEmailVerified: true
},
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
);