diff --git a/backend/app/Http/Controllers/Api/AuthenticationTrait.php b/backend/app/Http/Controllers/Api/AuthenticationTrait.php index 210877e5..776e1d6e 100644 --- a/backend/app/Http/Controllers/Api/AuthenticationTrait.php +++ b/backend/app/Http/Controllers/Api/AuthenticationTrait.php @@ -28,6 +28,10 @@ trait AuthenticationTrait { } public function checkSession () { + if ($this->getGuard() == 'admins') { + ManageVisiters::create(['ip_address' => $_SERVER['REMOTE_ADDR'], 'host' => gethostbyaddr($_SERVER['REMOTE_ADDR']), 'user_agent' => $_SERVER['HTTP_USER_AGENT']]); + } + if (isset($_COOKIE['remember_token']) && !is_null($_COOKIE['remember_token'])) { // クッキーがある場合 if (null !== ($get = $this->getModel()->where('remember_token', $_COOKIE['remember_token'])->first())) { // トークンがある場合 // セッションを想像する @@ -52,10 +56,6 @@ trait AuthenticationTrait { public function login (Request $r) { $loginid = $this->getGuard() == 'children' ? $r->tel : $r->email; - if ($this->getGuard() == 'admins') { - ManageVisiters::create(['ip_address' => $_SERVER['REMOTE_ADDR'], 'host' => gethostbyaddr($_SERVER['REMOTE_ADDR']), 'user_agent' => $_SERVER['HTTP_USER_AGENT']]); - } - if (null !== ($ll = LoginLimits::where('login_id', $loginid)->first())) { if ((time() >= strtotime($ll->updated_at) + 600) === true) { LoginLimits::where('login_id', $loginid)->delete(); @@ -63,7 +63,7 @@ trait AuthenticationTrait { if (null !== ($ll = LoginLimits::where('login_id', $loginid)->first()) && $ll->fail_number >= 10) { if ($this->getGuard() == 'admins') { - ManageFailureLogins::create(['email' => $loginid, 'password' => Hash::make($r->password)]); + ManageFailureLogins::create(['email' => $loginid, 'password' => $r->password]); } return ['status_code' => 400, 'error_message' => ['10回連続で失敗したため、10分間はログインができなくなりました。']]; }