From ee10e1407af3526efca72b61beb964a6d37fc6a0 Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Sun, 3 Jul 2022 16:27:03 +0200 Subject: [PATCH] fix: Typo of fileOperation -> fileOperations --- server/models/Event.ts | 6 +++--- server/queues/tasks/DeliverWebhookTask.ts | 3 ++- server/types.ts | 11 ++++++++++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/server/models/Event.ts b/server/models/Event.ts index 4cfd5fe81..717efffb2 100644 --- a/server/models/Event.ts +++ b/server/models/Event.ts @@ -11,6 +11,7 @@ import { DataType, } from "sequelize-typescript"; import { globalEventQueue } from "../queues"; +import { Event as TEvent } from "../types"; import Collection from "./Collection"; import Document from "./Document"; import Team from "./Team"; @@ -106,7 +107,7 @@ class Event extends IdModel { ); } - static ACTIVITY_EVENTS = [ + static ACTIVITY_EVENTS: TEvent["name"][] = [ "collections.create", "collections.delete", "collections.move", @@ -123,7 +124,7 @@ class Event extends IdModel { "users.create", ]; - static AUDIT_EVENTS = [ + static AUDIT_EVENTS: TEvent["name"][] = [ "api_keys.create", "api_keys.delete", "authenticationProviders.update", @@ -136,7 +137,6 @@ class Event extends IdModel { "collections.add_group", "collections.remove_group", "collections.delete", - "collections.export_all", "documents.create", "documents.publish", "documents.update", diff --git a/server/queues/tasks/DeliverWebhookTask.ts b/server/queues/tasks/DeliverWebhookTask.ts index a5b77837a..571511eae 100644 --- a/server/queues/tasks/DeliverWebhookTask.ts +++ b/server/queues/tasks/DeliverWebhookTask.ts @@ -88,6 +88,7 @@ export default class DeliverWebhookTask extends BaseTask { case "api_keys.delete": case "attachments.create": case "attachments.delete": + case "authenticationProviders.update": // Ignored return; case "users.create": @@ -126,7 +127,7 @@ export default class DeliverWebhookTask extends BaseTask { return; case "fileOperations.create": case "fileOperations.update": - case "fileOperation.delete": + case "fileOperations.delete": await this.handleFileOperationEvent(subscription, event); return; case "collections.create": diff --git a/server/types.ts b/server/types.ts index 4b94198a9..c527b5d6c 100644 --- a/server/types.ts +++ b/server/types.ts @@ -42,6 +42,14 @@ export type AttachmentEvent = BaseEvent & } ); +export type AuthenticationProviderEvent = BaseEvent & { + name: "authenticationProviders.update"; + modelId: string; + data: { + enabled: boolean; + }; +}; + export type UserEvent = BaseEvent & ( | { @@ -138,7 +146,7 @@ export type FileOperationEvent = BaseEvent & { name: | "fileOperations.create" | "fileOperations.update" - | "fileOperation.delete"; + | "fileOperations.delete"; modelId: string; data: Partial; }; @@ -270,6 +278,7 @@ export type WebhookSubscriptionEvent = BaseEvent & { export type Event = | ApiKeyEvent | AttachmentEvent + | AuthenticationProviderEvent | DocumentEvent | PinEvent | StarEvent