wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

do not hard-require the token provider

Browse source 
The provider might need DB access and therefore depenedency
resolution fails on the setup page where we cannot inject
the db implementation.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst 2017-01-02 11:57:05 +01:00 committed by Roeland Jago Douma
parent 6f74ecd94a
commit 21d3fe5883
No known key found for this signature in database
GPG key ID: F941078878347C0C
3 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/private/Authentication/LoginCredentials/Store.php
View file

@ -40,21 +40,21 @@ class Store implements IStore {
/** @var ISession */
private $session;
/** @var IProvider */
private $tokenProvider;
/** @var ILogger */
private $logger;
/** @var IProvider|null */
private $tokenProvider;
/**
* @param ISession $session
* @param IProvider $tokenProvider
* @param ILogger $logger
* @param IProvider $tokenProvider
*/
public function __construct(ISession $session, IProvider $tokenProvider, ILogger $logger) {
public function __construct(ISession $session, ILogger $logger, IProvider $tokenProvider = null) {
$this->session = $session;
$this->tokenProvider = $tokenProvider;
$this->logger = $logger;
$this->tokenProvider = $tokenProvider;
Util::connectHook('OC_User', 'post_login', $this, 'authenticate');
}
@ -84,6 +84,10 @@ class Store implements IStore {
* @throws CredentialsUnavailableException
*/
public function getLoginCredentials() {
if (is_null($this->tokenProvider)) {
throw new CredentialsUnavailableException();
}
$trySession = false;
try {
$sessionId = $this->session->getId();

8
lib/private/Server.php
View file

@ -250,9 +250,13 @@ class Server extends ServerContainer implements IServerContainer {
});
$this->registerService(Store::class, function(Server $c) {
$session = $c->getSession();
$tokenProvider = $c->query('OC\Authentication\Token\DefaultTokenProvider');
if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
$tokenProvider = $c->query('OC\Authentication\Token\IProvider');
} else {
$tokenProvider = null;
}
$logger = $c->getLogger();
return new Store($session, $tokenProvider, $logger);
return new Store($session, $logger, $tokenProvider);
});
$this->registerAlias(IStore::class, Store::class);
$this->registerService('OC\Authentication\Token\DefaultTokenMapper', function (Server $c) {

10
tests/lib/Authentication/LoginCredentials/StoreTest.php
View file

@ -58,7 +58,7 @@ class StoreTest extends TestCase {
$this->tokenProvider = $this->createMock(IProvider::class);
$this->logger = $this->createMock(ILogger::class);
$this->store = new Store($this->session, $this->tokenProvider, $this->logger);
$this->store = new Store($this->session, $this->logger, $this->tokenProvider);
}
public function testAuthenticate() {
@ -81,6 +81,14 @@ class StoreTest extends TestCase {
$this->store->setSession($session);
}
public function testGetLoginCredentialsNoTokenProvider() {
$this->store = new Store($this->session, $this->logger, null);
$this->expectException(CredentialsUnavailableException::class);
$this->store->getLoginCredentials();
}
public function testGetLoginCredentials() {
$uid = 'uid';
$user = 'user123';