mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-18 13:15:39 +00:00
PKI revamp: UI improvements
This commit is contained in:
@@ -10,11 +10,11 @@ import { TApiEnrollmentConfigInsert, TApiEnrollmentConfigUpdate } from "./enroll
|
||||
export type TApiEnrollmentConfigDALFactory = ReturnType<typeof apiEnrollmentConfigDALFactory>;
|
||||
|
||||
export const apiEnrollmentConfigDALFactory = (db: TDbClient) => {
|
||||
const apiEnrollmentConfigOrm = ormify(db, TableName.ApiEnrollmentConfig);
|
||||
const apiEnrollmentConfigOrm = ormify(db, TableName.PkiApiEnrollmentConfig);
|
||||
|
||||
const create = async (data: TApiEnrollmentConfigInsert, tx?: Knex) => {
|
||||
try {
|
||||
const [apiConfig] = await (tx || db)(TableName.ApiEnrollmentConfig).insert(data).returning("*");
|
||||
const [apiConfig] = await (tx || db)(TableName.PkiApiEnrollmentConfig).insert(data).returning("*");
|
||||
|
||||
return apiConfig;
|
||||
} catch (error) {
|
||||
@@ -24,7 +24,7 @@ export const apiEnrollmentConfigDALFactory = (db: TDbClient) => {
|
||||
|
||||
const updateById = async (id: string, data: TApiEnrollmentConfigUpdate, tx?: Knex) => {
|
||||
try {
|
||||
const [apiConfig] = await (tx || db)(TableName.ApiEnrollmentConfig).where({ id }).update(data).returning("*");
|
||||
const [apiConfig] = await (tx || db)(TableName.PkiApiEnrollmentConfig).where({ id }).update(data).returning("*");
|
||||
|
||||
return apiConfig;
|
||||
} catch (error) {
|
||||
@@ -34,7 +34,7 @@ export const apiEnrollmentConfigDALFactory = (db: TDbClient) => {
|
||||
|
||||
const deleteById = async (id: string, tx?: Knex) => {
|
||||
try {
|
||||
const [apiConfig] = await (tx || db)(TableName.ApiEnrollmentConfig).where({ id }).del().returning("*");
|
||||
const [apiConfig] = await (tx || db)(TableName.PkiApiEnrollmentConfig).where({ id }).del().returning("*");
|
||||
|
||||
return apiConfig;
|
||||
} catch (error) {
|
||||
@@ -44,7 +44,7 @@ export const apiEnrollmentConfigDALFactory = (db: TDbClient) => {
|
||||
|
||||
const findById = async (id: string, tx?: Knex) => {
|
||||
try {
|
||||
const apiConfig = await (tx || db)(TableName.ApiEnrollmentConfig).where({ id }).first();
|
||||
const apiConfig = await (tx || db)(TableName.PkiApiEnrollmentConfig).where({ id }).first();
|
||||
|
||||
return apiConfig;
|
||||
} catch (error) {
|
||||
@@ -60,15 +60,15 @@ export const apiEnrollmentConfigDALFactory = (db: TDbClient) => {
|
||||
|
||||
const profiles = await (tx || db)(TableName.CertificateProfile)
|
||||
.join(
|
||||
TableName.ApiEnrollmentConfig,
|
||||
TableName.PkiApiEnrollmentConfig,
|
||||
`${TableName.CertificateProfile}.apiConfigId`,
|
||||
`${TableName.ApiEnrollmentConfig}.id`
|
||||
`${TableName.PkiApiEnrollmentConfig}.id`
|
||||
)
|
||||
.where(`${TableName.ApiEnrollmentConfig}.autoRenew`, true)
|
||||
.where(`${TableName.PkiApiEnrollmentConfig}.autoRenew`, true)
|
||||
.where((query) => {
|
||||
void query
|
||||
.whereNull(`${TableName.ApiEnrollmentConfig}.autoRenewDays`)
|
||||
.orWhere(`${TableName.ApiEnrollmentConfig}.autoRenewDays`, "<=", renewalThresholdDays);
|
||||
.whereNull(`${TableName.PkiApiEnrollmentConfig}.autoRenewDays`)
|
||||
.orWhere(`${TableName.PkiApiEnrollmentConfig}.autoRenewDays`, "<=", renewalThresholdDays);
|
||||
})
|
||||
.select((tx || db).ref("id").withSchema(TableName.CertificateProfile))
|
||||
.select((tx || db).ref("name").withSchema(TableName.CertificateProfile))
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
import {
|
||||
TApiEnrollmentConfigs,
|
||||
TApiEnrollmentConfigsInsert,
|
||||
TApiEnrollmentConfigsUpdate
|
||||
} from "@app/db/schemas/api-enrollment-configs";
|
||||
TPkiApiEnrollmentConfigs,
|
||||
TPkiApiEnrollmentConfigsInsert,
|
||||
TPkiApiEnrollmentConfigsUpdate
|
||||
} from "@app/db/schemas/pki-api-enrollment-configs";
|
||||
import {
|
||||
TEstEnrollmentConfigs,
|
||||
TEstEnrollmentConfigsInsert,
|
||||
TEstEnrollmentConfigsUpdate
|
||||
} from "@app/db/schemas/est-enrollment-configs";
|
||||
TPkiEstEnrollmentConfigs,
|
||||
TPkiEstEnrollmentConfigsInsert,
|
||||
TPkiEstEnrollmentConfigsUpdate
|
||||
} from "@app/db/schemas/pki-est-enrollment-configs";
|
||||
|
||||
export type TEstEnrollmentConfig = TEstEnrollmentConfigs;
|
||||
export type TEstEnrollmentConfigInsert = TEstEnrollmentConfigsInsert;
|
||||
export type TEstEnrollmentConfigUpdate = TEstEnrollmentConfigsUpdate;
|
||||
export type TEstEnrollmentConfig = TPkiEstEnrollmentConfigs;
|
||||
export type TEstEnrollmentConfigInsert = TPkiEstEnrollmentConfigsInsert;
|
||||
export type TEstEnrollmentConfigUpdate = TPkiEstEnrollmentConfigsUpdate;
|
||||
|
||||
export type TApiEnrollmentConfig = TApiEnrollmentConfigs;
|
||||
export type TApiEnrollmentConfigInsert = TApiEnrollmentConfigsInsert;
|
||||
export type TApiEnrollmentConfigUpdate = TApiEnrollmentConfigsUpdate;
|
||||
export type TApiEnrollmentConfig = TPkiApiEnrollmentConfigs;
|
||||
export type TApiEnrollmentConfigInsert = TPkiApiEnrollmentConfigsInsert;
|
||||
export type TApiEnrollmentConfigUpdate = TPkiApiEnrollmentConfigsUpdate;
|
||||
|
||||
export interface TEstConfigData {
|
||||
disableBootstrapCaValidation: boolean;
|
||||
|
||||
@@ -10,11 +10,11 @@ import { TEstEnrollmentConfigInsert, TEstEnrollmentConfigUpdate } from "./enroll
|
||||
export type TEstEnrollmentConfigDALFactory = ReturnType<typeof estEnrollmentConfigDALFactory>;
|
||||
|
||||
export const estEnrollmentConfigDALFactory = (db: TDbClient) => {
|
||||
const estEnrollmentConfigOrm = ormify(db, TableName.EstEnrollmentConfig);
|
||||
const estEnrollmentConfigOrm = ormify(db, TableName.PkiEstEnrollmentConfig);
|
||||
|
||||
const create = async (data: TEstEnrollmentConfigInsert, tx?: Knex) => {
|
||||
try {
|
||||
const [estConfig] = await (tx || db)(TableName.EstEnrollmentConfig).insert(data).returning("*");
|
||||
const [estConfig] = await (tx || db)(TableName.PkiEstEnrollmentConfig).insert(data).returning("*");
|
||||
|
||||
return estConfig;
|
||||
} catch (error) {
|
||||
@@ -24,7 +24,7 @@ export const estEnrollmentConfigDALFactory = (db: TDbClient) => {
|
||||
|
||||
const updateById = async (id: string, data: TEstEnrollmentConfigUpdate, tx?: Knex) => {
|
||||
try {
|
||||
const [estConfig] = await (tx || db)(TableName.EstEnrollmentConfig).where({ id }).update(data).returning("*");
|
||||
const [estConfig] = await (tx || db)(TableName.PkiEstEnrollmentConfig).where({ id }).update(data).returning("*");
|
||||
|
||||
return estConfig;
|
||||
} catch (error) {
|
||||
@@ -34,7 +34,7 @@ export const estEnrollmentConfigDALFactory = (db: TDbClient) => {
|
||||
|
||||
const deleteById = async (id: string, tx?: Knex) => {
|
||||
try {
|
||||
const [estConfig] = await (tx || db)(TableName.EstEnrollmentConfig).where({ id }).del().returning("*");
|
||||
const [estConfig] = await (tx || db)(TableName.PkiEstEnrollmentConfig).where({ id }).del().returning("*");
|
||||
|
||||
return estConfig;
|
||||
} catch (error) {
|
||||
@@ -44,7 +44,7 @@ export const estEnrollmentConfigDALFactory = (db: TDbClient) => {
|
||||
|
||||
const findById = async (id: string, tx?: Knex) => {
|
||||
try {
|
||||
const estConfig = await (tx || db)(TableName.EstEnrollmentConfig).where({ id }).first();
|
||||
const estConfig = await (tx || db)(TableName.PkiEstEnrollmentConfig).where({ id }).first();
|
||||
|
||||
return estConfig;
|
||||
} catch (error) {
|
||||
|
||||
Reference in New Issue
Block a user