Skip to content

Commit 21c0fcc

Browse files
committed
refactor: extract startLogin(), completeLogin() methods
1 parent 26a7a3c commit 21c0fcc

File tree

1 file changed

+24
-10
lines changed

1 file changed

+24
-10
lines changed

src/Authentication/Authenticators/Session.php

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,7 @@ public function attempt(array $credentials): Result
102102
if (! empty($actionClass)) {
103103
session()->set('auth_action', $actionClass);
104104
} else {
105-
// a successful login
106-
Events::trigger('login', $user);
105+
$this->completeLogin($user);
107106
}
108107

109108
return $result;
@@ -140,12 +139,17 @@ public function checkAction(string $type, string $token): bool
140139

141140
$this->user = $user;
142141

143-
// a successful login
144-
Events::trigger('login', $user);
142+
$this->completeLogin($user);
145143

146144
return true;
147145
}
148146

147+
private function completeLogin(User $user): void
148+
{
149+
// a successful login
150+
Events::trigger('login', $user);
151+
}
152+
149153
/**
150154
* Activate a User
151155
*/
@@ -308,13 +312,8 @@ private function checkRememberMeToken(string $remember)
308312
return $token;
309313
}
310314

311-
/**
312-
* Logs the given user in.
313-
*/
314-
public function login(User $user): void
315+
private function startLogin(User $user): void
315316
{
316-
$this->user = $user;
317-
318317
// Update the user's last used date on their password identity.
319318
$this->user->touchIdentity($this->user->getEmailIdentity());
320319

@@ -331,7 +330,22 @@ public function login(User $user): void
331330

332331
// When logged in, ensure cache control headers are in place
333332
$response->noCache();
333+
}
334+
335+
/**
336+
* Logs the given user in.
337+
*/
338+
public function login(User $user): void
339+
{
340+
$this->user = $user;
341+
342+
$this->startLogin($user);
334343

344+
$this->processRemember();
345+
}
346+
347+
private function processRemember()
348+
{
335349
if ($this->shouldRemember && setting('Auth.sessionConfig')['allowRemembering']) {
336350
$this->rememberUser($this->user->getAuthId());
337351

0 commit comments

Comments
 (0)