Skip to content

Commit 1f32700

Browse files
chore: Add PR's requested changes
1 parent 82e8fbc commit 1f32700

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

app/Strategies/MFA/EmailOTPMFAChallengeStrategy.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Auth\Repositories\IUserRecoveryCodeRepository;
66
use Auth\User;
77
use Models\OAuth2\Client;
8+
use Models\OAuth2\OAuth2OTP;
89
use OAuth2\OAuth2Protocol;
910
use OAuth2\Services\ITokenService;
1011

@@ -34,13 +35,9 @@ public function issueChallenge(User $user, ?Client $client, bool $remember): arr
3435
];
3536
}
3637

37-
public function verifyChallenge(User $user, string $code): void
38+
public function verifyChallenge(User $user, string $code, ?Client $client = null): void
3839
{
39-
$otp = $this->otp_repository->getByValueConnectionAndUserName(
40-
$code,
41-
OAuth2Protocol::OAuth2PasswordlessConnectionEmail,
42-
$user->getEmail()
43-
);
40+
$otp = OAuth2OTP::fromParams($user->getEmail(), OAuth2Protocol::OAuth2PasswordlessConnectionEmail, $code);
4441

4542
if (is_null($otp)) {
4643
throw new AuthenticationException("Non existent single-use code.");

app/Strategies/MFA/IMFAChallengeStrategy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
interface IMFAChallengeStrategy
77
{
88
public function issueChallenge(User $user, ?Client $client, bool $remember): array;
9-
public function verifyChallenge(User $user, string $code): void;
9+
public function verifyChallenge(User $user, string $code, ?Client $client = null): void;
1010
public function resendChallenge(User $user, ?Client $client, bool $remember): array;
1111
public function getPendingState(): ?array;
1212
public function clearPendingState(): void;

0 commit comments

Comments
 (0)