Merge pull request apiato#137 from llstarscreamll/master

Fix WEB login
wangdeer · Apr 21, 2017 · 9a5d363 · 9a5d363
2 parents cbc9503 + c1accda
commit 9a5d363
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/app/Containers/Authentication/Actions/WebAdminLoginAction.php b/app/Containers/Authentication/Actions/WebAdminLoginAction.php
@@ -24,7 +24,7 @@ class WebAdminLoginAction extends Action
      */
     public function run(Request $request)
     {
-        $user = $this->call(WebLoginTask::class, [$request->email, $request->password, $request->remember_me]);
+        $user = $this->call(WebLoginTask::class, [$request->email, $request->password, $request->remember_me ?? false]);
 
         if (!$user->hasAdminRole()) {
             throw new UserNotAdminException();

diff --git a/app/Containers/Authentication/Tasks/WebLoginTask.php b/app/Containers/Authentication/Tasks/WebLoginTask.php
@@ -2,8 +2,9 @@
 
 namespace App\Containers\Authentication\Tasks;
 
-use App\Containers\Authentication\Exceptions\AuthenticationFailedException;
+use App\Containers\Authentication\Exceptions\LoginFailedException;
 use App\Ship\Parents\Tasks\Task;
+use Auth;
 
 /**
  * Class WebLoginTask.
@@ -19,10 +20,13 @@ class WebLoginTask extends Task
      *
      * @return  mixed
      */
-    public function run($email, $password, $remember = false)
+    public function run($email, $password, bool $remember = false)
     {
-        // TODO:..
-        dump('incomplete..');
+        if (!$user = Auth::attempt(['email' => $email, 'password' => $password], $remember)) {
+            throw new LoginFailedException();
+        }
+
+        return Auth::user();
     }
 
 }
diff --git a/app/Containers/Authentication/UI/WEB/Views/login.blade.php b/app/Containers/Authentication/UI/WEB/Views/login.blade.php
@@ -113,7 +113,7 @@
     <div class="login-page">
         <h1 class="center">Login</h1>
         <div class="form">
-            <form class="login-form" action="{{route('admin_login')}}" method="post">
+            <form class="login-form" action="{{route('post_admin_login_form')}}" method="post">
                 {{ csrf_field() }}
                 @if(session('status'))
                     <div class="text-red">{{ session('status') }}</div>