diff options
author | Morris Jobke <hey@morrisjobke.de> | 2015-04-28 16:57:09 +0300 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2015-04-28 16:57:09 +0300 |
commit | f87d492118b7c9cc4c76b725042df396a989a218 (patch) | |
tree | 7b65c0ccbe465e7b2352554e55d86962a93d248a | |
parent | 337c541c0c23fb1724a66ef8f3e23c7a0c90152a (diff) | |
parent | 68d37afa3b70eafb336c5b51cea3a65931b28520 (diff) |
Merge pull request #15610 from rullzer/backport-15564
[stable8] Backport of #15564
-rw-r--r-- | apps/provisioning_api/lib/users.php | 4 | ||||
-rw-r--r-- | apps/provisioning_api/tests/userstest.php | 25 |
2 files changed, 29 insertions, 0 deletions
diff --git a/apps/provisioning_api/lib/users.php b/apps/provisioning_api/lib/users.php index 4262dff7a6c..37bfd3b4eda 100644 --- a/apps/provisioning_api/lib/users.php +++ b/apps/provisioning_api/lib/users.php @@ -296,6 +296,10 @@ class Users { if(strtolower($group) == 'admin') { return new OC_OCS_Result(null, 103, 'Cannot create subadmins for admin group'); } + // We cannot be subadmin twice + if (OC_Subadmin::isSubAdminOfGroup($user, $group)) { + return new OC_OCS_Result(null, 100); + } // Go if(OC_Subadmin::createSubAdmin($user, $group)) { return new OC_OCS_Result(null, 100); diff --git a/apps/provisioning_api/tests/userstest.php b/apps/provisioning_api/tests/userstest.php index 917d06a8348..82ff26134dc 100644 --- a/apps/provisioning_api/tests/userstest.php +++ b/apps/provisioning_api/tests/userstest.php @@ -767,4 +767,29 @@ class UsersTest extends TestCase { $this->assertFalse($result->succeeded()); $this->assertEquals(101, $result->getStatusCode()); } + + public function testSubAdminOfGroupAlreadySubAdmin() { + $user1 = $this->generateUsers(); + $user2 = $this->generateUsers(); + \OC_User::setUserId($user1); + \OC_Group::addToGroup($user1, 'admin'); + $group1 = $this->getUniqueID(); + \OC_Group::createGroup($group1); + + //Make user2 subadmin of group1 + $_POST['groupid'] = $group1; + $result = \OCA\provisioning_api\Users::addSubAdmin([ + 'userid' => $user2, + ]); + $this->assertInstanceOf('OC_OCS_Result', $result); + $this->assertTrue($result->succeeded()); + + //Make user2 subadmin of group1 again + $_POST['groupid'] = $group1; + $result = \OCA\provisioning_api\Users::addSubAdmin([ + 'userid' => $user2, + ]); + $this->assertInstanceOf('OC_OCS_Result', $result); + $this->assertTrue($result->succeeded()); + } } |