oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

Make LoginFormAuthenticator a service and remove Factory

Browse source
This commit is contained in:
Yassine Guedidi 2024-11-23 18:47:08 +01:00
parent 81d269dec1
commit 0c49aee192
4 changed files with 30 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/Guzzle/AuthenticatorSubscriber.php
View file

@ -9,7 +9,7 @@ use GuzzleHttp\Message\RequestInterface;
use Psr\Log\LoggerAwareInterface;
use Psr\Log\LoggerInterface;
use Psr\Log\NullLogger;
use Wallabag\SiteConfig\Authenticator\Factory;
use Wallabag\SiteConfig\Authenticator\Authenticator;
use Wallabag\SiteConfig\SiteConfig;
use Wallabag\SiteConfig\SiteConfigBuilder;
@ -23,8 +23,8 @@ class AuthenticatorSubscriber implements SubscriberInterface, LoggerAwareInterfa
/** @var SiteConfigBuilder */
private $configBuilder;
/** @var Factory */
private $authenticatorFactory;
/** @var Authenticator */
private $authenticator;
/** @var LoggerInterface */
private $logger;
@ -32,10 +32,10 @@ class AuthenticatorSubscriber implements SubscriberInterface, LoggerAwareInterfa
/**
* AuthenticatorSubscriber constructor.
*/
public function __construct(SiteConfigBuilder $configBuilder, Factory $authenticatorFactory)
public function __construct(SiteConfigBuilder $configBuilder, Authenticator $authenticator)
{
$this->configBuilder = $configBuilder;
$this->authenticatorFactory = $authenticatorFactory;
$this->authenticator = $authenticator;
$this->logger = new NullLogger();
}
@ -62,14 +62,13 @@ class AuthenticatorSubscriber implements SubscriberInterface, LoggerAwareInterfa
}
$client = $event->getClient();
$authenticator = $this->authenticatorFactory->buildFromSiteConfig();
if (!$authenticator->isLoggedIn($config, $client)) {
if (!$this->authenticator->isLoggedIn($config, $client)) {
$this->logger->debug('loginIfRequired> user is not logged in, attach authenticator');
$emitter = $client->getEmitter();
$emitter->detach($this);
$authenticator->login($config, $client);
$this->authenticator->login($config, $client);
$emitter->attach($this);
}
}
@ -94,8 +93,7 @@ class AuthenticatorSubscriber implements SubscriberInterface, LoggerAwareInterfa
return;
}
$authenticator = $this->authenticatorFactory->buildFromSiteConfig();
$isLoginRequired = $authenticator->isLoginRequired($config, $body);
$isLoginRequired = $this->authenticator->isLoginRequired($config, $body);
$this->logger->debug('loginIfRequested> retry #' . $this->retries . ' with login ' . ($isLoginRequired ? '' : 'not ') . 'required');
@ -104,7 +102,7 @@ class AuthenticatorSubscriber implements SubscriberInterface, LoggerAwareInterfa
$emitter = $client->getEmitter();
$emitter->detach($this);
$authenticator->login($config, $client);
$this->authenticator->login($config, $client);
$emitter->attach($this);
$event->retry();

21
src/SiteConfig/Authenticator/Factory.php
View file

@ -1,21 +0,0 @@
<?php
namespace Wallabag\SiteConfig\Authenticator;
use Wallabag\SiteConfig\SiteConfig;
/**
* Builds an Authenticator based on a SiteConfig.
*/
class Factory
{
/**
* @return Authenticator
*
* @throw \OutOfRangeException if there are no credentials for this host
*/
public function buildFromSiteConfig()
{
return new LoginFormAuthenticator();
}
}

2
src/SiteConfig/Authenticator/LoginFormAuthenticator.php
View file

@ -16,7 +16,7 @@ class LoginFormAuthenticator implements Authenticator
$postFields = [
$siteConfig->getUsernameField() => $siteConfig->getUsername(),
$siteConfig->getPasswordField() => $siteConfig->getPassword(),
] + $this->getExtraFields($guzzle);
] + $this->getExtraFields($siteConfig, $guzzle);
$guzzle->post(
$siteConfig->getLoginUri(),