f1011ddd08
* feat(booking-audit): extract core audit system changes from PR 25125 This PR extracts core audit infrastructure changes without integration changes: 1. New action services introduced: - SeatBookedAuditActionService - SeatRescheduledAuditActionService 2. Simplification of ActionService interface: - Streamlined IAuditActionService interface - Reduced TypeScript burden with cleaner type definitions 3. ActionSource support: - Added BookingAuditSource enum (API_V1, API_V2, WEBAPP, WEBHOOK, UNKNOWN) - Added source and operationId fields to BookingAudit model 4. New AuditAction types: - SEAT_BOOKED - SEAT_RESCHEDULED - APP actor type 5. New BookingAuditAccessService: - Permission-based access control for audit logs - Added readTeamAuditLogs and readOrgAuditLogs permissions 6. Fixes in the logs viewer flow: - Enhanced BookingAuditViewerService with improved filtering - Local AttendeeRepository for actor enrichment Changes are contained within packages/features/booking-audit with minimal outside changes (permission registry only). Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * refactor(booking-audit): streamline action handling and enhance localization - Replaced action icon retrieval with a mapping object for improved clarity and performance. - Introduced constants for actor role labels to simplify role retrieval. - Added new localization strings for audit log permission errors and organization requirements. - Updated various service and repository interfaces to enhance type safety and clarity. - Removed deprecated architecture documentation and adjusted related imports for consistency. These changes aim to improve code maintainability and user experience in the booking audit system. * fix(booking-audit): enhance actor role localization and operation ID tracking - Updated actor role labels in the booking logs view to use lowercase for consistency. - Improved localization by wrapping actor role display in a translation function. - Added operationId field to audit logs for better correlation of actions across multiple bookings. - Enhanced BookingAuditViewerService to include operationId in enriched audit logs. - Updated integration tests to verify consistent operationId across related audit logs. These changes aim to improve localization accuracy and facilitate better tracking of user actions in the booking audit system. * feat: integrate credential repository and enhance app actor handling - Added CredentialRepository to manage app credentials, including a method to find credentials by ID. - Updated BookingAudit system to support app actors identified by credential ID, improving actor attribution and audit clarity. - Introduced a new utility function to map app slugs to display names, enhancing the user experience in audit logs. - Modified relevant interfaces and types to accommodate the new credential handling and app actor structure. - Enhanced BookingAuditViewerService to display app names based on credentials, ensuring accurate representation in audit logs. --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
442 lines
17 KiB
TypeScript
442 lines
17 KiB
TypeScript
import type { JsonValue } from "@calcom/types/Json";
|
|
|
|
import logger from "@calcom/lib/logger";
|
|
import type { IFeaturesRepository } from "@calcom/features/flags/features.repository.interface";
|
|
import type { UserRepository } from "@calcom/features/users/repositories/UserRepository";
|
|
|
|
import type { PiiFreeActor } from "../../../bookings/lib/types/actor";
|
|
import type {
|
|
SingleBookingAuditTaskConsumerPayload,
|
|
BulkBookingAuditTaskConsumerPayload,
|
|
BookingAuditTaskConsumerPayload
|
|
} from "../types/bookingAuditTask";
|
|
import { BookingAuditActionServiceRegistry } from "./BookingAuditActionServiceRegistry";
|
|
import type { IBookingAuditRepository, BookingAuditType, BookingAuditAction, BookingAuditCreateInput } from "../repository/IBookingAuditRepository";
|
|
import type { IAuditActorRepository } from "../repository/IAuditActorRepository";
|
|
import type { ActionSource } from "../types/actionSource";
|
|
import { safeStringify } from "@calcom/lib/safeStringify";
|
|
import { Task } from "@calcom/features/tasker/repository";
|
|
|
|
interface BookingAuditTaskConsumerDeps {
|
|
bookingAuditRepository: IBookingAuditRepository;
|
|
auditActorRepository: IAuditActorRepository;
|
|
featuresRepository: IFeaturesRepository;
|
|
userRepository: UserRepository;
|
|
}
|
|
|
|
type CreateBookingAuditInput = {
|
|
bookingUid: string;
|
|
actorId: string;
|
|
type: BookingAuditType;
|
|
action: BookingAuditAction;
|
|
source: ActionSource;
|
|
operationId: string;
|
|
data: JsonValue;
|
|
timestamp: Date; // Required: actual time of the booking change (business event)
|
|
};
|
|
|
|
type BookingAudit = {
|
|
id: string;
|
|
bookingUid: string;
|
|
actorId: string;
|
|
type: BookingAuditType;
|
|
action: BookingAuditAction;
|
|
timestamp: Date;
|
|
createdAt: Date;
|
|
updatedAt: Date;
|
|
data: JsonValue;
|
|
};
|
|
|
|
/**
|
|
* BookingAuditTaskConsumer - Task consumer for processing booking audit tasks
|
|
* Handles all audit processing logic including feature flag checks and routing to action handlers
|
|
* Designed to be deployed separately (e.g., as trigger.dev job) with minimal dependencies
|
|
*
|
|
* Note: PENDING and AWAITING_HOST actions are intentionally not implemented.
|
|
* These represent initial booking states captured by the CREATED action.
|
|
*
|
|
* Dependency Injection Note:
|
|
* - `userRepository` is included in this service's dependencies because it's required by
|
|
* ActionServices (e.g., ReassignmentAuditActionService) that need to fetch user data.
|
|
* - Currently, dependencies are passed down the flow: TaskConsumer → Registry → ActionService
|
|
* - Future improvement: Consider creating a container/module system for action services
|
|
* that can build instances directly with their dependencies, eliminating the need to
|
|
* pass dependencies through intermediate layers.
|
|
*/
|
|
export class BookingAuditTaskConsumer {
|
|
private readonly actionServiceRegistry: BookingAuditActionServiceRegistry;
|
|
private readonly bookingAuditRepository: IBookingAuditRepository;
|
|
private readonly auditActorRepository: IAuditActorRepository;
|
|
private readonly featuresRepository: IFeaturesRepository;
|
|
private readonly userRepository: UserRepository;
|
|
|
|
constructor(private readonly deps: BookingAuditTaskConsumerDeps) {
|
|
this.bookingAuditRepository = deps.bookingAuditRepository;
|
|
this.auditActorRepository = deps.auditActorRepository;
|
|
this.featuresRepository = deps.featuresRepository;
|
|
this.userRepository = deps.userRepository;
|
|
|
|
// Centralized registry for all action services
|
|
this.actionServiceRegistry = new BookingAuditActionServiceRegistry({ userRepository: this.userRepository });
|
|
}
|
|
|
|
/**
|
|
* Process single booking Audit Task
|
|
*/
|
|
async processAuditTask(payload: SingleBookingAuditTaskConsumerPayload, taskId: string): Promise<void> {
|
|
const { action, bookingUid, actor, organizationId, data, timestamp, source, operationId } = payload;
|
|
|
|
if (!await this.shouldProcessAudit({
|
|
organizationId,
|
|
action,
|
|
bookingUids: [bookingUid],
|
|
})) {
|
|
return;
|
|
}
|
|
|
|
const dataInLatestFormat = await this.migrateIfNeeded({ action, data, payload, taskId });
|
|
|
|
await this.onBookingAction({ bookingUid, actor, action, source, operationId, data: dataInLatestFormat, timestamp });
|
|
}
|
|
|
|
/**
|
|
* Process Bulk bookings Audit Task
|
|
*/
|
|
async processBulkAuditTask(payload: BulkBookingAuditTaskConsumerPayload, taskId: string): Promise<void> {
|
|
const { bookings, action, actor, organizationId, timestamp, source, operationId } = payload;
|
|
|
|
if (!await this.shouldProcessAudit({
|
|
organizationId,
|
|
action,
|
|
bookingUids: bookings.map((booking) => booking.bookingUid),
|
|
})) {
|
|
return;
|
|
}
|
|
|
|
const migratedBookings = await this.bulkMigrateIfNeeded({
|
|
bookings,
|
|
action,
|
|
payload,
|
|
taskId,
|
|
});
|
|
|
|
await this.onBulkBookingActions({
|
|
bookings: migratedBookings,
|
|
actor,
|
|
action,
|
|
source,
|
|
operationId,
|
|
timestamp,
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Migrate If Needed - Validates and migrates data to latest version
|
|
*
|
|
* This is where action-specific data validation happens.
|
|
* The action service's migrateToLatest method:
|
|
* - Validates the data against all supported versions
|
|
* - Migrates to latest version if needed
|
|
* - Returns validated data with migration status
|
|
*
|
|
* If migration occurred, updates the task payload in DB for retries.
|
|
*/
|
|
private async migrateIfNeeded(params: {
|
|
action: BookingAuditAction;
|
|
data: unknown;
|
|
payload: SingleBookingAuditTaskConsumerPayload;
|
|
taskId: string;
|
|
}) {
|
|
const { action, data, payload, taskId } = params;
|
|
const actionService = this.actionServiceRegistry.getActionService(action);
|
|
|
|
// migrateToLatest validates data with action-specific schema and migrates if needed
|
|
const migrationResult = actionService.migrateToLatest(data);
|
|
|
|
// If migrated, update task payload in DB
|
|
if (migrationResult.isMigrated) {
|
|
logger.info(
|
|
`Schema migration performed: action=${action}`
|
|
);
|
|
await this.updateTaskPayload(payload, migrationResult.latestData, taskId);
|
|
}
|
|
|
|
return migrationResult.latestData;
|
|
}
|
|
|
|
/**
|
|
* Update Task Payload - Updates the task payload in DB with migrated data
|
|
*
|
|
* This ensures that task retries use the latest schema version.
|
|
* When a task fails and retries, it will use the already-migrated payload.
|
|
*
|
|
* @param payload - Original task payload
|
|
* @param latestData - Migrated data in latest schema version
|
|
* @param taskId - Task ID (required for DB update)
|
|
*/
|
|
private async updateTaskPayload(
|
|
payload: BookingAuditTaskConsumerPayload,
|
|
latestData: unknown,
|
|
taskId: string
|
|
): Promise<void> {
|
|
try {
|
|
const updatedPayload = { ...payload, data: latestData };
|
|
await Task.updatePayload(taskId, JSON.stringify(updatedPayload));
|
|
|
|
logger.info(
|
|
`Successfully updated task payload in DB: taskId=${taskId}, action=${payload.action}`
|
|
);
|
|
} catch (error) {
|
|
// Warning because nothing functionally failed, we have a risk in future that if we completely remove a version support, the particular task if retried will fail with a schema error.
|
|
logger.warn(
|
|
`Failed to update task payload in DB: taskId=${taskId}, error=${safeStringify(error)}`
|
|
);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Bulk Migrate If Needed - Migrates all bookings in a bulk operation
|
|
*
|
|
* Since all bookings in a bulk operation share the same action type,
|
|
* they all use the same action service and schema version.
|
|
* If any booking is migrated, updates the DB task payload for retry consistency.
|
|
*
|
|
* @param params - Bookings, action, payload, and task ID
|
|
* @returns Array of migrated bookings with latest data
|
|
*/
|
|
private async bulkMigrateIfNeeded(params: {
|
|
bookings: BulkBookingAuditTaskConsumerPayload["bookings"];
|
|
action: BookingAuditAction;
|
|
payload: BulkBookingAuditTaskConsumerPayload;
|
|
taskId: string;
|
|
}): Promise<Array<{ bookingUid: string; data: Record<string, unknown> }>> {
|
|
const { bookings, action, payload, taskId } = params;
|
|
const actionService = this.actionServiceRegistry.getActionService(action);
|
|
|
|
let anyMigrated = false;
|
|
const migratedBookings = await Promise.all(
|
|
bookings.map(async (booking) => {
|
|
const migrationResult = actionService.migrateToLatest(booking.data);
|
|
if (migrationResult.isMigrated) {
|
|
anyMigrated = true;
|
|
}
|
|
return {
|
|
bookingUid: booking.bookingUid,
|
|
data: migrationResult.latestData,
|
|
};
|
|
})
|
|
);
|
|
|
|
if (anyMigrated) {
|
|
logger.info(`Schema migration performed for bulk audit: action=${action}`);
|
|
await this.updateBulkTaskPayload(payload, migratedBookings, taskId);
|
|
}
|
|
|
|
return migratedBookings;
|
|
}
|
|
|
|
private async updateBulkTaskPayload(
|
|
payload: BulkBookingAuditTaskConsumerPayload,
|
|
migratedBookings: Array<{ bookingUid: string; data: Record<string, unknown> }>,
|
|
taskId: string
|
|
): Promise<void> {
|
|
try {
|
|
const updatedPayload = { ...payload, bookings: migratedBookings };
|
|
await Task.updatePayload(taskId, JSON.stringify(updatedPayload));
|
|
|
|
logger.info(
|
|
`Successfully updated bulk task payload in DB: taskId=${taskId}, action=${payload.action}`
|
|
);
|
|
} catch (error) {
|
|
// Warning because nothing functionally failed, we have a risk in future that if we completely remove a version support, the particular task if retried will fail with a schema error.
|
|
logger.warn(
|
|
`Failed to update bulk task payload in DB: taskId=${taskId}, error=${safeStringify(error)}`
|
|
);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Check if audit should be processed based on organization and feature flag
|
|
*
|
|
* @param params - Organization ID, action, and context for logging
|
|
* @returns true if audit should be processed, false otherwise
|
|
*/
|
|
private async shouldProcessAudit(params: {
|
|
organizationId: number | null;
|
|
action: BookingAuditAction;
|
|
bookingUids: string[];
|
|
}): Promise<boolean> {
|
|
const { organizationId, action, bookingUids } = params;
|
|
|
|
if (organizationId === null) {
|
|
logger.info(`Skipping audit for non-organization booking: action=${action}, bookingUids=${bookingUids.join(",")}`);
|
|
return false;
|
|
}
|
|
|
|
const isFeatureEnabled = await this.featuresRepository.checkIfTeamHasFeature(
|
|
organizationId,
|
|
"booking-audit"
|
|
);
|
|
|
|
if (!isFeatureEnabled) {
|
|
logger.info(
|
|
`booking-audit feature is disabled for organization: action=${action}, bookingUids=${bookingUids.join(",")}, organizationId=${organizationId}`
|
|
);
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Resolves an Actor to an actor ID in the AuditActor table
|
|
* Handles different actor types appropriately (upsert, lookup, or direct ID)
|
|
*/
|
|
private async resolveActorId(actor: PiiFreeActor): Promise<string> {
|
|
switch (actor.identifiedBy) {
|
|
case "id":
|
|
return actor.id;
|
|
case "user": {
|
|
const userActor = await this.auditActorRepository.createIfNotExistsUserActor({ userUuid: actor.userUuid });
|
|
return userActor.id;
|
|
}
|
|
case "attendee": {
|
|
const attendeeActor = await this.auditActorRepository.createIfNotExistsAttendeeActor({ attendeeId: actor.attendeeId });
|
|
return attendeeActor.id;
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Creates a booking audit record
|
|
* Action services handle their own version wrapping
|
|
*/
|
|
private async createAuditRecord(input: CreateBookingAuditInput): Promise<BookingAudit> {
|
|
logger.info("Creating audit record", safeStringify({
|
|
bookingUid: input.bookingUid,
|
|
actorId: input.actorId,
|
|
type: input.type,
|
|
action: input.action,
|
|
source: input.source,
|
|
timestamp: input.timestamp,
|
|
}));
|
|
|
|
return this.bookingAuditRepository.create({
|
|
bookingUid: input.bookingUid,
|
|
actorId: input.actorId,
|
|
type: input.type,
|
|
action: input.action,
|
|
source: input.source,
|
|
timestamp: input.timestamp,
|
|
operationId: input.operationId,
|
|
data: input.data ?? null,
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Get Record Type - Derives the record type from the action
|
|
*
|
|
* Maps booking actions to their corresponding audit record types:
|
|
* - CREATED → RECORD_CREATED
|
|
* - All other actions (CANCELLED, RESCHEDULED, etc.) → RECORD_UPDATED
|
|
* - Future actions like DELETED → RECORD_DELETED
|
|
*
|
|
* @param action - The booking audit action
|
|
* @returns The corresponding record type
|
|
*/
|
|
private getRecordType(params: { action: BookingAuditAction }): BookingAuditType {
|
|
const { action } = params;
|
|
|
|
|
|
switch (action) {
|
|
case "CREATED":
|
|
return "RECORD_CREATED";
|
|
|
|
// All update actions fall through to return RECORD_UPDATED
|
|
case "CANCELLED":
|
|
case "ACCEPTED":
|
|
case "REJECTED":
|
|
case "RESCHEDULED":
|
|
case "RESCHEDULE_REQUESTED":
|
|
case "ATTENDEE_ADDED":
|
|
case "ATTENDEE_REMOVED":
|
|
case "REASSIGNMENT":
|
|
case "LOCATION_CHANGED":
|
|
case "HOST_NO_SHOW_UPDATED":
|
|
case "ATTENDEE_NO_SHOW_UPDATED":
|
|
case "SEAT_BOOKED":
|
|
case "SEAT_RESCHEDULED":
|
|
return "RECORD_UPDATED";
|
|
|
|
// PENDING and AWAITING_HOST are not implemented as they represent initial states
|
|
case "PENDING":
|
|
case "AWAITING_HOST":
|
|
throw new Error(`Action ${action} is not supported - it represents an initial booking state captured by CREATED`);
|
|
}
|
|
}
|
|
|
|
private async onBulkBookingActions(params: {
|
|
bookings: Array<{ bookingUid: string; data: Record<string, unknown> }>;
|
|
actor: PiiFreeActor;
|
|
action: BookingAuditAction;
|
|
source: ActionSource;
|
|
operationId: string;
|
|
timestamp: number;
|
|
}): Promise<void> {
|
|
const { bookings, actor, action, source, operationId, timestamp } = params;
|
|
|
|
const actorId = await this.resolveActorId(actor);
|
|
const recordType = this.getRecordType({ action });
|
|
const actionService = this.actionServiceRegistry.getActionService(action);
|
|
|
|
const auditRecordsToCreate: BookingAuditCreateInput[] = bookings.map((booking) => {
|
|
const versionedData = actionService.getVersionedData(booking.data);
|
|
return {
|
|
bookingUid: booking.bookingUid,
|
|
actorId,
|
|
type: recordType,
|
|
action,
|
|
source,
|
|
operationId,
|
|
data: versionedData as JsonValue,
|
|
timestamp: new Date(timestamp),
|
|
};
|
|
});
|
|
|
|
await this.bookingAuditRepository.createMany(auditRecordsToCreate);
|
|
|
|
logger.info(
|
|
`Successfully created ${auditRecordsToCreate.length} bulk audit records: action=${action}, operationId=${operationId}`
|
|
);
|
|
}
|
|
|
|
async onBookingAction(params: {
|
|
bookingUid: string;
|
|
actor: PiiFreeActor;
|
|
action: BookingAuditAction;
|
|
source: ActionSource;
|
|
operationId: string;
|
|
data: Record<string, unknown>;
|
|
timestamp: number;
|
|
}): Promise<BookingAudit> {
|
|
const { bookingUid, actor, action, source, operationId, data, timestamp } = params;
|
|
const actionService = this.actionServiceRegistry.getActionService(action);
|
|
const versionedData = actionService.getVersionedData(data);
|
|
const actorId = await this.resolveActorId(actor);
|
|
const recordType = this.getRecordType({ action });
|
|
|
|
return this.createAuditRecord({
|
|
bookingUid,
|
|
actorId,
|
|
type: recordType,
|
|
action,
|
|
source,
|
|
operationId,
|
|
// versionedData is { version: number; fields: unknown } which is JsonValue-compatible
|
|
data: versionedData as JsonValue,
|
|
timestamp: new Date(timestamp),
|
|
});
|
|
}
|
|
}
|
|
|