Associate activity with user by API key as fallback

range-of-motion · Dec 9, 2023 · 4706ce7 · 4706ce7
1 parent 96885de
commit 4706ce7
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 2 deletions.
diff --git a/app/Events/ImportCreated.php b/app/Events/ImportCreated.php
@@ -17,9 +17,17 @@ class ImportCreated
 
     public function __construct(Import $import)
     {
+        $userId = null;
+
+        if (Auth::check()) {
+            $userId = Auth::user()->id;
+        } elseif (request()->get('apiKey')) {
+            $userId = request()->get('apiKey')->user_id;
+        }
+
         Activity::create([
             'space_id' => $import->space_id,
-            'user_id' => Auth::user()->id,
+            'user_id' => $userId,
             'entity_id' => $import->id,
             'entity_type' => 'import',
             'action' => 'import.created'

diff --git a/app/Events/ImportDeleted.php b/app/Events/ImportDeleted.php
@@ -17,9 +17,17 @@ class ImportDeleted
 
     public function __construct(Import $import)
     {
+        $userId = null;
+
+        if (Auth::check()) {
+            $userId = Auth::user()->id;
+        } elseif (request()->get('apiKey')) {
+            $userId = request()->get('apiKey')->user_id;
+        }
+
         Activity::create([
             'space_id' => $import->space_id,
-            'user_id' => Auth::user()->id,
+            'user_id' => $userId,
             'entity_id' => $import->id,
             'entity_type' => 'import',
             'action' => 'import.deleted'

diff --git a/app/Events/RecurringCreated.php b/app/Events/RecurringCreated.php
@@ -21,6 +21,8 @@ public function __construct(Recurring $recurring)
 
         if (Auth::check()) {
             $userId = Auth::user()->id;
+        } elseif (request()->get('apiKey')) {
+            $userId = request()->get('apiKey')->user_id;
         }
 
         Activity::create([

diff --git a/app/Events/RecurringDeleted.php b/app/Events/RecurringDeleted.php
@@ -21,6 +21,8 @@ public function __construct(Recurring $recurring)
 
         if (Auth::check()) {
             $userId = Auth::user()->id;
+        } elseif (request()->get('apiKey')) {
+            $userId = request()->get('apiKey')->user_id;
         }
 
         Activity::create([

diff --git a/app/Events/TagCreated.php b/app/Events/TagCreated.php
@@ -21,6 +21,8 @@ public function __construct(Tag $tag)
 
         if (Auth::check()) {
             $userId = Auth::user()->id;
+        } elseif (request()->get('apiKey')) {
+            $userId = request()->get('apiKey')->user_id;
         }
 
         Activity::create([

diff --git a/app/Events/TagDeleted.php b/app/Events/TagDeleted.php
@@ -21,6 +21,8 @@ public function __construct(Tag $tag)
 
         if (Auth::check()) {
             $userId = Auth::user()->id;
+        } elseif (request()->get('apiKey')) {
+            $userId = request()->get('apiKey')->user_id;
         }
 
         Activity::create([

diff --git a/app/Events/TransactionCreated.php b/app/Events/TransactionCreated.php
@@ -22,6 +22,8 @@ public function __construct($transaction)
 
         if (Auth::check()) {
             $userId = Auth::user()->id;
+        } elseif (request()->get('apiKey')) {
+            $userId = request()->get('apiKey')->user_id;
         }
 
         if ($transaction instanceof Earning) {

diff --git a/app/Events/TransactionDeleted.php b/app/Events/TransactionDeleted.php
@@ -22,6 +22,8 @@ public function __construct($transaction)
 
         if (Auth::check()) {
             $userId = Auth::user()->id;
+        } elseif (request()->get('apiKey')) {
+            $userId = request()->get('apiKey')->user_id;
         }
 
         if ($transaction instanceof Earning) {