awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-06 14:27:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: update org seats whenever membership status is accepted

Browse Source
This commit is contained in:
ShubhamPalriwala
2024-06-10 09:02:11 +05:30
parent 6c596092b0
commit 8a46cbd08f
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/ee/services/ldap-config/ldap-config-service.ts
+2 -1
View File
@@ -77,7 +77,7 @@ type TLdapConfigServiceFactoryDep = {
>; >;
userAliasDAL: Pick<TUserAliasDALFactory, "create" | "findOne">; userAliasDAL: Pick<TUserAliasDALFactory, "create" | "findOne">;
permissionService: Pick<TPermissionServiceFactory, "getOrgPermission">; permissionService: Pick<TPermissionServiceFactory, "getOrgPermission">;
licenseService: Pick<TLicenseServiceFactory, "getPlan">; licenseService: Pick<TLicenseServiceFactory, "getPlan" | "updateSubscriptionOrgMemberCount">;
}; };
export type TLdapConfigServiceFactory = ReturnType<typeof ldapConfigServiceFactory>; export type TLdapConfigServiceFactory = ReturnType<typeof ldapConfigServiceFactory>;
@@ -510,6 +510,7 @@ export const ldapConfigServiceFactory = ({
return newUserAlias; return newUserAlias;
}); });
} }
await licenseService.updateSubscriptionOrgMemberCount(organization.id);
const user = await userDAL.transaction(async (tx) => { const user = await userDAL.transaction(async (tx) => {
const newUser = await userDAL.findOne({ id: userAlias.userId }, tx); const newUser = await userDAL.findOne({ id: userAlias.userId }, tx);
backend/src/ee/services/saml-config/saml-config-service.ts
+2 -1
View File
@@ -50,7 +50,7 @@ type TSamlConfigServiceFactoryDep = {
orgMembershipDAL: Pick<TOrgMembershipDALFactory, "create">; orgMembershipDAL: Pick<TOrgMembershipDALFactory, "create">;
orgBotDAL: Pick<TOrgBotDALFactory, "findOne" | "create" | "transaction">; orgBotDAL: Pick<TOrgBotDALFactory, "findOne" | "create" | "transaction">;
permissionService: Pick<TPermissionServiceFactory, "getOrgPermission">; permissionService: Pick<TPermissionServiceFactory, "getOrgPermission">;
licenseService: Pick<TLicenseServiceFactory, "getPlan">; licenseService: Pick<TLicenseServiceFactory, "getPlan" | "updateSubscriptionOrgMemberCount">;
tokenService: Pick<TAuthTokenServiceFactory, "createTokenForUser">; tokenService: Pick<TAuthTokenServiceFactory, "createTokenForUser">;
smtpService: Pick<TSmtpService, "sendMail">; smtpService: Pick<TSmtpService, "sendMail">;
}; };
@@ -449,6 +449,7 @@ export const samlConfigServiceFactory = ({
return newUser; return newUser;
}); });
} }
await licenseService.updateSubscriptionOrgMemberCount(organization.id);
const isUserCompleted = Boolean(user.isAccepted); const isUserCompleted = Boolean(user.isAccepted);
const providerAuthToken = jwt.sign( const providerAuthToken = jwt.sign(
backend/src/ee/services/scim/scim-service.ts
+1 -1
View File
@@ -391,7 +391,7 @@ export const scimServiceFactory = ({
); );
} }
} }
await licenseService.updateSubscriptionOrgMemberCount(orgMembership.id);
return { user, orgMembership }; return { user, orgMembership };
}); });
backend/src/services/org/org-service.ts
+1
View File
@@ -315,6 +315,7 @@ export const orgServiceFactory = ({
}, },
tx tx
); );
await licenseService.updateSubscriptionOrgMemberCount(org.id);
await orgBotDAL.create( await orgBotDAL.create(
{ {
name: org.name, name: org.name,