🚿

Author: codemasher

src/Core/OAuth1Provider.php

@@ -115,7 +115,6 @@ protected function nonce():string{
 		$nonce = random_bytes(32);
 
 		// use the sodium extension if available
-		/** @noinspection PhpComposerExtensionStubsInspection */
 		return function_exists('sodium_bin2hex') ? sodium_bin2hex($nonce) : bin2hex($nonce);
 	}
 
@@ -175,9 +174,9 @@ public function getAccessToken(string $token, string $verifier):AccessToken{
 	 * @return \Psr\Http\Message\RequestInterface
 	 */
 	public function getRequestAuthorization(RequestInterface $request, AccessToken $token):RequestInterface{
-		$u = $request->getUri();
+		$uri = $request->getUri();
 
-		parse_str($u->getQuery(), $p);
+		parse_str($uri->getQuery(), $query);
 
 		$parameters = [
 			'oauth_consumer_key'     => $this->options->key,
@@ -188,7 +187,12 @@ public function getRequestAuthorization(RequestInterface $request, AccessToken $
 			'oauth_version'          => '1.0',
 		];
 
-		$parameters['oauth_signature'] = $this->getSignature((string)$u->withQuery('')->withFragment(''), array_merge($p, $parameters), $request->getMethod(), $token->accessTokenSecret);
+		$parameters['oauth_signature'] = $this->getSignature(
+			(string)$uri->withQuery('')->withFragment(''),
+			array_merge($query, $parameters),
+			$request->getMethod(),
+			$token->accessTokenSecret
+		);
 
 		return $request->withHeader('Authorization', 'OAuth '.Psr7\build_http_query($parameters, true, ', ', '"'));
 	}

src/Core/OAuth2ClientCredentialsTrait.php

@@ -20,7 +20,7 @@
  * @property string                                          $clientCredentialsTokenURL
  * @property string                                          $accessTokenURL
  * @property \chillerlan\OAuth\Storage\OAuthStorageInterface $storage
- * @property \chillerlan\HTTP\HTTPClientInterface            $http
+ * @property \chillerlan\HTTP\Psr18\HTTPClientInterface      $http
  * @property \Psr\Http\Message\RequestFactoryInterface       $requestFactory
  * @property \Psr\Http\Message\StreamFactoryInterface        $streamFactory
  */

src/Core/OAuth2Interface.php

@@ -12,6 +12,8 @@
 
 namespace chillerlan\OAuth\Core;
 
+use Psr\Http\Message\UriInterface;
+
 interface OAuth2Interface extends OAuthInterface{
 
 	const HEADER_OAUTH              = 0;
@@ -43,4 +45,13 @@ interface OAuth2Interface extends OAuthInterface{
 	 */
 	public function getAccessToken(string $code, string $state = null):AccessToken;
 
+	/**
+	 * @param array|null $params
+	 * @param array|null $scopes
+	 *
+	 * @return \Psr\Http\Message\UriInterface
+	 */
+	public function getAuthURL(array $params = null, array $scopes = null):UriInterface;
+
+
 }

src/Core/OAuth2Provider.php

@@ -85,7 +85,7 @@ public function getAuthURL(array $params = null, array $scopes = null):UriInterf
 	 * @throws \chillerlan\OAuth\Core\ProviderException
 	 */
 	protected function parseTokenResponse(ResponseInterface $response):AccessToken{
-		$data = json_decode($response->getBody()->getContents(), true);
+		$data = Psr7\get_json($response, true);
 
 		if(!is_array($data)){
 			throw new ProviderException('unable to parse token response');
@@ -162,10 +162,10 @@ public function getAccessToken(string $code, string $state = null):AccessToken{
 	 */
 	public function getRequestAuthorization(RequestInterface $request, AccessToken $token):RequestInterface{
 
-		if(array_key_exists($this->authMethod, $this::AUTH_METHODS_HEADER)){
+		if(array_key_exists($this->authMethod, OAuth2Interface::AUTH_METHODS_HEADER)){
 			$request = $request->withHeader('Authorization', $this::AUTH_METHODS_HEADER[$this->authMethod].$token->accessToken);
 		}
-		elseif(array_key_exists($this->authMethod, $this::AUTH_METHODS_QUERY)){
+		elseif(array_key_exists($this->authMethod, OAuth2Interface::AUTH_METHODS_QUERY)){
 			$uri = Psr7\merge_query((string)$request->getUri(), [$this::AUTH_METHODS_QUERY[$this->authMethod] => $token->accessToken]);
 
 			$request = $request->withUri($this->uriFactory->createUri($uri));

src/Core/OAuth2TokenRefreshTrait.php

@@ -20,7 +20,7 @@
  * @property string                                          $refreshTokenURL
  * @property \chillerlan\OAuth\Storage\OAuthStorageInterface $storage
  * @property \chillerlan\OAuth\OAuthOptions                  $options
- * @property \chillerlan\HTTP\HTTPClientInterface            $http
+ * @property \chillerlan\HTTP\Psr18\HTTPClientInterface      $http
  * @property \Psr\Http\Message\RequestFactoryInterface       $requestFactory
  * @property \Psr\Http\Message\StreamFactoryInterface        $streamFactory
  */

src/Core/OAuthInterface.php

@@ -38,6 +38,7 @@ public function getAuthURL(array $params = null):UriInterface;
 	 * @param \chillerlan\OAuth\Core\AccessToken $token
 	 *
 	 * @return \Psr\Http\Message\RequestInterface
+	 * @internal
 	 */
 	public function getRequestAuthorization(RequestInterface $request, AccessToken $token):RequestInterface;
 

src/OAuthOptions.php

@@ -31,10 +31,10 @@
  * HTTPOptionsTrait
  *
  * @property string     $user_agent
- * @property int        $timeout
  * @property array      $curl_options
  * @property string     $ca_info
- * @property int        $max_redirects
+ * @property bool       $ssl_verifypeer
+ * @property string     $curlHandle
  */
 class OAuthOptions extends SettingsContainerAbstract{
 	use OAuthOptionsTrait, HTTPOptionsTrait;

src/Storage/OAuthStorageInterface.php

@@ -16,7 +16,7 @@
 
 interface OAuthStorageInterface{
 
-	public const TOKEN_NONCE = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01";
+	const TOKEN_NONCE = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01";
 
 	/**
 	 * @param string                             $service

tests/API/OAuth2APITestAbstract.php

@@ -34,7 +34,7 @@ public function testRequestCredentialsToken(){
 		$token = $this->provider->getClientCredentialsToken();
 
 		$this->assertInstanceOf(AccessToken::class, $token);
-		$this->assertInternalType('string', $token->accessToken);
+		$this->assertIsString($token->accessToken);
 
 		if($token->expires !== AccessToken::EOL_NEVER_EXPIRES){
 			$this->assertGreaterThan(time(), $token->expires);
@@ -43,5 +43,4 @@ public function testRequestCredentialsToken(){
 		$this->logger->debug('OAuth2ClientCredentials', $token->toArray());
 	}
 
-
 }