From 62cd6a43f203d7f783898975adfbe0c92db91566 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Fri, 24 Mar 2023 16:57:26 +0000
Subject: [PATCH] Remove "duplicated" events

---
 .../src/events/publishers/index.ts            |  1 -
 .../src/events/publishers/scim.ts             | 28 -------------------
 .../tests/utilities/mocks/events.ts           |  3 --
 packages/types/src/sdk/events/event.ts        |  8 ------
 .../routes/global/tests/scim/users.spec.ts    | 22 ++-------------
 5 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 packages/backend-core/src/events/publishers/scim.ts

diff --git a/packages/backend-core/src/events/publishers/index.ts b/packages/backend-core/src/events/publishers/index.ts
index 055d798979..87a34bf3f1 100644
--- a/packages/backend-core/src/events/publishers/index.ts
+++ b/packages/backend-core/src/events/publishers/index.ts
@@ -22,4 +22,3 @@ export { default as plugin } from "./plugin"
 export { default as backup } from "./backup"
 export { default as environmentVariable } from "./environmentVariable"
 export { default as auditLog } from "./auditLog"
-export { default as scim } from "./scim"
diff --git a/packages/backend-core/src/events/publishers/scim.ts b/packages/backend-core/src/events/publishers/scim.ts
deleted file mode 100644
index ff163fe2cc..0000000000
--- a/packages/backend-core/src/events/publishers/scim.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { publishEvent } from "../events"
-import {
-  Event,
-  ScimUserDeletedEvent,
-  ScimUserUpdatedEvent,
-} from "@budibase/types"
-
-async function SCIMUserUpdated(props: {
-  userId: string
-  timestamp?: string | number
-}) {
-  const properties: ScimUserUpdatedEvent = {
-    userId: props.userId,
-  }
-  await publishEvent(Event.SCIM_USER_UPDATED, properties, props.timestamp)
-}
-
-async function SCIMUserDeleted(props: { userId: string }) {
-  const properties: ScimUserDeletedEvent = {
-    userId: props.userId,
-  }
-  await publishEvent(Event.SCIM_USER_DELETED, properties)
-}
-
-export default {
-  SCIMUserUpdated,
-  SCIMUserDeleted,
-}
diff --git a/packages/backend-core/tests/utilities/mocks/events.ts b/packages/backend-core/tests/utilities/mocks/events.ts
index 5f597bf46d..ab0aaa93a6 100644
--- a/packages/backend-core/tests/utilities/mocks/events.ts
+++ b/packages/backend-core/tests/utilities/mocks/events.ts
@@ -120,6 +120,3 @@ jest.spyOn(events.view, "calculationDeleted")
 jest.spyOn(events.plugin, "init")
 jest.spyOn(events.plugin, "imported")
 jest.spyOn(events.plugin, "deleted")
-
-jest.spyOn(events.scim, "SCIMUserUpdated")
-jest.spyOn(events.scim, "SCIMUserDeleted")
diff --git a/packages/types/src/sdk/events/event.ts b/packages/types/src/sdk/events/event.ts
index ebe3d68deb..92268da763 100644
--- a/packages/types/src/sdk/events/event.ts
+++ b/packages/types/src/sdk/events/event.ts
@@ -184,10 +184,6 @@ export enum Event {
   // AUDIT LOG
   AUDIT_LOGS_FILTERED = "audit_log:filtered",
   AUDIT_LOGS_DOWNLOADED = "audit_log:downloaded",
-
-  // SCIM
-  SCIM_USER_UPDATED = "scim:user:updated",
-  SCIM_USER_DELETED = "scim:user:deleted",
 }
 
 // all events that are not audited have been added to this record as undefined, this means
@@ -368,10 +364,6 @@ export const AuditedEventFriendlyName: Record<Event, string | undefined> = {
   // AUDIT LOG - NOT AUDITED
   [Event.AUDIT_LOGS_FILTERED]: undefined,
   [Event.AUDIT_LOGS_DOWNLOADED]: undefined,
-
-  // SCIM
-  [Event.SCIM_USER_UPDATED]: `SCIM user "{{ email }}" updated`,
-  [Event.SCIM_USER_DELETED]: `SCIM user "{{ email }}" deleted`,
 }
 
 // properties added at the final stage of the event pipeline
diff --git a/packages/worker/src/api/routes/global/tests/scim/users.spec.ts b/packages/worker/src/api/routes/global/tests/scim/users.spec.ts
index 336e52e380..730f6b12f6 100644
--- a/packages/worker/src/api/routes/global/tests/scim/users.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/scim/users.spec.ts
@@ -241,18 +241,9 @@ describe("/api/global/scim/v2/users", () => {
       it("an event is dispatched", async () => {
         const body = createScimCreateUserRequest()
 
-        const res = await postScimUser({ body })
+        await postScimUser({ body })
 
         expect(events.user.created).toBeCalledTimes(1)
-        expect(events.user.created).toBeCalledWith(
-          expect.objectContaining({
-            _id: res.id,
-            createdAt: mockedTime.toISOString(),
-            scimInfo: expect.objectContaining({
-              isSync: true,
-            }),
-          })
-        )
       })
     })
   })
@@ -456,11 +447,7 @@ describe("/api/global/scim/v2/users", () => {
 
       await patchScimUser({ id: user.id, body })
 
-      expect(events.scim.SCIMUserUpdated).toBeCalledTimes(1)
-      expect(events.scim.SCIMUserUpdated).toBeCalledWith({
-        userId: user.id,
-        timestamp: mockedTime.toISOString(),
-      })
+      expect(events.user.updated).toBeCalledTimes(1)
     })
   })
 
@@ -506,10 +493,7 @@ describe("/api/global/scim/v2/users", () => {
     it("an event is dispatched", async () => {
       await deleteScimUser(user.id, { expect: 204 })
 
-      expect(events.scim.SCIMUserDeleted).toBeCalledTimes(1)
-      expect(events.scim.SCIMUserDeleted).toBeCalledWith({
-        userId: user.id,
-      })
+      expect(events.user.deleted).toBeCalledTimes(1)
     })
   })
 })