Set isAgent() and isAdmin() as dynamic methods

Author: xaviqv

src/Controllers/InstallController.php

@@ -28,6 +28,19 @@ public function __construct()
         }
     }
 
+	/*
+	 * Load member instance and Return true if auth() user has admin permissions
+	 *
+	 */
+	public function auth_member_is_admin()
+	{
+		if (auth()->check()){
+			$member = \PanicHDMember::findOrFail(auth()->user()->id);
+			return $member->isAdmin();
+		}else
+			return false;
+	}
+
     /*
      * Initial install form
      */
@@ -78,9 +91,12 @@ public function index()
 				}
 
 				return view('panichd::install.index', compact('inactive_migrations', 'previous_ticketit', 'quickstart'));
+			
 			}elseif(!$this->isUpdated()){
+				
+				
 				// Panic Help Desk requires an upgrade
-				if ( \PanicHDMember::isAdmin()){
+				if ($this->auth_member_is_admin()){
 					return view('panichd::install.upgrade', [
 						'inactive_migrations' => $inactive_migrations,
 						'inactive_settings' => $this->inactiveSettings(),
@@ -104,7 +120,7 @@ public function index()
 	*/
 	public function upgrade_menu()
 	{
-		if (!$this->isInstalled() or !\PanicHDMember::isAdmin()){
+		if (!$this->isInstalled() or !$this->auth_member_is_admin()){
 			return redirect()->route('panichd.install.setup');
 		}
 
@@ -205,7 +221,7 @@ public function setup(Request $request)
      */
 	public function upgrade(Request $request)
 	{
-		if ( \PanicHDMember::isAdmin()){
+		if ($this->auth_member_is_admin()){
 			// Migrations and Settings
 			$this->initialSettings();
 

src/Middleware/IsAdminMiddleware.php

@@ -16,7 +16,9 @@ class IsAdminMiddleware
      */
     public function handle($request, Closure $next)
     {
-        if (\PanicHDMember::isAdmin()) {
+        $member = \PanicHDMember::findOrFail(auth()->user()->id);
+        
+        if ($member->isAdmin()) {
             return $next($request);
         }
 

src/Middleware/IsAgentMiddleware.php

@@ -16,7 +16,9 @@ class IsAgentMiddleware
      */
     public function handle($request, Closure $next)
     {
-        if (\PanicHDMember::isAgent() || \PanicHDMember::isAdmin()) {
+        $member = \PanicHDMember::findOrFail(auth()->user()->id);
+
+        if ($member->isAgent() || $member->isAdmin()) {
             return $next($request);
         }
 

src/Models/Member.php

@@ -86,35 +86,23 @@ public function scopeAgentsLists($query)
     }
 
     /**
-     * Check if user is agent.
+     * Check if auth() member is agent.
      *
      * @return bool
      */
-    public static function isAgent($id = null)
+    public function isAgent()
     {
-        if (isset($id)) {
-            $user = \PanicHDMember::find($id);
-            if ($user->panichd_agent) {
-                return true;
-            }
-
-            return false;
-        }
-        if (auth()->check()) {
-            if (auth()->user()->panichd_agent) {
-                return true;
-            }
-        }
+        return $this->panichd_agent;
     }
 
     /**
-     * Check if user is admin.
+     * Check if auth() member is admin.
      *
      * @return bool
      */
-    public static function isAdmin()
+    public function isAdmin()
     {
-        return auth()->check() && auth()->user()->panichd_admin;
+        return $this->panichd_admin;
     }
 
     /**