From 3626c222abf1d53920eff8196f80b3e85008ab2a Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Mon, 5 Nov 2018 22:07:16 -0600 Subject: [PATCH] updating gates --- app/Providers/AuthServiceProvider.php | 22 ++++++++++++++++++++++ app/User.php | 3 --- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 17c8bafdb..d60b87d80 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -26,6 +26,27 @@ class AuthServiceProvider extends ServiceProvider { $this->registerPolicies($gate); + $gate->define('isSuperAdmin', function($user) { + return $user->hasRole('SuperAdmin'); + }); + + $gate->define('isAdmin', function($user) { + return $user->hasRole('Admin'); + }); + + $gate->define('isUser', function($user) { + return $user->hasRole('User'); + }); + + $gate->define('isGuest', function($user) { + return $user->hasRole('Guest'); + }); + + $gate->define('isNone', function($user) { + return $user->hasRole('None'); + }); + + /* $gate->define('isSuperAdmin', function($user) { return $user->role == 'SuperAdmin'; }); @@ -45,5 +66,6 @@ class AuthServiceProvider extends ServiceProvider $gate->define('isNone', function($user) { return $user->role == 'None'; }); + */ } } diff --git a/app/User.php b/app/User.php index ef570d63d..c1cec1b7f 100644 --- a/app/User.php +++ b/app/User.php @@ -49,8 +49,6 @@ class User extends Authenticatable public function hasRole($role) { $checks = User::roles()->get(); - //$charId = User::where('character_id')->get(); - //$checks = DB::table('user_roles')->where('character_id', $charId)->get(); foreach($checks as $check) { if($check['role'] == $role) { return true; @@ -58,7 +56,6 @@ class User extends Authenticatable } return false; - //return User::where('role', $role)->get(); } public function getUserType() {