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

[provisioning_api] Move users away from static code

Browse source
This commit is contained in:
Roeland Jago Douma 2015-07-25 12:46:39 +02:00
parent 27bfab37bc
commit abca7737b7
3 changed files with 304 additions and 248 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
apps/provisioning_api/appinfo/routes.php
View file

@ -21,30 +21,39 @@
*
*/
// Users
namespace OCA\Provisioning_API\AppInfo;
use OCP\API;
API::register('get', '/cloud/users', array('OCA\Provisioning_API\Users', 'getUsers'), 'provisioning_api', API::ADMIN_AUTH);
API::register('post', '/cloud/users', array('OCA\Provisioning_API\Users', 'addUser'), 'provisioning_api', API::ADMIN_AUTH);
API::register('get', '/cloud/users/{userid}', array('OCA\Provisioning_API\Users', 'getUser'), 'provisioning_api', API::USER_AUTH);
API::register('put', '/cloud/users/{userid}', array('OCA\Provisioning_API\Users', 'editUser'), 'provisioning_api', API::USER_AUTH);
API::register('delete', '/cloud/users/{userid}', array('OCA\Provisioning_API\Users', 'deleteUser'), 'provisioning_api', API::SUBADMIN_AUTH);
API::register('get', '/cloud/users/{userid}/groups', array('OCA\Provisioning_API\Users', 'getUsersGroups'), 'provisioning_api', API::USER_AUTH);
API::register('post', '/cloud/users/{userid}/groups', array('OCA\Provisioning_API\Users', 'addToGroup'), 'provisioning_api', API::SUBADMIN_AUTH);
API::register('delete', '/cloud/users/{userid}/groups', array('OCA\Provisioning_API\Users', 'removeFromGroup'), 'provisioning_api', API::SUBADMIN_AUTH);
API::register('post', '/cloud/users/{userid}/subadmins', array('OCA\Provisioning_API\Users', 'addSubAdmin'), 'provisioning_api', API::ADMIN_AUTH);
API::register('delete', '/cloud/users/{userid}/subadmins', array('OCA\Provisioning_API\Users', 'removeSubAdmin'), 'provisioning_api', API::ADMIN_AUTH);
API::register('get', '/cloud/users/{userid}/subadmins', array('OCA\Provisioning_API\Users', 'getUserSubAdminGroups'), 'provisioning_api', API::ADMIN_AUTH);
// Users
$users = new \OCA\Provisioning_API\Users(
\OC::$server->getUserManager(),
\OC::$server->getConfig(),
\OC::$server->getGroupManager()
);
API::register('get', '/cloud/users', [$users, 'getUsers'], 'provisioning_api', API::ADMIN_AUTH);
API::register('post', '/cloud/users', [$users, 'addUser'], 'provisioning_api', API::ADMIN_AUTH);
API::register('get', '/cloud/users/{userid}', [$users, 'getUser'], 'provisioning_api', API::USER_AUTH);
API::register('put', '/cloud/users/{userid}', [$users, 'editUser'], 'provisioning_api', API::USER_AUTH);
API::register('delete', '/cloud/users/{userid}', [$users, 'deleteUser'], 'provisioning_api', API::SUBADMIN_AUTH);
API::register('get', '/cloud/users/{userid}/groups', [$users, 'getUsersGroups'], 'provisioning_api', API::USER_AUTH);
API::register('post', '/cloud/users/{userid}/groups', [$users, 'addToGroup'], 'provisioning_api', API::SUBADMIN_AUTH);
API::register('delete', '/cloud/users/{userid}/groups', [$users, 'removeFromGroup'], 'provisioning_api', API::SUBADMIN_AUTH);
API::register('post', '/cloud/users/{userid}/subadmins', [$users, 'addSubAdmin'], 'provisioning_api', API::ADMIN_AUTH);
API::register('delete', '/cloud/users/{userid}/subadmins', [$users, 'removeSubAdmin'], 'provisioning_api', API::ADMIN_AUTH);
API::register('get', '/cloud/users/{userid}/subadmins', [$users, 'getUserSubAdminGroups'], 'provisioning_api', API::ADMIN_AUTH);
// Groups
API::register('get', '/cloud/groups', array('OCA\Provisioning_API\Groups', 'getGroups'), 'provisioning_api', API::SUBADMIN_AUTH);
API::register('post', '/cloud/groups', array('OCA\Provisioning_API\Groups', 'addGroup'), 'provisioning_api', API::SUBADMIN_AUTH);
API::register('get', '/cloud/groups/{groupid}', array('OCA\Provisioning_API\Groups', 'getGroup'), 'provisioning_api', API::SUBADMIN_AUTH);
API::register('delete', '/cloud/groups/{groupid}', array('OCA\Provisioning_API\Groups', 'deleteGroup'), 'provisioning_api', API::ADMIN_AUTH);
API::register('get', '/cloud/groups/{groupid}/subadmins', array('OCA\Provisioning_API\Groups', 'getSubAdminsOfGroup'), 'provisioning_api', API::ADMIN_AUTH);
$groups = new \OCA\Provisioning_API\Groups();
API::register('get', '/cloud/groups', [$groups, 'getGroups'], 'provisioning_api', API::SUBADMIN_AUTH);
API::register('post', '/cloud/groups', [$groups, 'addGroup'], 'provisioning_api', API::SUBADMIN_AUTH);
API::register('get', '/cloud/groups/{groupid}', [$groups, 'getGroup'], 'provisioning_api', API::SUBADMIN_AUTH);
API::register('delete', '/cloud/groups/{groupid}', [$groups, 'deleteGroup'], 'provisioning_api', API::ADMIN_AUTH);
API::register('get', '/cloud/groups/{groupid}/subadmins', [$groups, 'getSubAdminsOfGroup'], 'provisioning_api', API::ADMIN_AUTH);
// Apps
API::register('get', '/cloud/apps', array('OCA\Provisioning_API\Apps', 'getApps'), 'provisioning_api', API::ADMIN_AUTH);
API::register('get', '/cloud/apps/{appid}', array('OCA\Provisioning_API\Apps', 'getAppInfo'), 'provisioning_api', API::ADMIN_AUTH);
API::register('post', '/cloud/apps/{appid}', array('OCA\Provisioning_API\Apps', 'enable'), 'provisioning_api', API::ADMIN_AUTH);
API::register('delete', '/cloud/apps/{appid}', array('OCA\Provisioning_API\Apps', 'disable'), 'provisioning_api', API::ADMIN_AUTH);
$apps = new \OCA\Provisioning_API\Apps();
API::register('get', '/cloud/apps', [$apps, 'getApps'], 'provisioning_api', API::ADMIN_AUTH);
API::register('get', '/cloud/apps/{appid}', [$apps, 'getAppInfo'], 'provisioning_api', API::ADMIN_AUTH);
API::register('post', '/cloud/apps/{appid}', [$apps, 'enable'], 'provisioning_api', API::ADMIN_AUTH);
API::register('delete', '/cloud/apps/{appid}', [$apps, 'disable'], 'provisioning_api', API::ADMIN_AUTH);

122
apps/provisioning_api/lib/users.php
View file

@ -28,31 +28,56 @@ namespace OCA\Provisioning_API;
use \OC_OCS_Result;
use \OC_SubAdmin;
use \OC_User;
use \OC_Group;
use \OC_Helper;
use OCP\Files\NotFoundException;
class Users {
/** @var \OCP\IUserManager */
private $userManager;
/** @var \OCP\IConfig */
private $config;
/** @var \OCP\IGroupManager */
private $groupManager;
/**
* @param \OCP\IUserManager $userManager
*/
public function __construct(\OCP\IUserManager $userManager,
\OCP\IConfig $config,
\OCP\IGroupManager $groupManager) {
$this->userManager = $userManager;
$this->config = $config;
$this->groupManager = $groupManager;
}
/**
* returns a list of users
*/
public static function getUsers(){
public function getUsers(){
$search = !empty($_GET['search']) ? $_GET['search'] : '';
$limit = !empty($_GET['limit']) ? $_GET['limit'] : null;
$offset = !empty($_GET['offset']) ? $_GET['offset'] : null;
return new OC_OCS_Result(array('users' => OC_User::getUsers($search, $limit, $offset)));
$users = $this->userManager->search($search, $limit, $offset);
$users = array_keys($users);
return new OC_OCS_Result([
'users' => $users
]);
}
public static function addUser(){
public function addUser(){
$userId = isset($_POST['userid']) ? $_POST['userid'] : null;
$password = isset($_POST['password']) ? $_POST['password'] : null;
if(OC_User::userExists($userId)) {
if($this->userManager->userExists($userId)) {
\OCP\Util::writeLog('ocs_api', 'Failed addUser attempt: User already exists.', \OCP\Util::ERROR);
return new OC_OCS_Result(null, 102, 'User already exists');
} else {
try {
OC_User::createUser($userId, $password);
$this->userManager->createUser($userId, $password);
\OCP\Util::writeLog('ocs_api', 'Successful addUser call with userid: '.$_POST['userid'], \OCP\Util::INFO);
return new OC_OCS_Result(null, 100);
} catch (\Exception $e) {
@ -65,12 +90,12 @@ class Users {
/**
* gets user info
*/
public static function getUser($parameters){
public function getUser($parameters){
$userId = $parameters['userid'];
// Admin? Or SubAdmin?
if(OC_User::isAdminUser(OC_User::getUser()) || OC_SubAdmin::isUserAccessible(OC_User::getUser(), $userId)) {
// Check they exist
if(!OC_User::userExists($userId)) {
if(!$this->userManager->userExists($userId)) {
return new OC_OCS_Result(null, \OCP\API::RESPOND_NOT_FOUND, 'The requested user could not be found');
}
// Show all
@ -93,14 +118,12 @@ class Users {
);
}
$config = \OC::$server->getConfig();
// Find the data
$data = [];
$data = self::fillStorageInfo($userId, $data);
$data['enabled'] = $config->getUserValue($userId, 'core', 'enabled', 'true');
$data['email'] = $config->getUserValue($userId, 'settings', 'email');
$data['displayname'] = OC_User::getDisplayName($parameters['userid']);
$data['enabled'] = $this->config->getUserValue($userId, 'core', 'enabled', 'true');
$data['email'] = $this->config->getUserValue($userId, 'settings', 'email');
$data['displayname'] = $this->userManager->get($parameters['userid']);
// Return the appropriate data
$responseData = array();
@ -114,7 +137,7 @@ class Users {
/**
* edit users
*/
public static function editUser($parameters){
public function editUser($parameters){
$userId = $parameters['userid'];
if($userId === OC_User::getUser()) {
// Editing self (display, email)
@ -146,7 +169,7 @@ class Users {
// Process the edit
switch($parameters['_put']['key']){
case 'display':
OC_User::setDisplayName($userId, $parameters['_put']['value']);
$this->userManager->get($userId)->setDisplayName($parameters['_put']['value']);
break;
case 'quota':
$quota = $parameters['_put']['value'];
@ -167,14 +190,14 @@ class Users {
$quota = OC_Helper::humanFileSize($quota);
}
}
\OC::$server->getConfig()->setUserValue($userId, 'files', 'quota', $quota);
$this->config->setUserValue($userId, 'files', 'quota', $quota);
break;
case 'password':
OC_User::setPassword($userId, $parameters['_put']['value']);
$this->userManager->get($userId)->setPassword($parameters['_put']['value']);
break;
case 'email':
if(filter_var($parameters['_put']['value'], FILTER_VALIDATE_EMAIL)) {
\OC::$server->getConfig()->setUserValue($userId, 'settings', 'email', $parameters['_put']['value']);
$this->config->setUserValue($userId, 'settings', 'email', $parameters['_put']['value']);
} else {
return new OC_OCS_Result(null, 102);
}
@ -186,8 +209,8 @@ class Users {
return new OC_OCS_Result(null, 100);
}
public static function deleteUser($parameters){
if(!OC_User::userExists($parameters['userid'])
public function deleteUser($parameters){
if(!$this->userManager->userExists($parameters['userid'])
|| $parameters['userid'] === OC_User::getUser()) {
return new OC_OCS_Result(null, 101);
}
@ -196,22 +219,31 @@ class Users {
return new OC_OCS_Result(null, 997);
}
// Go ahead with the delete
if(OC_User::deleteUser($parameters['userid'])) {
if($this->userManager->get($parameters['userid'])->delete()) {
return new OC_OCS_Result(null, 100);
} else {
return new OC_OCS_Result(null, 101);
}
}
public static function getUsersGroups($parameters){
public function getUsersGroups($parameters){
if($parameters['userid'] === OC_User::getUser() || OC_User::isAdminUser(OC_User::getUser())) {
// Self lookup or admin lookup
return new OC_OCS_Result(array('groups' => OC_Group::getUserGroups($parameters['userid'])));
return new OC_OCS_Result([
'groups' => $this->groupManager->getUserGroupIds(
$this->userManager->get($parameters['userid'])
)
]);
} else {
// Looking up someone else
if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $parameters['userid'])) {
// Return the group that the method caller is subadmin of for the user in question
$groups = array_intersect(OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()), OC_Group::getUserGroups($parameters['userid']));
$groups = array_intersect(
OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()),
$this->groupManager->getUserGroupIds(
$this->userManager->get($parameters['userid'])
)
);
return new OC_OCS_Result(array('groups' => $groups));
} else {
// Not permitted
@ -221,40 +253,43 @@ class Users {
}
public static function addToGroup($parameters){
public function addToGroup($parameters){
$group = !empty($_POST['groupid']) ? $_POST['groupid'] : null;
if(is_null($group)){
return new OC_OCS_Result(null, 101);
}
// Check they're an admin
if(!OC_Group::inGroup(OC_User::getUser(), 'admin')){
if(!$this->groupManager->isInGroup(OC_User::getUser(), 'admin')){
// This user doesn't have rights to add a user to this group
return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
}
// Check if the group exists
if(!OC_Group::groupExists($group)){
if(!$this->groupManager->groupExists($group)){
return new OC_OCS_Result(null, 102);
}
// Check if the user exists
if(!OC_User::userExists($parameters['userid'])){
if(!$this->userManager->userExists($parameters['userid'])){
return new OC_OCS_Result(null, 103);
}
// Add user to group
return OC_Group::addToGroup($parameters['userid'], $group) ? new OC_OCS_Result(null, 100) : new OC_OCS_Result(null, 105);
$this->groupManager->get($group)->addUser(
$this->userManager->get($parameters['userid'])
);
return new OC_OCS_Result(null, 100);
}
public static function removeFromGroup($parameters){
public function removeFromGroup($parameters){
$group = !empty($parameters['_delete']['groupid']) ? $parameters['_delete']['groupid'] : null;
if(is_null($group)){
return new OC_OCS_Result(null, 101);
}
// If they're not an admin, check they are a subadmin of the group in question
if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isSubAdminofGroup(OC_User::getUser(), $group)){
if(!$this->groupManager->isInGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isSubAdminofGroup(OC_User::getUser(), $group)){
return new OC_OCS_Result(null, 104);
}
// Check they aren't removing themselves from 'admin' or their 'subadmin; group
if($parameters['userid'] === OC_User::getUser()){
if(OC_Group::inGroup(OC_User::getUser(), 'admin')){
if($this->groupManager->isInGroup(OC_User::getUser(), 'admin')){
if($group === 'admin'){
return new OC_OCS_Result(null, 105, 'Cannot remove yourself from the admin group');
}
@ -266,29 +301,32 @@ class Users {
}
}
// Check if the group exists
if(!OC_Group::groupExists($group)){
if(!$this->groupManager->groupExists($group)){
return new OC_OCS_Result(null, 102);
}
// Check if the user exists
if(!OC_User::userExists($parameters['userid'])){
if(!$this->userManager->userExists($parameters['userid'])){
return new OC_OCS_Result(null, 103);
}
// Remove user from group
return OC_Group::removeFromGroup($parameters['userid'], $group) ? new OC_OCS_Result(null, 100) : new OC_OCS_Result(null, 105);
$this->groupManager->get($group)->removeUser(
$this->userManager->get($parameters['userid'])
);
return new OC_OCS_Result(null, 100);
}
/**
* Creates a subadmin
*/
public static function addSubAdmin($parameters) {
public function addSubAdmin($parameters) {
$group = $_POST['groupid'];
$user = $parameters['userid'];
// Check if the user exists
if(!OC_User::userExists($user)) {
if(!$this->userManager->userExists($user)) {
return new OC_OCS_Result(null, 101, 'User does not exist');
}
// Check if group exists
if(!OC_Group::groupExists($group)) {
if(!$this->groupManager->groupExists($group)) {
return new OC_OCS_Result(null, 102, 'Group:'.$group.' does not exist');
}
// Check if trying to make subadmin of admin group
@ -311,11 +349,11 @@ class Users {
/**
* Removes a subadmin from a group
*/
public static function removeSubAdmin($parameters) {
public function removeSubAdmin($parameters) {
$group = $parameters['_delete']['groupid'];
$user = $parameters['userid'];
// Check if the user exists
if(!OC_User::userExists($user)) {
if(!$this->userManager->userExists($user)) {
return new OC_OCS_Result(null, 101, 'User does not exist');
}
// Check if they are a subadmin of this said group
@ -333,10 +371,10 @@ class Users {
/**
* @Get the groups a user is a subadmin of
*/
public static function getUserSubAdminGroups($parameters) {
public function getUserSubAdminGroups($parameters) {
$user = $parameters['userid'];
// Check if the user exists
if(!OC_User::userExists($user)) {
if(!$this->userManager->userExists($user)) {
return new OC_OCS_Result(null, 101, 'User does not exist');
}
// Get the subadmin groups

377
apps/provisioning_api/tests/userstest.php
View file

@ -32,18 +32,30 @@ class UsersTest extends TestCase {
$_POST = null;
}
protected function setup() {
parent::setup();
$this->userManager = \OC::$server->getUserManager();
$this->config = \OC::$server->getConfig();
$this->groupManager = \OC::$server->getGroupManager();
$this->api = new \OCA\Provisioning_Api\Users(
$this->userManager,
$this->config,
$this->groupManager);
}
// Test getting the list of users
public function testGetUsers() {
$result = \OCA\provisioning_API\Users::getUsers(array());
$result = $this->api->getUsers();
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
$count = $result->getData();
$count = count($count['users']);
$this->assertEquals(count(\OC_User::getUsers()), $count);
$this->assertEquals(count($this->userManager->search('', null, null)), $count);
$user = $this->generateUsers();
$_GET['search'] = $user;
$result = \OCA\provisioning_API\Users::getUsers(array());
$result = $this->api->getUsers();
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
$data = $result->getData();
@ -53,7 +65,7 @@ class UsersTest extends TestCase {
$this->generateUsers(10);
$this->resetParams();
$_GET['limit'] = 2;
$result = \OCA\provisioning_API\Users::getUsers(array());
$result = $this->api->getUsers();
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
$count = $result->getData();
@ -63,22 +75,22 @@ class UsersTest extends TestCase {
$this->resetParams();
$_GET['limit'] = 1;
$_GET['offset'] = 1;
$result = \OCA\provisioning_API\Users::getUsers(array());
$result = $this->api->getUsers(array());
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
$data = $result->getData();
$this->assertEquals(\OC_User::getUsers('', 1, 1), $data['users']);
$this->assertEquals(array_keys($this->userManager->search('', 1, 1)), $data['users']);
}
public function testAddUser() {
$this->resetParams();
$_POST['userid'] = $this->getUniqueID();
$_POST['password'] = 'password';
$result = \OCA\provisioning_API\Users::addUser(array());
$result = $this->api->addUser();
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
$this->assertTrue(\OC_User::userExists($_POST['userid']));
$this->assertEquals($_POST['userid'], \OC_User::checkPassword($_POST['userid'], $_POST['password']));
$this->assertTrue($this->userManager->userExists($_POST['userid']));
$this->assertEquals($_POST['userid'], $this->userManager->checkPassword($_POST['userid'], $_POST['password'])->getUID());
$this->users[] = $_POST['userid'];
}
@ -86,7 +98,7 @@ class UsersTest extends TestCase {
$user = $this->generateUsers();
self::loginAsUser($user);
$params['userid'] = $user;
$result = \OCA\provisioning_API\Users::getUser($params);
$result = $this->api->getUser($params);
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
$data = $result->getData();
@ -98,10 +110,10 @@ class UsersTest extends TestCase {
self::loginAsUser($user);
$params = array();
$params['userid'] = $this->getUniqueID();
while(\OC_User::userExists($params['userid'])) {
while($this->userManager->userExists($params['userid'])) {
$params['userid'] = $this->getUniqueID();
}
$result = \OCA\provisioning_API\Users::getUser($params);
$result = $this->api->getUser($params);
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded());
$this->assertEquals(\OCP\API::RESPOND_NOT_FOUND, $result->getStatusCode());
@ -112,7 +124,7 @@ class UsersTest extends TestCase {
$users = $this->generateUsers(2);
$params['userid'] = $users[0];
self::loginAsUser($users[1]);
$result = \OCA\provisioning_API\Users::getUser($params);
$result = $this->api->getUser($params);
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded());
@ -123,7 +135,7 @@ class UsersTest extends TestCase {
self::loginAsUser($users[0]);
\OC_Group::addToGroup($users[1], 'admin');
self::loginAsUser($users[1]);
$result = \OCA\provisioning_API\Users::getUser($params);
$result = $this->api->getUser($params);
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
$data = $result->getData();
@ -131,11 +143,10 @@ class UsersTest extends TestCase {
}
public function testEditOwnDisplayName() {
// Test editing own name
$user = $this->generateUsers();
self::loginAsUser($user);
$result = \OCA\provisioning_API\Users::editUser(
$result = $this->api->editUser(
array(
'userid' => $user,
'_put' => array(
@ -146,18 +157,17 @@ class UsersTest extends TestCase {
);
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
$this->assertEquals('newname', \OC_User::getDisplayName($user));
$this->assertEquals('newname', $this->userManager->get($user)->getDisplayName());
}
public function testAdminEditDisplayNameOfUser() {
// Test admin editing users name
$user = $this->generateUsers();
\OC_Group::addToGroup($user, 'admin');
self::loginAsUser($user);
$user2 = $this->generateUsers();
$result = \OCA\provisioning_API\Users::editUser(
$result = $this->api->editUser(
array(
'userid' => $user2,
'_put' => array(
@ -168,17 +178,16 @@ class UsersTest extends TestCase {
);
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
$this->assertEquals('newname', \OC_User::getDisplayName($user2));
$this->assertEquals('newname', $this->userManager->get($user2)->getDisplayName());
}
public function testUserEditOtherUserDisplayName() {
// Test editing other users name
$user = $this->generateUsers();
self::loginAsUser($user);
$user2 = $this->generateUsers();
$result = \OCA\provisioning_API\Users::editUser(
$result = $this->api->editUser(
array(
'userid' => $user2,
'_put' => array(
@ -199,9 +208,9 @@ class UsersTest extends TestCase {
*/
public function testEditOwnQuota($expected, $quota) {
$user = $this->generateUsers();
\OC_Group::addToGroup($user, 'admin');
$this->groupManager->get('admin')->addUser($this->userManager->get($user));
self::loginAsUser($user);
$result = \OCA\provisioning_API\Users::editUser(
$result = $this->api->editUser(
[
'userid' => $user,
'_put' => [
@ -226,9 +235,9 @@ class UsersTest extends TestCase {
public function testAdminEditOwnQuota() {
$user = $this->generateUsers();
\OC_Group::addToGroup($user, 'admin');
$this->groupManager->get('admin')->addUser($this->userManager->get($user));
self::loginAsUser($user);
$result = \OCA\provisioning_API\Users::editUser(
$result = $this->api->editUser(
array(
'userid' => $user,
'_put' => array(
@ -243,10 +252,10 @@ class UsersTest extends TestCase {
public function testAdminEditOtherUserQuota() {
$user = $this->generateUsers();
\OC_Group::addToGroup($user, 'admin');
$this->groupManager->get('admin')->addUser($this->userManager->get($user));
self::loginAsUser($user);
$user2 = $this->generateUsers();
$result = \OCA\provisioning_API\Users::editUser(
$result = $this->api->editUser(
array(
'userid' => $user2,
'_put' => array(
@ -263,7 +272,7 @@ class UsersTest extends TestCase {
$user = $this->generateUsers();
self::loginAsUser($user);
$user2 = $this->generateUsers();
$result = \OCA\provisioning_API\Users::editUser(
$result = $this->api->editUser(
array(
'userid' => $user2,
'_put' => array(
@ -280,7 +289,7 @@ class UsersTest extends TestCase {
$user = $this->generateUsers();
$email = 'test@example.com';
self::loginAsUser($user);
$result = \OCA\provisioning_API\Users::editUser(
$result = $this->api->editUser(
array(
'userid' => $user,
'_put' => array(
@ -298,7 +307,7 @@ class UsersTest extends TestCase {
$users = $this->generateUsers(2);
$email = 'test@example.com';
self::loginAsUser($users[0]);
$result = \OCA\provisioning_API\Users::editUser(
$result = $this->api->editUser(
array(
'userid' => $users[1],
'_put' => array(
@ -315,8 +324,8 @@ class UsersTest extends TestCase {
$users = $this->generateUsers(2);
$email = 'test@example.com';
self::loginAsUser($users[0]);
\OC_Group::addToGroup($users[0], 'admin');
$result = \OCA\provisioning_API\Users::editUser(
$this->groupManager->get('admin')->addUser($this->userManager->get($users[0]));
$result = $this->api->editUser(
array(
'userid' => $users[1],
'_put' => array(
@ -333,7 +342,7 @@ class UsersTest extends TestCase {
public function testDeleteSelf() {
$user = $this->generateUsers();
self::loginAsUser($user);
$result = \OCA\provisioning_API\Users::deleteUser(array(
$result = $this->api->deleteUser(array(
'userid' => $user,
));
$this->assertInstanceOf('OC_OCS_Result', $result);
@ -344,7 +353,7 @@ class UsersTest extends TestCase {
$user = $this->generateUsers();
self::loginAsUser($user);
$user2 = $this->generateUsers();
$result = \OCA\provisioning_API\Users::deleteUser(array(
$result = $this->api->deleteUser(array(
'userid' => $user2,
));
$this->assertInstanceOf('OC_OCS_Result', $result);
@ -356,16 +365,16 @@ class UsersTest extends TestCase {
self::loginAsUser($user);
$user2 = $this->generateUsers();
$group = $this->getUniqueID();
\OC_Group::createGroup($group);
\OC_Group::addToGroup($user, $group);
\OC_Group::addToGroup($user2, $group);
$this->groupManager->createGroup($group);
$this->groupManager->get($group)->addUser($this->userManager->get($user));
$this->groupManager->get($group)->addUser($this->userManager->get($user2));
\OC_SubAdmin::createSubAdmin($user, $group);
$result = \OCA\provisioning_API\Users::deleteUser(array(
$result = $this->api->deleteUser(array(
'userid' => $user2,
));
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
\OC_Group::deleteGroup($group);
$this->groupManager->get($group)->delete();
}
public function testDeleteOtherAsIrelevantSubAdmin() {
@ -374,26 +383,26 @@ class UsersTest extends TestCase {
$user2 = $this->generateUsers();
$group = $this->getUniqueID();
$group2 = $this->getUniqueID();
\OC_Group::createGroup($group);
\OC_Group::createGroup($group2);
\OC_Group::addToGroup($user, $group);
\OC_Group::addToGroup($user2, $group2);
\OC_SubAdmin::createSubAdmin($user, $group);
$result = \OCA\provisioning_API\Users::deleteUser(array(
$group = $this->groupManager->createGroup($group);
$group2 = $this->groupManager->createGroup($group2);
$group->addUser($this->userManager->get($user));
$group2->addUser($this->userManager->get($user2));
\OC_SubAdmin::createSubAdmin($user, $group->getGID());
$result = $this->api->deleteUser(array(
'userid' => $user2,
));
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded());
\OC_Group::deleteGroup($group);
\OC_Group::deleteGroup($group2);
$group->delete();
$group2->delete();
}
public function testDeleteOtherAsAdmin() {
$user = $this->generateUsers();
\OC_Group::addToGroup($user, 'admin');
$this->groupManager->get('admin')->addUser($this->userManager->get($user));
self::loginAsUser($user);
$user2 = $this->generateUsers();
$result = \OCA\provisioning_API\Users::deleteUser(array(
$result = $this->api->deleteUser(array(
'userid' => $user2,
));
$this->assertInstanceOf('OC_OCS_Result', $result);
@ -402,9 +411,9 @@ class UsersTest extends TestCase {
public function testDeleteSelfAsAdmin() {
$user = $this->generateUsers();
\OC_Group::addToGroup($user, 'admin');
$this->groupManager->get('admin')->addUser($this->userManager->get($user));
self::loginAsUser($user);
$result = \OCA\provisioning_API\Users::deleteUser(array(
$result = $this->api->deleteUser(array(
'userid' => $user,
));
$this->assertInstanceOf('OC_OCS_Result', $result);
@ -415,17 +424,17 @@ class UsersTest extends TestCase {
$user = $this->generateUsers();
self::loginAsUser($user);
$group = $this->getUniqueID();
\OC_Group::createGroup($group);
\OC_Group::addToGroup($user, $group);
$result = \OCA\provisioning_API\Users::getUsersGroups(array(
$group = $this->groupManager->createGroup($group);
$group->addUser($this->userManager->get($user));
$result = $this->api->getUsersGroups(array(
'userid' => $user,
));
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
$data = $result->getData();
$this->assertEquals($group, reset($data['groups']));
$this->assertEquals($group->getGID(), reset($data['groups']));
$this->assertEquals(1, count($data['groups']));
\OC_Group::deleteGroup($group);
$group->delete();
}
public function testGetUsersGroupOnOther() {
@ -433,33 +442,33 @@ class UsersTest extends TestCase {
$user2 = $this->generateUsers();
self::loginAsUser($user1);
$group = $this->getUniqueID();
\OC_Group::createGroup($group);
\OC_Group::addToGroup($user2, $group);
$result = \OCA\provisioning_API\Users::getUsersGroups(array(
$group = $this->groupManager->createGroup($group);
$group->addUser($this->userManager->get($user2));
$result = $this->api->getUsersGroups(array(
'userid' => $user2,
));
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded());
\OC_Group::deleteGroup($group);
$group->delete();
}
public function testGetUsersGroupOnOtherAsAdmin() {
$user1 = $this->generateUsers();
\OC_Group::addToGroup($user1, 'admin');
$this->groupManager->get('admin')->addUser($this->userManager->get($user1));
$user2 = $this->generateUsers();
self::loginAsUser($user1);
$group = $this->getUniqueID();
\OC_Group::createGroup($group);
\OC_Group::addToGroup($user2, $group);
$result = \OCA\provisioning_API\Users::getUsersGroups(array(
$group = $this->groupManager->createGroup($group);
$group->addUser($this->userManager->get($user2));
$result = $this->api->getUsersGroups(array(
'userid' => $user2,
));
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
$data = $result->getData();
$this->assertEquals($group, reset($data['groups']));
$this->assertEquals($group->getGID(), reset($data['groups']));
$this->assertEquals(1, count($data['groups']));
\OC_Group::deleteGroup($group);
$group->delete();
}
public function testGetUsersGroupsOnOtherAsSubAdmin() {
@ -468,22 +477,22 @@ class UsersTest extends TestCase {
self::loginAsUser($user1);
$group1 = $this->getUniqueID();
$group2 = $this->getUniqueID();
\OC_Group::createGroup($group1);
\OC_Group::createGroup($group2);
\OC_Group::addToGroup($user2, $group1);
\OC_Group::addToGroup($user2, $group2);
\OC_Group::addToGroup($user1, $group1);
\OC_SubAdmin::createSubAdmin($user1, $group1);
$result = \OCA\provisioning_API\Users::getUsersGroups(array(
$group1 = $this->groupManager->createGroup($group1);
$group2 = $this->groupManager->createGroup($group2);
$group1->addUser($this->userManager->get($user2));
$group2->addUser($this->userManager->get($user2));
$group1->addUser($this->userManager->get($user1));
\OC_SubAdmin::createSubAdmin($user1, $group1->getGID());
$result = $this->api->getUsersGroups(array(
'userid' => $user2,
));
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
$data = $result->getData();
$this->assertEquals($group1, reset($data['groups']));
$this->assertEquals($group1->getGID(), reset($data['groups']));
$this->assertEquals(1, count($data['groups']));
\OC_Group::deleteGroup($group1);
\OC_Group::deleteGroup($group2);
$group1->delete();
$group2->delete();
}
public function testGetUsersGroupsOnOtherAsIrelevantSubAdmin() {
@ -492,50 +501,50 @@ class UsersTest extends TestCase {
self::loginAsUser($user1);
$group1 = $this->getUniqueID();
$group2 = $this->getUniqueID();
\OC_Group::createGroup($group1);
\OC_Group::createGroup($group2);
\OC_Group::addToGroup($user2, $group2);
\OC_Group::addToGroup($user1, $group1);
\OC_SubAdmin::createSubAdmin($user1, $group1);
$result = \OCA\provisioning_API\Users::getUsersGroups(array(
$group1 = $this->groupManager->createGroup($group1);
$group2 = $this->groupManager->createGroup($group2);
$group2->addUser($this->userManager->get($user2));
$group1->addUser($this->userManager->get($user1));
\OC_SubAdmin::createSubAdmin($user1, $group1->getGID());
$result = $this->api->getUsersGroups(array(
'userid' => $user2,
));
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded());
\OC_Group::deleteGroup($group1);
\OC_Group::deleteGroup($group2);
$group1->delete();
$group2->delete();
}
public function testAddToGroup() {
$user = $this->generateUsers();
$group = $this->getUniqueID();
\OC_Group::createGroup($group);
$group = $this->groupManager->createGroup($group);
self::loginAsUser($user);
$_POST['groupid'] = $group;
$result = \OCA\provisioning_API\Users::addToGroup(array(
$_POST['groupid'] = $group->getGID();
$result = $this->api->addToGroup(array(
'userid' => $user,
));
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded());
$this->assertFalse(\OC_Group::inGroup($user, $group));
\OC_Group::deleteGroup($group);
$this->assertFalse($group->inGroup($this->userManager->get($user)));
$group->delete();
}
public function testAddToGroupAsAdmin() {
$user = $this->generateUsers();
\OC_Group::addToGroup($user, 'admin');
$this->groupManager->get('admin')->addUser($this->userManager->get($user));
$group = $this->getUniqueID();
\OC_Group::createGroup($group);
$group = $this->groupManager->createGroup($group);
$user2 = $this->generateUsers();
self::loginAsUser($user);
$_POST['groupid'] = $group;
$result = \OCA\provisioning_API\Users::addToGroup(array(
$_POST['groupid'] = $group->getGID();
$result = $this->api->addToGroup(array(
'userid' => $user2,
));
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
$this->assertTrue(\OC_Group::inGroup($user2, $group));
\OC_Group::deleteGroup($group);
$this->assertTrue($group->inGroup($this->userManager->get($user2)));
$group->delete();
}
public function testAddToGroupAsSubAdmin() {
@ -543,16 +552,16 @@ class UsersTest extends TestCase {
$user2 = $this->generateUsers();
self::loginAsUser($user1);
$group1 = $this->getUniqueID();
\OC_Group::createGroup($group1);
\OC_SubAdmin::createSubAdmin($user1, $group1);
$_POST['groupid'] = $group1;
$result = \OCA\provisioning_API\Users::addToGroup(array(
$group1 = $this->groupManager->createGroup($group1);
\OC_SubAdmin::createSubAdmin($user1, $group1->getGID());
$_POST['groupid'] = $group1->getGID();
$result = $this->api->addToGroup(array(
'userid' => $user2,
));
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded());
$this->assertFalse(\OC_Group::inGroup($user2, $group1));
\OC_Group::deleteGroup($group1);
$this->assertFalse($group1->inGroup($this->userManager->get($user2)));
$group1->delete();
}
public function testAddToGroupAsIrelevantSubAdmin() {
@ -561,18 +570,18 @@ class UsersTest extends TestCase {
self::loginAsUser($user1);
$group1 = $this->getUniqueID();
$group2 = $this->getUniqueID();
\OC_Group::createGroup($group1);
\OC_Group::createGroup($group2);
\OC_SubAdmin::createSubAdmin($user1, $group1);
$_POST['groupid'] = $group2;
$result = \OCA\provisioning_API\Users::addToGroup(array(
$group1 = $this->groupManager->createGroup($group1);
$group2 = $this->groupManager->createGroup($group2);
\OC_SubAdmin::createSubAdmin($user1, $group1->getGID());
$_POST['groupid'] = $group2->getGID();
$result = $this->api->addToGroup(array(
'userid' => $user2,
));
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded());
$this->assertFalse(\OC_Group::inGroup($user2, $group2));
\OC_Group::deleteGroup($group1);
\OC_Group::deleteGroup($group2);
$this->assertFalse($group2->inGroup($this->userManager->get($user2)));
$group1->delete();
$group2->delete();
}
// test delete /cloud/users/{userid}/groups
@ -580,18 +589,18 @@ class UsersTest extends TestCase {
$user1 = $this->generateUsers();
self::loginAsUser($user1);
$group1 = $this->getUniqueID();
\OC_Group::createGroup($group1);
\OC_Group::addToGroup($user1, $group1);
$result = \OCA\provisioning_api\Users::removeFromGroup(array(
$group1 = $this->groupManager->createGroup($group1);
$group1->addUser($this->userManager->get($user1));
$result = $this->api->removeFromGroup(array(
'userid' => $user1,
'_delete' => array(
'groupid' => $group1,
'groupid' => $group1->getGID(),
),
));
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded());
$this->assertTrue(\OC_Group::inGroup($user1, $group1));
\OC_Group::deleteGroup($group1);
$this->assertTrue($group1->inGroup($this->userManager->get($user1)));
$group1->delete();
}
public function testRemoveFromGroupAsAdmin() {
@ -599,19 +608,19 @@ class UsersTest extends TestCase {
$user2 = $this->generateUsers();
self::loginAsUser($user1);
$group1 = $this->getUniqueID();
\OC_Group::createGroup($group1);
\OC_Group::addToGroup($user2, $group1);
\OC_Group::addToGroup($user1, 'admin');
$result = \OCA\provisioning_api\Users::removeFromGroup(array(
$group1 = $this->groupManager->createGroup($group1);
$group1->addUser($this->userManager->get($user2));
$this->groupManager->get('admin')->addUser($this->userManager->get($user1));
$result = $this->api->removeFromGroup(array(
'userid' => $user2,
'_delete' => array(
'groupid' => $group1,
'groupid' => $group1->getGID(),
),
));
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
$this->assertFalse(\OC_Group::inGroup($user2, $group1));
\OC_Group::deleteGroup($group1);
$this->assertFalse($group1->inGroup($this->userManager->get($user2)));
$group1->delete();
}
public function testRemoveFromGroupAsSubAdmin() {
@ -619,20 +628,20 @@ class UsersTest extends TestCase {
self::loginAsUser($user1);
$user2 = $this->generateUsers();
$group1 = $this->getUniqueID();
\OC_Group::createGroup($group1);
\OC_Group::addToGroup($user1, $group1);
\OC_Group::addToGroup($user2, $group1);
\OC_SubAdmin::createSubAdmin($user1, $group1);
$result = \OCA\provisioning_api\Users::removeFromGroup(array(
$group1 = $this->groupManager->createGroup($group1);
$group1->addUser($this->userManager->get($user1));
$group1->addUser($this->userManager->get($user2));
\OC_SubAdmin::createSubAdmin($user1, $group1->getGID());
$result = $this->api->removeFromGroup(array(
'userid' => $user2,
'_delete' => array(
'groupid' => $group1,
'groupid' => $group1->getGID(),
),
));
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
$this->assertFalse(\OC_Group::inGroup($user2, $group1));
\OC_Group::deleteGroup($group1);
$this->assertFalse($group1->inGroup($this->userManager->get($user2)));
$group1->delete();
}
public function testRemoveFromGroupAsIrelevantSubAdmin() {
@ -641,48 +650,48 @@ class UsersTest extends TestCase {
$user2 = $this->generateUsers();
$group1 = $this->getUniqueID();
$group2 = $this->getUniqueID();
\OC_Group::createGroup($group1);
\OC_Group::createGroup($group2);
\OC_Group::addToGroup($user1, $group1);
\OC_Group::addToGroup($user2, $group2);
\OC_SubAdmin::createSubAdmin($user1, $group1);
$result = \OCA\provisioning_api\Users::removeFromGroup(array(
$group1 = $this->groupManager->createGroup($group1);
$group2 = $this->groupManager->createGroup($group2);
$group1->addUser($this->userManager->get($user1));
$group2->addUser($this->userManager->get($user2));
\OC_SubAdmin::createSubAdmin($user1, $group1->getGID());
$result = $this->api->removeFromGroup(array(
'userid' => $user2,
'_delete' => array(
'groupid' => $group2,
'groupid' => $group2->getGID(),
),
));
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded());
$this->assertTrue(\OC_Group::inGroup($user2, $group2));
\OC_Group::deleteGroup($group1);
\OC_Group::deleteGroup($group2);
$this->assertTrue($group2->inGroup($this->userManager->get($user2)));
$group1->delete();
$group2->delete();
}
public function testCreateSubAdmin() {
$user1 = $this->generateUsers();
$user2 = $this->generateUsers();
self::loginAsUser($user1);
\OC_Group::addToGroup($user1, 'admin');
$this->groupManager->get('admin')->addUser($this->userManager->get($user1));
$group1 = $this->getUniqueID();
\OC_Group::createGroup($group1);
$_POST['groupid'] = $group1;
$result = \OCA\provisioning_api\Users::addSubAdmin(array(
$group1 = $this->groupManager->createGroup($group1);
$_POST['groupid'] = $group1->getGID();
$result = $this->api->addSubAdmin(array(
'userid' => $user2,
));
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
$this->assertTrue(\OC_SubAdmin::isSubAdminofGroup($user2, $group1));
\OC_Group::deleteGroup($group1);
$this->assertTrue(\OC_SubAdmin::isSubAdminofGroup($user2, $group1->getGID()));
$group1->delete();
$this->resetParams();
$user1 = $this->generateUsers();
$user2 = $this->generateUsers();
self::loginAsUser($user1);
\OC_Group::addToGroup($user1, 'admin');
$this->groupManager->get('admin')->addUser($this->userManager->get($user1));
$_POST['groupid'] = 'admin';
$result = \OCA\provisioning_api\Users::addSubAdmin(array(
$result = $this->api->addSubAdmin(array(
'userid' => $user2,
));
$this->assertInstanceOf('OC_OCS_Result', $result);
@ -693,17 +702,17 @@ class UsersTest extends TestCase {
$user1 = $this->generateUsers();
self::loginAsUser($user1);
\OC_Group::addToGroup($user1, 'admin');
$this->groupManager->get('admin')->addUser($this->userManager->get($user1));
$group1 = $this->getUniqueID();
\OC_Group::createGroup($group1);
$_POST['groupid'] = $group1;
$result = \OCA\provisioning_api\Users::addSubAdmin(array(
$group1 = $this->groupManager->createGroup($group1);
$_POST['groupid'] = $group1->getGID();
$result = $this->api->addSubAdmin(array(
'userid' => $this->getUniqueID(),
));
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded());
$this->assertEquals(101, $result->getStatusCode());
\OC_Group::deleteGroup($group1);
$group1->delete();
}
public function testRemoveSubAdmin() {
@ -712,26 +721,26 @@ class UsersTest extends TestCase {
self::loginAsUser($user1);
\OC_Group::addToGroup($user1, 'admin');
$group1 = $this->getUniqueID();
\OC_Group::createGroup($group1);
\OC_SubAdmin::createSubAdmin($user2, $group1);
$result = \OCA\provisioning_api\Users::removeSubAdmin(array(
$group1 = $this->groupManager->createGroup($group1);
\OC_SubAdmin::createSubAdmin($user2, $group1->getGID());
$result = $this->api->removeSubAdmin(array(
'userid' => $user2,
'_delete' => array(
'groupid' => $group1,
'groupid' => $group1->getGID(),
),
));
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
$this->assertTrue(!\OC_SubAdmin::isSubAdminofGroup($user2, $group1));
\OC_Group::deleteGroup($group1);
$this->assertTrue(!\OC_SubAdmin::isSubAdminofGroup($user2, $group1->getGID()));
$group1->delete();
$user1 = $this->generateUsers();
self::loginAsUser($user1);
\OC_Group::addToGroup($user1, 'admin');
$result = \OCA\provisioning_api\Users::removeSubAdmin(array(
$this->groupManager->get('admin')->addUser($this->userManager->get($user1));
$result = $this->api->removeSubAdmin(array(
'userid' => $this->getUniqueID(),
'_delete' => array(
'groupid' => $group1,
'groupid' => $group1->getGID(),
),
));
$this->assertInstanceOf('OC_OCS_Result', $result);
@ -743,44 +752,43 @@ class UsersTest extends TestCase {
$user1 = $this->generateUsers();
$user2 = $this->generateUsers();
self::loginAsUser($user1);
\OC_Group::addToGroup($user1, 'admin');
$this->groupManager->get('admin')->addUser($this->userManager->get($user1));
$group1 = $this->getUniqueID();
\OC_Group::createGroup($group1);
$_POST['groupid'] = $group1;
$result = \OCA\provisioning_api\Users::removeSubAdmin(array(
$group1 = $this->groupManager->createGroup($group1);
$_POST['groupid'] = $group1->getGID();
$result = $this->api->removeSubAdmin(array(
'userid' => $user2,
'_delete' => array(
'groupid' => $group1,
'groupid' => $group1->getGID(),
),
));
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertFalse($result->succeeded());
$this->assertEquals(102, $result->getStatusCode());
\OC_Group::deleteGroup($group1);
$group1->delete();
}
public function testGetSubAdminGroups() {
$user1 = $this->generateUsers();
$user2 = $this->generateUsers();
self::loginAsUser($user1);
\OC_Group::addToGroup($user1, 'admin');
$this->groupManager->get('admin')->addUser($this->userManager->get($user1));
$group1 = $this->getUniqueID();
\OC_Group::createGroup($group1);
\OC_SubAdmin::createSubAdmin($user2, $group1);
$result = \OCA\provisioning_api\Users::getUserSubAdminGroups(array(
$group1 = $this->groupManager->createGroup($group1);
\OC_SubAdmin::createSubAdmin($user2, $group1->getGID());
$result = $this->api->getUserSubAdminGroups(array(
'userid' => $user2,
));
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
$data = $result->getData();
$this->assertEquals($group1, reset($data));
\OC_Group::deleteGroup($group1);
$this->assertEquals($group1->getGID(), reset($data));
$group1->delete();
$user1 = $this->generateUsers();
self::loginAsUser($user1);
\OC_Group::addToGroup($user1, 'admin');
$group1 = $this->getUniqueID();
$result = \OCA\provisioning_api\Users::getUserSubAdminGroups(array(
$this->groupManager->get('admin')->addUser($this->userManager->get($user1));
$result = $this->api->getUserSubAdminGroups(array(
'userid' => $this->getUniqueID(),
));
$this->assertInstanceOf('OC_OCS_Result', $result);
@ -792,24 +800,25 @@ class UsersTest extends TestCase {
$user1 = $this->generateUsers();
$user2 = $this->generateUsers();
self::loginAsUser($user1);
\OC_Group::addToGroup($user1, 'admin');
$this->groupManager->get('admin')->addUser($this->userManager->get($user1));
$group1 = $this->getUniqueID();
\OC_Group::createGroup($group1);
$group1 = $this->groupManager->createGroup($group1);
//Make user2 subadmin of group1
$_POST['groupid'] = $group1;
$result = \OCA\provisioning_api\Users::addSubAdmin([
$_POST['groupid'] = $group1->getGID();
$result = $this->api->addSubAdmin([
'userid' => $user2,
]);
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
//Make user2 subadmin of group1 again
$_POST['groupid'] = $group1;
$result = \OCA\provisioning_api\Users::addSubAdmin([
$_POST['groupid'] = $group1->getGID();
$result = $this->api->addSubAdmin([
'userid' => $user2,
]);
$this->assertInstanceOf('OC_OCS_Result', $result);
$this->assertTrue($result->succeeded());
$group1->delete();
}
}