OAuth1Provider: extract sendRequestTokenRequest() and sendAccessTokenRequest() to simplify mock tests

Author: codemasher

src/Core/OAuth1Interface.php

@@ -32,6 +32,6 @@ public function getRequestToken():AccessToken;
 	 *
 	 * @see https://datatracker.ietf.org/doc/html/rfc5849#section-2.3
 	 */
-	public function getAccessToken(string $token, string $verifier):AccessToken;
+	public function getAccessToken(string $requestToken, string $verifier):AccessToken;
 
 }

src/Core/OAuth1Provider.php

@@ -53,9 +53,17 @@ public function getRequestToken():AccessToken{
 
 		$params['oauth_signature'] = $this->getSignature($this->requestTokenURL, $params, 'POST');
 
+		return $this->parseTokenResponse($this->sendRequestTokenRequest($params), true);
+	}
+
+	/**
+	 * Sends a request to the request token endpoint with the given params
+	 */
+	protected function sendRequestTokenRequest(array $requestTokenRequestParams):ResponseInterface{
+
 		$request = $this->requestFactory
 			->createRequest('POST', $this->requestTokenURL)
-			->withHeader('Authorization', 'OAuth '.QueryUtil::build($params, null, ', ', '"'))
+			->withHeader('Authorization', 'OAuth '.QueryUtil::build($requestTokenRequestParams, null, ', ', '"'))
 			->withHeader('Accept-Encoding', 'identity') // try to avoid compression
 			->withHeader('Content-Length', '0') // tumblr requires a content-length header set
 		;
@@ -64,7 +72,7 @@ public function getRequestToken():AccessToken{
 			$request = $request->withHeader($header, $value);
 		}
 
-		return $this->parseTokenResponse($this->http->sendRequest($request), true);
+		return $this->http->sendRequest($request);
 	}
 
 	/**
@@ -153,18 +161,30 @@ protected function getSignature(
 
 	/**
 	 * @inheritDoc
+	 * @throws \chillerlan\OAuth\Providers\ProviderException
+	 */
+	public function getAccessToken(string $requestToken, string $verifier):AccessToken{
+		$token = $this->storage->getAccessToken($this->serviceName);
+
+		if($requestToken !== $token->accessToken){
+			throw new ProviderException('request token mismatch');
+		}
+
+		return $this->parseTokenResponse($this->sendAccessTokenRequest($token, $verifier), false);
+	}
+
+	/**
+	 * Sends the access token request
 	 */
-	public function getAccessToken(string $token, string $verifier):AccessToken{
+	protected function sendAccessTokenRequest(AccessToken $token, string $verifier):ResponseInterface{
 
 		$request = $this->requestFactory
 			->createRequest('POST', QueryUtil::merge($this->accessTokenURL, ['oauth_verifier' => $verifier]))
 			->withHeader('Accept-Encoding', 'identity')
 			->withHeader('Content-Length', '0')
 		;
 
-		$request = $this->getRequestAuthorization($request, $this->storage->getAccessToken($this->serviceName));
-
-		return $this->parseTokenResponse($this->http->sendRequest($request), false);
+		return $this->http->sendRequest($this->getRequestAuthorization($request, $token));
 	}
 
 	/**