pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Move site config from property to parameter in LoginFormAuthenticator

Browse Source
This commit is contained in:
Yassine Guedidi
2024-11-23 11:27:18 +01:00
parent aec8e26058
commit 81d269dec1
5 changed files with 35 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Guzzle/AuthenticatorSubscriber.php
View File

@ -62,14 +62,14 @@ class AuthenticatorSubscriber implements SubscriberInterface, LoggerAwareInterfa
}
$client = $event->getClient();
$authenticator = $this->authenticatorFactory->buildFromSiteConfig($config);
$authenticator = $this->authenticatorFactory->buildFromSiteConfig();
if (!$authenticator->isLoggedIn($client)) {
if (!$authenticator->isLoggedIn($config, $client)) {
$this->logger->debug('loginIfRequired> user is not logged in, attach authenticator');
$emitter = $client->getEmitter();
$emitter->detach($this);
$authenticator->login($client);
$authenticator->login($config, $client);
$emitter->attach($this);
}
}
@ -94,8 +94,8 @@ class AuthenticatorSubscriber implements SubscriberInterface, LoggerAwareInterfa
return;
}
$authenticator = $this->authenticatorFactory->buildFromSiteConfig($config);
$isLoginRequired = $authenticator->isLoginRequired($body);
$authenticator = $this->authenticatorFactory->buildFromSiteConfig();
$isLoginRequired = $authenticator->isLoginRequired($config, $body);
$this->logger->debug('loginIfRequested> retry #' . $this->retries . ' with login ' . ($isLoginRequired ? '' : 'not ') . 'required');
@ -104,7 +104,7 @@ class AuthenticatorSubscriber implements SubscriberInterface, LoggerAwareInterfa
$emitter = $client->getEmitter();
$emitter->detach($this);
$authenticator->login($client);
$authenticator->login($config, $client);
$emitter->attach($this);
$event->retry();