Merge pull request #8 from Braunson/5.5

Added config option to allow tokens or default to auth
jarektkaczyk · Jan 15, 2018 · 90b6a2d · 90b6a2d
2 parents b10aa56 + 8d0cf0a
commit 90b6a2d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/published/config.stub b/published/config.stub
@@ -39,6 +39,13 @@ return [
     */
     'user_model' => 'App\User',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Do you want to use tokens or just check based on the user authorized?
+    |--------------------------------------------------------------------------
+    */
+    'use_tokens' => true,
+
     /*
     |--------------------------------------------------------------------------
     | Channels for events broadcasting.

diff --git a/spec/LockingSpec.php b/spec/LockingSpec.php
@@ -172,6 +172,7 @@
             'model_locking.use_authenticated_user' => null,
             'model_locking.request_shorten_duration' => null,
             'model_locking.user' => null,
+            'model_locking.use_tokens' => true,
             'auth.providers.users.model' => null,
         ];
     });

diff --git a/src/ModelLock.php b/src/ModelLock.php
@@ -72,9 +72,13 @@ public function generateToken()
      * @param  string $token
      * @return boolean
      */
-    public function verify($token)
+    public function verify($token = null)
     {
-        return $this->token === $token;
+        if (config('model_locking.use_tokens', true)) {
+            return $this->token === $token;
+        }
+
+        return $this->user_id === auth()->user()->id;
     }
 
     /**