chore: Add PR's requested changes

Author: matiasperrone-exo

app/Strategies/MFA/AbstractMFAChallengeStrategy.php

@@ -5,6 +5,7 @@
 use Auth\User;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Session;
+use Models\OAuth2\Client;
 
 abstract class AbstractMFAChallengeStrategy implements IMFAChallengeStrategy
 {
@@ -62,4 +63,13 @@ protected function storePendingState(int $userId, bool $remember): void
         Session::put(self::KEY_PENDING_AT, time());
         Session::put(self::KEY_REMEMBER,   $remember);
     }
+
+    public function verifyChallenge(User $user, string $code, ?Client $client = null): void
+    {
+    }
+
+    public function issueChallenge(User $user, ?Client $client, bool $remember): array
+    {
+        return [];
+    }
 }

app/Strategies/MFA/EmailOTPMFAChallengeStrategy.php

@@ -5,6 +5,7 @@
 use Auth\Repositories\IUserRecoveryCodeRepository;
 use Auth\User;
 use Models\OAuth2\Client;
+use Models\OAuth2\OAuth2OTP;
 use OAuth2\OAuth2Protocol;
 use OAuth2\Services\ITokenService;
 
@@ -34,13 +35,9 @@ public function issueChallenge(User $user, ?Client $client, bool $remember): arr
         ];
     }
 
-    public function verifyChallenge(User $user, string $code): void
+    public function verifyChallenge(User $user, string $code, ?Client $client = null): void
     {
-        $otp = $this->otp_repository->getByValueConnectionAndUserName(
-            $code,
-            OAuth2Protocol::OAuth2PasswordlessConnectionEmail,
-            $user->getEmail()
-        );
+        $otp = OAuth2OTP::fromParams($user->getEmail(), OAuth2Protocol::OAuth2PasswordlessConnectionEmail, $code);
 
         if (is_null($otp)) {
             throw new AuthenticationException("Non existent single-use code.");

app/Strategies/MFA/IMFAChallengeStrategy.php

@@ -6,7 +6,7 @@
 interface IMFAChallengeStrategy
 {
     public function issueChallenge(User $user, ?Client $client, bool $remember): array;
-    public function verifyChallenge(User $user, string $code): void;
+    public function verifyChallenge(User $user, string $code, ?Client $client = null): void;
     public function resendChallenge(User $user, ?Client $client, bool $remember): array;
     public function getPendingState(): ?array;
     public function clearPendingState(): void;

tests/Unit/MFA/AbstractMFAChallengeStrategyTest.php

@@ -19,7 +19,7 @@ protected function setUp(): void
         $repo = \Mockery::mock(IUserRecoveryCodeRepository::class);
         $this->strategy = new class($repo) extends AbstractMFAChallengeStrategy {
             public function issueChallenge(User $user, ?Client $client, bool $remember): array { return []; }
-            public function verifyChallenge(User $user, string $code): void {}
+            public function verifyChallenge(User $user, string $code, ?Client $client = null): void {}
             public function resendChallenge(User $user, ?Client $client, bool $remember): array { return []; }
             public function exposeStorePendingState(int $userId, bool $remember): void {
                 $this->storePendingState($userId, $remember);
@@ -93,7 +93,7 @@ public function testVerifyRecoveryCode_withMatchingCode_marksAsUsed(): void
 
         $strategy = new class($repo) extends AbstractMFAChallengeStrategy {
             public function issueChallenge(User $user, ?Client $client, bool $remember): array { return []; }
-            public function verifyChallenge(User $user, string $code): void {}
+            public function verifyChallenge(User $user, string $code, ?Client $client = null): void {}
             public function resendChallenge(User $user, ?Client $client, bool $remember): array { return []; }
         };
 
@@ -114,7 +114,7 @@ public function testVerifyRecoveryCode_withNonMatchingCode_throwsException(): vo
 
         $strategy = new class($repo) extends AbstractMFAChallengeStrategy {
             public function issueChallenge(User $user, ?Client $client, bool $remember): array { return []; }
-            public function verifyChallenge(User $user, string $code): void {}
+            public function verifyChallenge(User $user, string $code, ?Client $client = null): void {}
             public function resendChallenge(User $user, ?Client $client, bool $remember): array { return []; }
         };
 
@@ -132,7 +132,7 @@ public function testVerifyRecoveryCode_withAllCodesUsed_throwsException(): void
 
         $strategy = new class($repo) extends AbstractMFAChallengeStrategy {
             public function issueChallenge(User $user, ?Client $client, bool $remember): array { return []; }
-            public function verifyChallenge(User $user, string $code): void {}
+            public function verifyChallenge(User $user, string $code, ?Client $client = null): void {}
             public function resendChallenge(User $user, ?Client $client, bool $remember): array { return []; }
         };