Merge branch 'devel'

coreui · Jun 18, 2020 · 4dd1659 · 4dd1659
2 parents 74a93f0 + c4892d2
commit 4dd1659
Show file tree

Hide file tree

Showing 3 changed files with 693 additions and 435 deletions.
diff --git a/laravel/app/User.php b/laravel/app/User.php
@@ -67,4 +67,8 @@ public function getJWTCustomClaims()
     ];
 
     protected $guard_name = 'api';
+
+    protected $attributes = [ 
+        'menuroles' => 'user',
+    ];
 }
diff --git a/laravel/composer.json b/laravel/composer.json
@@ -10,7 +10,7 @@
     "require": {
         "php": "^7.2",
         "fideloper/proxy": "^4.0",
-        "laravel/framework": "^7.0",
+        "laravel/framework": "^7.4",
         "laravel/tinker": "^2.0",
         "spatie/laravel-medialibrary": "^7.19.0",
         "spatie/laravel-permission": "^3.6",