Skip to content

Commit 7689ebe

Browse files
committed
fixed updating login logs
Signed-off-by: Claudiu Pintiuta <claudiupintiuta@gmail.com>
1 parent e0a99b9 commit 7689ebe

3 files changed

Lines changed: 13 additions & 7 deletions

File tree

src/Admin/src/Controller/AdminController.php

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,13 @@ public function loginAction(): ResponseInterface
244244
$adapter->setIdentity($data['username']);
245245
$adapter->setCredential($data['password']);
246246
$authResult = $this->authenticationService->authenticate();
247-
$logAdmin = $this->adminService->logAdminVisit($this->getServerParams(), $data['username']);
248247
if ($authResult->isValid()) {
249248
$identity = $authResult->getIdentity();
250-
$logAdmin->setLoginStatus(AdminLogin::LOGIN_SUCCESS);
251-
$this->adminService->getAdminRepository()->saveAdminVisit($logAdmin);
249+
$this->adminService->logAdminVisit(
250+
$this->getServerParams(),
251+
$data['username'],
252+
AdminLogin::LOGIN_SUCCESS
253+
);
252254
if ($identity->getStatus() === Admin::STATUS_INACTIVE) {
253255
$this->authenticationService->clearIdentity();
254256
$this->messenger->addError('Admin is inactive', 'user-login');
@@ -260,8 +262,11 @@ public function loginAction(): ResponseInterface
260262

261263
return new RedirectResponse($this->router->generateUri('dashboard'));
262264
} else {
263-
$logAdmin->setLoginStatus(AdminLogin::LOGIN_FAIL);
264-
$this->adminService->getAdminRepository()->saveAdminVisit($logAdmin);
265+
$this->adminService->logAdminVisit(
266+
$this->getServerParams(),
267+
$data['username'],
268+
AdminLogin::LOGIN_FAIL
269+
);
265270
$this->messenger->addData('shouldRebind', true);
266271
$this->forms->saveState($form);
267272
$this->messenger->addError($authResult->getMessages(), 'user-login');

src/Admin/src/Service/AdminService.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public function updateAdmin(Admin $admin, array $data): Admin
193193
return $admin;
194194
}
195195

196-
public function logAdminVisit(array $serverParams, string $name): AdminLogin
196+
public function logAdminVisit(array $serverParams, string $name, string $status): AdminLogin
197197
{
198198
/**
199199
* For device information
@@ -228,6 +228,7 @@ public function logAdminVisit(array $serverParams, string $name): AdminLogin
228228
->setClientName(null)
229229
->setClientEngine(null)
230230
->setClientVersion(null)
231+
->setLoginStatus($status)
231232
->setIdentity($name);
232233

233234
return $this->adminRepository->saveAdminVisit($adminLogin);

src/Admin/src/Service/AdminServiceInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function createAdmin(array $data): Admin;
5050
*/
5151
public function updateAdmin(Admin $admin, array $data): Admin;
5252

53-
public function logAdminVisit(array $serverParams, string $name): AdminLogin;
53+
public function logAdminVisit(array $serverParams, string $name, string $status): AdminLogin;
5454

5555
public function getAdminFormProcessedRoles(): array;
5656
}

0 commit comments

Comments
 (0)