From 39a3d7cc07ce567ef1df6d86b0baaed2f3eafe29 Mon Sep 17 00:00:00 2001
From: drkthunder02 <mancuso.christopher@gmail.com>
Date: Wed, 9 Jan 2019 01:37:20 -0600
Subject: [PATCH] allowed login models and update of login controller

---
 app/Providers/AuthServiceProvider.php | 68 +++++++++++++++------------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index ac3352dab..3b3755767 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -32,57 +32,63 @@ class AuthServiceProvider extends ServiceProvider
         $this->registerPolicies($gate);
 
         $gate->define('isAdmin', function($user) {
-            
-            $check = UserPermission::where('character_id', auth()->user()->character_id)->get(['role']);
-            if($check[0]-> role === 'role.admin') {
-                return true;
-            } else {
-                return false;
+            $permission = false;
+            $perms = UserPermission::where('character_id', auth()->user()->character_id)->get(['permission']);
+            foreach($perms as $perm) {
+                if($perm === 'role.admin') {
+                    $permission = true;
+                }
             }
             
+            return $permission;
         });
 
         $gate->define('isDirector', function($user) {
-           
-            $check = UserPermission::where('character_id', auth()->user()->character_id)->get(['role']);
-            if($check[0]-> role === 'role.director') {
-                return true;
-            } else {
-                return false;
+            $permission = false;
+            $perms = UserPermission::where('character_id', auth()->user()->character_id)->get(['permission']);
+            foreach($perms as $perm) {
+                if($perm === 'role.director') {
+                    $permission = true;
+                }
             }
-           
+            
+            return $permission;           
         });
 
         $gate->define('isUser', function($user) {
-            
-            $check = UserPermission::where('character_id', auth()->user()->character_id)->get(['role']);
-            if($check[0]-> role === 'role.user') {
-                return true;
-            } else {
-                return false;
+            $permission = false;
+            $perms = UserPermission::where('character_id', auth()->user()->character_id)->get(['permission']);
+            foreach($perms as $perm) {
+                if($perm === 'role.user') {
+                    $permission = true;
+                }
             }
             
+            return $permission;            
         });
 
         $gate->define('isGuest', function($user) {
-           
-            $check = UserPermission::where('character_id', auth()->user()->character_id)->get(['role']);
-            if($check[0]-> role === 'role.guest') {
-                return true;
-            } else {
-                return false;
+            $permission = false;
+            $perms = UserPermission::where('character_id', auth()->user()->character_id)->get(['permission']);
+            foreach($perms as $perm) {
+                if($perm === 'role.guest') {
+                    $permission = true;
+                }
             }
             
+            return $permission;
         });
 
         $gate->define('isNone', function($user) {
-            
-            $check = UserPermission::where('character_id', auth()->user()->character_id)->get(['role']);
-            if($check[0]-> role === 'role.none') {
-                return true;
-            } else {
-                return false;
+            $permission = false;
+            $perms = UserPermission::where('character_id', auth()->user()->character_id)->get(['permission']);
+            foreach($perms as $perm) {
+                if($perm === 'role.none') {
+                    $permission = true;
+                }
             }
+            
+            return $permission;
         });
     }
 }