From 7821c637c655d04fd28fd4f89a442046c83b50dc Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Mon, 27 Mar 2023 12:28:40 +0100
Subject: [PATCH] Move event one level up

---
 packages/backend-core/src/events/publishers/user.ts |  6 +++---
 packages/types/src/sdk/events/user.ts               | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/backend-core/src/events/publishers/user.ts b/packages/backend-core/src/events/publishers/user.ts
index cf5f041c1d..a81bb64096 100644
--- a/packages/backend-core/src/events/publishers/user.ts
+++ b/packages/backend-core/src/events/publishers/user.ts
@@ -20,9 +20,9 @@ import { context } from "../.."
 async function created(user: User, timestamp?: number) {
   const properties: UserCreatedEvent = {
     userId: user._id as string,
+    viaScim: context.isScimCall(),
     audited: {
       email: user.email,
-      viaScim: context.isScimCall(),
     },
   }
   await publishEvent(Event.USER_CREATED, properties, timestamp)
@@ -31,9 +31,9 @@ async function created(user: User, timestamp?: number) {
 async function updated(user: User) {
   const properties: UserUpdatedEvent = {
     userId: user._id as string,
+    viaScim: context.isScimCall(),
     audited: {
       email: user.email,
-      viaScim: context.isScimCall(),
     },
   }
   await publishEvent(Event.USER_UPDATED, properties)
@@ -42,9 +42,9 @@ async function updated(user: User) {
 async function deleted(user: User) {
   const properties: UserDeletedEvent = {
     userId: user._id as string,
+    viaScim: context.isScimCall(),
     audited: {
       email: user.email,
-      viaScim: context.isScimCall(),
     },
   }
   await publishEvent(Event.USER_DELETED, properties)
diff --git a/packages/types/src/sdk/events/user.ts b/packages/types/src/sdk/events/user.ts
index 6d74f25aa8..955f198732 100644
--- a/packages/types/src/sdk/events/user.ts
+++ b/packages/types/src/sdk/events/user.ts
@@ -2,25 +2,25 @@ import { BaseEvent } from "./event"
 
 export interface UserCreatedEvent extends BaseEvent {
   userId: string
+  viaScim?: boolean
   audited: {
     email: string
-    viaScim?: boolean
   }
 }
 
 export interface UserUpdatedEvent extends BaseEvent {
   userId: string
+  viaScim?: boolean
   audited: {
-    email: string,
-    viaScim?: boolean
+    email: string
   }
 }
 
 export interface UserDeletedEvent extends BaseEvent {
   userId: string
+  viaScim?: boolean
   audited: {
-    email: string,
-    viaScim?: boolean
+    email: string
   }
 }