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

Bring changes back

Browse Source
This commit is contained in:
Fang-Pen Lin
2025-11-10 21:36:08 -08:00
parent 192cf5a8f9
commit 0f5fa785a6
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/ee/services/pki-acme/pki-acme-service.ts
View File

@@ -130,7 +130,7 @@ export const pkiAcmeServiceFactory = ({
if (profile.enrollmentType !== EnrollmentType.ACME) {
throw new NotFoundError({ message: "Certificate profile is not configured for ACME enrollment" });
}
const orgLicensePlan = await licenseService.getPlan(profile.project.orgId);
const orgLicensePlan = await licenseService.getPlan(profile.project!.orgId);
if (!orgLicensePlan.pkiAcme) {
throw new AcmeUnauthorizedError({ message: "The organization does not have a valid license to use ACME" });
}

9
backend/src/services/certificate-profile/certificate-profile-dal.ts
View File

@@ -85,6 +85,7 @@ export const certificateProfileDALFactory = (db: TDbClient) => {
const findByIdWithConfigs = async (id: string, tx?: Knex): Promise<TCertificateProfileWithConfigs | undefined> => {
try {
const query = (tx || db)(TableName.PkiCertificateProfile)
.leftJoin(TableName.Project, `${TableName.PkiCertificateProfile}.projectId`, `${TableName.Project}.id`)
.leftJoin(
TableName.CertificateAuthority,
`${TableName.PkiCertificateProfile}.caId`,
@@ -112,6 +113,8 @@ export const certificateProfileDALFactory = (db: TDbClient) => {
)
.select(selectAllTableCols(TableName.PkiCertificateProfile))
.select(
db.ref("id").withSchema(TableName.Project).as("projectId"),
db.ref("orgId").withSchema(TableName.Project).as("orgId"),
db.ref("id").withSchema(TableName.CertificateAuthority).as("caId"),
db.ref("projectId").withSchema(TableName.CertificateAuthority).as("caProjectId"),
db.ref("status").withSchema(TableName.CertificateAuthority).as("caStatus"),
@@ -185,6 +188,11 @@ export const certificateProfileDALFactory = (db: TDbClient) => {
} as TCertificateProfileWithConfigs["certificateTemplate"])
: undefined;
const project = {
id: result.projectId,
orgId: result.orgId
} as TCertificateProfileWithConfigs["project"];
const transformedResult: TCertificateProfileWithConfigs = {
id: result.id,
projectId: result.projectId,
@@ -201,6 +209,7 @@ export const certificateProfileDALFactory = (db: TDbClient) => {
estConfig,
apiConfig,
acmeConfig,
project,
certificateAuthority,
certificateTemplate
};

4
backend/src/services/certificate-profile/certificate-profile-types.ts
View File

@@ -33,6 +33,10 @@ export type TCertificateProfileUpdate = Omit<TPkiCertificateProfilesUpdate, "enr
};
export type TCertificateProfileWithConfigs = TCertificateProfile & {
project?: {
id: string;
orgId: string;
};
certificateAuthority?: {
id: string;
projectId: string;