Fix resolving users in the queue

Signed-off-by: Kevin Ullyott <[email protected]>

Author: Orrison

src/Auditable.php

@@ -56,6 +56,11 @@ trait Auditable
      */
     public $isCustomEvent = false;
 
+    /**
+     * @var array Preloaded data to be used by resolvers
+     */
+    public $preloadedResolverData = [];
+
     /**
      * Auditable boot logic.
      *
@@ -372,7 +377,7 @@ protected function resolveUser()
         }
 
         if (is_subclass_of($userResolver, \OwenIt\Auditing\Contracts\UserResolver::class)) {
-            return call_user_func([$userResolver, 'resolve']);
+            return call_user_func([$userResolver, 'resolve'], $this);
         }
 
         throw new AuditingException('Invalid UserResolver implementation');
@@ -403,6 +408,17 @@ protected function runResolvers(): array
         return $resolved;
     }
 
+    public function preloadResolverData()
+    {
+        $this->preloadedResolverData = $this->runResolvers();
+
+        if (!empty ($this->resolveUser())) {
+            $this->preloadedResolverData['user'] = $this->resolveUser();
+        }
+
+        return $this;
+    }
+
     /**
      * Determine if an attribute is eligible for auditing.
      *

src/AuditableObserver.php

@@ -104,7 +104,7 @@ protected function dispatchAudit(Auditable $model)
         }
 
         // Unload the relations to prevent large amounts of unnecessary data from being serialized.
-        DispatchAudit::dispatch($model->withoutRelations());
+        DispatchAudit::dispatch($model->preloadResolverData()->withoutRelations());
     }
 
     /**

src/Contracts/UserResolver.php

@@ -9,5 +9,5 @@ interface UserResolver
      *
      * @return \Illuminate\Contracts\Auth\Authenticatable|null
      */
-    public static function resolve();
+    public static function resolve(Auditable $auditable);
 }

src/Resolvers/IpAddressResolver.php

@@ -10,6 +10,6 @@ class IpAddressResolver implements Resolver
 {
     public static function resolve(Auditable $auditable): string
     {
-        return Request::ip();
+        return $auditable->preloadedResolverData['ip_address'] ?? Request::ip();
     }
 }

src/Resolvers/UrlResolver.php

@@ -13,6 +13,10 @@ class UrlResolver implements \OwenIt\Auditing\Contracts\Resolver
      */
     public static function resolve(Auditable $auditable): string
     {
+        if (! empty($auditable->preloadedResolverData['url'])) {
+            return $auditable->preloadedResolverData['url'];
+        }
+
         if (App::runningInConsole()) {
             return 'console';
         }

src/Resolvers/UserAgentResolver.php

@@ -10,6 +10,6 @@ class UserAgentResolver implements Resolver
 {
     public static function resolve(Auditable $auditable)
     {
-        return Request::header('User-Agent');
+        return $auditable->preloadedResolverData['user_agent'] ?? Request::header('User-Agent');
     }
 }

src/Resolvers/UserResolver.php

@@ -4,14 +4,19 @@
 
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Config;
+use OwenIt\Auditing\Contracts\Auditable;
 
 class UserResolver implements \OwenIt\Auditing\Contracts\UserResolver
 {
     /**
      * @return \Illuminate\Contracts\Auth\Authenticatable|null
      */
-    public static function resolve()
+    public static function resolve(Auditable $auditable)
     {
+        if (! empty($auditable->preloadedResolverData['user'])) {
+            return $auditable->preloadedResolverData['user'];
+        }
+
         $guards = Config::get('audit.user.guards', [
             \config('auth.defaults.guard')
         ]);