mirror of
https://github.com/wallabag/wallabag.git
synced 2024-12-15 18:00:36 +01:00
Improved Guzzle subscribers extensibility
Allows 3rd parties to register new guzzle subscribers by adding extra calls to the http_client_factory service.
This commit is contained in:
parent
cebed9c01f
commit
5b914b0422
@ -13,8 +13,8 @@ use Psr\Log\LoggerInterface;
|
||||
*/
|
||||
class HttpClientFactory
|
||||
{
|
||||
/** @var \GuzzleHttp\Event\SubscriberInterface */
|
||||
private $authenticatorSubscriber;
|
||||
/** @var [\GuzzleHttp\Event\SubscriberInterface] */
|
||||
private $subscribers = [];
|
||||
|
||||
/** @var \GuzzleHttp\Cookie\CookieJar */
|
||||
private $cookieJar;
|
||||
@ -25,14 +25,12 @@ class HttpClientFactory
|
||||
/**
|
||||
* HttpClientFactory constructor.
|
||||
*
|
||||
* @param \GuzzleHttp\Event\SubscriberInterface $authenticatorSubscriber
|
||||
* @param \GuzzleHttp\Cookie\CookieJar $cookieJar
|
||||
* @param string $restrictedAccess this param is a kind of boolean. Values: 0 or 1
|
||||
* @param \GuzzleHttp\Cookie\CookieJar $cookieJar
|
||||
* @param string $restrictedAccess This param is a kind of boolean. Values: 0 or 1
|
||||
* @param LoggerInterface $logger
|
||||
*/
|
||||
public function __construct(SubscriberInterface $authenticatorSubscriber, CookieJar $cookieJar, $restrictedAccess, LoggerInterface $logger)
|
||||
public function __construct(CookieJar $cookieJar, $restrictedAccess, LoggerInterface $logger)
|
||||
{
|
||||
$this->authenticatorSubscriber = $authenticatorSubscriber;
|
||||
$this->cookieJar = $cookieJar;
|
||||
$this->restrictedAccess = $restrictedAccess;
|
||||
$this->logger = $logger;
|
||||
@ -53,8 +51,20 @@ class HttpClientFactory
|
||||
$this->cookieJar->clear();
|
||||
// need to set the (shared) cookie jar
|
||||
$client = new Client(['handler' => new SafeCurlHandler(), 'defaults' => ['cookies' => $this->cookieJar]]);
|
||||
$client->getEmitter()->attach($this->authenticatorSubscriber);
|
||||
foreach ($this->subscribers as $subscriber) {
|
||||
$client->getEmitter()->attach($subscriber);
|
||||
}
|
||||
|
||||
return $client;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a subscriber to the HTTP client.
|
||||
*
|
||||
* @param SubscriberInterface $subscriber
|
||||
*/
|
||||
public function addSubscriber(SubscriberInterface $subscriber)
|
||||
{
|
||||
$this->subscribers[] = $subscriber;
|
||||
}
|
||||
}
|
||||
|
@ -71,10 +71,11 @@ services:
|
||||
wallabag_core.guzzle.http_client_factory:
|
||||
class: Wallabag\CoreBundle\Helper\HttpClientFactory
|
||||
arguments:
|
||||
- "@bd_guzzle_site_authenticator.authenticator_subscriber"
|
||||
- "@wallabag_core.guzzle.cookie_jar"
|
||||
- '@=service(''craue_config'').get(''restricted_access'')'
|
||||
- '@logger'
|
||||
calls:
|
||||
- ["addSubscriber", ["@bd_guzzle_site_authenticator.authenticator_subscriber"]]
|
||||
|
||||
wallabag_core.guzzle.cookie_jar:
|
||||
class: GuzzleHttp\Cookie\FileCookieJar
|
||||
|
Loading…
Reference in New Issue
Block a user