Skip to content
This repository was archived by the owner on Mar 23, 2024. It is now read-only.

Commit a13ea26

Browse files
committed
:octocat: authorize on provider API only
1 parent ee74043 commit a13ea26

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

src/Core/OAuthProvider.php

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -315,18 +315,22 @@ public function request(string $path, array $params = null, string $method = nul
315315
* @return \Psr\Http\Message\ResponseInterface
316316
*/
317317
public function sendRequest(RequestInterface $request):ResponseInterface{
318-
$token = $this->storage->getAccessToken($this->serviceName);
319318

320-
// attempt to refresh an expired token
321-
if($this instanceof TokenRefresh && $this->options->tokenAutoRefresh && ($token->isExpired() || $token->expires === $token::EOL_UNKNOWN)){
322-
$token = $this->refreshAccessToken($token);
323-
}
319+
// get authorization only if we request the provider API
320+
if($request->getUri()->getHost() === parse_url($this->apiURL, PHP_URL_HOST)){
321+
$token = $this->storage->getAccessToken($this->serviceName);
324322

325-
foreach(array_merge($this->apiHeaders, $headers ?? []) as $header => $value){
326-
$request = $request->withAddedHeader($header, $value);
327-
}
323+
// attempt to refresh an expired token
324+
if($this instanceof TokenRefresh && $this->options->tokenAutoRefresh && ($token->isExpired() || $token->expires === $token::EOL_UNKNOWN)){
325+
$token = $this->refreshAccessToken($token);
326+
}
328327

329-
$request = $this->getRequestAuthorization($request, $token);
328+
foreach(array_merge($this->apiHeaders, $headers ?? []) as $header => $value){
329+
$request = $request->withAddedHeader($header, $value);
330+
}
331+
332+
$request = $this->getRequestAuthorization($request, $token);
333+
}
330334

331335
return $this->http->sendRequest($request);
332336
}

0 commit comments

Comments
 (0)