summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2015-10-27 14:09:45 +0100
committerLukas Reschke <lukas@owncloud.com>2015-10-29 11:31:18 +0100
commitc6f6a8758b3f08e47c3a8f45a67d09698376b2e2 (patch)
treebfd52190961e28ae97fa65a96df05b1fe0390a2f /apps
parentf428d31a5d1f91c6e7aa96fd8550c75c02cc0963 (diff)
downloadnextcloud-server-c6f6a8758b3f08e47c3a8f45a67d09698376b2e2.tar.gz
nextcloud-server-c6f6a8758b3f08e47c3a8f45a67d09698376b2e2.zip
Drop OC_SubAdmin and replace usages
Diffstat (limited to 'apps')
-rw-r--r--apps/provisioning_api/appinfo/routes.php4
-rw-r--r--apps/provisioning_api/lib/groups.php24
-rw-r--r--apps/provisioning_api/lib/users.php259
-rw-r--r--apps/provisioning_api/tests/groupstest.php12
-rw-r--r--apps/provisioning_api/tests/userstest.php2990
5 files changed, 1995 insertions, 1294 deletions
diff --git a/apps/provisioning_api/appinfo/routes.php b/apps/provisioning_api/appinfo/routes.php
index 2a4b50dc27c..dcf18e0e53b 100644
--- a/apps/provisioning_api/appinfo/routes.php
+++ b/apps/provisioning_api/appinfo/routes.php
@@ -1,6 +1,7 @@
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
* @author michag86 <micha_g@arcor.de>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Roeland Jago Douma <rullzer@owncloud.com>
@@ -32,7 +33,8 @@ $users = new \OCA\Provisioning_API\Users(
\OC::$server->getUserManager(),
\OC::$server->getConfig(),
\OC::$server->getGroupManager(),
- \OC::$server->getUserSession()
+ \OC::$server->getUserSession(),
+ \OC::$server->getLogger()
);
API::register('get', '/cloud/users', [$users, 'getUsers'], 'provisioning_api', API::SUBADMIN_AUTH);
API::register('post', '/cloud/users', [$users, 'addUser'], 'provisioning_api', API::ADMIN_AUTH);
diff --git a/apps/provisioning_api/lib/groups.php b/apps/provisioning_api/lib/groups.php
index 5b613562324..c28db35972f 100644
--- a/apps/provisioning_api/lib/groups.php
+++ b/apps/provisioning_api/lib/groups.php
@@ -26,7 +26,6 @@
namespace OCA\Provisioning_API;
use \OC_OCS_Result;
-use \OC_SubAdmin;
use OCP\IGroup;
use OCP\IUser;
@@ -85,9 +84,16 @@ class Groups{
if(!$this->groupManager->groupExists($parameters['groupid'])) {
return new OC_OCS_Result(null, \OCP\API::RESPOND_NOT_FOUND, 'The requested group could not be found');
}
+
+ $isSubadminOfGroup = false;
+ $targetGroupObject =$this->groupManager->get($parameters['groupid']);
+ if($targetGroupObject !== null) {
+ $isSubadminOfGroup =$this->groupManager->getSubAdmin()->isSubAdminofGroup($user, $targetGroupObject);
+ }
+
// Check subadmin has access to this group
if($this->groupManager->isAdmin($user->getUID())
- || in_array($parameters['groupid'], \OC_SubAdmin::getSubAdminsGroups($user->getUID()))){
+ || $isSubadminOfGroup) {
$users = $this->groupManager->get($parameters['groupid'])->getUsers();
$users = array_map(function($user) {
/** @var IUser $user */
@@ -144,11 +150,21 @@ class Groups{
public function getSubAdminsOfGroup($parameters) {
$group = $parameters['groupid'];
// Check group exists
- if(!$this->groupManager->groupExists($group)) {
+ $targetGroup = $this->groupManager->get($group);
+ if($targetGroup === null) {
return new OC_OCS_Result(null, 101, 'Group does not exist');
}
+
+ $subadmins = $this->groupManager->getSubAdmin()->getGroupsSubAdmins($targetGroup);
+ // New class returns IUser[] so convert back
+ $uids = [];
+ foreach ($subadmins as $user) {
+ $uids[] = $user->getUID();
+ }
+ $subadmins = $uids;
+
// Go
- if(!$subadmins = OC_Subadmin::getGroupsSubAdmins($group)) {
+ if(!$subadmins) {
return new OC_OCS_Result(null, 102, 'Unknown error occured');
} else {
return new OC_OCS_Result($subadmins);
diff --git a/apps/provisioning_api/lib/users.php b/apps/provisioning_api/lib/users.php
index 527b107ad50..a9fafb48912 100644
--- a/apps/provisioning_api/lib/users.php
+++ b/apps/provisioning_api/lib/users.php
@@ -28,39 +28,40 @@
namespace OCA\Provisioning_API;
use \OC_OCS_Result;
-use \OC_SubAdmin;
use \OC_Helper;
-use \OC_Group;
use OCP\Files\NotFoundException;
+use OCP\ILogger;
class Users {
/** @var \OCP\IUserManager */
private $userManager;
-
/** @var \OCP\IConfig */
private $config;
-
/** @var \OCP\IGroupManager */
private $groupManager;
-
/** @var \OCP\IUserSession */
private $userSession;
+ /** @var ILogger */
+ private $logger;
/**
* @param \OCP\IUserManager $userManager
* @param \OCP\IConfig $config
* @param \OCP\IGroupManager $groupManager
* @param \OCP\IUserSession $userSession
+ * @param ILogger $logger
*/
public function __construct(\OCP\IUserManager $userManager,
\OCP\IConfig $config,
\OCP\IGroupManager $groupManager,
- \OCP\IUserSession $userSession) {
+ \OCP\IUserSession $userSession,
+ ILogger $logger) {
$this->userManager = $userManager;
$this->config = $config;
$this->groupManager = $groupManager;
$this->userSession = $userSession;
+ $this->logger = $logger;
}
/**
@@ -80,10 +81,15 @@ class Users {
}
// Admin? Or SubAdmin?
- if($this->groupManager->isAdmin($user->getUID())){
+ $uid = $user->getUID();
+ $subAdminManager = $this->groupManager->getSubAdmin();
+ if($this->groupManager->isAdmin($uid)){
$users = $this->userManager->search($search, $limit, $offset);
- } else if (\OC_SubAdmin::isSubAdmin($user->getUID())) {
- $subAdminOfGroups = \OC_SubAdmin::getSubAdminsGroups($user->getUID());
+ } else if ($subAdminManager->isSubAdmin($user)) {
+ $subAdminOfGroups = $subAdminManager->getSubAdminsGroups($user);
+ foreach ($subAdminOfGroups as $key => $group) {
+ $subAdminOfGroups[$key] = $group->getGID();
+ }
if($offset === null) {
$offset = 0;
@@ -112,15 +118,15 @@ class Users {
$userId = isset($_POST['userid']) ? $_POST['userid'] : null;
$password = isset($_POST['password']) ? $_POST['password'] : null;
if($this->userManager->userExists($userId)) {
- \OCP\Util::writeLog('ocs_api', 'Failed addUser attempt: User already exists.', \OCP\Util::ERROR);
+ $this->logger->error('Failed addUser attempt: User already exists.', ['app' => 'ocs_api']);
return new OC_OCS_Result(null, 102, 'User already exists');
} else {
try {
$this->userManager->createUser($userId, $password);
- \OCP\Util::writeLog('ocs_api', 'Successful addUser call with userid: '.$_POST['userid'], \OCP\Util::INFO);
+ $this->logger->info('Successful addUser call with userid: '.$_POST['userid'], ['app' => 'ocs_api']);
return new OC_OCS_Result(null, 100);
} catch (\Exception $e) {
- \OCP\Util::writeLog('ocs_api', 'Failed addUser attempt with exception: '.$e->getMessage(), \OCP\Util::ERROR);
+ $this->logger->error('Failed addUser attempt with exception: '.$e->getMessage(), ['app' => 'ocs_api']);
return new OC_OCS_Result(null, 101, 'Bad request');
}
}
@@ -132,35 +138,38 @@ class Users {
* @param array $parameters
* @return OC_OCS_Result
*/
- public function getUser($parameters){
+ public function getUser($parameters) {
$userId = $parameters['userid'];
// Check if user is logged in
- $user = $this->userSession->getUser();
- if ($user === null) {
+ $currentLoggedInUser = $this->userSession->getUser();
+ if ($currentLoggedInUser === null) {
return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
}
$data = [];
+ // Check if the target user exists
+ $targetUserObject = $this->userManager->get($userId);
+ if($targetUserObject === null) {
+ return new OC_OCS_Result(null, \OCP\API::RESPOND_NOT_FOUND, 'The requested user could not be found');
+ }
+
// Admin? Or SubAdmin?
- if($this->groupManager->isAdmin($user->getUID()) || OC_SubAdmin::isUserAccessible($user->getUID(), $userId)) {
- // Check they exist
- if(!$this->userManager->userExists($userId)) {
- return new OC_OCS_Result(null, \OCP\API::RESPOND_NOT_FOUND, 'The requested user could not be found');
- }
+ if($this->groupManager->isAdmin($currentLoggedInUser->getUID())
+ || $this->groupManager->getSubAdmin()->isUserAccessible($currentLoggedInUser, $targetUserObject)) {
$data['enabled'] = $this->config->getUserValue($userId, 'core', 'enabled', 'true');
} else {
// Check they are looking up themselves
- if($user->getUID() !== $userId) {
+ if($currentLoggedInUser->getUID() !== $userId) {
return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
}
}
// Find the data
- $data['quota'] = self::fillStorageInfo($userId);
+ $data['quota'] = $this->fillStorageInfo($userId);
$data['email'] = $this->config->getUserValue($userId, 'settings', 'email');
- $data['displayname'] = $this->userManager->get($userId)->getDisplayName();
+ $data['displayname'] = $targetUserObject->getDisplayName();
return new OC_OCS_Result($data);
}
@@ -172,27 +181,34 @@ class Users {
* @return OC_OCS_Result
*/
public function editUser($parameters) {
- $userId = $parameters['userid'];
+ /** @var string $targetUserId */
+ $targetUserId = $parameters['userid'];
// Check if user is logged in
- $user = $this->userSession->getUser();
- if ($user === null) {
+ $currentLoggedInUser = $this->userSession->getUser();
+ if ($currentLoggedInUser === null) {
return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
}
- if($userId === $user->getUID()) {
+ $targetUser = $this->userManager->get($targetUserId);
+ if($targetUser === null) {
+ return new OC_OCS_Result(null, 997);
+ }
+
+ if($targetUserId === $currentLoggedInUser->getUID()) {
// Editing self (display, email)
$permittedFields[] = 'display';
$permittedFields[] = 'email';
$permittedFields[] = 'password';
// If admin they can edit their own quota
- if($this->groupManager->isAdmin($user->getUID())) {
+ if($this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
$permittedFields[] = 'quota';
}
} else {
// Check if admin / subadmin
- if(OC_SubAdmin::isUserAccessible($user->getUID(), $userId)
- || $this->groupManager->isAdmin($user->getUID())) {
+ $subAdminManager = $this->groupManager->getSubAdmin();
+ if($subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
+ || $this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
// They have permissions over the user
$permittedFields[] = 'display';
$permittedFields[] = 'quota';
@@ -208,9 +224,9 @@ class Users {
return new OC_OCS_Result(null, 997);
}
// Process the edit
- switch($parameters['_put']['key']){
+ switch($parameters['_put']['key']) {
case 'display':
- $this->userManager->get($userId)->setDisplayName($parameters['_put']['value']);
+ $targetUser->setDisplayName($parameters['_put']['value']);
break;
case 'quota':
$quota = $parameters['_put']['value'];
@@ -225,20 +241,20 @@ class Users {
}
if($quota === 0) {
$quota = 'default';
- }else if($quota === -1){
+ }else if($quota === -1) {
$quota = 'none';
} else {
$quota = \OCP\Util::humanFileSize($quota);
}
}
- $this->config->setUserValue($userId, 'files', 'quota', $quota);
+ $this->config->setUserValue($targetUserId, 'files', 'quota', $quota);
break;
case 'password':
- $this->userManager->get($userId)->setPassword($parameters['_put']['value']);
+ $targetUser->setPassword($parameters['_put']['value']);
break;
case 'email':
if(filter_var($parameters['_put']['value'], FILTER_VALIDATE_EMAIL)) {
- $this->config->setUserValue($userId, 'settings', 'email', $parameters['_put']['value']);
+ $this->config->setUserValue($targetUserId, 'settings', 'email', $parameters['_put']['value']);
} else {
return new OC_OCS_Result(null, 102);
}
@@ -256,21 +272,25 @@ class Users {
*/
public function deleteUser($parameters) {
// Check if user is logged in
- $user = $this->userSession->getUser();
- if ($user === null) {
+ $currentLoggedInUser = $this->userSession->getUser();
+ if ($currentLoggedInUser === null) {
return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
}
- if(!$this->userManager->userExists($parameters['userid'])
- || $parameters['userid'] === $user->getUID()) {
+ $targetUser = $this->userManager->get($parameters['userid']);
+
+ if($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
return new OC_OCS_Result(null, 101);
}
+
// If not permitted
- if(!$this->groupManager->isAdmin($user->getUID()) && !OC_SubAdmin::isUserAccessible($user->getUID(), $parameters['userid'])) {
+ $subAdminManager = $this->groupManager->getSubAdmin();
+ if(!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
return new OC_OCS_Result(null, 997);
}
+
// Go ahead with the delete
- if($this->userManager->get($parameters['userid'])->delete()) {
+ if($targetUser->delete()) {
return new OC_OCS_Result(null, 100);
} else {
return new OC_OCS_Result(null, 101);
@@ -283,27 +303,34 @@ class Users {
*/
public function getUsersGroups($parameters) {
// Check if user is logged in
- $user = $this->userSession->getUser();
- if ($user === null) {
+ $loggedInUser = $this->userSession->getUser();
+ if ($loggedInUser === null) {
return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
}
- if($parameters['userid'] === $user->getUID() || $this->groupManager->isAdmin($user->getUID())) {
+ $targetUser = $this->userManager->get($parameters['userid']);
+ if($targetUser === null) {
+ return new OC_OCS_Result(null, \OCP\API::RESPOND_NOT_FOUND);
+ }
+
+ if($targetUser->getUID() === $loggedInUser->getUID() || $this->groupManager->isAdmin($loggedInUser->getUID())) {
// Self lookup or admin lookup
return new OC_OCS_Result([
- 'groups' => $this->groupManager->getUserGroupIds(
- $this->userManager->get($parameters['userid'])
- )
+ 'groups' => $this->groupManager->getUserGroupIds($targetUser)
]);
} else {
+ $subAdminManager = $this->groupManager->getSubAdmin();
+
// Looking up someone else
- if(OC_SubAdmin::isUserAccessible($user->getUID(), $parameters['userid'])) {
+ if($subAdminManager->isUserAccessible($loggedInUser, $targetUser)) {
// Return the group that the method caller is subadmin of for the user in question
+ $getSubAdminsGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
+ foreach ($getSubAdminsGroups as $key => $group) {
+ $getSubAdminsGroups[$key] = $group->getGID();
+ }
$groups = array_intersect(
- OC_SubAdmin::getSubAdminsGroups($user->getUID()),
- $this->groupManager->getUserGroupIds(
- $this->userManager->get($parameters['userid'])
- )
+ $getSubAdminsGroups,
+ $this->groupManager->getUserGroupIds($targetUser)
);
return new OC_OCS_Result(array('groups' => $groups));
} else {
@@ -325,27 +352,28 @@ class Users {
return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
}
- $group = !empty($_POST['groupid']) ? $_POST['groupid'] : null;
- if(is_null($group)){
- return new OC_OCS_Result(null, 101);
- }
// Check they're an admin
- if(!$this->groupManager->isInGroup($user->getUID(), 'admin')){
+ if(!$this->groupManager->isAdmin($user->getUID())) {
// 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(!$this->groupManager->groupExists($group)){
+
+ $groupId = !empty($_POST['groupid']) ? $_POST['groupid'] : null;
+ if($groupId === null) {
+ return new OC_OCS_Result(null, 101);
+ }
+
+ $group = $this->groupManager->get($groupId);
+ $targetUser = $this->userManager->get($parameters['userid']);
+ if($group === null) {
return new OC_OCS_Result(null, 102);
}
- // Check if the user exists
- if(!$this->userManager->userExists($parameters['userid'])){
+ if($targetUser === null) {
return new OC_OCS_Result(null, 103);
}
+
// Add user to group
- $this->groupManager->get($group)->addUser(
- $this->userManager->get($parameters['userid'])
- );
+ $group->addUser($targetUser);
return new OC_OCS_Result(null, 100);
}
@@ -355,44 +383,47 @@ class Users {
*/
public function removeFromGroup($parameters) {
// Check if user is logged in
- $user = $this->userSession->getUser();
- if ($user === null) {
+ $loggedInUser = $this->userSession->getUser();
+ if ($loggedInUser === null) {
return new OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
}
- $group = !empty($parameters['_delete']['groupid']) ? $parameters['_delete']['groupid'] : null;
- if(is_null($group)){
+ $group = $this->groupManager->get(!empty($parameters['_delete']['groupid']) ? $parameters['_delete']['groupid'] : null);
+ if($group === null) {
return new OC_OCS_Result(null, 101);
}
+
+ $targetUser = $this->userManager->get($parameters['userid']);
+ if($targetUser === null) {
+ return new OC_OCS_Result(null, 103);
+ }
+
// If they're not an admin, check they are a subadmin of the group in question
- if(!$this->groupManager->isInGroup($user->getUID(), 'admin') && !OC_SubAdmin::isSubAdminofGroup($user->getUID(), $group)){
+ $subAdminManager = $this->groupManager->getSubAdmin();
+ if(!$this->groupManager->isAdmin($loggedInUser->getUID()) && !$subAdminManager->isSubAdminofGroup($loggedInUser, $group)) {
return new OC_OCS_Result(null, 104);
}
// Check they aren't removing themselves from 'admin' or their 'subadmin; group
- if($parameters['userid'] === $user->getUID()){
- if($this->groupManager->isInGroup($user->getUID(), 'admin')){
- if($group === 'admin'){
+ if($parameters['userid'] === $loggedInUser->getUID()) {
+ if($this->groupManager->isAdmin($loggedInUser->getUID())) {
+ if($group->getGID() === 'admin') {
return new OC_OCS_Result(null, 105, 'Cannot remove yourself from the admin group');
}
} else {
// Not an admin, check they are not removing themself from their subadmin group
- if(in_array($group, OC_SubAdmin::getSubAdminsGroups($user->getUID()))){
+ $subAdminGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
+ foreach ($subAdminGroups as $key => $group) {
+ $subAdminGroups[$key] = $group->getGID();
+ }
+
+ if(in_array($group->getGID(), $subAdminGroups, true)) {
return new OC_OCS_Result(null, 105, 'Cannot remove yourself from this group as you are a SubAdmin');
}
}
}
- // Check if the group exists
- if(!$this->groupManager->groupExists($group)){
- return new OC_OCS_Result(null, 102);
- }
- // Check if the user exists
- if(!$this->userManager->userExists($parameters['userid'])){
- return new OC_OCS_Result(null, 103);
- }
+
// Remove user from group
- $this->groupManager->get($group)->removeUser(
- $this->userManager->get($parameters['userid'])
- );
+ $group->removeUser($targetUser);
return new OC_OCS_Result(null, 100);
}
@@ -403,31 +434,34 @@ class Users {
* @return OC_OCS_Result
*/
public function addSubAdmin($parameters) {
- $group = $_POST['groupid'];
- $user = $parameters['userid'];
+ $group = $this->groupManager->get($_POST['groupid']);
+ $user = $this->userManager->get($parameters['userid']);
+
// Check if the user exists
- if(!$this->userManager->userExists($user)) {
+ if($user === null) {
return new OC_OCS_Result(null, 101, 'User does not exist');
}
// Check if group exists
- if(!$this->groupManager->groupExists($group)) {
- return new OC_OCS_Result(null, 102, 'Group:'.$group.' does not exist');
+ if($group === null) {
+ return new OC_OCS_Result(null, 102, 'Group:'.$_POST['groupid'].' does not exist');
}
// Check if trying to make subadmin of admin group
- if(strtolower($group) === 'admin') {
+ if(strtolower($_POST['groupid']) === 'admin') {
return new OC_OCS_Result(null, 103, 'Cannot create subadmins for admin group');
}
+
+ $subAdminManager = $this->groupManager->getSubAdmin();
+
// We cannot be subadmin twice
- if (OC_Subadmin::isSubAdminOfGroup($user, $group)) {
+ if ($subAdminManager->isSubAdminofGroup($user, $group)) {
return new OC_OCS_Result(null, 100);
}
// Go
- if(OC_Subadmin::createSubAdmin($user, $group)) {
+ if($subAdminManager->createSubAdmin($user, $group)) {
return new OC_OCS_Result(null, 100);
} else {
- return new OC_OCS_Result(null, 103, 'Unknown error occured');
+ return new OC_OCS_Result(null, 103, 'Unknown error occurred');
}
-
}
/**
@@ -437,18 +471,25 @@ class Users {
* @return OC_OCS_Result
*/
public function removeSubAdmin($parameters) {
- $group = $parameters['_delete']['groupid'];
- $user = $parameters['userid'];
+ $group = $this->groupManager->get($parameters['_delete']['groupid']);
+ $user = $this->userManager->get($parameters['userid']);
+ $subAdminManager = $this->groupManager->getSubAdmin();
+
// Check if the user exists
- if(!$this->userManager->userExists($user)) {
+ if($user === null) {
return new OC_OCS_Result(null, 101, 'User does not exist');
}
+ // Check if the group exists
+ if($group === null) {
+ return new OC_OCS_Result(null, 101, 'Group does not exist');
+ }
// Check if they are a subadmin of this said group
- if(!OC_SubAdmin::isSubAdminofGroup($user, $group)) {
+ if(!$subAdminManager->isSubAdminofGroup($user, $group)) {
return new OC_OCS_Result(null, 102, 'User is not a subadmin of this group');
}
+
// Go
- if(OC_Subadmin::deleteSubAdmin($user, $group)) {
+ if($subAdminManager->deleteSubAdmin($user, $group)) {
return new OC_OCS_Result(null, 100);
} else {
return new OC_OCS_Result(null, 103, 'Unknown error occurred');
@@ -462,13 +503,19 @@ class Users {
* @return OC_OCS_Result
*/
public function getUserSubAdminGroups($parameters) {
- $user = $parameters['userid'];
+ $user = $this->userManager->get($parameters['userid']);
// Check if the user exists
- if(!$this->userManager->userExists($user)) {
+ if($user === null) {
return new OC_OCS_Result(null, 101, 'User does not exist');
}
+
// Get the subadmin groups
- if(!$groups = OC_SubAdmin::getSubAdminsGroups($user)) {
+ $groups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($user);
+ foreach ($groups as $key => $group) {
+ $groups[$key] = $group->getGID();
+ }
+
+ if(!$groups) {
return new OC_OCS_Result(null, 102, 'Unknown error occurred');
} else {
return new OC_OCS_Result($groups);
@@ -477,12 +524,10 @@ class Users {
/**
* @param string $userId
- * @param array $data
- * @return mixed
+ * @return array
* @throws \OCP\Files\NotFoundException
*/
- private static function fillStorageInfo($userId) {
- $data = [];
+ protected function fillStorageInfo($userId) {
try {
\OC_Util::tearDownFS();
\OC_Util::setupFS($userId);
diff --git a/apps/provisioning_api/tests/groupstest.php b/apps/provisioning_api/tests/groupstest.php
index c75ba76bd35..f67ed1c36ae 100644
--- a/apps/provisioning_api/tests/groupstest.php
+++ b/apps/provisioning_api/tests/groupstest.php
@@ -1,6 +1,7 @@
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Roeland Jago Douma <rullzer@owncloud.com>
* @author Tom Needham <tom@owncloud.com>
@@ -29,15 +30,14 @@ use OCP\IGroupManager;
use OCP\IUserSession;
class GroupsTest extends TestCase {
-
/** @var IUserManager */
protected $userManager;
-
/** @var IGroupManager */
protected $groupManager;
-
/** @var IUserSession */
protected $userSession;
+ /** @var \OCA\Provisioning_API\Groups */
+ protected $api;
protected function setup() {
parent::setup();
@@ -114,7 +114,7 @@ class GroupsTest extends TestCase {
$group->addUser($users[0]);
$group->addUser($users[1]);
- \OC_SubAdmin::createSubAdmin($users[0]->getUID(), $group->getGID());
+ $this->groupManager->getSubAdmin()->createSubAdmin($users[0], $group);
$result = $this->api->getGroup([
'groupid' => $group->getGID(),
@@ -147,7 +147,7 @@ class GroupsTest extends TestCase {
$group1->addUser($users[1]);
$group2->addUser($users[0]);
- \OC_SubAdmin::createSubAdmin($users[0]->getUID(), $group2->getGID());
+ $this->groupManager->getSubAdmin()->createSubAdmin($users[0], $group2);
$result = $this->api->getGroup([
'groupid' => $group1->getGID(),
@@ -196,7 +196,7 @@ class GroupsTest extends TestCase {
$this->userSession->setUser($user1);
$this->groupManager->get('admin')->addUser($user1);
$group1 = $this->groupManager->createGroup($this->getUniqueID());
- \OC_SubAdmin::createSubAdmin($user2->getUID(), $group1->getGID());
+ $this->groupManager->getSubAdmin()->createSubAdmin($user2, $group1);
$result = $this->api->getSubAdminsOfGroup([
'groupid' => $group1->getGID(),
]);
diff --git a/apps/provisioning_api/tests/userstest.php b/apps/provisioning_api/tests/userstest.php
index 607e6f118ae..c5a1ac3061e 100644
--- a/apps/provisioning_api/tests/userstest.php
+++ b/apps/provisioning_api/tests/userstest.php
@@ -1,11 +1,11 @@
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Roeland Jago Douma <rullzer@owncloud.com>
* @author Thomas Müller <thomas.mueller@tmit.eu>
* @author Tom Needham <tom@owncloud.com>
- * @author Vincent Petry <pvince81@owncloud.com>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
@@ -26,1248 +26,1886 @@
namespace OCA\Provisioning_API\Tests;
+use OCA\Provisioning_API\Users;
use OCP\IUserManager;
use OCP\IConfig;
use OCP\IGroupManager;
use OCP\IUserSession;
+use Test\TestCase as OriginalTest;
+use OCP\ILogger;
-class UsersTest extends TestCase {
+class UsersTest extends OriginalTest {
/** @var IUserManager */
protected $userManager;
-
/** @var IConfig */
protected $config;
-
- /** @var IGroupManager */
+ /** @var \OC\Group\Manager */
protected $groupManager;
-
/** @var IUserSession */
protected $userSession;
+ /** @var ILogger */
+ protected $logger;
+ /** @var Users */
+ protected $api;
- protected function resetParams() {
+ protected function tearDown() {
$_GET = null;
$_POST = null;
+ parent::tearDown();
}
protected function setup() {
parent::setup();
- $this->userManager = \OC::$server->getUserManager();
- $this->config = \OC::$server->getConfig();
- $this->groupManager = \OC::$server->getGroupManager();
- $this->userSession = \OC::$server->getUserSession();
- $this->api = new \OCA\Provisioning_Api\Users(
- $this->userManager,
- $this->config,
- $this->groupManager,
- $this->userSession
- );
+ $this->userManager = $this->getMock('\OCP\IUserManager');
+ $this->config = $this->getMock('\OCP\IConfig');
+ $this->groupManager = $this->getMockBuilder('\OC\Group\Manager')
+ ->disableOriginalConstructor()->getMock();
+ $this->userSession = $this->getMock('\OCP\IUserSession');
+ $this->logger = $this->getMock('\OCP\ILogger');
+ $this->api = $this->getMockBuilder('\OCA\Provisioning_API\Users')
+ ->setConstructorArgs([
+ $this->userManager,
+ $this->config,
+ $this->groupManager,
+ $this->userSession,
+ $this->logger,
+ ]
+ )
+ ->setMethods(['fillStorageInfo'])
+ ->getMock();
+ }
- $this->userSession->setUser(null);
+ public function testGetUsersNotLoggedIn() {
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue(null));
+
+ $expected = new \OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
+ $this->assertEquals($expected, $this->api->getUsers());
}
- // Test getting the list of users
public function testGetUsersAsAdmin() {
- $user = $this->generateUsers();
- $this->groupManager->get('admin')->addUser($user);
- $this->userSession->setUser($user);
-
- $result = $this->api->getUsers();
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $count = $result->getData();
- $count = count($count['users']);
- $this->assertEquals(count($this->userManager->search('', null, null)), $count);
-
- $user = $this->generateUsers();
- $_GET['search'] = $user->getUID();
- $result = $this->api->getUsers();
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $data = $result->getData();
- $this->assertEquals($user->getUID(), reset($data['users']));
-
- // Add several users
- $this->generateUsers(10);
- $this->resetParams();
- $_GET['limit'] = 2;
- $result = $this->api->getUsers();
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $count = $result->getData();
- $count = count($count['users']);
- $this->assertEquals(2, $count);
-
- $this->resetParams();
- $_GET['limit'] = 1;
- $_GET['offset'] = 1;
- $result = $this->api->getUsers(array());
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $data = $result->getData();
- $this->assertEquals(array_keys($this->userManager->search('', 1, 1)), $data['users']);
+ $_GET['search'] = 'MyCustomSearch';
+
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('admin'));
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('isAdmin')
+ ->will($this->returnValue(true));
+ $this->userManager
+ ->expects($this->once())
+ ->method('search')
+ ->with('MyCustomSearch', null, null)
+ ->will($this->returnValue(['Admin' => [], 'Foo' => [], 'Bar' => []]));
+
+ $expected = new \OC_OCS_Result([
+ 'users' => [
+ 'Admin',
+ 'Foo',
+ 'Bar',
+ ],
+ ]);
+ $this->assertEquals($expected, $this->api->getUsers());
}
public function testGetUsersAsSubAdmin() {
- $user = $this->generateUsers(10);
- $this->userSession->setUser($user[0]);
- $group = $this->groupManager->createGroup($this->getUniqueID());
- \OC_SubAdmin::createSubAdmin($user[0]->getUID(), $group->getGID());
-
- //Empty list
- $result = $this->api->getUsers([]);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $this->assertEquals(['users' => []], $result->getData());
-
- //Some users in group
- $group->addUser($user[1]);
- $group->addUser($user[2]);
- $group->addUser($user[3]);
- $group->addUser($user[4]);
-
- $result = $this->api->getUsers([]);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $this->assertArrayHasKey('users', $result->getData());
-
- $this->assertContains($user[1]->getUID(), $result->getData()['users']);
- $this->assertContains($user[2]->getUID(), $result->getData()['users']);
- $this->assertContains($user[3]->getUID(), $result->getData()['users']);
- $this->assertContains($user[4]->getUID(), $result->getData()['users']);
-
- $uids = [
- $user[1]->getUID(),
- $user[2]->getUID(),
- $user[3]->getUID(),
- $user[4]->getUID()
- ];
- sort($uids);
-
- $_GET['limit'] = 2;
- $_GET['offset'] = 1;
- $result = $this->api->getUsers([]);
-
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
-
- // Disable this test for now since sorting is not done the same on all backends
- //$this->assertEquals(['users' => array_slice($uids, 1, 2)], $result->getData());
-
- $this->assertCount(2, $result->getData()['users']);
-
- $counter = 0;
- foreach ($uids as $uid) {
- if (in_array($uid, $result->getData()['users'], true)) {
- $counter += 1;
- }
- }
-
- $this->assertEquals(2, $counter);
- }
-
- public function testGetUsersNoUser() {
- $result = $this->api->getUsers([]);
-
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertEquals(\OCP\API::RESPOND_UNAUTHORISED, $result->getStatusCode());
- }
-
- public function testGetUsersAsUser() {
- $user = $this->generateUsers();
- $this->userSession->setUser($user);
-
- $result = $this->api->getUsers();
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertEquals(\OCP\API::RESPOND_UNAUTHORISED, $result->getStatusCode());
-
- }
-
- public function testAddUser() {
- $this->resetParams();
- $_POST['userid'] = $this->getUniqueID();
- $_POST['password'] = 'password';
- $result = $this->api->addUser();
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $this->assertTrue($this->userManager->userExists($_POST['userid']));
- $this->assertEquals($_POST['userid'], $this->userManager->checkPassword($_POST['userid'], $_POST['password'])->getUID());
- $this->users[] = $this->userManager->get($_POST['userid']);
- }
-
- public function testAddUserTwice() {
- $this->resetParams();
- $_POST['userid'] = $this->getUniqueID();
- $_POST['password'] = 'password';
- $this->api->addUser();
- $result = $this->api->addUser();
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertEquals(102, $result->getStatusCode());
- $this->assertEquals('User already exists', $result->getMeta()['message']);
- }
-
- public function testAddUserFails() {
- $uid = $this->getUniqueID();
+ $_GET['search'] = 'MyCustomSearch';
- $userManager = $this->getMockBuilder('\OCP\IUserManager')
- ->disableOriginalConstructor()
- ->getMock();
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('subadmin'));
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('isAdmin')
+ ->will($this->returnValue(false));
+ $firstGroup = $this->getMock('\OCP\IGroup');
+ $firstGroup
+ ->expects($this->once())
+ ->method('getGID')
+ ->will($this->returnValue('FirstGroup'));
+ $secondGroup = $this->getMock('\OCP\IGroup');
+ $secondGroup
+ ->expects($this->once())
+ ->method('getGID')
+ ->will($this->returnValue('SecondGroup'));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+ ->disableOriginalConstructor()->getMock();
+ $subAdminManager
+ ->expects($this->once())
+ ->method('isSubAdmin')
+ ->with($loggedInUser)
+ ->will($this->returnValue(true));
+ $subAdminManager
+ ->expects($this->once())
+ ->method('getSubAdminsGroups')
+ ->with($loggedInUser)
+ ->will($this->returnValue([$firstGroup, $secondGroup]));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+ $this->groupManager
+ ->expects($this->any())
+ ->method('displayNamesInGroup')
+ ->will($this->onConsecutiveCalls(['AnotherUserInTheFirstGroup' => []], ['UserInTheSecondGroup' => []]));
+
+ $expected = new \OC_OCS_Result([
+ 'users' => [
+ 'AnotherUserInTheFirstGroup',
+ 'UserInTheSecondGroup',
+ ],
+ ]);
+ $this->assertEquals($expected, $this->api->getUsers());
+ }
+
+ public function testGetUsersAsRegularUser() {
+ $_GET['search'] = 'MyCustomSearch';
+
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('regularUser'));
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('isAdmin')
+ ->will($this->returnValue(false));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+ ->disableOriginalConstructor()->getMock();
+ $subAdminManager
+ ->expects($this->once())
+ ->method('isSubAdmin')
+ ->with($loggedInUser)
+ ->will($this->returnValue(false));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+
+ $expected = new \OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
+ $this->assertEquals($expected, $this->api->getUsers());
+ }
+
+ public function testAddUserAlreadyExisting() {
+ $_POST['userid'] = 'AlreadyExistingUser';
+ $this->userManager
+ ->expects($this->once())
+ ->method('userExists')
+ ->with('AlreadyExistingUser')
+ ->will($this->returnValue(true));
+ $this->logger
+ ->expects($this->once())
+ ->method('error')
+ ->with('Failed addUser attempt: User already exists.', ['app' => 'ocs_api']);
+
+ $expected = new \OC_OCS_Result(null, 102, 'User already exists');
+ $this->assertEquals($expected, $this->api->addUser());
+ }
- $userManager->expects($this->once())
+ public function testAddUserSuccessful() {
+ $_POST['userid'] = 'NewUser';
+ $_POST['password'] = 'PasswordOfTheNewUser';
+ $this->userManager
+ ->expects($this->once())
->method('userExists')
- ->with($uid)
- ->willReturn(false);
- $userManager->expects($this->once())
+ ->with('NewUser')
+ ->will($this->returnValue(false));
+ $this->userManager
+ ->expects($this->once())
->method('createUser')
- ->with($uid, 'password')
- ->will($this->throwException(new \Exception));
-
- $api = new \OCA\Provisioning_Api\Users(
- $userManager,
- $this->config,
- $this->groupManager,
- $this->userSession
- );
+ ->with('NewUser', 'PasswordOfTheNewUser');
+ $this->logger
+ ->expects($this->once())
+ ->method('info')
+ ->with('Successful addUser call with userid: NewUser', ['app' => 'ocs_api']);
+
+ $expected = new \OC_OCS_Result(null, 100);
+ $this->assertEquals($expected, $this->api->addUser());
+ }
- $this->resetParams();
- $_POST['userid'] = $uid;
- $_POST['password'] = 'password';
- $result = $api->addUser();
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertEquals(101, $result->getStatusCode());
- $this->assertEquals('Bad request', $result->getMeta()['message']);
- }
-
- public function testGetUserOnSelf() {
- $user = $this->generateUsers();
- $user->setDisplayName('foobar');
- $this->userSession->setUser($user);
- $params = ['userid' => $user->getUID()];
- $result = $this->api->getUser($params);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $data = $result->getData();
-
- $this->assertEquals('foobar', $data['displayname']);
- }
-
- public function testGetUserOnNonExistingUser() {
- $user = $this->generateUsers();
- $this->groupManager->get('admin')->addUser($user);
- $this->userSession->setUser($user);
- $params = array();
- $params['userid'] = $this->getUniqueID();
- while($this->userManager->userExists($params['userid'])) {
- $params['userid'] = $this->getUniqueID();
- }
- $result = $this->api->getUser($params);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertEquals(\OCP\API::RESPOND_NOT_FOUND, $result->getStatusCode());
-
- }
-
- public function testGetUserOnOtherUser() {
- $users = $this->generateUsers(2);
- $params = ['userid' => $users[0]->getUID()];
- $this->userSession->setUser($users[1]);
- $result = $this->api->getUser($params);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
-
- // Now as as admin
- $users = $this->generateUsers(2);
- $params['userid'] = $users[0]->getUID();
- // login to generate home
- $this->userSession->setUser($users[0]);
- $this->groupManager->get('admin')->addUser($users[1]);
- $this->userSession->setUser($users[1]);
- $result = $this->api->getUser($params);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $data = $result->getData();
- $this->assertEquals(\OC::$server->getConfig()->getUserValue($users[0]->getUID(), 'core', 'enabled', 'true'), $data['enabled']);
- }
-
- public function testEditOwnDisplayName() {
- // Test editing own name
- $user = $this->generateUsers();
- $this->userSession->setUser($user);
- $result = $this->api->editUser(
- array(
- 'userid' => $user->getUID(),
- '_put' => array(
- 'key' => 'display',
- 'value' => 'newname',
- ),
- )
- );
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $this->assertEquals('newname', $user->getDisplayName());
-
- }
-
- public function testAdminEditDisplayNameOfUser() {
- // Test admin editing users name
- $user = $this->generateUsers();
- $this->groupManager->get('admin')->addUser($user);
- $this->userSession->setUser($user);
- $user2 = $this->generateUsers();
- $result = $this->api->editUser(
- [
- 'userid' => $user2->getUID(),
- '_put' => [
- 'key' => 'display',
- 'value' => 'newname',
- ],
- ]
- );
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $this->assertEquals('newname', $user2->getDisplayName());
-
- }
-
- public function testUserEditOtherUserDisplayName() {
- // Test editing other users name
- $user = $this->generateUsers();
- $this->userSession->setUser($user);
- $user2 = $this->generateUsers();
- $result = $this->api->editUser(
- array(
- 'userid' => $user2->getUID(),
- '_put' => array(
- 'key' => 'display',
- 'value' => 'newname',
- ),
- )
- );
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
-
- }
-
- /**
- * @dataProvider providesQuotas
- * @param $expected
- * @param $quota
- */
- public function testEditOwnQuota($expected, $quota) {
- $user = $this->generateUsers();
- $this->userSession->setUser($user);
- $result = $this->api->editUser(
+ public function testAddUserUnsuccessful() {
+ $_POST['userid'] = 'NewUser';
+ $_POST['password'] = 'PasswordOfTheNewUser';
+ $this->userManager
+ ->expects($this->once())
+ ->method('userExists')
+ ->with('NewUser')
+ ->will($this->returnValue(false));
+ $this->userManager
+ ->expects($this->once())
+ ->method('createUser')
+ ->with('NewUser', 'PasswordOfTheNewUser')
+ ->will($this->throwException(new \Exception('User backend not found.')));
+ $this->logger
+ ->expects($this->once())
+ ->method('error')
+ ->with('Failed addUser attempt with exception: User backend not found.', ['app' => 'ocs_api']);
+
+ $expected = new \OC_OCS_Result(null, 101, 'Bad request');
+ $this->assertEquals($expected, $this->api->addUser());
+ }
+
+ public function testGetUserNotLoggedIn() {
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue(null));
+
+ $expected = new \OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
+ $this->assertEquals($expected, $this->api->getUser(['userid' => 'UserToGet']));
+ }
+
+ public function testGetUserTargetDoesNotExist() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToGet')
+ ->will($this->returnValue(null));
+
+ $expected = new \OC_OCS_Result(null, \OCP\API::RESPOND_NOT_FOUND, 'The requested user could not be found');
+ $this->assertEquals($expected, $this->api->getUser(['userid' => 'UserToGet']));
+ }
+
+ public function testGetUserAsAdmin() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('admin'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToGet')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('isAdmin')
+ ->with('admin')
+ ->will($this->returnValue(true));
+ $this->config
+ ->expects($this->at(0))
+ ->method('getUserValue')
+ ->with('UserToGet', 'core', 'enabled', 'true')
+ ->will($this->returnValue('true'));
+ $this->api
+ ->expects($this->once())
+ ->method('fillStorageInfo')
+ ->with('UserToGet')
+ ->will($this->returnValue(['DummyValue']));
+ $this->config
+ ->expects($this->at(1))
+ ->method('getUserValue')
+ ->with('UserToGet', 'settings', 'email')
+ ->will($this->returnValue('demo@owncloud.org'));
+ $targetUser
+ ->expects($this->once())
+ ->method('getDisplayName')
+ ->will($this->returnValue('Demo User'));
+
+ $expected = new \OC_OCS_Result(
[
- 'userid' => $user->getUID(),
- '_put' => [
- 'key' => 'quota',
- 'value' => $quota,
- ],
+ 'enabled' => 'true',
+ 'quota' => ['DummyValue'],
+ 'email' => 'demo@owncloud.org',
+ 'displayname' => 'Demo User',
]
- );
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertEquals(997, $result->getStatusCode());
- }
-
- /**
- * @dataProvider providesQuotas
- * @param $expected
- * @param $quota
- */
- public function testEditOwnQuotaAsAdmin($expected, $quota) {
- $user = $this->generateUsers();
- $this->groupManager->get('admin')->addUser($user);
- $this->userSession->setUser($user);
- $result = $this->api->editUser(
+ );
+ $this->assertEquals($expected, $this->api->getUser(['userid' => 'UserToGet']));
+ }
+
+ public function testGetUserAsSubAdminAndUserIsAccessible() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('subadmin'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToGet')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('isAdmin')
+ ->with('subadmin')
+ ->will($this->returnValue(false));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $subAdminManager
+ ->expects($this->once())
+ ->method('isUserAccessible')
+ ->with($loggedInUser, $targetUser)
+ ->will($this->returnValue(true));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+ $this->config
+ ->expects($this->at(0))
+ ->method('getUserValue')
+ ->with('UserToGet', 'core', 'enabled', 'true')
+ ->will($this->returnValue('true'));
+ $this->api
+ ->expects($this->once())
+ ->method('fillStorageInfo')
+ ->with('UserToGet')
+ ->will($this->returnValue(['DummyValue']));
+ $this->config
+ ->expects($this->at(1))
+ ->method('getUserValue')
+ ->with('UserToGet', 'settings', 'email')
+ ->will($this->returnValue('demo@owncloud.org'));
+ $targetUser
+ ->expects($this->once())
+ ->method('getDisplayName')
+ ->will($this->returnValue('Demo User'));
+
+ $expected = new \OC_OCS_Result(
[
- 'userid' => $user->getUID(),
- '_put' => [
- 'key' => 'quota',
- 'value' => $quota,
- ],
+ 'enabled' => 'true',
+ 'quota' => ['DummyValue'],
+ 'email' => 'demo@owncloud.org',
+ 'displayname' => 'Demo User',
]
- );
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertEquals($expected, $result->succeeded());
- }
-
- public function providesQuotas() {
- return [
- [true, '20G'],
- [true, '1234567'],
- [true, 'none'],
- [true, 'default'],
- [false, 'qwertzu'],
- [true, 0],
- [true, -1]
- ];
- }
-
- public function testAdminEditOwnQuota() {
- $user = $this->generateUsers();
- $this->groupManager->get('admin')->addUser($user);
- $this->userSession->setUser($user);
- $result = $this->api->editUser(
- array(
- 'userid' => $user->getUID(),
- '_put' => array(
- 'key' => 'quota',
- 'value' => '20G',
- ),
- )
- );
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- }
-
- public function testAdminEditOtherUserQuota() {
- $user = $this->generateUsers();
- $this->groupManager->get('admin')->addUser($user);
- $this->userSession->setUser($user);
- $user2 = $this->generateUsers();
- $result = $this->api->editUser(
- array(
- 'userid' => $user2->getUID(),
- '_put' => array(
- 'key' => 'quota',
- 'value' => '20G',
- ),
- )
- );
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- }
-
- public function testUserEditOtherUserQuota() {
- $user = $this->generateUsers();
- $this->userSession->setUser($user);
- $user2 = $this->generateUsers();
- $result = $this->api->editUser(
- array(
- 'userid' => $user2->getUID(),
- '_put' => array(
- 'key' => 'quota',
- 'value' => '20G',
- ),
- )
- );
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- }
-
- public function testUserEditOwnEmail() {
- $user = $this->generateUsers();
- $email = 'test@example.com';
- $this->userSession->setUser($user);
- $result = $this->api->editUser(
- array(
- 'userid' => $user->getUID(),
- '_put' => array(
- 'key' => 'email',
- 'value' => $email,
- ),
- )
- );
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $this->assertEquals($email, \OC::$server->getConfig()->getUserValue($user->getUID(), 'settings', 'email', null));
- }
-
- public function testUserEditOwnEmailInvalid() {
- $user = $this->generateUsers();
- $email = 'test@example';
- $this->userSession->setUser($user);
- $result = $this->api->editUser([
- 'userid' => $user->getUID(),
- '_put' => [
- 'key' => 'email',
- 'value' => $email,
- ],
- ]);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertEquals(102, $result->getStatusCode());
- }
-
- public function testUserEditOtherUserEmailAsUser() {
- $users = $this->generateUsers(2);
- $email = 'test@example.com';
- $this->userSession->setUser($users[0]);
- $result = $this->api->editUser(
- array(
- 'userid' => $users[1]->getUID(),
- '_put' => array(
- 'key' => 'email',
- 'value' => $email,
- ),
- )
- );
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- }
-
- public function testUserEditOtherUserEmailAsAdmin() {
- $users = $this->generateUsers(2);
- $email = 'test@example.com';
- $this->userSession->setUser($users[0]);
- $this->groupManager->get('admin')->addUser($users[0]);
- $result = $this->api->editUser(
- array(
- 'userid' => $users[1]->getUID(),
- '_put' => array(
- 'key' => 'email',
- 'value' => $email,
- ),
- )
- );
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $this->assertEquals($email, \OC::$server->getConfig()->getUserValue($users[1]->getUID(), 'settings', 'email', null));
- }
-
- public function testUserEditOwnPassword() {
- $user = $this->generateUsers();
- $password = 'foo';
- $this->userSession->setUser($user);
- $result = $this->api->editUser([
- 'userid' => $user->getUID(),
- '_put' => [
- 'key' => 'password',
- 'value' => $password,
- ],
- ]);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- }
-
- public function testUserEditOtherUserPasswordAsUser() {
- $users = $this->generateUsers(2);
- $password = 'foo';
- $this->userSession->setUser($users[0]);
- $result = $this->api->editUser([
- 'userid' => $users[1]->getUID(),
- '_put' => [
- 'key' => 'password',
- 'value' => $password,
- ],
- ]);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- }
-
- public function testUserEditOtherUserPasswordAsAdmin() {
- $users = $this->generateUsers(2);
- $password = 'foo';
- $this->userSession->setUser($users[0]);
- $this->groupManager->get('admin')->addUser($users[0]);
- $result = $this->api->editUser([
- 'userid' => $users[1]->getUID(),
- '_put' => [
- 'key' => 'password',
- 'value' => $password,
- ],
- ]);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- }
-
- public function testDeleteSelf() {
- $user = $this->generateUsers();
- $this->userSession->setUser($user);
- $result = $this->api->deleteUser(array(
- 'userid' => $user->getUID(),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- }
-
- public function testDeleteOtherAsUser() {
- $user = $this->generateUsers();
- $this->userSession->setUser($user);
- $user2 = $this->generateUsers();
- $result = $this->api->deleteUser(array(
- 'userid' => $user2->getUID(),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- }
-
- public function testDeleteOtherAsSubAdmin() {
- $user = $this->generateUsers();
- $this->userSession->setUser($user);
- $user2 = $this->generateUsers();
- $group = $this->groupManager->createGroup($this->getUniqueID());
- $group->addUser($user);
- $group->addUser($user2);
- \OC_SubAdmin::createSubAdmin($user->getUID(), $group->getGID());
- $result = $this->api->deleteUser(array(
- 'userid' => $user2->getUID(),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $group->delete();
- }
-
- public function testDeleteOtherAsIrelevantSubAdmin() {
- $user = $this->generateUsers();
- $this->userSession->setUser($user);
- $user2 = $this->generateUsers();
- $group = $this->groupManager->createGroup($this->getUniqueID());
- $group2 = $this->groupManager->createGroup($this->getUniqueID());
- $group->addUser($user);
- $group2->addUser($user2);
- \OC_SubAdmin::createSubAdmin($user->getUID(), $group->getGID());
- $result = $this->api->deleteUser(array(
- 'userid' => $user2->getUID(),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $group->delete();
- $group2->delete();
- }
-
- public function testDeleteOtherAsAdmin() {
- $user = $this->generateUsers();
- $this->groupManager->get('admin')->addUser($user);
- $this->userSession->setUser($user);
- $user2 = $this->generateUsers();
- $result = $this->api->deleteUser(array(
- 'userid' => $user2->getUID(),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- }
-
- public function testDeleteSelfAsAdmin() {
- $user = $this->generateUsers();
- $this->groupManager->get('admin')->addUser($user);
- $this->userSession->setUser($user);
- $result = $this->api->deleteUser(array(
- 'userid' => $user->getUID(),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- }
-
- public function testDeleteFails() {
- $user = $this->getMockBuilder('\OCP\IUser')
+ );
+ $this->assertEquals($expected, $this->api->getUser(['userid' => 'UserToGet']));
+ }
+
+ public function testGetUserAsSubAdminAndUserIsNotAccessible() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->exactly(2))
+ ->method('getUID')
+ ->will($this->returnValue('subadmin'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToGet')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('isAdmin')
+ ->with('subadmin')
+ ->will($this->returnValue(false));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
->disableOriginalConstructor()
->getMock();
- $user->expects($this->once())
- ->method('delete')
- ->willReturn(false);
+ $subAdminManager
+ ->expects($this->once())
+ ->method('isUserAccessible')
+ ->with($loggedInUser, $targetUser)
+ ->will($this->returnValue(false));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+
+ $expected = new \OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
+ $this->assertEquals($expected, $this->api->getUser(['userid' => 'UserToGet']));
+ }
- $user2 = $this->getMockBuilder('\OCP\IUser')
+ public function testGetUserAsSubAdminSelfLookup() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->exactly(2))
+ ->method('getUID')
+ ->will($this->returnValue('subadmin'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('subadmin')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('isAdmin')
+ ->with('subadmin')
+ ->will($this->returnValue(false));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
->disableOriginalConstructor()
->getMock();
- $user2->expects($this->any())
+ $subAdminManager
+ ->expects($this->once())
+ ->method('isUserAccessible')
+ ->with($loggedInUser, $targetUser)
+ ->will($this->returnValue(false));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+ $this->api
+ ->expects($this->once())
+ ->method('fillStorageInfo')
+ ->with('subadmin')
+ ->will($this->returnValue(['DummyValue']));
+ $this->config
+ ->expects($this->once())
+ ->method('getUserValue')
+ ->with('subadmin', 'settings', 'email')
+ ->will($this->returnValue('subadmin@owncloud.org'));
+ $targetUser
+ ->expects($this->once())
+ ->method('getDisplayName')
+ ->will($this->returnValue('Subadmin User'));
+
+ $expected = new \OC_OCS_Result([
+ 'quota' => ['DummyValue'],
+ 'email' => 'subadmin@owncloud.org',
+ 'displayname' => 'Subadmin User',
+ ]);
+ $this->assertEquals($expected, $this->api->getUser(['userid' => 'subadmin']));
+ }
+
+ public function testEditUserNotLoggedIn() {
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue(null));
+
+ $expected = new \OC_OCS_Result(null, \OCP\API::RESPOND_UNAUTHORISED);
+ $this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit']));
+ }
+
+ public function testEditUserRegularUserSelfEditChangeDisplayName() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->any())
+ ->method('getUID')
+ ->will($this->returnValue('UserToEdit'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToEdit')
+ ->will($this->returnValue($targetUser));
+ $targetUser
+ ->expects($this->once())
+ ->method('setDisplayName')
+ ->with('NewDisplayName');
+
+ $expected = new \OC_OCS_Result(null, 100);
+ $this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'display', 'value' => 'NewDisplayName']]));
+ }
+
+ public function testEditUserRegularUserSelfEditChangeEmailValid() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->any())
+ ->method('getUID')
+ ->will($this->returnValue('UserToEdit'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToEdit')
+ ->will($this->returnValue($targetUser));
+ $this->config
+ ->expects($this->once())
+ ->method('setUserValue')
+ ->with('UserToEdit', 'settings', 'email', 'demo@owncloud.org');
+
+ $expected = new \OC_OCS_Result(null, 100);
+ $this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'email', 'value' => 'demo@owncloud.org']]));
+ }
+
+ public function testEditUserRegularUserSelfEditChangeEmailInvalid() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->any())
+ ->method('getUID')
+ ->will($this->returnValue('UserToEdit'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToEdit')
+ ->will($this->returnValue($targetUser));
+
+ $expected = new \OC_OCS_Result(null, 102);
+ $this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'email', 'value' => 'demo.org']]));
+ }
+
+ public function testEditUserRegularUserSelfEditChangePassword() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->any())
+ ->method('getUID')
+ ->will($this->returnValue('UserToEdit'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToEdit')
+ ->will($this->returnValue($targetUser));
+ $targetUser
+ ->expects($this->once())
+ ->method('setPassword')
+ ->with('NewPassword');
+
+ $expected = new \OC_OCS_Result(null, 100);
+ $this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'password', 'value' => 'NewPassword']]));
+ }
+
+ public function testEditUserRegularUserSelfEditChangeQuota() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->any())
+ ->method('getUID')
+ ->will($this->returnValue('UserToEdit'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToEdit')
+ ->will($this->returnValue($targetUser));
+
+ $expected = new \OC_OCS_Result(null, 997);
+ $this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'quota', 'value' => 'NewQuota']]));
+ }
+
+ public function testEditUserAdminUserSelfEditChangeValidQuota() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->any())
+ ->method('getUID')
+ ->will($this->returnValue('UserToEdit'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToEdit')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('isAdmin')
+ ->with('UserToEdit')
+ ->will($this->returnValue(true));
+ $this->config
+ ->expects($this->once())
+ ->method('setUserValue')
+ ->with('UserToEdit', 'files', 'quota', '2.9 MB');
+
+ $expected = new \OC_OCS_Result(null, 100);
+ $this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'quota', 'value' => '3042824']]));
+ }
+
+ public function testEditUserAdminUserSelfEditChangeInvalidQuota() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->any())
->method('getUID')
- ->willReturn('user2');
+ ->will($this->returnValue('UserToEdit'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToEdit')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('isAdmin')
+ ->with('UserToEdit')
+ ->will($this->returnValue(true));
+
+ $expected = new \OC_OCS_Result(null, 103, 'Invalid quota value ABC');
+ $this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'quota', 'value' => 'ABC']]));
+ }
- $userManager = $this->getMockBuilder('\OCP\IUserManager')
+ public function testEditUserAdminUserEditChangeValidQuota() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->any())
+ ->method('getUID')
+ ->will($this->returnValue('admin'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToEdit')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('isAdmin')
+ ->with('admin')
+ ->will($this->returnValue(true));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
->disableOriginalConstructor()
->getMock();
- $userManager->expects($this->once())
- ->method('userExists')
- ->with('user')
- ->willReturn(true);
- $userManager->expects($this->once())
- ->method('get')
- ->with('user')
- ->willReturn($user);
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+ $this->config
+ ->expects($this->once())
+ ->method('setUserValue')
+ ->with('UserToEdit', 'files', 'quota', '2.9 MB');
+
+ $expected = new \OC_OCS_Result(null, 100);
+ $this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'quota', 'value' => '3042824']]));
+ }
- $userSession = $this->getMockBuilder('\OCP\IUserSession')
+ public function testEditUserSubadminUserAccessible() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->any())
+ ->method('getUID')
+ ->will($this->returnValue('subadmin'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToEdit')
+ ->will($this->returnValue($targetUser));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
->disableOriginalConstructor()
->getMock();
- $userSession->expects($this->once())
+ $subAdminManager
+ ->expects($this->once())
+ ->method('isUserAccessible')
+ ->with($loggedInUser, $targetUser)
+ ->will($this->returnValue(true));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+ $this->config
+ ->expects($this->once())
+ ->method('setUserValue')
+ ->with('UserToEdit', 'files', 'quota', '2.9 MB');
+
+ $expected = new \OC_OCS_Result(null, 100);
+ $this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'quota', 'value' => '3042824']]));
+ }
+
+ public function testEditUserSubadminUserInaccessible() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->any())
+ ->method('getUID')
+ ->will($this->returnValue('subadmin'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $this->userSession
+ ->expects($this->once())
->method('getUser')
- ->willReturn($user2);
-
- $groupManager = $this->getMockBuilder('\OCP\IGroupManager')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToEdit')
+ ->will($this->returnValue($targetUser));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
->disableOriginalConstructor()
->getMock();
- $groupManager->expects($this->once())
+ $subAdminManager
+ ->expects($this->once())
+ ->method('isUserAccessible')
+ ->with($loggedInUser, $targetUser)
+ ->will($this->returnValue(false));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+
+ $expected = new \OC_OCS_Result(null, 997);
+ $this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'quota', 'value' => '3042824']]));
+ }
+
+ public function testDeleteUserNotLoggedIn() {
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue(null));
+
+ $expected = new \OC_OCS_Result(null, 997);
+ $this->assertEquals($expected, $this->api->deleteUser(['userid' => 'UserToDelete']));
+ }
+
+ public function testDeleteUserNotExistingUser() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->any())
+ ->method('getUID')
+ ->will($this->returnValue('UserToEdit'));
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToDelete')
+ ->will($this->returnValue(null));
+
+ $expected = new \OC_OCS_Result(null, 101);
+ $this->assertEquals($expected, $this->api->deleteUser(['userid' => 'UserToDelete']));
+ }
+
+ public function testDeleteUserSelf() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->any())
+ ->method('getUID')
+ ->will($this->returnValue('UserToDelete'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $targetUser
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('UserToDelete'));
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToDelete')
+ ->will($this->returnValue($targetUser));
+
+ $expected = new \OC_OCS_Result(null, 101);
+ $this->assertEquals($expected, $this->api->deleteUser(['userid' => 'UserToDelete']));
+ }
+
+ public function testDeleteSuccessfulUserAsAdmin() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->any())
+ ->method('getUID')
+ ->will($this->returnValue('admin'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $targetUser
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('UserToDelete'));
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToDelete')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
->method('isAdmin')
- ->with('user2')
- ->willReturn(true);
-
- $api = new \OCA\Provisioning_Api\Users(
- $userManager,
- $this->config,
- $groupManager,
- $userSession
- );
+ ->with('admin')
+ ->will($this->returnValue(true));
+ $targetUser
+ ->expects($this->once())
+ ->method('delete')
+ ->will($this->returnValue(true));
- $result = $api->deleteUser([
- 'userid' => 'user',
- ]);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertEquals(101, $result->getStatusCode());
- }
-
- public function testGetUsersGroupsOnSelf() {
- $user = $this->generateUsers();
- $this->userSession->setUser($user);
- $group = $this->getUniqueID();
- $group = $this->groupManager->createGroup($group);
- $group->addUser($user);
- $result = $this->api->getUsersGroups(array(
- 'userid' => $user->getUID(),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $data = $result->getData();
- $this->assertEquals($group->getGID(), reset($data['groups']));
- $this->assertEquals(1, count($data['groups']));
- $group->delete();
- }
-
- public function testGetUsersGroupOnOther() {
- $user1 = $this->generateUsers();
- $user2 = $this->generateUsers();
- $this->userSession->setUser($user1);
- $group = $this->getUniqueID();
- $group = $this->groupManager->createGroup($group);
- $group->addUser($user2);
- $result = $this->api->getUsersGroups(array(
- 'userid' => $user2->getUID(),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $group->delete();
- }
-
- public function testGetUsersGroupOnOtherAsAdmin() {
- $user1 = $this->generateUsers();
- $this->groupManager->get('admin')->addUser($user1);
- $user2 = $this->generateUsers();
- $this->userSession->setUser($user1);
- $group = $this->getUniqueID();
- $group = $this->groupManager->createGroup($group);
- $group->addUser($user2);
- $result = $this->api->getUsersGroups(array(
- 'userid' => $user2->getUID(),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $data = $result->getData();
- $this->assertEquals($group->getGID(), reset($data['groups']));
- $this->assertEquals(1, count($data['groups']));
- $group->delete();
- }
-
- public function testGetUsersGroupsOnOtherAsSubAdmin() {
- $user1 = $this->generateUsers();
- $user2 = $this->generateUsers();
- $this->userSession->setUser($user1);
- $group1 = $this->getUniqueID();
- $group2 = $this->getUniqueID();
- $group1 = $this->groupManager->createGroup($group1);
- $group2 = $this->groupManager->createGroup($group2);
- $group1->addUser($user2);
- $group2->addUser($user2);
- $group1->addUser($user1);
- \OC_SubAdmin::createSubAdmin($user1->getUID(), $group1->getGID());
- $result = $this->api->getUsersGroups(array(
- 'userid' => $user2->getUID(),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $data = $result->getData();
- $this->assertEquals($group1->getGID(), reset($data['groups']));
- $this->assertEquals(1, count($data['groups']));
- $group1->delete();
- $group2->delete();
- }
-
- public function testGetUsersGroupsOnOtherAsIrelevantSubAdmin() {
- $user1 = $this->generateUsers();
- $user2 = $this->generateUsers();
- $this->userSession->setUser($user1);
- $group1 = $this->getUniqueID();
- $group2 = $this->getUniqueID();
- $group1 = $this->groupManager->createGroup($group1);
- $group2 = $this->groupManager->createGroup($group2);
- $group2->addUser($user2);
- $group1->addUser($user1);
- \OC_SubAdmin::createSubAdmin($user1->getUID(), $group1->getGID());
- $result = $this->api->getUsersGroups(array(
- 'userid' => $user2->getUID(),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $group1->delete();
- $group2->delete();
- }
-
- public function testAddToGroup() {
- $user = $this->generateUsers();
- $group = $this->getUniqueID();
- $group = $this->groupManager->createGroup($group);
- $this->userSession->setUser($user);
- $_POST['groupid'] = $group->getGID();
- $result = $this->api->addToGroup(array(
- 'userid' => $user->getUID(),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertFalse($group->inGroup($user));
- $group->delete();
- }
-
- public function testAddToGroupAsAdmin() {
- $user = $this->generateUsers();
- $this->groupManager->get('admin')->addUser($user);
- $group = $this->getUniqueID();
- $group = $this->groupManager->createGroup($group);
- $user2 = $this->generateUsers();
- $this->userSession->setUser($user);
- $_POST['groupid'] = $group->getGID();
- $result = $this->api->addToGroup(array(
- 'userid' => $user2->getUID(),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $this->assertTrue($group->inGroup($user2));
- $group->delete();
- }
-
- public function testAddToGroupAsSubAdmin() {
- $user1 = $this->generateUsers();
- $user2 = $this->generateUsers();
- $this->userSession->setUser($user1);
- $group1 = $this->getUniqueID();
- $group1 = $this->groupManager->createGroup($group1);
- \OC_SubAdmin::createSubAdmin($user1->getUID(), $group1->getGID());
- $_POST['groupid'] = $group1->getGID();
- $result = $this->api->addToGroup(array(
- 'userid' => $user2->getUID(),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertFalse($group1->inGroup($user2));
- $group1->delete();
- }
-
- public function testAddToGroupAsIrelevantSubAdmin() {
- $user1 = $this->generateUsers();
- $user2 = $this->generateUsers();
- $this->userSession->setUser($user1);
- $group1 = $this->getUniqueID();
- $group2 = $this->getUniqueID();
- $group1 = $this->groupManager->createGroup($group1);
- $group2 = $this->groupManager->createGroup($group2);
- \OC_SubAdmin::createSubAdmin($user1->getUID(), $group1->getGID());
- $_POST['groupid'] = $group2->getGID();
- $result = $this->api->addToGroup(array(
- 'userid' => $user2->getUID(),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertFalse($group2->inGroup($user2));
- $group1->delete();
- $group2->delete();
- }
-
- public function testAddToGroupNoGroupId() {
- $user = $this->generateUsers();
- $this->userSession->setUser($user);
-
- $_POST['groupid'] = '';
- $result = $this->api->addToGroup([
- 'userid' => $this->getUniqueID(),
- ]);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertEquals(101, $result->getStatusCode());
+ $expected = new \OC_OCS_Result(null, 100);
+ $this->assertEquals($expected, $this->api->deleteUser(['userid' => 'UserToDelete']));
}
- public function testAddToNonExistingGroup() {
- $user = $this->generateUsers();
- $this->groupManager->get('admin')->addUser($user);
- $this->userSession->setUser($user);
+ public function testDeleteUnsuccessfulUserAsAdmin() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->any())
+ ->method('getUID')
+ ->will($this->returnValue('admin'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $targetUser
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('UserToDelete'));
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToDelete')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('isAdmin')
+ ->with('admin')
+ ->will($this->returnValue(true));
+ $targetUser
+ ->expects($this->once())
+ ->method('delete')
+ ->will($this->returnValue(false));
- $group = $this->groupManager->createGroup($this->getUniqueID());
- $_POST['groupid'] = $group->getGID();
- $result = $this->api->addToGroup([
- 'userid' => $this->getUniqueID(),
- ]);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertEquals(103, $result->getStatusCode());
+ $expected = new \OC_OCS_Result(null, 101);
+ $this->assertEquals($expected, $this->api->deleteUser(['userid' => 'UserToDelete']));
}
- public function testAddNonExistingUserToGroup() {
- $user = $this->generateUsers();
- $this->groupManager->get('admin')->addUser($user);
- $this->userSession->setUser($user);
+ public function testDeleteSuccessfulUserAsSubadmin() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->any())
+ ->method('getUID')
+ ->will($this->returnValue('subadmin'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $targetUser
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('UserToDelete'));
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToDelete')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('isAdmin')
+ ->with('subadmin')
+ ->will($this->returnValue(false));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+ ->disableOriginalConstructor()->getMock();
+ $subAdminManager
+ ->expects($this->once())
+ ->method('isUserAccessible')
+ ->with($loggedInUser, $targetUser)
+ ->will($this->returnValue(true));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+ $targetUser
+ ->expects($this->once())
+ ->method('delete')
+ ->will($this->returnValue(true));
+
+ $expected = new \OC_OCS_Result(null, 100);
+ $this->assertEquals($expected, $this->api->deleteUser(['userid' => 'UserToDelete']));
+ }
- $_POST['groupid'] = $this->getUniqueID();
- $result = $this->api->addToGroup([
- 'userid' => $this->getUniqueID(),
- ]);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertEquals(102, $result->getStatusCode());
- }
-
- // test delete /cloud/users/{userid}/groups
- public function testRemoveFromGroupAsSelf() {
- $user1 = $this->generateUsers();
- $this->userSession->setUser($user1);
- $group1 = $this->getUniqueID();
- $group1 = $this->groupManager->createGroup($group1);
- $group1->addUser($user1);
- $result = $this->api->removeFromGroup(array(
- 'userid' => $user1->getUID(),
- '_delete' => array(
- 'groupid' => $group1->getGID(),
- ),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertTrue($group1->inGroup($user1));
- $group1->delete();
- }
-
- public function testRemoveFromGroupAsAdmin() {
- $user1 = $this->generateUsers();
- $user2 = $this->generateUsers();
- $this->userSession->setUser($user1);
- $group1 = $this->getUniqueID();
- $group1 = $this->groupManager->createGroup($group1);
- $group1->addUser($user2);
- $this->groupManager->get('admin')->addUser($user1);
- $result = $this->api->removeFromGroup(array(
- 'userid' => $user2->getUID(),
- '_delete' => array(
- 'groupid' => $group1->getGID(),
- ),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $this->assertFalse($group1->inGroup($user2));
- $group1->delete();
- }
-
- public function testRemoveSelfFromGroupAsAdmin() {
- $user1 = $this->generateUsers();
- $this->userSession->setUser($user1);
- $group1 = $this->groupManager->createGroup($this->getUniqueID());
- $group1->addUser($user1);
- $this->groupManager->get('admin')->addUser($user1);
- $result = $this->api->removeFromGroup([
- 'userid' => $user1->getUID(),
- '_delete' => [
- 'groupid' => $group1->getGID(),
- ],
- ]);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $this->assertFalse($group1->inGroup($user1));
- $group1->delete();
- }
-
- public function testRemoveFromGroupAsSubAdmin() {
- $user1 = $this->generateUsers();
- $this->userSession->setUser($user1);
- $user2 = $this->generateUsers();
- $group1 = $this->getUniqueID();
- $group1 = $this->groupManager->createGroup($group1);
- $group1->addUser($user1);
- $group1->addUser($user2);
- \OC_SubAdmin::createSubAdmin($user1->getUID(), $group1->getGID());
- $result = $this->api->removeFromGroup(array(
- 'userid' => $user2->getUID(),
- '_delete' => array(
- 'groupid' => $group1->getGID(),
- ),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $this->assertFalse($group1->inGroup($user2));
- $group1->delete();
- }
-
- public function testRemoveFromGroupAsIrelevantSubAdmin() {
- $user1 = $this->generateUsers();
- $this->userSession->setUser($user1);
- $user2 = $this->generateUsers();
- $group1 = $this->getUniqueID();
- $group2 = $this->getUniqueID();
- $group1 = $this->groupManager->createGroup($group1);
- $group2 = $this->groupManager->createGroup($group2);
- $group1->addUser($user1);
- $group2->addUser($user2);
- \OC_SubAdmin::createSubAdmin($user1->getUID(), $group1->getGID());
- $result = $this->api->removeFromGroup(array(
- 'userid' => $user2->getUID(),
- '_delete' => array(
- 'groupid' => $group2->getGID(),
- ),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertTrue($group2->inGroup($user2));
- $group1->delete();
- $group2->delete();
- }
-
- public function testRemoveFromGroupNoGroupId() {
- $user = $this->generateUsers();
- $this->userSession->setUser($user);
-
- $result = $this->api->removeFromGroup([
- '_delete' => [
- 'groupid' => ''
- ],
- ]);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertEquals(101, $result->getStatusCode());
+ public function testDeleteUnsuccessfulUserAsSubadmin() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->any())
+ ->method('getUID')
+ ->will($this->returnValue('subadmin'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $targetUser
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('UserToDelete'));
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToDelete')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('isAdmin')
+ ->with('subadmin')
+ ->will($this->returnValue(false));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+ ->disableOriginalConstructor()->getMock();
+ $subAdminManager
+ ->expects($this->once())
+ ->method('isUserAccessible')
+ ->with($loggedInUser, $targetUser)
+ ->will($this->returnValue(true));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+ $targetUser
+ ->expects($this->once())
+ ->method('delete')
+ ->will($this->returnValue(false));
+
+ $expected = new \OC_OCS_Result(null, 101);
+ $this->assertEquals($expected, $this->api->deleteUser(['userid' => 'UserToDelete']));
}
- public function testRemoveSelfFromAdminAsAdmin() {
- $user = $this->generateUsers();
- $this->userSession->setUser($user);
- $this->groupManager->get('admin')->addUser($user);
+ public function testDeleteUserAsSubAdminAndUserIsNotAccessible() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->any())
+ ->method('getUID')
+ ->will($this->returnValue('subadmin'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $targetUser
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('UserToDelete'));
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToDelete')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('isAdmin')
+ ->with('subadmin')
+ ->will($this->returnValue(false));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+ ->disableOriginalConstructor()->getMock();
+ $subAdminManager
+ ->expects($this->once())
+ ->method('isUserAccessible')
+ ->with($loggedInUser, $targetUser)
+ ->will($this->returnValue(false));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+
+ $expected = new \OC_OCS_Result(null, 997);
+ $this->assertEquals($expected, $this->api->deleteUser(['userid' => 'UserToDelete']));
+ }
- $result = $this->api->removeFromGroup([
- 'userid' => $user->getUID(),
- '_delete' => [
- 'groupid' => 'admin'
- ],
- ]);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertEquals(105, $result->getStatusCode());
- $this->assertEquals('Cannot remove yourself from the admin group', $result->getMeta()['message']);
- }
-
- public function testRemoveSelfFromSubAdminGroupAsSubAdmin() {
- $user = $this->generateUsers();
- $this->userSession->setUser($user);
- $group = $this->groupManager->createGroup($this->getUniqueID());
- \OC_SubAdmin::createSubAdmin($user->getUID(), $group->getGID());
-
- $result = $this->api->removeFromGroup([
- 'userid' => $user->getUID(),
- '_delete' => [
- 'groupid' => $group->getGID()
- ],
- ]);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertEquals(105, $result->getStatusCode());
- $this->assertEquals('Cannot remove yourself from this group as you are a SubAdmin', $result->getMeta()['message']);
- $group->delete();
- }
-
- public function testRemoveFromNonExistingGroup() {
- $user1 = $this->generateUsers();
- $this->userSession->setUser($user1);
- $this->groupManager->get('admin')->addUser($user1);
-
- $user2 = $this->generateUsers();
- $result = $this->api->removeFromGroup([
- 'userid' => $user2->getUID(),
- '_delete' => [
- 'groupid' => $this->getUniqueID()
- ],
- ]);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertEquals(102, $result->getStatusCode());
+ public function testGetUsersGroupsNotLoggedIn() {
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue(null));
+
+ $expected = new \OC_OCS_Result(null, 997);
+ $this->assertEquals($expected, $this->api->getUsersGroups(['userid' => 'UserToLookup']));
}
- public function testRemoveFromNonGroupNonExistingUser() {
- $user = $this->generateUsers();
- $this->userSession->setUser($user);
- $this->groupManager->get('admin')->addUser($user);
+ public function testGetUsersGroupsTargetUserNotExisting() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
- $group = $this->groupManager->createGroup($this->getUniqueID());
+ $expected = new \OC_OCS_Result(null, 998);
+ $this->assertEquals($expected, $this->api->getUsersGroups(['userid' => 'UserToLookup']));
+ }
- $result = $this->api->removeFromGroup([
- 'userid' => $this->getUniqueID(),
- '_delete' => [
- 'groupid' => $group->getGID()
- ],
- ]);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertEquals(103, $result->getStatusCode());
- }
-
-
- public function testCreateSubAdmin() {
- $user1 = $this->generateUsers();
- $user2 = $this->generateUsers();
- $this->userSession->setUser($user1);
- $this->groupManager->get('admin')->addUser($user1);
- $group1 = $this->getUniqueID();
- $group1 = $this->groupManager->createGroup($group1);
- $_POST['groupid'] = $group1->getGID();
- $result = $this->api->addSubAdmin(array(
- 'userid' => $user2->getUID(),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $this->assertTrue(\OC_SubAdmin::isSubAdminofGroup($user2->getUID(), $group1->getGID()));
- $group1->delete();
-
- $this->resetParams();
-
- $user1 = $this->generateUsers();
- $user2 = $this->generateUsers();
- $this->userSession->setUser($user1);
- $this->groupManager->get('admin')->addUser($user1);
- $_POST['groupid'] = 'admin';
- $result = $this->api->addSubAdmin(array(
- 'userid' => $user2->getUID(),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertEquals(103, $result->getStatusCode());
- $this->assertFalse($result->succeeded());
-
- $this->resetParams();
-
- $user1 = $this->generateUsers();
- $this->userSession->setUser($user1);
- $this->groupManager->get('admin')->addUser($user1);
- $group1 = $this->getUniqueID();
- $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());
- $group1->delete();
-
- $user1 = $this->generateUsers();
- $this->userSession->setUser($user1);
- $group = $this->getUniqueID();
- $_POST['groupid'] = $group;
- $result = $this->api->addSubAdmin([
- 'userid' => $user1->getUID()
- ]);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertEquals(102, $result->getStatusCode());
- $this->assertEquals('Group:'.$group.' does not exist', $result->getMeta()['message']);
- }
-
- public function testRemoveSubAdmin() {
- $user1 = $this->generateUsers();
- $user2 = $this->generateUsers();
- $this->userSession->setUser($user1);
- $this->groupManager->get('admin')->addUser($user1);
- $group1 = $this->getUniqueID();
- $group1 = $this->groupManager->createGroup($group1);
- \OC_SubAdmin::createSubAdmin($user2->getUID(), $group1->getGID());
- $result = $this->api->removeSubAdmin(array(
- 'userid' => $user2->getUID(),
- '_delete' => array(
- 'groupid' => $group1->getGID(),
- ),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $this->assertTrue(!\OC_SubAdmin::isSubAdminofGroup($user2->getUID(), $group1->getGID()));
- $group1->delete();
-
- $user1 = $this->generateUsers();
- $this->userSession->setUser($user1);
- $this->groupManager->get('admin')->addUser($user1);
- $result = $this->api->removeSubAdmin(array(
- 'userid' => $this->getUniqueID(),
- '_delete' => array(
- 'groupid' => $group1->getGID(),
- ),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertEquals(101, $result->getStatusCode());
- $this->assertFalse($result->succeeded());
-
- $this->resetParams();
-
- $user1 = $this->generateUsers();
- $user2 = $this->generateUsers();
- $this->userSession->setUser($user1);
- $this->groupManager->get('admin')->addUser($user1);
- $group1 = $this->getUniqueID();
- $group1 = $this->groupManager->createGroup($group1);
- $_POST['groupid'] = $group1->getGID();
- $result = $this->api->removeSubAdmin(array(
- 'userid' => $user2->getUID(),
- '_delete' => array(
- 'groupid' => $group1->getGID(),
- ),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertEquals(102, $result->getStatusCode());
- $group1->delete();
- }
-
- public function testGetSubAdminGroups() {
- $user1 = $this->generateUsers();
- $user2 = $this->generateUsers();
- $this->userSession->setUser($user1);
- $this->groupManager->get('admin')->addUser($user1);
- $group1 = $this->getUniqueID();
- $group1 = $this->groupManager->createGroup($group1);
- \OC_SubAdmin::createSubAdmin($user2->getUID(), $group1->getGID());
- $result = $this->api->getUserSubAdminGroups(array(
- 'userid' => $user2->getUID(),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $data = $result->getData();
- $this->assertEquals($group1->getGID(), reset($data));
- $group1->delete();
-
- $user1 = $this->generateUsers();
- $this->userSession->setUser($user1);
- $this->groupManager->get('admin')->addUser($user1);
- $result = $this->api->getUserSubAdminGroups(array(
- 'userid' => $this->getUniqueID(),
- ));
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertFalse($result->succeeded());
- $this->assertEquals(101, $result->getStatusCode());
- }
-
- public function testSubAdminOfGroupAlreadySubAdmin() {
- $user1 = $this->generateUsers();
- $user2 = $this->generateUsers();
- $this->userSession->setUser($user1);
- $this->groupManager->get('admin')->addUser($user1);
- $group1 = $this->groupManager->createGroup($this->getUniqueID());
-
- //Make user2 subadmin of group1
- $_POST['groupid'] = $group1->getGID();
- $result = $this->api->addSubAdmin([
- 'userid' => $user2->getUID(),
- ]);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
+ public function testGetUsersGroupsSelfTargetted() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('UserToLookup'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $targetUser
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('UserToLookup'));
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToLookup')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getUserGroupIds')
+ ->with($targetUser)
+ ->will($this->returnValue(['DummyValue']));
+
+ $expected = new \OC_OCS_Result(['groups' => ['DummyValue']]);
+ $this->assertEquals($expected, $this->api->getUsersGroups(['userid' => 'UserToLookup']));
+ }
- //Make user2 subadmin of group1 again
- $_POST['groupid'] = $group1->getGID();
- $result = $this->api->addSubAdmin([
- 'userid' => $user2->getUID(),
- ]);
- $this->assertInstanceOf('OC_OCS_Result', $result);
- $this->assertTrue($result->succeeded());
- $group1->delete();
+ public function testGetUsersGroupsForAdminUser() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->exactly(2))
+ ->method('getUID')
+ ->will($this->returnValue('admin'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $targetUser
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('UserToLookup'));
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToLookup')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getUserGroupIds')
+ ->with($targetUser)
+ ->will($this->returnValue(['DummyValue']));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('isAdmin')
+ ->with('admin')
+ ->will($this->returnValue(true));
+
+ $expected = new \OC_OCS_Result(['groups' => ['DummyValue']]);
+ $this->assertEquals($expected, $this->api->getUsersGroups(['userid' => 'UserToLookup']));
+ }
+
+ public function testGetUsersGroupsForSubAdminUserAndUserIsAccessible() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->exactly(2))
+ ->method('getUID')
+ ->will($this->returnValue('subadmin'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $targetUser
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('UserToLookup'));
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToLookup')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('isAdmin')
+ ->with('subadmin')
+ ->will($this->returnValue(false));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+ ->disableOriginalConstructor()->getMock();
+ $subAdminManager
+ ->expects($this->once())
+ ->method('isUserAccessible')
+ ->with($loggedInUser, $targetUser)
+ ->will($this->returnValue(true));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+ $group1 = $this->getMock('\OCP\IGroup');
+ $group1
+ ->expects($this->any())
+ ->method('getGID')
+ ->will($this->returnValue('Group1'));
+ $group2 = $this->getMock('\OCP\IGroup');
+ $group2
+ ->expects($this->any())
+ ->method('getGID')
+ ->will($this->returnValue('Group2'));
+ $subAdminManager
+ ->expects($this->once())
+ ->method('getSubAdminsGroups')
+ ->with($loggedInUser)
+ ->will($this->returnValue([$group1, $group2]));
+ $this->groupManager
+ ->expects($this->any())
+ ->method('getUserGroupIds')
+ ->with($targetUser)
+ ->will($this->returnValue(['Group1']));
+
+ $expected = new \OC_OCS_Result(['groups' => ['Group1']]);
+ $this->assertEquals($expected, $this->api->getUsersGroups(['userid' => 'UserToLookup']));
+ }
+
+
+ public function testGetUsersGroupsForSubAdminUserAndUserIsInaccessible() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->exactly(2))
+ ->method('getUID')
+ ->will($this->returnValue('subadmin'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $targetUser
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('UserToLookup'));
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('UserToLookup')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('isAdmin')
+ ->with('subadmin')
+ ->will($this->returnValue(false));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+ ->disableOriginalConstructor()->getMock();
+ $subAdminManager
+ ->expects($this->once())
+ ->method('isUserAccessible')
+ ->with($loggedInUser, $targetUser)
+ ->will($this->returnValue(false));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+ $this->groupManager
+ ->expects($this->any())
+ ->method('getUserGroupIds')
+ ->with($targetUser)
+ ->will($this->returnValue(['Group1']));
+
+ $expected = new \OC_OCS_Result(null, 997);
+ $this->assertEquals($expected, $this->api->getUsersGroups(['userid' => 'UserToLookup']));
+ }
+
+ public function testAddToGroupNotLoggedIn() {
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue(null));
+
+ $expected = new \OC_OCS_Result(null, 997);
+ $this->assertEquals($expected, $this->api->addToGroup([]));
+ }
+
+ public function testAddToGroupWithTargetGroupNotExisting() {
+ $_POST['groupid'] = 'GroupToAddTo';
+
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('admin'));
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('GroupToAddTo')
+ ->will($this->returnValue(null));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('isAdmin')
+ ->with('admin')
+ ->will($this->returnValue(true));
+
+ $expected = new \OC_OCS_Result(null, 102);
+ $this->assertEquals($expected, $this->api->addToGroup(['userid' => 'TargetUser']));
+ }
+
+ public function testAddToGroupWithNoGroupSpecified() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('admin'));
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('isAdmin')
+ ->with('admin')
+ ->will($this->returnValue(true));
+
+ $expected = new \OC_OCS_Result(null, 101);
+ $this->assertEquals($expected, $this->api->addToGroup(['userid' => 'TargetUser']));
+ }
+
+ public function testAddToGroupWithTargetUserNotExisting() {
+ $_POST['groupid'] = 'GroupToAddTo';
+
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('admin'));
+ $targetGroup = $this->getMock('\OCP\IGroup');
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('GroupToAddTo')
+ ->will($this->returnValue($targetGroup));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('isAdmin')
+ ->with('admin')
+ ->will($this->returnValue(true));
+
+ $expected = new \OC_OCS_Result(null, 103);
+ $this->assertEquals($expected, $this->api->addToGroup(['userid' => 'TargetUser']));
+ }
+
+ public function testAddToGroupWithoutPermission() {
+ $_POST['groupid'] = 'GroupToAddTo';
+
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('admin'));
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('isAdmin')
+ ->with('admin')
+ ->will($this->returnValue(false));
+
+ $expected = new \OC_OCS_Result(null, 997);
+ $this->assertEquals($expected, $this->api->addToGroup(['userid' => 'TargetUser']));
+ }
+
+ public function testRemoveFromGroupWithoutLogIn() {
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue(null));
+
+ $expected = new \OC_OCS_Result(null, 997);
+ $this->assertEquals($expected, $this->api->removeFromGroup(['userid' => 'TargetUser', '_delete' => ['groupid' => 'TargetGroup']]));
+ }
+
+ public function testRemoveFromGroupWithNotExistingTargetGroup() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('TargetGroup')
+ ->will($this->returnValue(null));
+
+ $expected = new \OC_OCS_Result(null, 101);
+ $this->assertEquals($expected, $this->api->removeFromGroup(['userid' => 'TargetUser', '_delete' => ['groupid' => 'TargetGroup']]));
+ }
+
+ public function testRemoveFromGroupWithNotExistingTargetUser() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $targetGroup = $this->getMock('\OCP\IGroup');
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('TargetGroup')
+ ->will($this->returnValue($targetGroup));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('TargetUser')
+ ->will($this->returnValue(null));
+
+ $expected = new \OC_OCS_Result(null, 103);
+ $this->assertEquals($expected, $this->api->removeFromGroup(['userid' => 'TargetUser', '_delete' => ['groupid' => 'TargetGroup']]));
+ }
+
+ public function testRemoveFromGroupWithoutPermission() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->once())
+ ->method('getUID')
+ ->will($this->returnValue('unauthorizedUser'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $targetGroup = $this->getMock('\OCP\IGroup');
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('TargetGroup')
+ ->will($this->returnValue($targetGroup));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('TargetUser')
+ ->will($this->returnValue($targetUser));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+ ->disableOriginalConstructor()->getMock();
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('isAdmin')
+ ->with('unauthorizedUser')
+ ->will($this->returnValue(false));
+
+ $expected = new \OC_OCS_Result(null, 104);
+ $this->assertEquals($expected, $this->api->removeFromGroup(['userid' => 'TargetUser', '_delete' => ['groupid' => 'TargetGroup']]));
+ }
+
+ public function testRemoveFromGroupAsAdminFromAdmin() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->any())
+ ->method('getUID')
+ ->will($this->returnValue('admin'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $targetGroup = $this->getMock('\OCP\IGroup');
+ $targetGroup
+ ->expects($this->once())
+ ->method('getGID')
+ ->will($this->returnValue('admin'));
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('admin')
+ ->will($this->returnValue($targetGroup));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('admin')
+ ->will($this->returnValue($targetUser));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+ ->disableOriginalConstructor()->getMock();
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+ $this->groupManager
+ ->expects($this->any())
+ ->method('isAdmin')
+ ->with('admin')
+ ->will($this->returnValue(true));
+
+ $expected = new \OC_OCS_Result(null, 105, 'Cannot remove yourself from the admin group');
+ $this->assertEquals($expected, $this->api->removeFromGroup(['userid' => 'admin', '_delete' => ['groupid' => 'admin']]));
+ }
+
+ public function testRemoveFromGroupAsSubAdminFromSubAdmin() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->any())
+ ->method('getUID')
+ ->will($this->returnValue('subadmin'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $targetGroup = $this->getMock('\OCP\IGroup');
+ $targetGroup
+ ->expects($this->any())
+ ->method('getGID')
+ ->will($this->returnValue('subadmin'));
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('subadmin')
+ ->will($this->returnValue($targetGroup));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('subadmin')
+ ->will($this->returnValue($targetUser));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+ ->disableOriginalConstructor()->getMock();
+ $subAdminManager
+ ->expects($this->once())
+ ->method('isSubAdminofGroup')
+ ->with($loggedInUser, $targetGroup)
+ ->will($this->returnValue(true));
+ $subAdminManager
+ ->expects($this->once())
+ ->method('getSubAdminsGroups')
+ ->with($loggedInUser)
+ ->will($this->returnValue([$targetGroup]));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+ $this->groupManager
+ ->expects($this->any())
+ ->method('isAdmin')
+ ->with('subadmin')
+ ->will($this->returnValue(false));
+
+ $expected = new \OC_OCS_Result(null, 105, 'Cannot remove yourself from this group as you are a SubAdmin');
+ $this->assertEquals($expected, $this->api->removeFromGroup(['userid' => 'subadmin', '_delete' => ['groupid' => 'subadmin']]));
+ }
+
+ public function testRemoveFromGroupSuccessful() {
+ $loggedInUser = $this->getMock('\OCP\IUser');
+ $loggedInUser
+ ->expects($this->any())
+ ->method('getUID')
+ ->will($this->returnValue('admin'));
+ $targetUser = $this->getMock('\OCP\IUser');
+ $targetGroup = $this->getMock('\OCP\IGroup');
+ $this->userSession
+ ->expects($this->once())
+ ->method('getUser')
+ ->will($this->returnValue($loggedInUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('admin')
+ ->will($this->returnValue($targetGroup));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('AnotherUser')
+ ->will($this->returnValue($targetUser));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+ ->disableOriginalConstructor()->getMock();
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+ $this->groupManager
+ ->expects($this->any())
+ ->method('isAdmin')
+ ->with('admin')
+ ->will($this->returnValue(true));
+ $targetGroup
+ ->expects($this->once())
+ ->method('removeUser')
+ ->with($targetUser);
+
+ $expected = new \OC_OCS_Result(null, 100);
+ $this->assertEquals($expected, $this->api->removeFromGroup(['userid' => 'AnotherUser', '_delete' => ['groupid' => 'admin']]));
+ }
+
+ public function testAddSubAdminWithNotExistingTargetUser() {
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('NotExistingUser')
+ ->will($this->returnValue(null));
+
+ $expected = new \OC_OCS_Result(null, 101, 'User does not exist');
+ $this->assertEquals($expected, $this->api->addSubAdmin(['userid' => 'NotExistingUser']));
+ }
+
+ public function testAddSubAdminWithNotExistingTargetGroup() {
+ $_POST['groupid'] = 'NotExistingGroup';
+
+ $targetUser = $this->getMock('\OCP\IUser');
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('ExistingUser')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('NotExistingGroup')
+ ->will($this->returnValue(null));
+
+ $expected = new \OC_OCS_Result(null, 102, 'Group:NotExistingGroup does not exist');
+ $this->assertEquals($expected, $this->api->addSubAdmin(['userid' => 'ExistingUser']));
+ }
+
+ public function testAddSubAdminToAdminGroup() {
+ $_POST['groupid'] = 'ADmiN';
+
+ $targetUser = $this->getMock('\OCP\IUser');
+ $targetGroup = $this->getMock('\OCP\IGroup');
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('ExistingUser')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('ADmiN')
+ ->will($this->returnValue($targetGroup));
+
+ $expected = new \OC_OCS_Result(null, 103, 'Cannot create subadmins for admin group');
+ $this->assertEquals($expected, $this->api->addSubAdmin(['userid' => 'ExistingUser']));
+ }
+
+ public function testAddSubAdminTwice() {
+ $_POST['groupid'] = 'TargetGroup';
+
+ $targetUser = $this->getMock('\OCP\IUser');
+ $targetGroup = $this->getMock('\OCP\IGroup');
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('ExistingUser')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('TargetGroup')
+ ->will($this->returnValue($targetGroup));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+ ->disableOriginalConstructor()->getMock();
+ $subAdminManager
+ ->expects($this->once())
+ ->method('isSubAdminOfGroup')
+ ->with($targetUser, $targetGroup)
+ ->will($this->returnValue(true));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+
+ $expected = new \OC_OCS_Result(null, 100);
+ $this->assertEquals($expected, $this->api->addSubAdmin(['userid' => 'ExistingUser']));
+ }
+
+ public function testAddSubAdminSuccessful() {
+ $_POST['groupid'] = 'TargetGroup';
+
+ $targetUser = $this->getMock('\OCP\IUser');
+ $targetGroup = $this->getMock('\OCP\IGroup');
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('ExistingUser')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('TargetGroup')
+ ->will($this->returnValue($targetGroup));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+ ->disableOriginalConstructor()->getMock();
+ $subAdminManager
+ ->expects($this->once())
+ ->method('isSubAdminOfGroup')
+ ->with($targetUser, $targetGroup)
+ ->will($this->returnValue(false));
+ $subAdminManager
+ ->expects($this->once())
+ ->method('createSubAdmin')
+ ->with($targetUser, $targetGroup)
+ ->will($this->returnValue(true));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+
+ $expected = new \OC_OCS_Result(null, 100);
+ $this->assertEquals($expected, $this->api->addSubAdmin(['userid' => 'ExistingUser']));
+ }
+
+ public function testAddSubAdminUnsuccessful() {
+ $_POST['groupid'] = 'TargetGroup';
+
+ $targetUser = $this->getMock('\OCP\IUser');
+ $targetGroup = $this->getMock('\OCP\IGroup');
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('ExistingUser')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('TargetGroup')
+ ->will($this->returnValue($targetGroup));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+ ->disableOriginalConstructor()->getMock();
+ $subAdminManager
+ ->expects($this->once())
+ ->method('isSubAdminOfGroup')
+ ->with($targetUser, $targetGroup)
+ ->will($this->returnValue(false));
+ $subAdminManager
+ ->expects($this->once())
+ ->method('createSubAdmin')
+ ->with($targetUser, $targetGroup)
+ ->will($this->returnValue(false));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+
+ $expected = new \OC_OCS_Result(null, 103, 'Unknown error occurred');
+ $this->assertEquals($expected, $this->api->addSubAdmin(['userid' => 'ExistingUser']));
+ }
+
+ public function testRemoveSubAdminNotExistingTargetUser() {
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('NotExistingUser')
+ ->will($this->returnValue(null));
+
+ $expected = new \OC_OCS_Result(null, 101, 'User does not exist');
+ $this->assertEquals($expected, $this->api->removeSubAdmin(['userid' => 'NotExistingUser', '_delete' => ['groupid' => 'GroupToDeleteFrom']]));
+ }
+
+ public function testRemoveSubAdminNotExistingTargetGroup() {
+ $targetUser = $this->getMock('\OCP\IUser');
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('ExistingUser')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('GroupToDeleteFrom')
+ ->will($this->returnValue(null));
+
+ $expected = new \OC_OCS_Result(null, 101, 'Group does not exist');
+ $this->assertEquals($expected, $this->api->removeSubAdmin(['userid' => 'ExistingUser', '_delete' => ['groupid' => 'GroupToDeleteFrom']]));
+ }
+
+ public function testRemoveSubAdminFromNotASubadmin() {
+ $targetUser = $this->getMock('\OCP\IUser');
+ $targetGroup = $this->getMock('\OCP\IGroup');
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('ExistingUser')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('GroupToDeleteFrom')
+ ->will($this->returnValue($targetGroup));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+ ->disableOriginalConstructor()->getMock();
+ $subAdminManager
+ ->expects($this->once())
+ ->method('isSubAdminOfGroup')
+ ->with($targetUser, $targetGroup)
+ ->will($this->returnValue(false));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+
+ $expected = new \OC_OCS_Result(null, 102, 'User is not a subadmin of this group');
+ $this->assertEquals($expected, $this->api->removeSubAdmin(['userid' => 'ExistingUser', '_delete' => ['groupid' => 'GroupToDeleteFrom']]));
+ }
+
+ public function testRemoveSubAdminSuccessful() {
+ $targetUser = $this->getMock('\OCP\IUser');
+ $targetGroup = $this->getMock('\OCP\IGroup');
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('ExistingUser')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('GroupToDeleteFrom')
+ ->will($this->returnValue($targetGroup));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+ ->disableOriginalConstructor()->getMock();
+ $subAdminManager
+ ->expects($this->once())
+ ->method('isSubAdminOfGroup')
+ ->with($targetUser, $targetGroup)
+ ->will($this->returnValue(true));
+ $subAdminManager
+ ->expects($this->once())
+ ->method('deleteSubAdmin')
+ ->with($targetUser, $targetGroup)
+ ->will($this->returnValue(true));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+
+ $expected = new \OC_OCS_Result(null, 100);
+ $this->assertEquals($expected, $this->api->removeSubAdmin(['userid' => 'ExistingUser', '_delete' => ['groupid' => 'GroupToDeleteFrom']]));
+ }
+
+ public function testRemoveSubAdminUnsuccessful() {
+ $targetUser = $this->getMock('\OCP\IUser');
+ $targetGroup = $this->getMock('\OCP\IGroup');
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('ExistingUser')
+ ->will($this->returnValue($targetUser));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('GroupToDeleteFrom')
+ ->will($this->returnValue($targetGroup));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+ ->disableOriginalConstructor()->getMock();
+ $subAdminManager
+ ->expects($this->once())
+ ->method('isSubAdminOfGroup')
+ ->with($targetUser, $targetGroup)
+ ->will($this->returnValue(true));
+ $subAdminManager
+ ->expects($this->once())
+ ->method('deleteSubAdmin')
+ ->with($targetUser, $targetGroup)
+ ->will($this->returnValue(false));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+
+ $expected = new \OC_OCS_Result(null, 103, 'Unknown error occurred');
+ $this->assertEquals($expected, $this->api->removeSubAdmin(['userid' => 'ExistingUser', '_delete' => ['groupid' => 'GroupToDeleteFrom']]));
+ }
+
+ public function testGetUserSubAdminGroupsNotExistingTargetUser() {
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('RequestedUser')
+ ->will($this->returnValue(null));
+
+ $expected = new \OC_OCS_Result(null, 101, 'User does not exist');
+ $this->assertEquals($expected, $this->api->getUserSubAdminGroups(['userid' => 'RequestedUser']));
+ }
+
+ public function testGetUserSubAdminGroupsWithGroups() {
+ $targetUser = $this->getMock('\OCP\IUser');
+ $targetGroup = $this->getMock('\OCP\IGroup');
+ $targetGroup
+ ->expects($this->once())
+ ->method('getGID')
+ ->will($this->returnValue('TargetGroup'));
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('RequestedUser')
+ ->will($this->returnValue($targetUser));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+ ->disableOriginalConstructor()->getMock();
+ $subAdminManager
+ ->expects($this->once())
+ ->method('getSubAdminsGroups')
+ ->with($targetUser)
+ ->will($this->returnValue([$targetGroup]));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+
+ $expected = new \OC_OCS_Result(['TargetGroup'], 100);
+ $this->assertEquals($expected, $this->api->getUserSubAdminGroups(['userid' => 'RequestedUser']));
+ }
+
+ public function testGetUserSubAdminGroupsWithoutGroups() {
+ $targetUser = $this->getMock('\OCP\IUser');
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('RequestedUser')
+ ->will($this->returnValue($targetUser));
+ $subAdminManager = $this->getMockBuilder('\OC\Subadmin')
+ ->disableOriginalConstructor()->getMock();
+ $subAdminManager
+ ->expects($this->once())
+ ->method('getSubAdminsGroups')
+ ->with($targetUser)
+ ->will($this->returnValue([]));
+ $this->groupManager
+ ->expects($this->once())
+ ->method('getSubAdmin')
+ ->will($this->returnValue($subAdminManager));
+
+ $expected = new \OC_OCS_Result(null, 102, 'Unknown error occurred');
+ $this->assertEquals($expected, $this->api->getUserSubAdminGroups(['userid' => 'RequestedUser']));
}
}