awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(sso): this PR corrects where plan identity limits are checked during sso login to prevent throwing limit error on users that already have a membership for email login

Browse Source
This commit is contained in:
Scott Wilson
2025-09-10 14:18:23 -07:00
parent 7a37be469a
commit a677191e47
3 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
backend/src/ee/services/ldap-config/ldap-config-service.ts
View File

@@ -417,14 +417,6 @@ export const ldapConfigServiceFactory = ({
}
});
} else {
const plan = await licenseService.getPlan(orgId);
if (plan?.slug !== "enterprise" && plan?.identityLimit && plan.identitiesUsed >= plan.identityLimit) {
// limit imposed on number of identities allowed / number of identities used exceeds the number of identities allowed
throw new BadRequestError({
message: "Failed to create new member via LDAP due to member limit reached. Upgrade plan to add more members."
});
}
userAlias = await userDAL.transaction(async (tx) => {
let newUser: TUsers | undefined;
newUser = await userDAL.findOne(
@@ -473,6 +465,15 @@ export const ldapConfigServiceFactory = ({
);
if (!orgMembership) {
const plan = await licenseService.getPlan(orgId);
if (plan?.slug !== "enterprise" && plan?.identityLimit && plan.identitiesUsed >= plan.identityLimit) {
// limit imposed on number of identities allowed / number of identities used exceeds the number of identities allowed
throw new BadRequestError({
message:
"Failed to create new member via LDAP due to member limit reached. Upgrade plan to add more members."
});
}
const { role, roleId } = await getDefaultOrgMembershipRole(organization.defaultMembershipRole);
await orgMembershipDAL.create(

9
backend/src/ee/services/oidc/oidc-config-service.ts
View File

@@ -294,6 +294,15 @@ export const oidcConfigServiceFactory = ({
);
if (!orgMembership) {
const plan = await licenseService.getPlan(orgId);
if (plan?.slug !== "enterprise" && plan?.identityLimit && plan.identitiesUsed >= plan.identityLimit) {
// limit imposed on number of identities allowed / number of identities used exceeds the number of identities allowed
throw new BadRequestError({
message:
"Failed to create new member via OIDC due to member limit reached. Upgrade plan to add more members."
});
}
const { role, roleId } = await getDefaultOrgMembershipRole(organization.defaultMembershipRole);
await orgMembershipDAL.create(

17
backend/src/ee/services/saml-config/saml-config-service.ts
View File

@@ -336,14 +336,6 @@ export const samlConfigServiceFactory = ({
return foundUser;
});
} else {
const plan = await licenseService.getPlan(orgId);
if (plan?.slug !== "enterprise" && plan?.identityLimit && plan.identitiesUsed >= plan.identityLimit) {
// limit imposed on number of identities allowed / number of identities used exceeds the number of identities allowed
throw new BadRequestError({
message: "Failed to create new member via SAML due to member limit reached. Upgrade plan to add more members."
});
}
user = await userDAL.transaction(async (tx) => {
let newUser: TUsers | undefined;
newUser = await userDAL.findOne(
@@ -391,6 +383,15 @@ export const samlConfigServiceFactory = ({
);
if (!orgMembership) {
const plan = await licenseService.getPlan(orgId);
if (plan?.slug !== "enterprise" && plan?.identityLimit && plan.identitiesUsed >= plan.identityLimit) {
// limit imposed on number of identities allowed / number of identities used exceeds the number of identities allowed
throw new BadRequestError({
message:
"Failed to create new member via SAML due to member limit reached. Upgrade plan to add more members."
});
}
const { role, roleId } = await getDefaultOrgMembershipRole(organization.defaultMembershipRole);
await orgMembershipDAL.create(