Merge pull request #20546 from owncloud/provision_api_fix

[provisioning api] Return empty list if group does not have subadmins

2 files changed, 3 insertions, 10 deletions

diff --git a/apps/provisioning_api/lib/groups.php b/apps/provisioning_api/lib/groups.php
index 7c35caca5fd..7a6e6150782 100644
--- a/apps/provisioning_api/lib/groups.php
+++ b/apps/provisioning_api/lib/groups.php
@@ -176,14 +176,8 @@ class Groups{
 		foreach ($subadmins as $user) {
 			$uids[] = $user->getUID();
 		}
-		$subadmins = $uids;
 
-		// Go
-		if(!$subadmins) {
-			return new OC_OCS_Result(null, 102, 'Unknown error occured');
-		} else {
-			return new OC_OCS_Result($subadmins);
-		}
+		return new OC_OCS_Result($uids);
 	}
 
 }
diff --git a/apps/provisioning_api/tests/groupstest.php b/apps/provisioning_api/tests/groupstest.php
index 7d4beb6a368..d37f4412e20 100644
--- a/apps/provisioning_api/tests/groupstest.php
+++ b/apps/provisioning_api/tests/groupstest.php
@@ -308,9 +308,8 @@ class GroupsTest extends \Test\TestCase {
 		]);
 
 		$this->assertInstanceOf('OC_OCS_Result', $result);
-		$this->assertFalse($result->succeeded());
-		$this->assertEquals(102, $result->getStatusCode());
-		$this->assertEquals('Unknown error occured', $result->getMeta()['message']);
+		$this->assertTrue($result->succeeded());
+		$this->assertEquals([], $result->getData());
 	}
 
 	public function testAddGroupEmptyGroup() {