Fixed a bug causing problems if the users permission attribute is c…

…ast to `json`.
tpg · Feb 27, 2020 · 2f02caf · 2f02caf
1 parent f48c853
commit 2f02caf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.2] 27-02-2020
+### Changes
+- Fixed a bug that was causing problems if the `permissions` attribute is cast to `json`.
+
 ## [0.2.1] 27-02-2020
 ### Additions
 - Updated the `Deadbolt::permissions()` to accept role names.

diff --git a/src/User.php b/src/User.php
@@ -225,6 +225,10 @@ public function has(string $permission): bool
      */
     protected function userPermissions(): array
     {
+        if (is_array($this->user->permissions)) {
+            return $this->user->permissions;
+        }
+
         return json_decode($this->user->permissions, true) ?: [];
     }