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

feat: project-independent log support

Browse Source
This commit is contained in:
Daniel Hougaard
2024-09-18 17:07:00 +04:00
parent 59b8e83476
commit 9f61177b62
5 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/ee/routes/v1/project-router.ts
View File

@@ -122,10 +122,12 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => {
})
.merge(
z.object({
project: z.object({
name: z.string(),
slug: z.string()
}),
project: z
.object({
name: z.string(),
slug: z.string()
})
.optional(),
event: z.object({
type: z.string(),
metadata: z.any()

13
backend/src/ee/services/audit-log/audit-log-dal.ts
View File

@@ -55,8 +55,7 @@ export const auditLogDALFactory = (db: TDbClient) => {
// eslint-disable-next-line func-names
.where(function () {
if (orgId) {
void this.where(`${TableName.Project}.orgId`, orgId);
// .orWhere(`${TableName.AuditLog}.orgId`, orgId);
void this.where(`${TableName.Project}.orgId`, orgId).orWhere(`${TableName.AuditLog}.orgId`, orgId);
} else if (projectId) {
void this.where(`${TableName.AuditLog}.projectId`, projectId);
}
@@ -114,10 +113,12 @@ export const auditLogDALFactory = (db: TDbClient) => {
return {
...AuditLogsSchema.parse(doc),
project: {
name: projectDoc.projectName,
slug: projectDoc.projectSlug
}
...(projectDoc?.projectSlug && {
project: {
name: projectDoc.projectName,
slug: projectDoc.projectSlug
}
})
};
});
} catch (error) {

10
backend/src/server/routes/v1/organization-router.ts
View File

@@ -120,10 +120,12 @@ export const registerOrgRouter = async (server: FastifyZodProvider) => {
})
.merge(
z.object({
project: z.object({
name: z.string(),
slug: z.string()
}),
project: z
.object({
name: z.string(),
slug: z.string()
})
.optional(),
event: z.object({
type: z.string(),
metadata: z.any()

2
frontend/src/hooks/api/auditLogs/types.tsx
View File

@@ -886,7 +886,7 @@ export type AuditLog = {
userAgentType: UserAgentType;
createdAt: string;
updatedAt: string;
project: {
project?: {
name: string;
slug: string;
};

2
frontend/src/views/Org/AuditLogsPage/components/LogsTableRow.tsx
View File

@@ -531,7 +531,7 @@ export const LogsTableRow = ({ auditLog, isOrgAuditLogs, showActorColumn }: Prop
<Tr className={`log-${auditLog.id} h-10 border-x-0 border-b border-t-0`}>
<Td>{formatDate(auditLog.createdAt)}</Td>
<Td>{`${eventToNameMap[auditLog.event.type]}`}</Td>
{isOrgAuditLogs && <Td>{auditLog.project.name}</Td>}
{isOrgAuditLogs && <Td>{auditLog?.project?.name ?? "N/A"}</Td>}
{showActorColumn && renderActor(auditLog.actor)}
{renderSource()}
{renderMetadata(auditLog.event)}