mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Store user bucket in preferences

This commit is contained in:
Roeland Jago Douma 2016-05-23 21:03:25 +02:00
parent e03e4921a0
commit abe338f433
No known key found for this signature in database
GPG Key ID: 1E152838F164D13B
3 changed files with 98 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.htaccess
View File

@ -72,7 +72,3 @@ Options -Indexes
<IfModule pagespeed_module>
ModPagespeed Off
</IfModule>
#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####
ErrorDocument 403 /core/templates/403.php
ErrorDocument 404 /core/templates/404.php

24
lib/private/Files/Mount/ObjectHomeMountProvider.php
View File

@ -108,15 +108,23 @@ class ObjectHomeMountProvider implements IHomeMountProvider {
}
$config['arguments']['user'] = $user;
/*
* Use any provided bucket argument as prefix
* and add the mapping from username => bucket
*/
if (!isset($config['arguments']['bucket'])) {
$config['arguments']['bucket'] = '';
$bucket = $this->config->getUserValue($user->getUID(), 'homeobjectstore', 'bucket', null);
if ($bucket === null) {
/*
* Use any provided bucket argument as prefix
* and add the mapping from username => bucket
*/
if (!isset($config['arguments']['bucket'])) {
$config['arguments']['bucket'] = '';
}
$mapper = new \OC\Files\ObjectStore\Mapper($user);
$config['arguments']['bucket'] .= $mapper->getBucket();
$this->config->setUserValue($user->getUID(), 'homeobjectstore', 'bucket', $config['arguments']['bucket']);
} else {
$config['arguments']['bucket'] = $bucket;
}
$mapper = new \OC\Files\ObjectStore\Mapper($user);
$config['arguments']['bucket'] .= $mapper->getBucket();
// instantiate object store implementation
$config['arguments']['objectstore'] = new $config['class']($config['arguments']);

90
tests/lib/Files/Mount/ObjectHomeMountProviderTest.php
View File

@ -61,11 +61,29 @@ class ObjectHomeMountProviderTest extends \Test\TestCase {
'class' => 'Test\Files\Mount\FakeObjectStore',
]);
$this->user->expects($this->once())
->method('getUID')
$this->user->method('getUID')
->willReturn('uid');
$this->loader->expects($this->never())->method($this->anything());
$this->config->expects($this->once())
->method('getUserValue')
->with(
$this->equalTo('uid'),
$this->equalTo('homeobjectstore'),
$this->equalTo('bucket'),
$this->equalTo(null)
)->willReturn(null);
$this->config->expects($this->once())
->method('setUserValue')
->with(
$this->equalTo('uid'),
$this->equalTo('homeobjectstore'),
$this->equalTo('bucket'),
$this->equalTo('987'),
$this->equalTo(null)
);
$config = $this->invokePrivate($this->provider, 'getMultiBucketObjectStoreConfig', [$this->user, $this->loader]);
$this->assertArrayHasKey('class', $config);
@ -90,11 +108,29 @@ class ObjectHomeMountProviderTest extends \Test\TestCase {
],
]);
$this->user->expects($this->once())
->method('getUID')
$this->user->method('getUID')
->willReturn('uid');
$this->loader->expects($this->never())->method($this->anything());
$this->config->expects($this->once())
->method('getUserValue')
->with(
$this->equalTo('uid'),
$this->equalTo('homeobjectstore'),
$this->equalTo('bucket'),
$this->equalTo(null)
)->willReturn(null);
$this->config->expects($this->once())
->method('setUserValue')
->with(
$this->equalTo('uid'),
$this->equalTo('homeobjectstore'),
$this->equalTo('bucket'),
$this->equalTo('myBucketPrefix987'),
$this->equalTo(null)
);
$config = $this->invokePrivate($this->provider, 'getMultiBucketObjectStoreConfig', [$this->user, $this->loader]);
$this->assertArrayHasKey('class', $config);
@ -108,6 +144,46 @@ class ObjectHomeMountProviderTest extends \Test\TestCase {
$this->assertEquals('myBucketPrefix987', $config['arguments']['bucket']);
}
public function testMultiBucketBucketAlreadySet() {
$this->config->expects($this->once())
->method('getSystemValue')
->with($this->equalTo('objectstore_multibucket'), '')
->willReturn([
'class' => 'Test\Files\Mount\FakeObjectStore',
'arguments' => [
'bucket' => 'myBucketPrefix',
],
]);
$this->user->method('getUID')
->willReturn('uid');
$this->loader->expects($this->never())->method($this->anything());
$this->config->expects($this->once())
->method('getUserValue')
->with(
$this->equalTo('uid'),
$this->equalTo('homeobjectstore'),
$this->equalTo('bucket'),
$this->equalTo(null)
)->willReturn('awesomeBucket1');
$this->config->expects($this->never())
->method('setUserValue');
$config = $this->invokePrivate($this->provider, 'getMultiBucketObjectStoreConfig', [$this->user, $this->loader]);
$this->assertArrayHasKey('class', $config);
$this->assertEquals($config['class'], 'Test\Files\Mount\FakeObjectStore');
$this->assertArrayHasKey('arguments', $config);
$this->assertArrayHasKey('user', $config['arguments']);
$this->assertSame($this->user, $config['arguments']['user']);
$this->assertArrayHasKey('objectstore', $config['arguments']);
$this->assertInstanceOf('Test\Files\Mount\FakeObjectStore', $config['arguments']['objectstore']);
$this->assertArrayHasKey('bucket', $config['arguments']);
$this->assertEquals('awesomeBucket1', $config['arguments']['bucket']);
}
public function testMultiBucketConfigFirst() {
$this->config->expects($this->once())
->method('getSystemValue')
@ -116,8 +192,7 @@ class ObjectHomeMountProviderTest extends \Test\TestCase {
'class' => 'Test\Files\Mount\FakeObjectStore',
]);
$this->user->expects($this->exactly(2))
->method('getUID')
$this->user->method('getUID')
->willReturn('uid');
$this->loader->expects($this->never())->method($this->anything());
@ -138,8 +213,7 @@ class ObjectHomeMountProviderTest extends \Test\TestCase {
'class' => 'Test\Files\Mount\FakeObjectStore',
]);
$this->user->expects($this->once())
->method('getUID')
$this->user->method('getUID')
->willReturn('uid');
$this->loader->expects($this->never())->method($this->anything());