fix entitlements on login

This commit is contained in:
Alex Holliday committed 2025-12-02 21:46:01 +00:00
1 parent 53355cad04
commit 30d7b3d258
17 files changed
+100 -46

No files matched your search

+19 -3
View File
@@ -22,6 +22,8 @@ import { IJobQueue } from "../infrastructure/JobQueue.js";
import { hashPassword } from "@/utils/JWTUtils.js";
import { Plans } from "@/types/entitlements.js";
import { PERMISSIONS } from "@/types/permissions.js";
import { EntitlementsFactory } from "@/services/system/EntitlementsService.js";
import type { Entitlements } from "@/types/entitlements.js";
const SERVICE_NAME = "AuthService";
@@ -255,6 +257,11 @@ class AuthService implements IAuthService {
permissions: roles[2]?.permissions || [],
};
const provider = EntitlementsFactory.create();
const entitlements: Entitlements = await provider.getForOrg(
org._id.toString()
);
const returnableUser: IUserReturnable = {
id: user._id.toString(),
email: user.email,
@@ -266,7 +273,7 @@ class AuthService implements IAuthService {
permissions: roles[0]?.permissions || [],
},
teams: [returnableTeam],
entitlements: org.entitlements,
entitlements,
};
return { tokenizedUser, returnableUser };
@@ -392,6 +399,10 @@ class AuthService implements IAuthService {
const orgRole = await Role.findById(orgMembership.roleId);
const orgPermissions = orgRole?.permissions || [];
const provider = EntitlementsFactory.create();
const entitlements: Entitlements = await provider.getForOrg(
org._id.toString()
);
const returnableUser: IUserReturnable = {
id: user._id.toString(),
email: user.email,
@@ -403,7 +414,7 @@ class AuthService implements IAuthService {
permissions: orgPermissions,
},
teams: returnableTeams,
entitlements: org.entitlements,
entitlements,
};
return {
@@ -499,6 +510,11 @@ class AuthService implements IAuthService {
orgId: orgMembership.orgId.toString(),
};
const provider = EntitlementsFactory.create();
const entitlements: Entitlements = await provider.getForOrg(
org._id.toString()
);
const returnableUser: IUserReturnable = {
id: user._id.toString(),
email: user.email,
@@ -510,7 +526,7 @@ class AuthService implements IAuthService {
permissions: orgRoles?.permissions || [],
},
teams: returnableTeams,
entitlements: org.entitlements,
entitlements,
};
return {
@@ -1,5 +1,7 @@
import { Entitlements, Plans } from "@/types/entitlements.js";
import { Org } from "@/db/models/index.js";
import { DeploymentMode } from "@/utils/FeatureFlags.js";
import { config } from "@/config/index.js";
export interface IEntitlementsProvider {
getForOrg(orgId: string): Promise<Entitlements>;
@@ -31,8 +33,8 @@ export class SelfHostedEntitlementsProvider implements IEntitlementsProvider {
export class EntitlementsFactory {
static create(): IEntitlementsProvider {
const mode = (process.env.DEPLOYMENT_MODE || "saas").toLowerCase();
if (mode === "self") return new SelfHostedEntitlementsProvider();
const mode: DeploymentMode = config.DEPLOYMENT_MODE || "self_hosted";
if (mode === "self_hosted") return new SelfHostedEntitlementsProvider();
return new SaaSEntitlementsProvider();
}
}