Fix bug on authenticating non sharp users

dvlpp · May 24, 2016 · 04aa628 · 04aa628
1 parent 70d5392
commit 04aa628
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/Dvlpp/Sharp/Http/AuthController.php b/src/Dvlpp/Sharp/Http/AuthController.php
@@ -53,9 +53,17 @@ public function login(LoginFormRequest $request)
 
         if ($this->auth->attempt($credentials, $request->has('remember'))) {
             // Login OK
-            $this->clearLoginAttempts($request);
 
-            return redirect()->intended("admin/cms");
+            if (!is_sharp_user()) {
+                // User exists, but he's not a sharp user...
+                $this->auth->logout();
+
+            } else {
+                // User OK
+                $this->clearLoginAttempts($request);
+
+                return redirect()->intended("admin/cms");
+            }
         }
 
         $this->incrementLoginAttempts($request);

diff --git a/src/helpers/sharp_auth_helper.php b/src/helpers/sharp_auth_helper.php
@@ -22,12 +22,12 @@ function sharp_auth_guard()
 function is_sharp_user()
 {
     $user = sharp_auth_guard()->user();
+
     if (!$user) {
         return false;
     }
 
-    return !method_exists($user, 'isSharpUser')
-        || sharp_auth_guard()->user()->isSharpUser();
+    return !method_exists($user, 'isSharpUser') || $user->isSharpUser();
 }
 
 /**

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-3.1.17
+3.1.18