Create LoginResponseInterface

src/LoginResponseInterface.php

@@ -0,0 +1,17 @@
+<?php
+declare(strict_types=1);
+
+namespace Firehed\U2F;
+
+interface LoginResponseInterface
+{
+ public function getChallengeProvider(): ChallengeProvider;
+
+ public function getCounter(): int;
+
+ public function getKeyHandleBinary(): string;
+
+ public function getSignature(): string;
+
+ public function getSignedData(): string;
+}

src/Server.php

@@ -49,19 +49,19 @@ class Server
  private $signRequests = [];
 
  /**
- * This method authenticates a `SignResponse` against outstanding
+ * This method authenticates a `LoginResponseInterface` against outstanding
  * registrations and their corresponding `SignRequest`s. If the response's
  * signature validates and the counter hasn't done anything strange, the
  * registration will be returned with an updated counter value, which *must*
  * be persisted for the next authentication. If any verification component
  * fails, a `SE` will be thrown.
  *
- * @param SignResponse $response the parsed response from the user
+ * @param LoginResponseInterface $response the parsed response from the user
  * @return RegistrationInterface if authentication succeeds
  * @throws SE if authentication fails
  * @throws BadMethodCallException if a precondition is not met
  */
- public function authenticate(SignResponse $response): RegistrationInterface
+ public function authenticate(LoginResponseInterface $response): RegistrationInterface
  {
  if (!$this->registrations) {
  throw new BadMethodCallException(
@@ -105,7 +105,7 @@ public function authenticate(SignResponse $response): RegistrationInterface
  // match the one in the signing request, the client signed the
  // wrong thing. This could possibly be an attempt at a replay
  // attack.
- $this->validateChallenge($response->getClientData(), $request);
+ $this->validateChallenge($response->getChallengeProvider(), $request);
 
  $pem = $registration->getPublicKeyPem();
 

src/SignResponse.php

@@ -5,7 +5,7 @@
 
 use Firehed\U2F\InvalidDataException as IDE;
 
-class SignResponse
+class SignResponse implements LoginResponseInterface
 {
  use ResponseTrait;
 
@@ -72,4 +72,9 @@ public function getSignedData(): string
  $this->getClientData()->getChallengeParameter()
  );
  }
+
+ public function getChallengeProvider(): ChallengeProvider
+ {
+ return $this->getClientData();
+ }
 }