Merge pull request #695 from owen-it/default_user_guard

Default user guard

Author: anteriovieira

config/audit.php

@@ -28,9 +28,9 @@
         'morph_prefix' => 'user',
         'guards'       => [
             'web',
-            'api',
+            'api'
         ],
-        'resolver' => OwenIt\Auditing\Resolvers\UserResolver::class
+        'resolver'     => OwenIt\Auditing\Resolvers\UserResolver::class
     ],
 
     /*

src/Contracts/UserResolver.php

@@ -2,12 +2,14 @@
 
 namespace OwenIt\Auditing\Contracts;
 
+use Illuminate\Auth\Authenticatable;
+
 interface UserResolver
 {
     /**
      * Resolve the User.
      *
-     * @return mixed|null
+     * @return Authenticatable|null
      */
     public static function resolve();
 }

src/Resolvers/UserResolver.php

@@ -7,17 +7,27 @@
 
 class UserResolver implements \OwenIt\Auditing\Contracts\UserResolver
 {
+    /**
+     * @return \Illuminate\Contracts\Auth\Authenticatable|null
+     */
     public static function resolve()
     {
         $guards = Config::get('audit.user.guards', [
-            'web',
-            'api',
+            \config('auth.defaults.guard')
         ]);
 
         foreach ($guards as $guard) {
-            if (Auth::guard($guard)->check()) {
+            try {
+                $authenticated = Auth::guard($guard);
+            } catch (\Exception $exception) {
+                continue;
+            }
+
+            if ($authenticated) {
                 return Auth::guard($guard)->user();
             }
         }
+
+        return null;
     }
 }