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

Merge pull request #12726 from owncloud/add-filter-for-backend-to-rest-index 

Add filter for backend to rest index
This commit is contained in:
Morris Jobke 2014-12-13 08:50:15 +01:00
parent 416e21d902 76a633bf52
commit efb495b09f
6 changed files with 157 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/private/user.php
View File

@ -546,6 +546,7 @@ class OC_User {
* @return array associative array with all display names (value) and corresponding uids (key)
*
* Get a list of all display names and user ids.
* @deprecated Use \OC::$server->getUserManager->searchDisplayName($search, $limit, $offset) instead.
*/
public static function getDisplayNames($search = '', $limit = null, $offset = null) {
$displayNames = array();

16
lib/private/user/manager.php
View File

@ -28,7 +28,7 @@ use OCP\IConfig;
*/
class Manager extends PublicEmitter implements IUserManager {
/**
* @var \OC_User_Interface[] $backends
* @var \OCP\UserInterface [] $backends
*/
private $backends = array();
@ -62,10 +62,18 @@ class Manager extends PublicEmitter implements IUserManager {
});
}
/**
* Get the active backends
* @return \OCP\UserInterface[]
*/
public function getBackends() {
return $this->backends;
}
/**
* register a user backend
*
* @param \OC_User_Interface $backend
* @param \OCP\UserInterface $backend
*/
public function registerBackend($backend) {
$this->backends[] = $backend;
@ -74,7 +82,7 @@ class Manager extends PublicEmitter implements IUserManager {
/**
* remove a user backend
*
* @param \OC_User_Interface $backend
* @param \OCP\UserInterface $backend
*/
public function removeBackend($backend) {
$this->cachedUsers = array();
@ -113,7 +121,7 @@ class Manager extends PublicEmitter implements IUserManager {
* get or construct the user object
*
* @param string $uid
* @param \OC_User_Interface $backend
* @param \OCP\UserInterface $backend
* @return \OC\User\User
*/
protected function getUserObject($uid, $backend) {

6
lib/public/iusermanager.php
View File

@ -31,6 +31,12 @@ interface IUserManager {
*/
public function registerBackend($backend);
/**
* Get the active backends
* @return \OCP\UserInterface[]
*/
public function getBackends();
/**
* remove a user backend
*

62
settings/controller/userscontroller.php
View File

@ -11,6 +11,7 @@
namespace OC\Settings\Controller;
use OC\AppFramework\Http;
use OC\User\Manager;
use OC\User\User;
use \OCP\AppFramework\Controller;
use OCP\AppFramework\Http\DataResponse;
@ -84,46 +85,69 @@ class UsersController extends Controller {
);
}
/**
* @param array $userIDs Array with schema [$uid => $displayName]
* @return IUser[]
*/
private function getUsersForUID(array $userIDs) {
$users = [];
foreach ($userIDs as $uid => $displayName) {
$users[] = $this->userManager->get($uid);
}
return $users;
}
/**
* @NoAdminRequired
*
* @param int $offset
* @param int $limit
* @param string $gid
* @param string $pattern
* @param string $gid GID to filter for
* @param string $pattern Pattern to search for in the username
* @param string $backend Backend to filter for (class-name)
* @return DataResponse
*
* TODO: Tidy up and write unit tests - code is mainly static method calls
*/
public function index($offset = 0, $limit = 10, $gid = '', $pattern = '') {
public function index($offset = 0, $limit = 10, $gid = '', $pattern = '', $backend = '') {
// FIXME: The JS sends the group '_everyone' instead of no GID for the "all users" group.
if($gid === '_everyone') {
$gid = '';
}
// Remove backends
if(!empty($backend)) {
$activeBackends = $this->userManager->getBackends();
$this->userManager->clearBackends();
foreach($activeBackends as $singleActiveBackend) {
if($backend === get_class($singleActiveBackend)) {
$this->userManager->registerBackend($singleActiveBackend);
break;
}
}
}
$users = array();
if ($this->isAdmin) {
if($gid !== '') {
$batch = $this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset);
$batch = $this->getUsersForUID($this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset));
} else {
// FIXME: Remove static method call
$batch = \OC_User::getDisplayNames($pattern, $limit, $offset);
$batch = $this->userManager->search('', $limit, $offset);
}
foreach ($batch as $uid => $displayname) {
$users[] = $this->formatUserForIndex($this->userManager->get($uid));
foreach ($batch as $user) {
$users[] = $this->formatUserForIndex($user);
}
} else {
$groups = \OC_SubAdmin::getSubAdminsGroups($this->userSession->getUser()->getUID());
if($gid !== '' && in_array($gid, $groups)) {
$groups = array($gid);
} elseif($gid !== '') {
//don't you try to investigate loops you must not know about
$groups = array();
}
$batch = \OC_Group::usersInGroups($groups, $pattern, $limit, $offset);
foreach ($batch as $uid) {
$user = $this->userManager->get($uid);
} else {
// Set the $gid parameter to an empty value if the subadmin has no rights to access a specific group
if($gid !== '' && !in_array($gid, \OC_SubAdmin::getSubAdminsGroups($this->userSession->getUser()->getUID()))) {
$gid = '';
}
$batch = $this->getUsersForUID($this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset));
foreach ($batch as $user) {
// Only add the groups, this user is a subadmin of
$userGroups = array_intersect($this->groupManager->getUserGroupIds($user),
\OC_SubAdmin::getSubAdminsGroups($this->userSession->getUser()->getUID()));

11
tests/lib/user/manager.php
View File

@ -10,6 +10,17 @@
namespace Test\User;
class Manager extends \Test\TestCase {
public function testGetBackends() {
$userDummyBackend = $this->getMock('\OC_User_Dummy');
$manager = new \OC\User\Manager();
$manager->registerBackend($userDummyBackend);
$this->assertEquals([$userDummyBackend], $manager->getBackends());
$dummyDatabaseBackend = $this->getMock('\OC_User_Database');
$manager->registerBackend($dummyDatabaseBackend);
$this->assertEquals([$userDummyBackend, $dummyDatabaseBackend], $manager->getBackends());
}
public function testUserExistsSingleBackendExists() {
/**
* @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend

89
tests/settings/controller/userscontrollertest.php
View File

@ -126,9 +126,20 @@ class UsersControllerTest extends \Test\TestCase {
->method('getUserGroupIds')
->will($this->onConsecutiveCalls(array('Users', 'Support'), array('admins', 'Support'), array('External Users')));
$this->container['UserManager']
->expects($this->exactly(3))
->expects($this->at(0))
->method('get')
->will($this->onConsecutiveCalls($foo, $admin, $bar));
->with('foo')
->will($this->returnValue($foo));
$this->container['UserManager']
->expects($this->at(1))
->method('get')
->with('admin')
->will($this->returnValue($admin));
$this->container['UserManager']
->expects($this->at(2))
->method('get')
->with('bar')
->will($this->returnValue($bar));
$this->container['Config']
->expects($this->exactly(3))
->method('getUserValue')
@ -168,7 +179,79 @@ class UsersControllerTest extends \Test\TestCase {
),
)
);
$response = $this->usersController->index(0, 10, 'pattern');
$response = $this->usersController->index(0, 10, 'gid', 'pattern');
$this->assertEquals($expectedResponse, $response);
}
public function testIndexWithBackend() {
$user = $this->getMockBuilder('\OC\User\User')
->disableOriginalConstructor()->getMock();
$user
->expects($this->exactly(3))
->method('getUID')
->will($this->returnValue('foo'));
$user
->expects($this->once())
->method('getDisplayName')
->will($this->returnValue('M. Foo'));
$user
->method('getLastLogin')
->will($this->returnValue(500));
$user
->method('getHome')
->will($this->returnValue('/home/foo'));
$user
->expects($this->once())
->method('getBackendClassName')
->will($this->returnValue('OC_User_Database'));
$this->container['UserManager']
->expects($this->once())
->method('getBackends')
->will($this->returnValue([new \OC_User_Dummy(), new \OC_User_Database()]));
$this->container['UserManager']
->expects($this->once())
->method('clearBackends');
$this->container['UserManager']
->expects($this->once())
->method('registerBackend')
->with(new \OC_User_Dummy());
$this->container['UserManager']
->expects($this->once())
->method('search')
->with('')
->will($this->returnValue([$user]));
$expectedResponse = new DataResponse(
array(
0 => array(
'name' => 'foo',
'displayname' => 'M. Foo',
'groups' => null,
'subadmin' => array(),
'quota' => null,
'storageLocation' => '/home/foo',
'lastLogin' => 500,
'backend' => 'OC_User_Database'
)
)
);
$response = $this->usersController->index(0, 10, '','', 'OC_User_Dummy');
$this->assertEquals($expectedResponse, $response);
}
public function testIndexWithBackendNoUser() {
$this->container['UserManager']
->expects($this->once())
->method('getBackends')
->will($this->returnValue([new \OC_User_Dummy(), new \OC_User_Database()]));
$this->container['UserManager']
->expects($this->once())
->method('search')
->with('')
->will($this->returnValue([]));
$expectedResponse = new DataResponse([]);
$response = $this->usersController->index(0, 10, '','', 'OC_User_Dummy');
$this->assertEquals($expectedResponse, $response);
}