From f6b367cdcafe20fa717add48ff6dba9a40bcd1bc Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Thu, 27 Jun 2024 13:44:24 +0200
Subject: [PATCH 1/2] :sparkles: Add extra events info to track teams and
 invitations

---
 backend/src/app/rpc/commands/teams.clj        |  1 -
 backend/src/app/rpc/commands/verify_token.clj | 23 ++++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/backend/src/app/rpc/commands/teams.clj b/backend/src/app/rpc/commands/teams.clj
index 4730ee06e..b7a73213d 100644
--- a/backend/src/app/rpc/commands/teams.clj
+++ b/backend/src/app/rpc/commands/teams.clj
@@ -867,7 +867,6 @@
                     :invitations invitations}
           {::audit/props {:invitations (count invitations)}})))))
 
-
 ;; --- Mutation: Create Team & Invite Members
 
 (def ^:private schema:create-team-with-invitations
diff --git a/backend/src/app/rpc/commands/verify_token.clj b/backend/src/app/rpc/commands/verify_token.clj
index e2641df23..1fc83bc85 100644
--- a/backend/src/app/rpc/commands/verify_token.clj
+++ b/backend/src/app/rpc/commands/verify_token.clj
@@ -147,7 +147,7 @@
 
 (defmethod process-token :team-invitation
   [{:keys [conn] :as cfg}
-   {:keys [::rpc/profile-id token]}
+   {:keys [::rpc/profile-id token] :as params}
    {:keys [member-id team-id member-email] :as claims}]
 
   (us/verify! ::team-invitation-claims claims)
@@ -169,13 +169,20 @@
         ;; if we have logged-in user and it matches the invitation we proceed
         ;; with accepting the invitation and joining the current profile to the
         ;; invited team.
-        (let [profile (accept-invitation cfg claims invitation profile)]
-          (-> (assoc claims :state :created)
-              (rph/with-meta {::audit/name "accept-team-invitation"
-                              ::audit/profile-id (:id profile)
-                              ::audit/props {:team-id (:team-id claims)
-                                             :role (:role claims)
-                                             :invitation-id (:id invitation)}})))
+        (let [context (audit/params->context params)
+              props   {:team-id (:team-id claims)
+                       :role (:role claims)
+                       :invitation-id (:id invitation)}]
+
+          (accept-invitation cfg claims invitation profile)
+          (audit/submit! cfg
+                         {::audit/type "action"
+                          ::audit/name "accept-team-invitation"
+                          ::audit/profile-id profile-id
+                          ::audit/props props
+                          ::audit/context context})
+
+          (assoc claims :state :created))
 
         (ex/raise :type :validation
                   :code :invalid-token

From c090a11e5b3b23f79f4a55a5a311462de0d0e4c5 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Fri, 28 Jun 2024 09:04:35 +0200
Subject: [PATCH 2/2] :sparkles: Normalize audit event origin tracking on
 frontend and backend

---
 backend/src/app/loggers/audit.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/app/loggers/audit.clj b/backend/src/app/loggers/audit.clj
index 32cccb770..b2b29170c 100644
--- a/backend/src/app/loggers/audit.clj
+++ b/backend/src/app/loggers/audit.clj
@@ -91,7 +91,7 @@
   [params]
   (d/without-nils
    {:external-session-id (::rpc/external-session-id params)
-    :triggered-by (::rpc/handler-name params)}))
+    :event-origin (::rpc/handler-name params)}))
 
 ;; --- SPECS