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

review fixes

Browse Source
This commit is contained in:
x032205
2025-05-13 10:44:28 -04:00
parent 4b94848a79
commit d483e70748
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/db/migrations/20250429203304_certificates-ca-relation-removal.ts
+7 -9
View File
@@ -6,22 +6,20 @@ export async function up(knex: Knex): Promise<void> {
if (await knex.schema.hasTable(TableName.Certificate)) { if (await knex.schema.hasTable(TableName.Certificate)) {
const hasProjectIdColumn = await knex.schema.hasColumn(TableName.Certificate, "projectId"); const hasProjectIdColumn = await knex.schema.hasColumn(TableName.Certificate, "projectId");
if (!hasProjectIdColumn) { if (!hasProjectIdColumn) {
await knex.transaction(async (trx) => { await knex.schema.alterTable(TableName.Certificate, (t) => {
await trx.schema.alterTable(TableName.Certificate, (t) => { t.string("projectId", 36).nullable();
t.string("projectId", 36).nullable(); t.foreign("projectId").references("id").inTable(TableName.Project).onDelete("CASCADE");
t.foreign("projectId").references("id").inTable(TableName.Project).onDelete("CASCADE"); });
});
await trx.raw(` await knex.raw(`
UPDATE "${TableName.Certificate}" cert UPDATE "${TableName.Certificate}" cert
SET "projectId" = ca."projectId" SET "projectId" = ca."projectId"
FROM "${TableName.CertificateAuthority}" ca FROM "${TableName.CertificateAuthority}" ca
WHERE cert."caId" = ca.id WHERE cert."caId" = ca.id
`); `);
await trx.schema.alterTable(TableName.Certificate, (t) => { await knex.schema.alterTable(TableName.Certificate, (t) => {
t.string("projectId").notNullable().alter(); t.string("projectId").notNullable().alter();
});
}); });
} }
backend/src/services/pki-subscriber/pki-subscriber-service.ts
+4 -2
View File
@@ -449,7 +449,8 @@ export const pkiSubscriberServiceFactory = ({
notBefore: notBeforeDate, notBefore: notBeforeDate,
notAfter: notAfterDate, notAfter: notAfterDate,
keyUsages: selectedKeyUsages, keyUsages: selectedKeyUsages,
extendedKeyUsages: subscriber.extendedKeyUsages as CertExtendedKeyUsage[] extendedKeyUsages: subscriber.extendedKeyUsages as CertExtendedKeyUsage[],
projectId
}, },
tx tx
); );
@@ -718,7 +719,8 @@ export const pkiSubscriberServiceFactory = ({
notBefore: notBeforeDate, notBefore: notBeforeDate,
notAfter: notAfterDate, notAfter: notAfterDate,
keyUsages: selectedKeyUsages, keyUsages: selectedKeyUsages,
extendedKeyUsages: selectedExtendedKeyUsages extendedKeyUsages: selectedExtendedKeyUsages,
projectId
}, },
tx tx
); );