diff options
Diffstat (limited to 'apps/provisioning_api/tests/Controller/UsersControllerTest.php')
| -rw-r--r-- | apps/provisioning_api/tests/Controller/UsersControllerTest.php | 3251 |
1 files changed, 2199 insertions, 1052 deletions
diff --git a/apps/provisioning_api/tests/Controller/UsersControllerTest.php b/apps/provisioning_api/tests/Controller/UsersControllerTest.php index ef47583e9df..0c0a0ae3d74 100644 --- a/apps/provisioning_api/tests/Controller/UsersControllerTest.php +++ b/apps/provisioning_api/tests/Controller/UsersControllerTest.php @@ -1,99 +1,97 @@ <?php + + /** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Arthur Schiwon <blizzz@arthur-schiwon.de> - * @author Bjoern Schiessle <bjoern@schiessle.org> - * @author Christoph Wurst <christoph@owncloud.com> - * @author Joas Schilling <coding@schilljs.com> - * @author Lukas Reschke <lukas@statuscode.ch> - * @author michag86 <micha_g@arcor.de> - * @author Morris Jobke <hey@morrisjobke.de> - * @author Roeland Jago Douma <roeland@famdouma.nl> - * @author Thomas Müller <thomas.mueller@tmit.eu> - * @author Tom Needham <tom@owncloud.com> - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * + * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-FileCopyrightText: 2016 ownCloud, Inc. + * SPDX-License-Identifier: AGPL-3.0-only */ - namespace OCA\Provisioning_API\Tests\Controller; use Exception; -use OC\Accounts\AccountManager; +use OC\Authentication\Token\RemoteWipe; use OC\Group\Manager; -use OCP\App\IAppManager; -use OCP\AppFramework\OCS\OCSException; -use OCP\Mail\IEMailTemplate; -use OC\Settings\Mailer\NewUserMailHelper; +use OC\KnownUser\KnownUserService; +use OC\PhoneNumberUtil; use OC\SubAdmin; use OCA\Provisioning_API\Controller\UsersController; +use OCA\Settings\Mailer\NewUserMailHelper; +use OCP\Accounts\IAccount; +use OCP\Accounts\IAccountManager; +use OCP\Accounts\IAccountProperty; +use OCP\Accounts\IAccountPropertyCollection; +use OCP\App\IAppManager; use OCP\AppFramework\Http\DataResponse; -use OCP\Defaults; +use OCP\AppFramework\OCS\OCSException; +use OCP\EventDispatcher\IEventDispatcher; +use OCP\Files\IRootFolder; +use OCP\Group\ISubAdmin; use OCP\IConfig; use OCP\IGroup; -use OCP\ILogger; use OCP\IL10N; +use OCP\IPhoneNumberUtil; use OCP\IRequest; use OCP\IURLGenerator; use OCP\IUser; use OCP\IUserManager; use OCP\IUserSession; use OCP\L10N\IFactory; -use OCP\Mail\IMailer; -use PHPUnit_Framework_MockObject_MockObject; +use OCP\Mail\IEMailTemplate; +use OCP\Security\Events\GenerateSecurePasswordEvent; +use OCP\Security\ISecureRandom; +use OCP\User\Backend\ISetDisplayNameBackend; +use OCP\UserInterface; +use PHPUnit\Framework\MockObject\MockObject; +use Psr\Log\LoggerInterface; +use RuntimeException; use Test\TestCase; class UsersControllerTest extends TestCase { - - /** @var IUserManager|PHPUnit_Framework_MockObject_MockObject */ - protected $userManager; - /** @var IConfig|PHPUnit_Framework_MockObject_MockObject */ - protected $config; - /** @var IAppManager|PHPUnit_Framework_MockObject_MockObject */ - protected $appManager; - /** @var Manager|PHPUnit_Framework_MockObject_MockObject */ - protected $groupManager; - /** @var IUserSession|PHPUnit_Framework_MockObject_MockObject */ - protected $userSession; - /** @var ILogger|PHPUnit_Framework_MockObject_MockObject */ - protected $logger; - /** @var UsersController|PHPUnit_Framework_MockObject_MockObject */ - protected $api; - /** @var AccountManager|PHPUnit_Framework_MockObject_MockObject */ - protected $accountManager; - /** @var IRequest|PHPUnit_Framework_MockObject_MockObject */ - protected $request; - /** @var IFactory|PHPUnit_Framework_MockObject_MockObject */ - private $l10nFactory; - /** @var NewUserMailHelper|PHPUnit_Framework_MockObject_MockObject */ - private $newUserMailHelper; - - protected function setUp() { + protected IUserManager&MockObject $userManager; + protected IConfig&MockObject $config; + protected Manager&MockObject $groupManager; + protected IUserSession&MockObject $userSession; + protected LoggerInterface&MockObject $logger; + protected UsersController&MockObject $api; + protected IAccountManager&MockObject $accountManager; + protected ISubAdmin&MockObject $subAdminManager; + protected IURLGenerator&MockObject $urlGenerator; + protected IRequest&MockObject $request; + private IFactory&MockObject $l10nFactory; + private NewUserMailHelper&MockObject $newUserMailHelper; + private ISecureRandom&MockObject $secureRandom; + private RemoteWipe&MockObject $remoteWipe; + private KnownUserService&MockObject $knownUserService; + private IEventDispatcher&MockObject $eventDispatcher; + private IRootFolder $rootFolder; + private IPhoneNumberUtil $phoneNumberUtil; + private IAppManager $appManager; + + protected function setUp(): void { parent::setUp(); $this->userManager = $this->createMock(IUserManager::class); $this->config = $this->createMock(IConfig::class); - $this->appManager = $this->createMock(IAppManager::class); $this->groupManager = $this->createMock(Manager::class); $this->userSession = $this->createMock(IUserSession::class); - $this->logger = $this->createMock(ILogger::class); + $this->logger = $this->createMock(LoggerInterface::class); $this->request = $this->createMock(IRequest::class); - $this->accountManager = $this->createMock(AccountManager::class); + $this->accountManager = $this->createMock(IAccountManager::class); + $this->subAdminManager = $this->createMock(ISubAdmin::class); + $this->urlGenerator = $this->createMock(IURLGenerator::class); $this->l10nFactory = $this->createMock(IFactory::class); $this->newUserMailHelper = $this->createMock(NewUserMailHelper::class); + $this->secureRandom = $this->createMock(ISecureRandom::class); + $this->remoteWipe = $this->createMock(RemoteWipe::class); + $this->knownUserService = $this->createMock(KnownUserService::class); + $this->eventDispatcher = $this->createMock(IEventDispatcher::class); + $this->phoneNumberUtil = new PhoneNumberUtil(); + $this->appManager = $this->createMock(IAppManager::class); + $this->rootFolder = $this->createMock(IRootFolder::class); + + $l10n = $this->createMock(IL10N::class); + $l10n->method('t')->willReturnCallback(fn (string $txt, array $replacement = []) => sprintf($txt, ...$replacement)); + $this->l10nFactory->method('get')->with('provisioning_api')->willReturn($l10n); $this->api = $this->getMockBuilder(UsersController::class) ->setConstructorArgs([ @@ -101,41 +99,50 @@ class UsersControllerTest extends TestCase { $this->request, $this->userManager, $this->config, - $this->appManager, $this->groupManager, $this->userSession, $this->accountManager, - $this->logger, + $this->subAdminManager, $this->l10nFactory, - $this->newUserMailHelper + $this->rootFolder, + $this->urlGenerator, + $this->logger, + $this->newUserMailHelper, + $this->secureRandom, + $this->remoteWipe, + $this->knownUserService, + $this->eventDispatcher, + $this->phoneNumberUtil, + $this->appManager, ]) - ->setMethods(['fillStorageInfo']) + ->onlyMethods(['fillStorageInfo']) ->getMock(); } - public function testGetUsersAsAdmin() { + public function testGetUsersAsAdmin(): void { $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $loggedInUser ->expects($this->once()) ->method('getUID') - ->will($this->returnValue('admin')); + ->willReturn('admin'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') - ->will($this->returnValue(true)); + ->willReturn(true); $this->userManager ->expects($this->once()) ->method('search') - ->with('MyCustomSearch', null, null) - ->will($this->returnValue(['Admin' => [], 'Foo' => [], 'Bar' => []])); + ->with('MyCustomSearch') + ->willReturn(['Admin' => [], 'Foo' => [], 'Bar' => []]); - $expected = ['users' => [ + $expected = [ + 'users' => [ 'Admin', 'Foo', 'Bar', @@ -144,56 +151,55 @@ class UsersControllerTest extends TestCase { $this->assertEquals($expected, $this->api->getUsers('MyCustomSearch')->getData()); } - public function testGetUsersAsSubAdmin() { + public function testGetUsersAsSubAdmin(): void { $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $loggedInUser ->expects($this->once()) ->method('getUID') - ->will($this->returnValue('subadmin')); + ->willReturn('subadmin'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') - ->will($this->returnValue(false)); + ->willReturn(false); $firstGroup = $this->getMockBuilder('OCP\IGroup') ->disableOriginalConstructor() ->getMock(); $firstGroup ->expects($this->once()) ->method('getGID') - ->will($this->returnValue('FirstGroup')); + ->willReturn('FirstGroup'); $secondGroup = $this->getMockBuilder('OCP\IGroup') ->disableOriginalConstructor() ->getMock(); $secondGroup ->expects($this->once()) ->method('getGID') - ->will($this->returnValue('SecondGroup')); + ->willReturn('SecondGroup'); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) ->method('isSubAdmin') ->with($loggedInUser) - ->will($this->returnValue(true)); + ->willReturn(true); $subAdminManager ->expects($this->once()) ->method('getSubAdminsGroups') ->with($loggedInUser) - ->will($this->returnValue([$firstGroup, $secondGroup])); + ->willReturn([$firstGroup, $secondGroup]); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $this->groupManager ->expects($this->any()) - ->method('displayNamesInGroup') - ->will($this->onConsecutiveCalls(['AnotherUserInTheFirstGroup' => []], ['UserInTheSecondGroup' => []])); + ->method('displayNamesInGroup')->willReturnOnConsecutiveCalls(['AnotherUserInTheFirstGroup' => []], ['UserInTheSecondGroup' => []]); $expected = [ 'users' => [ @@ -204,16 +210,141 @@ class UsersControllerTest extends TestCase { $this->assertEquals($expected, $this->api->getUsers('MyCustomSearch')->getData()); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 102 - */ - public function testAddUserAlreadyExisting() { + private function createUserMock(string $uid, bool $enabled): MockObject&IUser { + $mockUser = $this->getMockBuilder(IUser::class) + ->disableOriginalConstructor() + ->getMock(); + $mockUser + ->method('getUID') + ->willReturn($uid); + $mockUser + ->method('isEnabled') + ->willReturn($enabled); + return $mockUser; + } + + public function testGetDisabledUsersAsAdmin(): void { + $loggedInUser = $this->getMockBuilder(IUser::class) + ->disableOriginalConstructor() + ->getMock(); + $loggedInUser + ->expects($this->once()) + ->method('getUID') + ->willReturn('admin'); + $this->userSession + ->expects($this->atLeastOnce()) + ->method('getUser') + ->willReturn($loggedInUser); + $this->groupManager + ->expects($this->once()) + ->method('isAdmin') + ->willReturn(true); + $this->userManager + ->expects($this->once()) + ->method('getDisabledUsers') + ->with(3, 0, 'MyCustomSearch') + ->willReturn([ + $this->createUserMock('admin', false), + $this->createUserMock('foo', false), + $this->createUserMock('bar', false), + ]); + + $expected = [ + 'users' => [ + 'admin' => ['id' => 'admin'], + 'foo' => ['id' => 'foo'], + 'bar' => ['id' => 'bar'], + ], + ]; + $this->assertEquals($expected, $this->api->getDisabledUsersDetails('MyCustomSearch', 3)->getData()); + } + + public function testGetDisabledUsersAsSubAdmin(): void { + $loggedInUser = $this->getMockBuilder(IUser::class) + ->disableOriginalConstructor() + ->getMock(); + $loggedInUser + ->expects($this->once()) + ->method('getUID') + ->willReturn('subadmin'); + $this->userSession + ->expects($this->atLeastOnce()) + ->method('getUser') + ->willReturn($loggedInUser); + $this->groupManager + ->expects($this->once()) + ->method('isAdmin') + ->willReturn(false); + $firstGroup = $this->getMockBuilder('OCP\IGroup') + ->disableOriginalConstructor() + ->getMock(); + $secondGroup = $this->getMockBuilder('OCP\IGroup') + ->disableOriginalConstructor() + ->getMock(); + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') + ->disableOriginalConstructor()->getMock(); + $subAdminManager + ->expects($this->once()) + ->method('isSubAdmin') + ->with($loggedInUser) + ->willReturn(true); + $subAdminManager + ->expects($this->once()) + ->method('getSubAdminsGroups') + ->with($loggedInUser) + ->willReturn([$firstGroup, $secondGroup]); + $this->groupManager + ->expects($this->once()) + ->method('getSubAdmin') + ->willReturn($subAdminManager); + $this->groupManager + ->expects($this->never()) + ->method('displayNamesInGroup'); + + $firstGroup + ->expects($this->once()) + ->method('searchUsers') + ->with('MyCustomSearch') + ->willReturn([ + $this->createUserMock('user1', false), + $this->createUserMock('bob', true), + $this->createUserMock('user2', false), + $this->createUserMock('alice', true), + ]); + + $secondGroup + ->expects($this->once()) + ->method('searchUsers') + ->with('MyCustomSearch') + ->willReturn([ + $this->createUserMock('user2', false), + $this->createUserMock('joe', true), + $this->createUserMock('user3', false), + $this->createUserMock('jim', true), + $this->createUserMock('john', true), + ]); + + + $expected = [ + 'users' => [ + 'user1' => ['id' => 'user1'], + 'user2' => ['id' => 'user2'], + 'user3' => ['id' => 'user3'], + ], + ]; + $this->assertEquals($expected, $this->api->getDisabledUsersDetails('MyCustomSearch', 3)->getData()); + } + + + public function testAddUserAlreadyExisting(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(102); + $this->userManager ->expects($this->once()) ->method('userExists') ->with('AlreadyExistingUser') - ->will($this->returnValue(true)); + ->willReturn(true); $this->logger ->expects($this->once()) ->method('error') @@ -222,28 +353,28 @@ class UsersControllerTest extends TestCase { ->disableOriginalConstructor() ->getMock(); $loggedInUser - ->expects($this->once()) + ->expects($this->exactly(2)) ->method('getUID') - ->will($this->returnValue('adminUser')); + ->willReturn('adminUser'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') ->with('adminUser') ->willReturn(true); - $this->api->addUser('AlreadyExistingUser', null, null); + $this->api->addUser('AlreadyExistingUser', 'password', '', '', []); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 104 - * @expectedExceptionMessage group NonExistingGroup does not exist - */ - public function testAddUserNonExistingGroup() { + + public function testAddUserNonExistingGroup(): void { + $this->expectException(OCSException::class); + $this->expectExceptionMessage('Group NonExistingGroup does not exist'); + $this->expectExceptionCode(104); + $this->userManager ->expects($this->once()) ->method('userExists') @@ -253,13 +384,13 @@ class UsersControllerTest extends TestCase { ->disableOriginalConstructor() ->getMock(); $loggedInUser - ->expects($this->once()) + ->expects($this->exactly(2)) ->method('getUID') - ->will($this->returnValue('adminUser')); + ->willReturn('adminUser'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') @@ -271,15 +402,15 @@ class UsersControllerTest extends TestCase { ->with('NonExistingGroup') ->willReturn(false); - $this->api->addUser('NewUser', 'pass', ['NonExistingGroup']); + $this->api->addUser('NewUser', 'pass', '', '', ['NonExistingGroup']); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 104 - * @expectedExceptionMessage group NonExistingGroup does not exist - */ - public function testAddUserExistingGroupNonExistingGroup() { + + public function testAddUserExistingGroupNonExistingGroup(): void { + $this->expectException(OCSException::class); + $this->expectExceptionMessage('Group NonExistingGroup does not exist'); + $this->expectExceptionCode(104); + $this->userManager ->expects($this->once()) ->method('userExists') @@ -289,13 +420,13 @@ class UsersControllerTest extends TestCase { ->disableOriginalConstructor() ->getMock(); $loggedInUser - ->expects($this->once()) + ->expects($this->exactly(2)) ->method('getUID') - ->will($this->returnValue('adminUser')); + ->willReturn('adminUser'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') @@ -304,28 +435,25 @@ class UsersControllerTest extends TestCase { $this->groupManager ->expects($this->exactly(2)) ->method('groupExists') - ->withConsecutive( - ['ExistingGroup'], - ['NonExistingGroup'] - ) - ->will($this->returnValueMap([ + ->willReturnMap([ ['ExistingGroup', true], ['NonExistingGroup', false] - ])); + ]); - $this->api->addUser('NewUser', 'pass', ['ExistingGroup', 'NonExistingGroup']); + $this->api->addUser('NewUser', 'pass', '', '', ['ExistingGroup', 'NonExistingGroup']); } - public function testAddUserSuccessful() { + public function testAddUserSuccessful(): void { $this->userManager ->expects($this->once()) ->method('userExists') ->with('NewUser') - ->will($this->returnValue(false)); + ->willReturn(false); $this->userManager ->expects($this->once()) ->method('createUser') - ->with('NewUser', 'PasswordOfTheNewUser'); + ->with('NewUser', 'PasswordOfTheNewUser') + ->willReturn($this->createMock(IUser::class)); $this->logger ->expects($this->once()) ->method('info') @@ -334,39 +462,343 @@ class UsersControllerTest extends TestCase { ->disableOriginalConstructor() ->getMock(); $loggedInUser + ->expects($this->exactly(2)) + ->method('getUID') + ->willReturn('adminUser'); + $this->userSession ->expects($this->once()) + ->method('getUser') + ->willReturn($loggedInUser); + $this->groupManager + ->expects($this->once()) + ->method('isAdmin') + ->with('adminUser') + ->willReturn(true); + + $this->assertTrue(key_exists( + 'id', + $this->api->addUser('NewUser', 'PasswordOfTheNewUser')->getData() + )); + } + + public function testAddUserSuccessfulWithDisplayName(): void { + /** + * @var UserController + */ + $api = $this->getMockBuilder(UsersController::class) + ->setConstructorArgs([ + 'provisioning_api', + $this->request, + $this->userManager, + $this->config, + $this->groupManager, + $this->userSession, + $this->accountManager, + $this->subAdminManager, + $this->l10nFactory, + $this->rootFolder, + $this->urlGenerator, + $this->logger, + $this->newUserMailHelper, + $this->secureRandom, + $this->remoteWipe, + $this->knownUserService, + $this->eventDispatcher, + $this->phoneNumberUtil, + $this->appManager, + ]) + ->onlyMethods(['editUser']) + ->getMock(); + + $this->userManager + ->expects($this->once()) + ->method('userExists') + ->with('NewUser') + ->willReturn(false); + $this->userManager + ->expects($this->once()) + ->method('createUser') + ->with('NewUser', 'PasswordOfTheNewUser') + ->willReturn($this->createMock(IUser::class)); + $this->logger + ->expects($this->once()) + ->method('info') + ->with('Successful addUser call with userid: NewUser', ['app' => 'ocs_api']); + $loggedInUser = $this->getMockBuilder(IUser::class) + ->disableOriginalConstructor() + ->getMock(); + $loggedInUser + ->expects($this->any()) + ->method('getUID') + ->willReturn('adminUser'); + $this->userSession + ->expects($this->any()) + ->method('getUser') + ->willReturn($loggedInUser); + $this->groupManager + ->expects($this->once()) + ->method('isAdmin') + ->with('adminUser') + ->willReturn(true); + $api + ->expects($this->once()) + ->method('editUser') + ->with('NewUser', 'display', 'DisplayNameOfTheNewUser'); + + $this->assertTrue(key_exists( + 'id', + $api->addUser('NewUser', 'PasswordOfTheNewUser', 'DisplayNameOfTheNewUser')->getData() + )); + } + + public function testAddUserSuccessfulGenerateUserID(): void { + $this->config + ->expects($this->any()) + ->method('getAppValue') + ->willReturnCallback(function ($appid, $key, $default) { + if ($key === 'newUser.generateUserID') { + return 'yes'; + } + return null; + }); + $this->userManager + ->expects($this->any()) + ->method('userExists') + ->with($this->anything()) + ->willReturn(false); + $this->userManager + ->expects($this->once()) + ->method('createUser') + ->with($this->anything(), 'PasswordOfTheNewUser') + ->willReturn($this->createMock(IUser::class)); + $this->logger + ->expects($this->once()) + ->method('info') + ->with($this->stringStartsWith('Successful addUser call with userid: '), ['app' => 'ocs_api']); + $loggedInUser = $this->getMockBuilder(IUser::class) + ->disableOriginalConstructor() + ->getMock(); + $loggedInUser + ->expects($this->exactly(2)) + ->method('getUID') + ->willReturn('adminUser'); + $this->userSession + ->expects($this->once()) + ->method('getUser') + ->willReturn($loggedInUser); + $this->groupManager + ->expects($this->once()) + ->method('isAdmin') + ->with('adminUser') + ->willReturn(true); + $this->secureRandom->expects($this->any()) + ->method('generate') + ->with(10) + ->willReturnCallback(function () { + return (string)rand(100000000, 999999999); + }); + + $this->assertTrue(key_exists( + 'id', + $this->api->addUser('', 'PasswordOfTheNewUser')->getData() + )); + } + + public function testAddUserSuccessfulGeneratePassword(): void { + $this->userManager + ->expects($this->once()) + ->method('userExists') + ->with('NewUser') + ->willReturn(false); + $newUser = $this->createMock(IUser::class); + $newUser->expects($this->once()) + ->method('setSystemEMailAddress'); + $this->userManager + ->expects($this->once()) + ->method('createUser') + ->willReturn($newUser); + $this->logger + ->expects($this->once()) + ->method('info') + ->with('Successful addUser call with userid: NewUser', ['app' => 'ocs_api']); + $loggedInUser = $this->getMockBuilder(IUser::class) + ->disableOriginalConstructor() + ->getMock(); + $loggedInUser + ->expects($this->exactly(2)) ->method('getUID') - ->will($this->returnValue('adminUser')); + ->willReturn('adminUser'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') ->with('adminUser') ->willReturn(true); + $this->eventDispatcher + ->expects($this->once()) + ->method('dispatchTyped') + ->with(new GenerateSecurePasswordEvent()); - $this->assertEquals([], $this->api->addUser('NewUser', 'PasswordOfTheNewUser')->getData()); + $this->assertTrue(key_exists( + 'id', + $this->api->addUser('NewUser', '', '', 'foo@bar')->getData() + )); } - public function testAddUserExistingGroup() { + public function testAddUserSuccessfulLowercaseEmail(): void { $this->userManager ->expects($this->once()) ->method('userExists') ->with('NewUser') ->willReturn(false); + $newUser = $this->createMock(IUser::class); + $newUser->expects($this->once()) + ->method('setSystemEMailAddress') + ->with('foo@bar.com'); + $this->userManager + ->expects($this->once()) + ->method('createUser') + ->willReturn($newUser); + $this->logger + ->expects($this->once()) + ->method('info') + ->with('Successful addUser call with userid: NewUser', ['app' => 'ocs_api']); $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $loggedInUser + ->expects($this->exactly(2)) + ->method('getUID') + ->willReturn('adminUser'); + $this->userSession + ->expects($this->once()) + ->method('getUser') + ->willReturn($loggedInUser); + $this->groupManager ->expects($this->once()) + ->method('isAdmin') + ->with('adminUser') + ->willReturn(true); + $this->eventDispatcher + ->expects($this->once()) + ->method('dispatchTyped') + ->with(new GenerateSecurePasswordEvent()); + + $this->assertTrue(key_exists( + 'id', + $this->api->addUser('NewUser', '', '', 'fOo@BaR.CoM')->getData() + )); + } + + + public function testAddUserFailedToGenerateUserID(): void { + $this->expectException(OCSException::class); + $this->expectExceptionMessage('Could not create non-existing user ID'); + $this->expectExceptionCode(111); + + $this->config + ->expects($this->any()) + ->method('getAppValue') + ->willReturnCallback(function ($appid, $key, $default) { + if ($key === 'newUser.generateUserID') { + return 'yes'; + } + return null; + }); + $this->userManager + ->expects($this->any()) + ->method('userExists') + ->with($this->anything()) + ->willReturn(true); + $this->userManager + ->expects($this->never()) + ->method('createUser'); + $loggedInUser = $this->getMockBuilder(IUser::class) + ->disableOriginalConstructor() + ->getMock(); + $loggedInUser + ->expects($this->exactly(2)) ->method('getUID') - ->will($this->returnValue('adminUser')); + ->willReturn('adminUser'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); + $this->groupManager + ->expects($this->once()) + ->method('isAdmin') + ->with('adminUser') + ->willReturn(true); + + $this->api->addUser('', 'PasswordOfTheNewUser')->getData(); + } + + + public function testAddUserEmailRequired(): void { + $this->expectException(OCSException::class); + $this->expectExceptionMessage('Required email address was not provided'); + $this->expectExceptionCode(110); + + $this->config + ->expects($this->any()) + ->method('getAppValue') + ->willReturnCallback(function ($appid, $key, $default) { + if ($key === 'newUser.requireEmail') { + return 'yes'; + } + return null; + }); + $this->userManager + ->expects($this->once()) + ->method('userExists') + ->with('NewUser') + ->willReturn(false); + $this->userManager + ->expects($this->never()) + ->method('createUser'); + $loggedInUser = $this->getMockBuilder(IUser::class) + ->disableOriginalConstructor() + ->getMock(); + $loggedInUser + ->expects($this->exactly(2)) + ->method('getUID') + ->willReturn('adminUser'); + $this->userSession + ->expects($this->once()) + ->method('getUser') + ->willReturn($loggedInUser); + $this->groupManager + ->expects($this->once()) + ->method('isAdmin') + ->with('adminUser') + ->willReturn(true); + + $this->assertTrue(key_exists( + 'id', + $this->api->addUser('NewUser', 'PasswordOfTheNewUser')->getData() + )); + } + + public function testAddUserExistingGroup(): void { + $this->userManager + ->expects($this->once()) + ->method('userExists') + ->with('NewUser') + ->willReturn(false); + $loggedInUser = $this->getMockBuilder(IUser::class) + ->disableOriginalConstructor() + ->getMock(); + $loggedInUser + ->expects($this->exactly(2)) + ->method('getUID') + ->willReturn('adminUser'); + $this->userSession + ->expects($this->once()) + ->method('getUser') + ->willReturn($loggedInUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') @@ -397,48 +829,60 @@ class UsersControllerTest extends TestCase { ->method('get') ->with('ExistingGroup') ->willReturn($group); + + $calls = [ + ['Successful addUser call with userid: NewUser', ['app' => 'ocs_api']], + ['Added userid NewUser to group ExistingGroup', ['app' => 'ocs_api']], + ]; $this->logger ->expects($this->exactly(2)) ->method('info') - ->withConsecutive( - ['Successful addUser call with userid: NewUser', ['app' => 'ocs_api']], - ['Added userid NewUser to group ExistingGroup', ['app' => 'ocs_api']] - ); + ->willReturnCallback(function () use (&$calls): void { + $expected = array_shift($calls); + $this->assertEquals($expected, func_get_args()); + }); - $this->assertEquals([], $this->api->addUser('NewUser', 'PasswordOfTheNewUser', ['ExistingGroup'])->getData()); + $this->assertArrayHasKey('id', $this->api->addUser('NewUser', 'PasswordOfTheNewUser', '', '', ['ExistingGroup'])->getData()); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 101 - * @expectedExceptionMessage Bad request - */ - public function testAddUserUnsuccessful() { + + public function testAddUserUnsuccessful(): void { + $this->expectException(OCSException::class); + $this->expectExceptionMessage('Bad request'); + $this->expectExceptionCode(101); + + $exception = new Exception('User backend not found.'); $this->userManager ->expects($this->once()) ->method('userExists') ->with('NewUser') - ->will($this->returnValue(false)); + ->willReturn(false); $this->userManager ->expects($this->once()) ->method('createUser') ->with('NewUser', 'PasswordOfTheNewUser') - ->will($this->throwException(new Exception('User backend not found.'))); + ->willThrowException($exception); $this->logger ->expects($this->once()) ->method('error') - ->with('Failed addUser attempt with exception: User backend not found.', ['app' => 'ocs_api']); + ->with( + 'Failed addUser attempt with exception.', + [ + 'app' => 'ocs_api', + 'exception' => $exception + ] + ); $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $loggedInUser - ->expects($this->once()) + ->expects($this->exactly(2)) ->method('getUID') - ->will($this->returnValue('adminUser')); + ->willReturn('adminUser'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') @@ -448,23 +892,23 @@ class UsersControllerTest extends TestCase { $this->api->addUser('NewUser', 'PasswordOfTheNewUser'); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 106 - * @expectedExceptionMessage no group specified (required for subadmins) - */ - public function testAddUserAsSubAdminNoGroup() { + + public function testAddUserAsSubAdminNoGroup(): void { + $this->expectException(OCSException::class); + $this->expectExceptionMessage('No group specified (required for sub-admins)'); + $this->expectExceptionCode(106); + $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $loggedInUser - ->expects($this->once()) + ->expects($this->exactly(2)) ->method('getUID') - ->will($this->returnValue('regularUser')); + ->willReturn('regularUser'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') @@ -478,26 +922,26 @@ class UsersControllerTest extends TestCase { ->with() ->willReturn($subAdminManager); - $this->api->addUser('NewUser', 'PasswordOfTheNewUser', null); + $this->api->addUser('NewUser', 'PasswordOfTheNewUser', '', '', []); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 105 - * @expectedExceptionMessage insufficient privileges for group ExistingGroup - */ - public function testAddUserAsSubAdminValidGroupNotSubAdmin() { + + public function testAddUserAsSubAdminValidGroupNotSubAdmin(): void { + $this->expectException(OCSException::class); + $this->expectExceptionMessage('Insufficient privileges for group ExistingGroup'); + $this->expectExceptionCode(105); + $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $loggedInUser - ->expects($this->once()) + ->expects($this->exactly(2)) ->method('getUID') - ->will($this->returnValue('regularUser')); + ->willReturn('regularUser'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') @@ -527,10 +971,10 @@ class UsersControllerTest extends TestCase { ->with('ExistingGroup') ->willReturn(true); - $this->api->addUser('NewUser', 'PasswordOfTheNewUser', ['ExistingGroup'])->getData(); + $this->api->addUser('NewUser', 'PasswordOfTheNewUser', '', '', ['ExistingGroup'])->getData(); } - public function testAddUserAsSubAdminExistingGroups() { + public function testAddUserAsSubAdminExistingGroups(): void { $this->userManager ->expects($this->once()) ->method('userExists') @@ -540,13 +984,13 @@ class UsersControllerTest extends TestCase { ->disableOriginalConstructor() ->getMock(); $loggedInUser - ->expects($this->once()) + ->expects($this->exactly(2)) ->method('getUID') - ->will($this->returnValue('subAdminUser')); + ->willReturn('subAdminUser'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') @@ -555,11 +999,10 @@ class UsersControllerTest extends TestCase { $this->groupManager ->expects($this->exactly(2)) ->method('groupExists') - ->withConsecutive( - ['ExistingGroup1'], - ['ExistingGroup2'] - ) - ->willReturn(true); + ->willReturnMap([ + ['ExistingGroup1', true], + ['ExistingGroup2', true] + ]); $user = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); @@ -585,24 +1028,23 @@ class UsersControllerTest extends TestCase { $this->groupManager ->expects($this->exactly(4)) ->method('get') - ->withConsecutive( - ['ExistingGroup1'], - ['ExistingGroup2'], - ['ExistingGroup1'], - ['ExistingGroup2'] - ) - ->will($this->returnValueMap([ + ->willReturnMap([ ['ExistingGroup1', $existingGroup1], ['ExistingGroup2', $existingGroup2] - ])); + ]); + + $calls = [ + ['Successful addUser call with userid: NewUser', ['app' => 'ocs_api']], + ['Added userid NewUser to group ExistingGroup1', ['app' => 'ocs_api']], + ['Added userid NewUser to group ExistingGroup2', ['app' => 'ocs_api']], + ]; $this->logger ->expects($this->exactly(3)) ->method('info') - ->withConsecutive( - ['Successful addUser call with userid: NewUser', ['app' => 'ocs_api']], - ['Added userid NewUser to group ExistingGroup1', ['app' => 'ocs_api']], - ['Added userid NewUser to group ExistingGroup2', ['app' => 'ocs_api']] - ); + ->willReturnCallback(function () use (&$calls): void { + $expected = array_shift($calls); + $this->assertEquals($expected, func_get_args()); + }); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $this->groupManager @@ -612,160 +1054,219 @@ class UsersControllerTest extends TestCase { $subAdminManager ->expects($this->exactly(2)) ->method('isSubAdminOfGroup') - ->withConsecutive( - [$loggedInUser, $existingGroup1], - [$loggedInUser, $existingGroup2] - ) - ->willReturn(true); + ->willReturnMap([ + [$loggedInUser, $existingGroup1, true], + [$loggedInUser, $existingGroup2, true], + ]); - $this->assertEquals([], $this->api->addUser('NewUser', 'PasswordOfTheNewUser', ['ExistingGroup1', 'ExistingGroup2'])->getData()); + $this->assertArrayHasKey('id', $this->api->addUser('NewUser', 'PasswordOfTheNewUser', '', '', ['ExistingGroup1', 'ExistingGroup2'])->getData()); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 998 - * @expectedExceptionMessage The requested user could not be found - */ - public function testGetUserTargetDoesNotExist() { + + public function testGetUserTargetDoesNotExist(): void { + $this->expectException(OCSException::class); + $this->expectExceptionMessage('User does not exist'); + $this->expectExceptionCode(404); + $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $this->userSession - ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToGet') - ->will($this->returnValue(null)); + ->willReturn(null); $this->api->getUser('UserToGet'); } - public function testGetUserDataAsAdmin() { - $group = $this->getMockBuilder(IGroup::class) + public function testGetUserDataAsAdmin(): void { + $group0 = $this->createMock(IGroup::class); + $group1 = $this->createMock(IGroup::class); + $group2 = $this->createMock(IGroup::class); + $group3 = $this->createMock(IGroup::class); + $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); - $loggedInUser = $this->getMockBuilder(IUser::class) + $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor() ->getMock(); $loggedInUser - ->expects($this->once()) ->method('getUID') - ->will($this->returnValue('admin')); + ->willReturn('admin'); $targetUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $targetUser->expects($this->once()) - ->method('getEMailAddress') - ->willReturn('demo@owncloud.org'); + ->method('getSystemEMailAddress') + ->willReturn('demo@nextcloud.com'); $this->userSession - ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager - ->expects($this->once()) ->method('get') - ->with('UserToGet') - ->will($this->returnValue($targetUser)); + ->with('UID') + ->willReturn($targetUser); $this->groupManager - ->expects($this->once()) ->method('isAdmin') ->with('admin') - ->will($this->returnValue(true)); + ->willReturn(true); $this->groupManager ->expects($this->any()) ->method('getUserGroups') - ->willReturn([$group, $group, $group]); - $group->expects($this->at(0)) - ->method('getDisplayName') + ->willReturn([$group0, $group1, $group2]); + $this->groupManager + ->expects($this->once()) + ->method('getSubAdmin') + ->willReturn($subAdminManager); + $subAdminManager + ->expects($this->once()) + ->method('getSubAdminsGroups') + ->willReturn([$group3]); + $group0->expects($this->once()) + ->method('getGID') ->willReturn('group0'); - $group->expects($this->at(1)) - ->method('getDisplayName') + $group1->expects($this->once()) + ->method('getGID') ->willReturn('group1'); - $group->expects($this->at(2)) - ->method('getDisplayName') + $group2->expects($this->once()) + ->method('getGID') ->willReturn('group2'); - $this->accountManager->expects($this->any())->method('getUser') - ->with($targetUser) - ->willReturn( - [ - AccountManager::PROPERTY_ADDRESS => ['value' => 'address'], - AccountManager::PROPERTY_PHONE => ['value' => 'phone'], - AccountManager::PROPERTY_TWITTER => ['value' => 'twitter'], - AccountManager::PROPERTY_WEBSITE => ['value' => 'website'], - ] - ); - $this->config - ->expects($this->at(0)) - ->method('getUserValue') - ->with('UID', 'core', 'enabled', 'true') - ->will($this->returnValue('true')); + $group3->expects($this->once()) + ->method('getGID') + ->willReturn('group3'); + + $this->mockAccount($targetUser, [ + IAccountManager::PROPERTY_ADDRESS => ['value' => 'address'], + IAccountManager::PROPERTY_PHONE => ['value' => 'phone'], + IAccountManager::PROPERTY_TWITTER => ['value' => 'twitter'], + IAccountManager::PROPERTY_BLUESKY => ['value' => 'bluesky'], + IAccountManager::PROPERTY_FEDIVERSE => ['value' => 'fediverse'], + IAccountManager::PROPERTY_WEBSITE => ['value' => 'website'], + IAccountManager::PROPERTY_ORGANISATION => ['value' => 'organisation'], + IAccountManager::PROPERTY_ROLE => ['value' => 'role'], + IAccountManager::PROPERTY_HEADLINE => ['value' => 'headline'], + IAccountManager::PROPERTY_BIOGRAPHY => ['value' => 'biography'], + IAccountManager::PROPERTY_PROFILE_ENABLED => ['value' => '1'], + IAccountManager::PROPERTY_PRONOUNS => ['value' => 'they/them'], + ]); $this->config - ->expects($this->at(1)) ->method('getUserValue') - ->with('UID', 'core', 'lang') - ->will($this->returnValue('de')); + ->willReturnMap([ + ['UID', 'core', 'enabled', 'true', 'true'], + ]); $this->api ->expects($this->once()) ->method('fillStorageInfo') - ->with('UID') - ->will($this->returnValue(['DummyValue'])); + ->with($targetUser) + ->willReturn(['DummyValue']); + + $backend = $this->createMock(UserInterface::class); + $backend->expects($this->any()) + ->method('implementsActions') + ->willReturn(true); + $targetUser ->expects($this->once()) ->method('getDisplayName') - ->will($this->returnValue('Demo User')); + ->willReturn('Demo User'); + $targetUser + ->expects($this->once()) + ->method('getHome') + ->willReturn('/var/www/newtcloud/data/UID'); + $targetUser + ->expects($this->exactly(2)) + ->method('getLastLogin') + ->willReturn(1521191471); + $targetUser + ->expects($this->once()) + ->method('getFirstLogin') + ->willReturn(1511191471); + $targetUser + ->expects($this->once()) + ->method('getBackendClassName') + ->willReturn('Database'); + $targetUser + ->expects($this->once()) + ->method('getBackend') + ->willReturn($backend); $targetUser - ->expects($this->exactly(4)) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); + + $this->l10nFactory + ->expects($this->once()) + ->method('getUserLanguage') + ->with($targetUser) + ->willReturn('de'); $expected = [ 'id' => 'UID', - 'enabled' => 'true', + 'enabled' => true, + 'storageLocation' => '/var/www/newtcloud/data/UID', + 'firstLoginTimestamp' => 1511191471, + 'lastLoginTimestamp' => 1521191471, + 'lastLogin' => 1521191471000, + 'backend' => 'Database', + 'subadmin' => ['group3'], 'quota' => ['DummyValue'], - 'email' => 'demo@owncloud.org', + 'email' => 'demo@nextcloud.com', 'displayname' => 'Demo User', + 'display-name' => 'Demo User', 'phone' => 'phone', 'address' => 'address', 'website' => 'website', 'twitter' => 'twitter', + 'bluesky' => 'bluesky', + 'fediverse' => 'fediverse', 'groups' => ['group0', 'group1', 'group2'], 'language' => 'de', + 'locale' => null, + 'backendCapabilities' => [ + 'setDisplayName' => true, + 'setPassword' => true, + ], + 'additional_mail' => [], + 'organisation' => 'organisation', + 'role' => 'role', + 'headline' => 'headline', + 'biography' => 'biography', + 'profile_enabled' => '1', + 'notify_email' => null, + 'manager' => '', + 'pronouns' => 'they/them', ]; - $this->assertEquals($expected, $this->invokePrivate($this->api, 'getUserData', ['UserToGet'])); + $this->assertEquals($expected, $this->invokePrivate($this->api, 'getUserData', ['UID'])); } - public function testGetUserDataAsSubAdminAndUserIsAccessible() { + public function testGetUserDataAsSubAdminAndUserIsAccessible(): void { $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $loggedInUser - ->expects($this->once()) ->method('getUID') - ->will($this->returnValue('subadmin')); + ->willReturn('subadmin'); $targetUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $targetUser - ->expects($this->once()) - ->method('getEMailAddress') - ->willReturn('demo@owncloud.org'); - $this->userSession ->expects($this->once()) + ->method('getSystemEMailAddress') + ->willReturn('demo@nextcloud.com'); + $this->userSession ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager - ->expects($this->once()) ->method('get') - ->with('UserToGet') - ->will($this->returnValue($targetUser)); + ->with('UID') + ->willReturn($targetUser); $this->groupManager - ->expects($this->once()) ->method('isAdmin') ->with('subadmin') - ->will($this->returnValue(false)); + ->willReturn(false); $this->groupManager ->expects($this->any()) ->method('getUserGroups') @@ -777,91 +1278,146 @@ class UsersControllerTest extends TestCase { ->expects($this->once()) ->method('isUserAccessible') ->with($loggedInUser, $targetUser) - ->will($this->returnValue(true)); - $this->groupManager + ->willReturn(true); + $subAdminManager ->expects($this->once()) + ->method('getSubAdminsGroups') + ->willReturn([]); + $this->groupManager + ->expects($this->exactly(2)) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); - $this->config - ->expects($this->at(0)) - ->method('getUserValue') - ->with('UID', 'core', 'enabled', 'true') - ->will($this->returnValue('true')); + ->willReturn($subAdminManager); $this->config - ->expects($this->at(1)) ->method('getUserValue') - ->with('UID', 'core', 'lang') - ->will($this->returnValue('da')); + ->willReturnMap([ + ['UID', 'core', 'enabled', 'true', 'true'], + ]); $this->api ->expects($this->once()) ->method('fillStorageInfo') - ->with('UID') - ->will($this->returnValue(['DummyValue'])); + ->with($targetUser) + ->willReturn(['DummyValue']); + + $backend = $this->createMock(UserInterface::class); + $backend->expects($this->any()) + ->method('implementsActions') + ->willReturn(true); + $targetUser ->expects($this->once()) ->method('getDisplayName') - ->will($this->returnValue('Demo User')); + ->willReturn('Demo User'); + $targetUser + ->expects($this->never()) + ->method('getHome'); + $targetUser + ->expects($this->exactly(2)) + ->method('getLastLogin') + ->willReturn(1521191471); + $targetUser + ->expects($this->once()) + ->method('getFirstLogin') + ->willReturn(1511191471); + $targetUser + ->expects($this->once()) + ->method('getBackendClassName') + ->willReturn('Database'); + $targetUser + ->expects($this->once()) + ->method('getBackend') + ->willReturn($backend); $targetUser - ->expects($this->exactly(4)) ->method('getUID') - ->will($this->returnValue('UID')); - $this->accountManager->expects($this->any())->method('getUser') + ->willReturn('UID'); + + $this->mockAccount($targetUser, [ + IAccountManager::PROPERTY_ADDRESS => ['value' => 'address'], + IAccountManager::PROPERTY_PHONE => ['value' => 'phone'], + IAccountManager::PROPERTY_TWITTER => ['value' => 'twitter'], + IAccountManager::PROPERTY_BLUESKY => ['value' => 'bluesky'], + IAccountManager::PROPERTY_FEDIVERSE => ['value' => 'fediverse'], + IAccountManager::PROPERTY_WEBSITE => ['value' => 'website'], + IAccountManager::PROPERTY_ORGANISATION => ['value' => 'organisation'], + IAccountManager::PROPERTY_ROLE => ['value' => 'role'], + IAccountManager::PROPERTY_HEADLINE => ['value' => 'headline'], + IAccountManager::PROPERTY_BIOGRAPHY => ['value' => 'biography'], + IAccountManager::PROPERTY_PROFILE_ENABLED => ['value' => '1'], + IAccountManager::PROPERTY_PRONOUNS => ['value' => 'they/them'], + ]); + + $this->l10nFactory + ->expects($this->once()) + ->method('getUserLanguage') ->with($targetUser) - ->willReturn( - [ - AccountManager::PROPERTY_ADDRESS => ['value' => 'address'], - AccountManager::PROPERTY_PHONE => ['value' => 'phone'], - AccountManager::PROPERTY_TWITTER => ['value' => 'twitter'], - AccountManager::PROPERTY_WEBSITE => ['value' => 'website'], - ] - ); + ->willReturn('da'); $expected = [ 'id' => 'UID', - 'enabled' => 'true', + 'enabled' => true, + 'firstLoginTimestamp' => 1511191471, + 'lastLoginTimestamp' => 1521191471, + 'lastLogin' => 1521191471000, + 'backend' => 'Database', + 'subadmin' => [], 'quota' => ['DummyValue'], - 'email' => 'demo@owncloud.org', + 'email' => 'demo@nextcloud.com', 'displayname' => 'Demo User', + 'display-name' => 'Demo User', 'phone' => 'phone', 'address' => 'address', 'website' => 'website', 'twitter' => 'twitter', + 'bluesky' => 'bluesky', + 'fediverse' => 'fediverse', 'groups' => [], 'language' => 'da', + 'locale' => null, + 'backendCapabilities' => [ + 'setDisplayName' => true, + 'setPassword' => true, + ], + 'additional_mail' => [], + 'organisation' => 'organisation', + 'role' => 'role', + 'headline' => 'headline', + 'biography' => 'biography', + 'profile_enabled' => '1', + 'notify_email' => null, + 'manager' => '', + 'pronouns' => 'they/them', ]; - $this->assertEquals($expected, $this->invokePrivate($this->api, 'getUserData', ['UserToGet'])); + $this->assertEquals($expected, $this->invokePrivate($this->api, 'getUserData', ['UID'])); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 997 - */ - public function testGetUserDataAsSubAdminAndUserIsNotAccessible() { + + public function testGetUserDataAsSubAdminAndUserIsNotAccessible(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(998); + $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $loggedInUser - ->expects($this->exactly(2)) + ->expects($this->exactly(4)) ->method('getUID') - ->will($this->returnValue('subadmin')); + ->willReturn('subadmin'); $targetUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $this->userSession - ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToGet') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') ->with('subadmin') - ->will($this->returnValue(false)); + ->willReturn(false); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor() ->getMock(); @@ -869,40 +1425,36 @@ class UsersControllerTest extends TestCase { ->expects($this->once()) ->method('isUserAccessible') ->with($loggedInUser, $targetUser) - ->will($this->returnValue(false)); + ->willReturn(false); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); - $this->invokePrivate($this->api, 'getUserData', ['UserToGet']); + $this->invokePrivate($this->api, 'getUser', ['UserToGet']); } - public function testGetUserDataAsSubAdminSelfLookup() { + public function testGetUserDataAsSubAdminSelfLookup(): void { $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $loggedInUser - ->expects($this->exactly(2)) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); $targetUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $this->userSession - ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager - ->expects($this->once()) ->method('get') - ->with('subadmin') - ->will($this->returnValue($targetUser)); + ->with('UID') + ->willReturn($targetUser); $this->groupManager - ->expects($this->once()) ->method('isAdmin') ->with('UID') - ->will($this->returnValue(false)); + ->willReturn(false); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor() ->getMock(); @@ -910,11 +1462,15 @@ class UsersControllerTest extends TestCase { ->expects($this->once()) ->method('isUserAccessible') ->with($loggedInUser, $targetUser) - ->will($this->returnValue(false)); - $this->groupManager + ->willReturn(false); + $subAdminManager ->expects($this->once()) + ->method('getSubAdminsGroups') + ->willReturn([]); + $this->groupManager + ->expects($this->exactly(2)) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $this->groupManager ->expects($this->any()) ->method('getUserGroups') @@ -922,168 +1478,600 @@ class UsersControllerTest extends TestCase { $this->api ->expects($this->once()) ->method('fillStorageInfo') - ->with('UID') - ->will($this->returnValue(['DummyValue'])); + ->with($targetUser) + ->willReturn(['DummyValue']); + + $backend = $this->createMock(UserInterface::class); + $backend->expects($this->atLeastOnce()) + ->method('implementsActions') + ->willReturn(false); + $targetUser ->expects($this->once()) ->method('getDisplayName') - ->will($this->returnValue('Subadmin User')); + ->willReturn('Subadmin User'); $targetUser ->expects($this->once()) - ->method('getEMailAddress') - ->will($this->returnValue('subadmin@owncloud.org')); + ->method('getSystemEMailAddress') + ->willReturn('subadmin@nextcloud.com'); $targetUser - ->expects($this->exactly(4)) ->method('getUID') - ->will($this->returnValue('UID')); - $this->config - ->expects($this->at(0)) - ->method('getUserValue') - ->with('UID', 'core', 'lang') - ->will($this->returnValue('ru')); - $this->accountManager->expects($this->any())->method('getUser') + ->willReturn('UID'); + $targetUser + ->expects($this->never()) + ->method('getHome'); + $targetUser + ->expects($this->exactly(2)) + ->method('getLastLogin') + ->willReturn(1521191471); + $targetUser + ->expects($this->once()) + ->method('getFirstLogin') + ->willReturn(1511191471); + $targetUser + ->expects($this->once()) + ->method('getBackendClassName') + ->willReturn('Database'); + $targetUser + ->expects($this->once()) + ->method('getBackend') + ->willReturn($backend); + $this->mockAccount($targetUser, [ + IAccountManager::PROPERTY_ADDRESS => ['value' => 'address'], + IAccountManager::PROPERTY_PHONE => ['value' => 'phone'], + IAccountManager::PROPERTY_TWITTER => ['value' => 'twitter'], + IAccountManager::PROPERTY_BLUESKY => ['value' => 'bluesky'], + IAccountManager::PROPERTY_FEDIVERSE => ['value' => 'fediverse'], + IAccountManager::PROPERTY_WEBSITE => ['value' => 'website'], + IAccountManager::PROPERTY_ORGANISATION => ['value' => 'organisation'], + IAccountManager::PROPERTY_ROLE => ['value' => 'role'], + IAccountManager::PROPERTY_HEADLINE => ['value' => 'headline'], + IAccountManager::PROPERTY_BIOGRAPHY => ['value' => 'biography'], + IAccountManager::PROPERTY_PROFILE_ENABLED => ['value' => '1'], + IAccountManager::PROPERTY_PRONOUNS => ['value' => 'they/them'], + ]); + + $this->l10nFactory + ->expects($this->once()) + ->method('getUserLanguage') ->with($targetUser) - ->willReturn( - [ - AccountManager::PROPERTY_ADDRESS => ['value' => 'address'], - AccountManager::PROPERTY_PHONE => ['value' => 'phone'], - AccountManager::PROPERTY_TWITTER => ['value' => 'twitter'], - AccountManager::PROPERTY_WEBSITE => ['value' => 'website'], - ] - ); + ->willReturn('ru'); $expected = [ 'id' => 'UID', + 'firstLoginTimestamp' => 1511191471, + 'lastLoginTimestamp' => 1521191471, + 'lastLogin' => 1521191471000, + 'backend' => 'Database', + 'subadmin' => [], 'quota' => ['DummyValue'], - 'email' => 'subadmin@owncloud.org', + 'email' => 'subadmin@nextcloud.com', 'displayname' => 'Subadmin User', + 'display-name' => 'Subadmin User', 'phone' => 'phone', 'address' => 'address', 'website' => 'website', 'twitter' => 'twitter', + 'bluesky' => 'bluesky', + 'fediverse' => 'fediverse', 'groups' => [], 'language' => 'ru', + 'locale' => null, + 'backendCapabilities' => [ + 'setDisplayName' => false, + 'setPassword' => false, + ], + 'additional_mail' => [], + 'organisation' => 'organisation', + 'role' => 'role', + 'headline' => 'headline', + 'biography' => 'biography', + 'profile_enabled' => '1', + 'notify_email' => null, + 'manager' => '', + 'pronouns' => 'they/them', + ]; + $this->assertEquals($expected, $this->invokePrivate($this->api, 'getUserData', ['UID'])); + } + + public static function dataSearchByPhoneNumbers(): array { + return [ + 'Invalid country' => ['Not a country code', ['12345' => ['NaN']], 400, null, null, []], + 'No number to search' => ['DE', ['12345' => ['NaN']], 200, null, null, []], + 'Valid number but no match' => ['DE', ['12345' => ['0711 / 25 24 28-90']], 200, ['+4971125242890'], [], []], + 'Invalid number' => ['FR', ['12345' => ['0711 / 25 24 28-90']], 200, null, null, []], + 'Invalid and valid number' => ['DE', ['12345' => ['NaN', '0711 / 25 24 28-90']], 200, ['+4971125242890'], [], []], + 'Valid and invalid number' => ['DE', ['12345' => ['0711 / 25 24 28-90', 'NaN']], 200, ['+4971125242890'], [], []], + 'Valid number and a match' => ['DE', ['12345' => ['0711 / 25 24 28-90']], 200, ['+4971125242890'], ['+4971125242890' => 'admin'], ['12345' => 'admin@localhost']], + 'Same number twice, later hits' => ['DE', ['12345' => ['0711 / 25 24 28-90'], '23456' => ['0711 / 25 24 28-90']], 200, ['+4971125242890'], ['+4971125242890' => 'admin'], ['23456' => 'admin@localhost']], ]; - $this->assertEquals($expected, $this->invokePrivate($this->api, 'getUserData', ['subadmin'])); } - public function testEditUserRegularUserSelfEditChangeDisplayName() { + #[\PHPUnit\Framework\Attributes\DataProvider('dataSearchByPhoneNumbers')] + public function testSearchByPhoneNumbers(string $location, array $search, int $status, ?array $searchUsers, ?array $userMatches, array $expected): void { + $knownTo = 'knownTo'; + $user = $this->createMock(IUser::class); + $user->method('getUID') + ->willReturn($knownTo); + $this->userSession->method('getUser') + ->willReturn($user); + + if ($searchUsers === null) { + $this->accountManager->expects($this->never()) + ->method('searchUsers'); + } else { + $this->accountManager->expects($this->once()) + ->method('searchUsers') + ->with(IAccountManager::PROPERTY_PHONE, $searchUsers) + ->willReturn($userMatches); + + $this->knownUserService->expects($this->once()) + ->method('deleteKnownTo') + ->with($knownTo); + + $this->knownUserService->expects($this->exactly(count($expected))) + ->method('storeIsKnownToUser') + ->with($knownTo, $this->anything()); + } + + $this->urlGenerator->method('getAbsoluteURL') + ->with('/') + ->willReturn('https://localhost/'); + + $response = $this->api->searchByPhoneNumbers($location, $search); + + self::assertEquals($status, $response->getStatus()); + self::assertEquals($expected, $response->getData()); + } + + public function testEditUserRegularUserSelfEditChangeDisplayName(): void { $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); $targetUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToEdit') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); + $targetUser + ->expects($this->once()) + ->method('getBackend') + ->willReturn($this->createMock(ISetDisplayNameBackend::class)); $targetUser ->expects($this->once()) ->method('setDisplayName') - ->with('NewDisplayName'); + ->with('NewDisplayName') + ->willReturn(true); $targetUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); $this->assertEquals([], $this->api->editUser('UserToEdit', 'display', 'NewDisplayName')->getData()); } - public function testEditUserRegularUserSelfEditChangeEmailValid() { + public function testEditUserRegularUserSelfEditChangeEmailValid(): void { $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); $targetUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToEdit') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $targetUser ->expects($this->once()) - ->method('setEMailAddress') - ->with('demo@owncloud.org'); + ->method('setSystemEMailAddress') + ->with('demo@nextcloud.com'); $targetUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); + + $backend = $this->createMock(UserInterface::class); + $targetUser + ->expects($this->any()) + ->method('getBackend') + ->willReturn($backend); - $this->assertEquals([], $this->api->editUser('UserToEdit', 'email', 'demo@owncloud.org')->getData()); + $this->config->method('getSystemValue')->willReturnCallback(fn (string $key, mixed $default) => $default); + + $this->assertEquals([], $this->api->editUser('UserToEdit', 'email', 'demo@nextcloud.com')->getData()); } + public function testEditUserRegularUserSelfEditAddAdditionalEmailValid(): void { + $loggedInUser = $this->getMockBuilder(IUser::class) + ->disableOriginalConstructor() + ->getMock(); + $loggedInUser + ->expects($this->any()) + ->method('getUID') + ->willReturn('UID'); + $targetUser = $this->getMockBuilder(IUser::class) + ->disableOriginalConstructor() + ->getMock(); + $this->userSession + ->expects($this->once()) + ->method('getUser') + ->willReturn($loggedInUser); + $this->userManager + ->expects($this->once()) + ->method('get') + ->with('UserToEdit') + ->willReturn($targetUser); + $targetUser + ->expects($this->any()) + ->method('getUID') + ->willReturn('UID'); + + $backend = $this->createMock(UserInterface::class); + $targetUser + ->expects($this->any()) + ->method('getBackend') + ->willReturn($backend); + + $userAccount = $this->createMock(IAccount::class); - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 102 - */ - public function testEditUserRegularUserSelfEditChangeEmailInvalid() { + $this->accountManager + ->expects($this->once()) + ->method('getAccount') + ->with($targetUser) + ->willReturn($userAccount); + $this->accountManager + ->expects($this->once()) + ->method('updateAccount') + ->with($userAccount); + + $this->assertEquals([], $this->api->editUser('UserToEdit', 'additional_mail', 'demo1@nextcloud.com')->getData()); + } + + public function testEditUserRegularUserSelfEditAddAdditionalEmailMainAddress(): void { $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); $targetUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToEdit') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $targetUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); + + $backend = $this->createMock(UserInterface::class); + $targetUser + ->expects($this->any()) + ->method('getBackend') + ->willReturn($backend); + $targetUser + ->expects($this->any()) + ->method('getSystemEMailAddress') + ->willReturn('demo@nextcloud.com'); + + $userAccount = $this->createMock(IAccount::class); + + $this->accountManager + ->expects($this->never()) + ->method('getAccount') + ->with($targetUser) + ->willReturn($userAccount); + $this->accountManager + ->expects($this->never()) + ->method('updateAccount') + ->with($userAccount); + + $this->expectException(OCSException::class); + $this->expectExceptionCode(101); + $this->api->editUser('UserToEdit', 'additional_mail', 'demo@nextcloud.com')->getData(); + } + + public function testEditUserRegularUserSelfEditAddAdditionalEmailDuplicate(): void { + $loggedInUser = $this->getMockBuilder(IUser::class) + ->disableOriginalConstructor() + ->getMock(); + $loggedInUser + ->expects($this->any()) + ->method('getUID') + ->willReturn('UID'); + $targetUser = $this->getMockBuilder(IUser::class) + ->disableOriginalConstructor() + ->getMock(); + $this->userSession + ->expects($this->once()) + ->method('getUser') + ->willReturn($loggedInUser); + $this->userManager + ->expects($this->once()) + ->method('get') + ->with('UserToEdit') + ->willReturn($targetUser); + $targetUser + ->expects($this->any()) + ->method('getUID') + ->willReturn('UID'); + + $backend = $this->createMock(UserInterface::class); + $targetUser + ->expects($this->any()) + ->method('getBackend') + ->willReturn($backend); + + $property = $this->createMock(IAccountProperty::class); + $property->method('getValue') + ->willReturn('demo1@nextcloud.com'); + $collection = $this->createMock(IAccountPropertyCollection::class); + $collection->method('getPropertyByValue') + ->with('demo1@nextcloud.com') + ->willReturn($property); + + $userAccount = $this->createMock(IAccount::class); + $userAccount->method('getPropertyCollection') + ->with(IAccountManager::COLLECTION_EMAIL) + ->willReturn($collection); + + $this->accountManager + ->expects($this->once()) + ->method('getAccount') + ->with($targetUser) + ->willReturn($userAccount); + $this->accountManager + ->expects($this->never()) + ->method('updateAccount') + ->with($userAccount); + + $this->expectException(OCSException::class); + $this->expectExceptionCode(101); + $this->api->editUser('UserToEdit', 'additional_mail', 'demo1@nextcloud.com')->getData(); + } + + public function testEditUserRegularUserSelfEditChangeEmailInvalid(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(101); + + $loggedInUser = $this->getMockBuilder(IUser::class) + ->disableOriginalConstructor() + ->getMock(); + $loggedInUser + ->expects($this->any()) + ->method('getUID') + ->willReturn('UID'); + $targetUser = $this->getMockBuilder(IUser::class) + ->disableOriginalConstructor() + ->getMock(); + $this->userSession + ->expects($this->once()) + ->method('getUser') + ->willReturn($loggedInUser); + $this->userManager + ->expects($this->once()) + ->method('get') + ->with('UserToEdit') + ->willReturn($targetUser); + $targetUser + ->expects($this->any()) + ->method('getUID') + ->willReturn('UID'); + + $backend = $this->createMock(UserInterface::class); + $targetUser + ->expects($this->any()) + ->method('getBackend') + ->willReturn($backend); + + $this->config->method('getSystemValue')->willReturnCallback(fn (string $key, mixed $default) => $default); $this->api->editUser('UserToEdit', 'email', 'demo.org'); } - public function testEditUserRegularUserSelfEditChangePassword() { + public static function selfEditChangePropertyProvider(): array { + return [ + [IAccountManager::PROPERTY_TWITTER, '@oldtwitter', '@newtwitter'], + [IAccountManager::PROPERTY_BLUESKY, 'old.bluesky', 'new.bluesky'], + [IAccountManager::PROPERTY_FEDIVERSE, '@oldFediverse@floss.social', '@newFediverse@floss.social'], + [IAccountManager::PROPERTY_PHONE, '1234', '12345'], + [IAccountManager::PROPERTY_ADDRESS, 'Something street 2', 'Another street 3'], + [IAccountManager::PROPERTY_WEBSITE, 'https://examplesite1', 'https://examplesite2'], + [IAccountManager::PROPERTY_ORGANISATION, 'Organisation A', 'Organisation B'], + [IAccountManager::PROPERTY_ROLE, 'Human', 'Alien'], + [IAccountManager::PROPERTY_HEADLINE, 'Hi', 'Hello'], + [IAccountManager::PROPERTY_BIOGRAPHY, 'A biography', 'Another biography'], + [IAccountManager::PROPERTY_PROFILE_ENABLED, '1', '0'], + [IAccountManager::PROPERTY_PRONOUNS, 'they/them', 'he/him'], + ]; + } + + #[\PHPUnit\Framework\Attributes\DataProvider('selfEditChangePropertyProvider')] + public function testEditUserRegularUserSelfEditChangeProperty($propertyName, $oldValue, $newValue): void { + $loggedInUser = $this->getMockBuilder(IUser::class) + ->disableOriginalConstructor() + ->getMock(); + $loggedInUser + ->expects($this->any()) + ->method('getUID') + ->willReturn('UID'); + $this->userSession + ->expects($this->once()) + ->method('getUser') + ->willReturn($loggedInUser); + $this->userManager + ->expects($this->once()) + ->method('get') + ->with('UserToEdit') + ->willReturn($loggedInUser); + + $backend = $this->createMock(UserInterface::class); + $loggedInUser + ->expects($this->any()) + ->method('getBackend') + ->willReturn($backend); + + $propertyMock = $this->createMock(IAccountProperty::class); + $propertyMock->expects($this->any()) + ->method('getName') + ->willReturn($propertyName); + $propertyMock->expects($this->any()) + ->method('getValue') + ->willReturn($oldValue); + $propertyMock->expects($this->once()) + ->method('setValue') + ->with($newValue) + ->willReturnSelf(); + $propertyMock->expects($this->any()) + ->method('getScope') + ->willReturn(IAccountManager::SCOPE_LOCAL); + + $accountMock = $this->createMock(IAccount::class); + $accountMock->expects($this->any()) + ->method('getProperty') + ->with($propertyName) + ->willReturn($propertyMock); + + $this->accountManager->expects($this->atLeastOnce()) + ->method('getAccount') + ->with($loggedInUser) + ->willReturn($accountMock); + $this->accountManager->expects($this->once()) + ->method('updateAccount') + ->with($accountMock); + + $this->assertEquals([], $this->api->editUser('UserToEdit', $propertyName, $newValue)->getData()); + } + + public function selfEditChangePropertyScopeProvider() { + return [ + [IAccountManager::PROPERTY_AVATAR, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED], + [IAccountManager::PROPERTY_DISPLAYNAME, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED], + [IAccountManager::PROPERTY_EMAIL, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED], + [IAccountManager::PROPERTY_TWITTER, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED], + [IAccountManager::PROPERTY_BLUESKY, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED], + [IAccountManager::PROPERTY_FEDIVERSE, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED], + [IAccountManager::PROPERTY_PHONE, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED], + [IAccountManager::PROPERTY_ADDRESS, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED], + [IAccountManager::PROPERTY_WEBSITE, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED], + [IAccountManager::PROPERTY_ORGANISATION, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED], + [IAccountManager::PROPERTY_ROLE, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED], + [IAccountManager::PROPERTY_HEADLINE, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED], + [IAccountManager::PROPERTY_BIOGRAPHY, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED], + [IAccountManager::PROPERTY_PROFILE_ENABLED, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED], + [IAccountManager::PROPERTY_PRONOUNS, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED], + ]; + } + + #[\PHPUnit\Framework\Attributes\DataProvider('selfEditChangePropertyProvider')] + public function testEditUserRegularUserSelfEditChangePropertyScope($propertyName, $oldScope, $newScope): void { $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); + $this->userSession + ->expects($this->once()) + ->method('getUser') + ->willReturn($loggedInUser); + $this->userManager + ->expects($this->once()) + ->method('get') + ->with('UserToEdit') + ->willReturn($loggedInUser); + + $backend = $this->createMock(UserInterface::class); + $loggedInUser + ->expects($this->any()) + ->method('getBackend') + ->willReturn($backend); + + $propertyMock = $this->createMock(IAccountProperty::class); + $propertyMock->expects($this->any()) + ->method('getName') + ->willReturn($propertyName); + $propertyMock->expects($this->any()) + ->method('getValue') + ->willReturn('somevalue'); + $propertyMock->expects($this->any()) + ->method('getScope') + ->willReturn($oldScope); + $propertyMock->expects($this->atLeastOnce()) + ->method('setScope') + ->with($newScope) + ->willReturnSelf(); + + $accountMock = $this->createMock(IAccount::class); + $accountMock->expects($this->any()) + ->method('getProperty') + ->with($propertyName) + ->willReturn($propertyMock); + + $this->accountManager->expects($this->atLeastOnce()) + ->method('getAccount') + ->with($loggedInUser) + ->willReturn($accountMock); + $this->accountManager->expects($this->once()) + ->method('updateAccount') + ->with($accountMock); + + $this->assertEquals([], $this->api->editUser('UserToEdit', $propertyName . 'Scope', $newScope)->getData()); + } + + public function testEditUserRegularUserSelfEditChangePassword(): void { + $loggedInUser = $this->getMockBuilder(IUser::class) + ->disableOriginalConstructor() + ->getMock(); + $loggedInUser + ->expects($this->any()) + ->method('getUID') + ->willReturn('UID'); $targetUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToEdit') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); + $targetUser + ->expects($this->once()) + ->method('canChangePassword') + ->willReturn(true); $targetUser ->expects($this->once()) ->method('setPassword') @@ -1091,50 +2079,71 @@ class UsersControllerTest extends TestCase { $targetUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); + + $backend = $this->createMock(UserInterface::class); + $targetUser + ->expects($this->any()) + ->method('getBackend') + ->willReturn($backend); $this->assertEquals([], $this->api->editUser('UserToEdit', 'password', 'NewPassword')->getData()); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 997 - */ - public function testEditUserRegularUserSelfEditChangeQuota() { + + public function testEditUserRegularUserSelfEditChangeQuota(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(113); + $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); $targetUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToEdit') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $targetUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); + + $backend = $this->createMock(UserInterface::class); + $targetUser + ->expects($this->any()) + ->method('getBackend') + ->willReturn($backend); $this->api->editUser('UserToEdit', 'quota', 'NewQuota'); } - public function testEditUserAdminUserSelfEditChangeValidQuota() { + public function testEditUserAdminUserSelfEditChangeValidQuota(): void { + $this->config + ->expects($this->once()) + ->method('getAppValue') + ->willReturnCallback(function ($appid, $key, $default) { + if ($key === 'max_quota') { + return '-1'; + } + return null; + }); $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetUser->expects($this->once()) ->method('setQuota') @@ -1142,66 +2151,87 @@ class UsersControllerTest extends TestCase { $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToEdit') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager - ->expects($this->exactly(2)) + ->expects($this->exactly(3)) ->method('isAdmin') ->with('UID') - ->will($this->returnValue(true)); + ->willReturn(true); $targetUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); + + $backend = $this->createMock(UserInterface::class); + $targetUser + ->expects($this->any()) + ->method('getBackend') + ->willReturn($backend); $this->assertEquals([], $this->api->editUser('UserToEdit', 'quota', '3042824')->getData()); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 103 - * @expectedExceptionMessage Invalid quota value ABC - */ - public function testEditUserAdminUserSelfEditChangeInvalidQuota() { + + public function testEditUserAdminUserSelfEditChangeInvalidQuota(): void { + $this->expectException(OCSException::class); + $this->expectExceptionMessage('Invalid quota value: ABC'); + $this->expectExceptionCode(101); + $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToEdit') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager - ->expects($this->exactly(2)) + ->expects($this->exactly(3)) ->method('isAdmin') ->with('UID') - ->will($this->returnValue(true)); + ->willReturn(true); $targetUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); + + $backend = $this->createMock(UserInterface::class); + $targetUser + ->expects($this->any()) + ->method('getBackend') + ->willReturn($backend); $this->api->editUser('UserToEdit', 'quota', 'ABC'); } - public function testEditUserAdminUserEditChangeValidQuota() { + public function testEditUserAdminUserEditChangeValidQuota(): void { + $this->config + ->expects($this->once()) + ->method('getAppValue') + ->willReturnCallback(function ($appid, $key, $default) { + if ($key === 'max_quota') { + return '-1'; + } + return null; + }); $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('admin')); + ->willReturn('admin'); $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetUser->expects($this->once()) ->method('setQuota') @@ -1209,34 +2239,39 @@ class UsersControllerTest extends TestCase { $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToEdit') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') ->with('admin') - ->will($this->returnValue(true)); + ->willReturn(true); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor() ->getMock(); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $targetUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); + + $backend = $this->createMock(UserInterface::class); + $targetUser + ->expects($this->any()) + ->method('getBackend') + ->willReturn($backend); $this->assertEquals([], $this->api->editUser('UserToEdit', 'quota', '3042824')->getData()); } - public function testEditUserSelfEditChangeLanguage() { - + public function testEditUserSelfEditChangeLanguage(): void { $this->l10nFactory->expects($this->once()) ->method('findAvailableLanguages') ->willReturn(['en', 'de', 'sv']); @@ -1251,7 +2286,7 @@ class UsersControllerTest extends TestCase { $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UserToEdit')); + ->willReturn('UserToEdit'); $targetUser = $this->createMock(IUser::class); $this->config->expects($this->once()) ->method('setUserValue') @@ -1259,37 +2294,42 @@ class UsersControllerTest extends TestCase { $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToEdit') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->atLeastOnce()) ->method('isAdmin') ->with('UserToEdit') - ->will($this->returnValue(false)); + ->willReturn(false); $targetUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UserToEdit')); + ->willReturn('UserToEdit'); + + $backend = $this->createMock(UserInterface::class); + $targetUser + ->expects($this->any()) + ->method('getBackend') + ->willReturn($backend); $this->assertEquals([], $this->api->editUser('UserToEdit', 'language', 'de')->getData()); } - public function dataEditUserSelfEditChangeLanguageButForced() { + public static function dataEditUserSelfEditChangeLanguageButForced(): array { return [ ['de'], [true], ]; } - /** - * @dataProvider dataEditUserSelfEditChangeLanguageButForced - * @expectedException \OCP\AppFramework\OCS\OCSException - */ - public function testEditUserSelfEditChangeLanguageButForced($forced) { + #[\PHPUnit\Framework\Attributes\DataProvider('dataEditUserSelfEditChangeLanguageButForced')] + public function testEditUserSelfEditChangeLanguageButForced($forced): void { + $this->expectException(OCSException::class); + $this->config->expects($this->any()) ->method('getSystemValue') ->willReturnMap([ @@ -1301,34 +2341,39 @@ class UsersControllerTest extends TestCase { $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UserToEdit')); + ->willReturn('UserToEdit'); $targetUser = $this->createMock(IUser::class); $this->config->expects($this->never()) ->method('setUserValue'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToEdit') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->atLeastOnce()) ->method('isAdmin') ->with('UserToEdit') - ->will($this->returnValue(false)); + ->willReturn(false); $targetUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UserToEdit')); + ->willReturn('UserToEdit'); + + $backend = $this->createMock(UserInterface::class); + $targetUser + ->expects($this->any()) + ->method('getBackend') + ->willReturn($backend); $this->assertEquals([], $this->api->editUser('UserToEdit', 'language', 'de')->getData()); } - public function testEditUserAdminEditChangeLanguage() { - + public function testEditUserAdminEditChangeLanguage(): void { $this->l10nFactory->expects($this->once()) ->method('findAvailableLanguages') ->willReturn(['en', 'de', 'sv']); @@ -1337,7 +2382,7 @@ class UsersControllerTest extends TestCase { $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('admin')); + ->willReturn('admin'); $targetUser = $this->createMock(IUser::class); $this->config->expects($this->once()) ->method('setUserValue') @@ -1345,35 +2390,40 @@ class UsersControllerTest extends TestCase { $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToEdit') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') ->with('admin') - ->will($this->returnValue(true)); + ->willReturn(true); $subAdminManager = $this->createMock(SubAdmin::class); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $targetUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UserToEdit')); + ->willReturn('UserToEdit'); + + $backend = $this->createMock(UserInterface::class); + $targetUser + ->expects($this->any()) + ->method('getBackend') + ->willReturn($backend); $this->assertEquals([], $this->api->editUser('UserToEdit', 'language', 'de')->getData()); } - /** - * @dataProvider dataEditUserSelfEditChangeLanguageButForced - * @expectedException \OCP\AppFramework\OCS\OCSException - */ - public function testEditUserAdminEditChangeLanguageInvalidLanguage() { + #[\PHPUnit\Framework\Attributes\DataProvider('dataEditUserSelfEditChangeLanguageButForced')] + public function testEditUserAdminEditChangeLanguageInvalidLanguage(): void { + $this->expectException(OCSException::class); + $this->l10nFactory->expects($this->once()) ->method('findAvailableLanguages') @@ -1383,43 +2433,58 @@ class UsersControllerTest extends TestCase { $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('admin')); + ->willReturn('admin'); $targetUser = $this->createMock(IUser::class); $this->config->expects($this->never()) ->method('setUserValue'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToEdit') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') ->with('admin') - ->will($this->returnValue(true)); + ->willReturn(true); $subAdminManager = $this->createMock(SubAdmin::class); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $targetUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UserToEdit')); + ->willReturn('UserToEdit'); + + $backend = $this->createMock(UserInterface::class); + $targetUser + ->expects($this->any()) + ->method('getBackend') + ->willReturn($backend); $this->assertEquals([], $this->api->editUser('UserToEdit', 'language', 'ru')->getData()); } - public function testEditUserSubadminUserAccessible() { + public function testEditUserSubadminUserAccessible(): void { + $this->config + ->expects($this->once()) + ->method('getAppValue') + ->willReturnCallback(function ($appid, $key, $default) { + if ($key === 'max_quota') { + return '-1'; + } + return null; + }); $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('subadmin')); + ->willReturn('subadmin'); $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetUser->expects($this->once()) ->method('setQuota') @@ -1427,12 +2492,12 @@ class UsersControllerTest extends TestCase { $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToEdit') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor() ->getMock(); @@ -1440,39 +2505,45 @@ class UsersControllerTest extends TestCase { ->expects($this->once()) ->method('isUserAccessible') ->with($loggedInUser, $targetUser) - ->will($this->returnValue(true)); + ->willReturn(true); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $targetUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); + + $backend = $this->createMock(UserInterface::class); + $targetUser + ->expects($this->any()) + ->method('getBackend') + ->willReturn($backend); $this->assertEquals([], $this->api->editUser('UserToEdit', 'quota', '3042824')->getData()); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 997 - */ - public function testEditUserSubadminUserInaccessible() { + + public function testEditUserSubadminUserInaccessible(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(998); + $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('subadmin')); + ->willReturn('subadmin'); $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToEdit') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor() ->getMock(); @@ -1480,467 +2551,467 @@ class UsersControllerTest extends TestCase { ->expects($this->once()) ->method('isUserAccessible') ->with($loggedInUser, $targetUser) - ->will($this->returnValue(false)); + ->willReturn(false); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $targetUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); $this->api->editUser('UserToEdit', 'quota', 'value'); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 101 - */ - public function testDeleteUserNotExistingUser() { + + public function testDeleteUserNotExistingUser(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(998); + $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UserToEdit')); + ->willReturn('UserToEdit'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToDelete') - ->will($this->returnValue(null)); + ->willReturn(null); $this->api->deleteUser('UserToDelete'); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 101 - */ - public function testDeleteUserSelf() { + + public function testDeleteUserSelf(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(101); + $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetUser ->expects($this->once()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToDelete') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->api->deleteUser('UserToDelete'); } - public function testDeleteSuccessfulUserAsAdmin() { + public function testDeleteSuccessfulUserAsAdmin(): void { $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('admin')); + ->willReturn('admin'); $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetUser ->expects($this->once()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToDelete') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') ->with('admin') - ->will($this->returnValue(true)); + ->willReturn(true); $targetUser ->expects($this->once()) ->method('delete') - ->will($this->returnValue(true)); + ->willReturn(true); $this->assertEquals([], $this->api->deleteUser('UserToDelete')->getData()); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 101 - */ - public function testDeleteUnsuccessfulUserAsAdmin() { + + public function testDeleteUnsuccessfulUserAsAdmin(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(101); + $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('admin')); + ->willReturn('admin'); $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetUser ->expects($this->once()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToDelete') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') ->with('admin') - ->will($this->returnValue(true)); + ->willReturn(true); $targetUser ->expects($this->once()) ->method('delete') - ->will($this->returnValue(false)); + ->willReturn(false); $this->api->deleteUser('UserToDelete'); } - public function testDeleteSuccessfulUserAsSubadmin() { + public function testDeleteSuccessfulUserAsSubadmin(): void { $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('subadmin')); + ->willReturn('subadmin'); $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetUser ->expects($this->once()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToDelete') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') ->with('subadmin') - ->will($this->returnValue(false)); + ->willReturn(false); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) ->method('isUserAccessible') ->with($loggedInUser, $targetUser) - ->will($this->returnValue(true)); + ->willReturn(true); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $targetUser ->expects($this->once()) ->method('delete') - ->will($this->returnValue(true)); + ->willReturn(true); $this->assertEquals([], $this->api->deleteUser('UserToDelete')->getData()); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 101 - */ - public function testDeleteUnsuccessfulUserAsSubadmin() { + + public function testDeleteUnsuccessfulUserAsSubadmin(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(101); + $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('subadmin')); + ->willReturn('subadmin'); $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetUser ->expects($this->once()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToDelete') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') ->with('subadmin') - ->will($this->returnValue(false)); + ->willReturn(false); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) ->method('isUserAccessible') ->with($loggedInUser, $targetUser) - ->will($this->returnValue(true)); + ->willReturn(true); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $targetUser ->expects($this->once()) ->method('delete') - ->will($this->returnValue(false)); + ->willReturn(false); $this->api->deleteUser('UserToDelete'); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 997 - */ - public function testDeleteUserAsSubAdminAndUserIsNotAccessible() { + + public function testDeleteUserAsSubAdminAndUserIsNotAccessible(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(998); + $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('subadmin')); + ->willReturn('subadmin'); $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetUser ->expects($this->once()) ->method('getUID') - ->will($this->returnValue('UID')); + ->willReturn('UID'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToDelete') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') ->with('subadmin') - ->will($this->returnValue(false)); + ->willReturn(false); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) ->method('isUserAccessible') ->with($loggedInUser, $targetUser) - ->will($this->returnValue(false)); + ->willReturn(false); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $this->api->deleteUser('UserToDelete'); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 998 - */ - public function testGetUsersGroupsTargetUserNotExisting() { + + public function testGetUsersGroupsTargetUserNotExisting(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(998); + $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->api->getUsersGroups('UserToLookup'); } - public function testGetUsersGroupsSelfTargetted() { + public function testGetUsersGroupsSelfTargetted(): void { $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser - ->expects($this->once()) + ->expects($this->exactly(3)) ->method('getUID') - ->will($this->returnValue('UserToLookup')); + ->willReturn('UserToLookup'); $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetUser ->expects($this->once()) ->method('getUID') - ->will($this->returnValue('UserToLookup')); + ->willReturn('UserToLookup'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToLookup') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->once()) ->method('getUserGroupIds') ->with($targetUser) - ->will($this->returnValue(['DummyValue'])); + ->willReturn(['DummyValue']); $this->assertEquals(['groups' => ['DummyValue']], $this->api->getUsersGroups('UserToLookup')->getData()); } - public function testGetUsersGroupsForAdminUser() { + public function testGetUsersGroupsForAdminUser(): void { $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser - ->expects($this->exactly(2)) + ->expects($this->exactly(3)) ->method('getUID') - ->will($this->returnValue('admin')); + ->willReturn('admin'); $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetUser ->expects($this->once()) ->method('getUID') - ->will($this->returnValue('UserToLookup')); + ->willReturn('UserToLookup'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToLookup') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->once()) ->method('getUserGroupIds') ->with($targetUser) - ->will($this->returnValue(['DummyValue'])); + ->willReturn(['DummyValue']); $this->groupManager ->expects($this->once()) ->method('isAdmin') ->with('admin') - ->will($this->returnValue(true)); + ->willReturn(true); $this->assertEquals(['groups' => ['DummyValue']], $this->api->getUsersGroups('UserToLookup')->getData()); } - public function testGetUsersGroupsForSubAdminUserAndUserIsAccessible() { + public function testGetUsersGroupsForSubAdminUserAndUserIsAccessible(): void { $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser - ->expects($this->exactly(2)) + ->expects($this->exactly(3)) ->method('getUID') - ->will($this->returnValue('subadmin')); + ->willReturn('subadmin'); $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetUser ->expects($this->once()) ->method('getUID') - ->will($this->returnValue('UserToLookup')); + ->willReturn('UserToLookup'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToLookup') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') ->with('subadmin') - ->will($this->returnValue(false)); + ->willReturn(false); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) ->method('isUserAccessible') ->with($loggedInUser, $targetUser) - ->will($this->returnValue(true)); + ->willReturn(true); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $group1 = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock(); $group1 ->expects($this->any()) ->method('getGID') - ->will($this->returnValue('Group1')); + ->willReturn('Group1'); $group2 = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock(); $group2 ->expects($this->any()) ->method('getGID') - ->will($this->returnValue('Group2')); + ->willReturn('Group2'); $subAdminManager ->expects($this->once()) ->method('getSubAdminsGroups') ->with($loggedInUser) - ->will($this->returnValue([$group1, $group2])); + ->willReturn([$group1, $group2]); $this->groupManager ->expects($this->any()) ->method('getUserGroupIds') ->with($targetUser) - ->will($this->returnValue(['Group1'])); + ->willReturn(['Group1']); $this->assertEquals(['groups' => ['Group1']], $this->api->getUsersGroups('UserToLookup')->getData()); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 997 - */ - public function testGetUsersGroupsForSubAdminUserAndUserIsInaccessible() { + + public function testGetUsersGroupsForSubAdminUserAndUserIsInaccessible(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(998); + $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser - ->expects($this->exactly(2)) + ->expects($this->exactly(3)) ->method('getUID') - ->will($this->returnValue('subadmin')); + ->willReturn('subadmin'); $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetUser ->expects($this->once()) ->method('getUID') - ->will($this->returnValue('UserToLookup')); + ->willReturn('UserToLookup'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToLookup') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') ->with('subadmin') - ->will($this->returnValue(false)); + ->willReturn(false); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) ->method('isUserAccessible') ->with($loggedInUser, $targetUser) - ->will($this->returnValue(false)); + ->willReturn(false); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $this->groupManager ->expects($this->any()) ->method('getUserGroupIds') ->with($targetUser) - ->will($this->returnValue(['Group1'])); + ->willReturn(['Group1']); $this->api->getUsersGroups('UserToLookup'); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 102 - */ - public function testAddToGroupWithTargetGroupNotExisting() { + + public function testAddToGroupWithTargetGroupNotExisting(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(102); + $this->groupManager->expects($this->once()) ->method('get') ->with('GroupToAddTo') @@ -1949,19 +3020,19 @@ class UsersControllerTest extends TestCase { $this->api->addToGroup('TargetUser', 'GroupToAddTo'); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 101 - */ - public function testAddToGroupWithNoGroupSpecified() { + + public function testAddToGroupWithNoGroupSpecified(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(101); + $this->api->addToGroup('TargetUser'); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 103 - */ - public function testAddToGroupWithTargetUserNotExisting() { + + public function testAddToGroupWithTargetUserNotExisting(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(103); + $targetGroup = $this->createMock(IGroup::class); $this->groupManager->expects($this->once()) ->method('get') @@ -1971,14 +3042,14 @@ class UsersControllerTest extends TestCase { $this->api->addToGroup('TargetUser', 'GroupToAddTo'); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 104 - */ - public function testAddToGroupNoSubadmin() { + + public function testAddToGroupNoSubadmin(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(104); + $targetUser = $this->createMock(IUser::class); $loggedInUser = $this->createMock(IUser::class); - $loggedInUser->expects($this->once()) + $loggedInUser->expects($this->exactly(2)) ->method('getUID') ->willReturn('subadmin'); @@ -2019,10 +3090,10 @@ class UsersControllerTest extends TestCase { $this->api->addToGroup('TargetUser', 'GroupToAddTo'); } - public function testAddToGroupSuccessAsSubadmin() { + public function testAddToGroupSuccessAsSubadmin(): void { $targetUser = $this->createMock(IUser::class); $loggedInUser = $this->createMock(IUser::class); - $loggedInUser->expects($this->once()) + $loggedInUser->expects($this->exactly(2)) ->method('getUID') ->willReturn('subadmin'); @@ -2063,10 +3134,10 @@ class UsersControllerTest extends TestCase { $this->assertEquals(new DataResponse(), $this->api->addToGroup('TargetUser', 'GroupToAddTo')); } - public function testAddToGroupSuccessAsAdmin() { + public function testAddToGroupSuccessAsAdmin(): void { $targetUser = $this->createMock(IUser::class); $loggedInUser = $this->createMock(IUser::class); - $loggedInUser->expects($this->once()) + $loggedInUser->expects($this->exactly(2)) ->method('getUID') ->willReturn('admin'); @@ -2105,277 +3176,277 @@ class UsersControllerTest extends TestCase { $this->assertEquals(new DataResponse(), $this->api->addToGroup('TargetUser', 'GroupToAddTo')); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 101 - */ - public function testRemoveFromGroupWithNoTargetGroup() { + + public function testRemoveFromGroupWithNoTargetGroup(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(101); + $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); - $this->api->removeFromGroup('TargetUser', null); + $this->api->removeFromGroup('TargetUser', ''); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 101 - */ - public function testRemoveFromGroupWithEmptyTargetGroup() { + + public function testRemoveFromGroupWithEmptyTargetGroup(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(101); + $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->api->removeFromGroup('TargetUser', ''); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 102 - */ - public function testRemoveFromGroupWithNotExistingTargetGroup() { + + public function testRemoveFromGroupWithNotExistingTargetGroup(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(102); + $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->groupManager ->expects($this->once()) ->method('get') ->with('TargetGroup') - ->will($this->returnValue(null)); + ->willReturn(null); $this->api->removeFromGroup('TargetUser', 'TargetGroup'); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 103 - */ - public function testRemoveFromGroupWithNotExistingTargetUser() { + + public function testRemoveFromGroupWithNotExistingTargetUser(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(103); + $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock(); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->groupManager ->expects($this->once()) ->method('get') ->with('TargetGroup') - ->will($this->returnValue($targetGroup)); + ->willReturn($targetGroup); $this->userManager ->expects($this->once()) ->method('get') ->with('TargetUser') - ->will($this->returnValue(null)); + ->willReturn(null); $this->api->removeFromGroup('TargetUser', 'TargetGroup'); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 104 - */ - public function testRemoveFromGroupWithoutPermission() { + + public function testRemoveFromGroupWithoutPermission(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(104); + $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser - ->expects($this->once()) + ->expects($this->exactly(2)) ->method('getUID') - ->will($this->returnValue('unauthorizedUser')); + ->willReturn('unauthorizedUser'); $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock(); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->groupManager ->expects($this->once()) ->method('get') ->with('TargetGroup') - ->will($this->returnValue($targetGroup)); + ->willReturn($targetGroup); $this->userManager ->expects($this->once()) ->method('get') ->with('TargetUser') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $this->groupManager ->expects($this->once()) ->method('isAdmin') ->with('unauthorizedUser') - ->will($this->returnValue(false)); + ->willReturn(false); $this->api->removeFromGroup('TargetUser', 'TargetGroup'); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 105 - * @expectedExceptionMessage Cannot remove yourself from the admin group - */ - public function testRemoveFromGroupAsAdminFromAdmin() { + + public function testRemoveFromGroupAsAdminFromAdmin(): void { + $this->expectException(OCSException::class); + $this->expectExceptionMessage('Cannot remove yourself from the admin group'); + $this->expectExceptionCode(105); + $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('admin')); + ->willReturn('admin'); $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetUser ->expects($this->once()) ->method('getUID') - ->will($this->returnValue('admin')); + ->willReturn('admin'); $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock(); $targetGroup ->expects($this->once()) ->method('getGID') - ->will($this->returnValue('admin')); + ->willReturn('admin'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->groupManager ->expects($this->once()) ->method('get') ->with('admin') - ->will($this->returnValue($targetGroup)); + ->willReturn($targetGroup); $this->userManager ->expects($this->once()) ->method('get') ->with('Admin') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $this->groupManager ->expects($this->any()) ->method('isAdmin') ->with('admin') - ->will($this->returnValue(true)); + ->willReturn(true); $this->api->removeFromGroup('Admin', 'admin'); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 105 - * @expectedExceptionMessage Cannot remove yourself from this group as you are a SubAdmin - */ - public function testRemoveFromGroupAsSubAdminFromSubAdmin() { + + public function testRemoveFromGroupAsSubAdminFromSubAdmin(): void { + $this->expectException(OCSException::class); + $this->expectExceptionMessage('Cannot remove yourself from this group as you are a sub-admin'); + $this->expectExceptionCode(105); + $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('subadmin')); + ->willReturn('subadmin'); $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetUser ->expects($this->once()) ->method('getUID') - ->will($this->returnValue('subadmin')); + ->willReturn('subadmin'); $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock(); $targetGroup ->expects($this->any()) ->method('getGID') - ->will($this->returnValue('subadmin')); + ->willReturn('subadmin'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->groupManager ->expects($this->once()) ->method('get') ->with('subadmin') - ->will($this->returnValue($targetGroup)); + ->willReturn($targetGroup); $this->userManager ->expects($this->once()) ->method('get') ->with('SubAdmin') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) - ->method('isSubAdminofGroup') + ->method('isSubAdminOfGroup') ->with($loggedInUser, $targetGroup) - ->will($this->returnValue(true)); + ->willReturn(true); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $this->groupManager ->expects($this->any()) ->method('isAdmin') ->with('subadmin') - ->will($this->returnValue(false)); + ->willReturn(false); $this->api->removeFromGroup('SubAdmin', 'subadmin'); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 105 - * @expectedExceptionMessage Cannot remove user from this group as this is the only remaining group you are a SubAdmin of - */ - public function testRemoveFromGroupAsSubAdminFromLastSubAdminGroup() { + + public function testRemoveFromGroupAsSubAdminFromLastSubAdminGroup(): void { + $this->expectException(OCSException::class); + $this->expectExceptionMessage('Not viable to remove user from the last group you are sub-admin of'); + $this->expectExceptionCode(105); + $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('subadmin')); + ->willReturn('subadmin'); $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock(); $targetGroup ->expects($this->any()) ->method('getGID') - ->will($this->returnValue('subadmin')); + ->willReturn('subadmin'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->groupManager ->expects($this->once()) ->method('get') ->with('subadmin') - ->will($this->returnValue($targetGroup)); + ->willReturn($targetGroup); $this->userManager ->expects($this->once()) ->method('get') ->with('AnotherUser') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) - ->method('isSubAdminofGroup') + ->method('isSubAdminOfGroup') ->with($loggedInUser, $targetGroup) - ->will($this->returnValue(true)); + ->willReturn(true); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $subAdminManager ->expects($this->once()) ->method('getSubAdminsGroups') ->with($loggedInUser) - ->will($this->returnValue([$targetGroup])); + ->willReturn([$targetGroup]); $this->groupManager ->expects($this->any()) ->method('isAdmin') ->with('subadmin') - ->will($this->returnValue(false)); + ->willReturn(false); $this->groupManager ->expects($this->once()) ->method('getUserGroupIds') @@ -2385,39 +3456,39 @@ class UsersControllerTest extends TestCase { $this->api->removeFromGroup('AnotherUser', 'subadmin'); } - public function testRemoveFromGroupSuccessful() { + public function testRemoveFromGroupSuccessful(): void { $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser ->expects($this->any()) ->method('getUID') - ->will($this->returnValue('admin')); + ->willReturn('admin'); $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock(); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->groupManager ->expects($this->once()) ->method('get') ->with('admin') - ->will($this->returnValue($targetGroup)); + ->willReturn($targetGroup); $this->userManager ->expects($this->once()) ->method('get') ->with('AnotherUser') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $this->groupManager ->expects($this->any()) ->method('isAdmin') ->with('admin') - ->will($this->returnValue(true)); + ->willReturn(true); $targetGroup ->expects($this->once()) ->method('removeUser') @@ -2426,379 +3497,274 @@ class UsersControllerTest extends TestCase { $this->assertEquals([], $this->api->removeFromGroup('AnotherUser', 'admin')->getData()); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 101 - * @expectedExceptionMessage User does not exist - */ - public function testAddSubAdminWithNotExistingTargetUser() { + + public function testAddSubAdminWithNotExistingTargetUser(): void { + $this->expectException(OCSException::class); + $this->expectExceptionMessage('User does not exist'); + $this->expectExceptionCode(101); + $this->userManager ->expects($this->once()) ->method('get') ->with('NotExistingUser') - ->will($this->returnValue(null)); + ->willReturn(null); - $this->api->addSubAdmin('NotExistingUser', null); + $this->api->addSubAdmin('NotExistingUser', ''); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 102 - * @expectedExceptionMessage Group does not exist - */ - public function testAddSubAdminWithNotExistingTargetGroup() { + + public function testAddSubAdminWithNotExistingTargetGroup(): void { + $this->expectException(OCSException::class); + $this->expectExceptionMessage('Group does not exist'); + $this->expectExceptionCode(102); + $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $this->userManager ->expects($this->once()) ->method('get') ->with('ExistingUser') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->once()) ->method('get') ->with('NotExistingGroup') - ->will($this->returnValue(null)); + ->willReturn(null); $this->api->addSubAdmin('ExistingUser', 'NotExistingGroup'); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 103 - * @expectedExceptionMessage Cannot create subadmins for admin group - */ - public function testAddSubAdminToAdminGroup() { + + public function testAddSubAdminToAdminGroup(): void { + $this->expectException(OCSException::class); + $this->expectExceptionMessage('Cannot create sub-admins for admin group'); + $this->expectExceptionCode(103); + $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock(); $targetGroup ->expects($this->once()) ->method('getGID') - ->will($this->returnValue('admin')); + ->willReturn('admin'); $this->userManager ->expects($this->once()) ->method('get') ->with('ExistingUser') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->once()) ->method('get') ->with('ADmiN') - ->will($this->returnValue($targetGroup)); + ->willReturn($targetGroup); $this->api->addSubAdmin('ExistingUser', 'ADmiN'); } - public function testAddSubAdminTwice() { + public function testAddSubAdminTwice(): void { $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock(); $this->userManager ->expects($this->once()) ->method('get') ->with('ExistingUser') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->once()) ->method('get') ->with('TargetGroup') - ->will($this->returnValue($targetGroup)); + ->willReturn($targetGroup); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) ->method('isSubAdminOfGroup') ->with($targetUser, $targetGroup) - ->will($this->returnValue(true)); + ->willReturn(true); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $this->assertEquals([], $this->api->addSubAdmin('ExistingUser', 'TargetGroup')->getData()); } - public function testAddSubAdminSuccessful() { + public function testAddSubAdminSuccessful(): void { $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock(); $this->userManager ->expects($this->once()) ->method('get') ->with('ExistingUser') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->once()) ->method('get') ->with('TargetGroup') - ->will($this->returnValue($targetGroup)); + ->willReturn($targetGroup); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) ->method('isSubAdminOfGroup') ->with($targetUser, $targetGroup) - ->will($this->returnValue(false)); + ->willReturn(false); $subAdminManager ->expects($this->once()) ->method('createSubAdmin') - ->with($targetUser, $targetGroup) - ->will($this->returnValue(true)); + ->with($targetUser, $targetGroup); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $this->assertEquals([], $this->api->addSubAdmin('ExistingUser', 'TargetGroup')->getData()); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 103 - * @expectedExceptionMessage Unknown error occurred - */ - public function testAddSubAdminUnsuccessful() { - $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); - $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock(); - $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)); - $this->api->addSubAdmin('ExistingUser', 'TargetGroup'); - } + public function testRemoveSubAdminNotExistingTargetUser(): void { + $this->expectException(OCSException::class); + $this->expectExceptionMessage('User does not exist'); + $this->expectExceptionCode(101); - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 101 - * @expectedExceptionMessage User does not exist - */ - public function testRemoveSubAdminNotExistingTargetUser() { $this->userManager ->expects($this->once()) ->method('get') ->with('NotExistingUser') - ->will($this->returnValue(null)); + ->willReturn(null); $this->api->removeSubAdmin('NotExistingUser', 'GroupToDeleteFrom'); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 101 - * @expectedExceptionMessage Group does not exist - */ - public function testRemoveSubAdminNotExistingTargetGroup() { + + public function testRemoveSubAdminNotExistingTargetGroup(): void { + $this->expectException(OCSException::class); + $this->expectExceptionMessage('Group does not exist'); + $this->expectExceptionCode(101); + $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $this->userManager ->expects($this->once()) ->method('get') ->with('ExistingUser') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->once()) ->method('get') ->with('GroupToDeleteFrom') - ->will($this->returnValue(null)); + ->willReturn(null); $this->api->removeSubAdmin('ExistingUser', 'GroupToDeleteFrom'); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 102 - * @expectedExceptionMessage User is not a subadmin of this group - */ - public function testRemoveSubAdminFromNotASubadmin() { + + public function testRemoveSubAdminFromNotASubadmin(): void { + $this->expectException(OCSException::class); + $this->expectExceptionMessage('User is not a sub-admin of this group'); + $this->expectExceptionCode(102); + $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock(); $this->userManager ->expects($this->once()) ->method('get') ->with('ExistingUser') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->once()) ->method('get') ->with('GroupToDeleteFrom') - ->will($this->returnValue($targetGroup)); + ->willReturn($targetGroup); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) ->method('isSubAdminOfGroup') ->with($targetUser, $targetGroup) - ->will($this->returnValue(false)); + ->willReturn(false); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $this->api->removeSubAdmin('ExistingUser', 'GroupToDeleteFrom'); } - public function testRemoveSubAdminSuccessful() { + public function testRemoveSubAdminSuccessful(): void { $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock(); $this->userManager ->expects($this->once()) ->method('get') ->with('ExistingUser') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->once()) ->method('get') ->with('GroupToDeleteFrom') - ->will($this->returnValue($targetGroup)); + ->willReturn($targetGroup); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) ->method('isSubAdminOfGroup') ->with($targetUser, $targetGroup) - ->will($this->returnValue(true)); + ->willReturn(true); $subAdminManager ->expects($this->once()) ->method('deleteSubAdmin') - ->with($targetUser, $targetGroup) - ->will($this->returnValue(true)); + ->with($targetUser, $targetGroup); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $this->assertEquals([], $this->api->removeSubAdmin('ExistingUser', 'GroupToDeleteFrom')->getData()); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 103 - * @expectedExceptionMessage Unknown error occurred - */ - public function testRemoveSubAdminUnsuccessful() { - $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); - $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock(); - $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)); - $this->api->removeSubAdmin('ExistingUser', 'GroupToDeleteFrom'); - } + public function testGetUserSubAdminGroupsNotExistingTargetUser(): void { + $this->expectException(OCSException::class); + $this->expectExceptionMessage('User does not exist'); + $this->expectExceptionCode(404); - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 101 - * @expectedExceptionMessage User does not exist - */ - public function testGetUserSubAdminGroupsNotExistingTargetUser() { $this->userManager ->expects($this->once()) ->method('get') ->with('RequestedUser') - ->will($this->returnValue(null)); + ->willReturn(null); $this->api->getUserSubAdminGroups('RequestedUser'); } - public function testGetUserSubAdminGroupsWithGroups() { + public function testGetUserSubAdminGroupsWithGroups(): void { $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock(); $targetGroup ->expects($this->once()) ->method('getGID') - ->will($this->returnValue('TargetGroup')); + ->willReturn('TargetGroup'); $this->userManager ->expects($this->once()) ->method('get') ->with('RequestedUser') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor()->getMock(); $subAdminManager ->expects($this->once()) ->method('getSubAdminsGroups') ->with($targetUser) - ->will($this->returnValue([$targetGroup])); + ->willReturn([$targetGroup]); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $this->assertEquals(['TargetGroup'], $this->api->getUserSubAdminGroups('RequestedUser')->getData()); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 102 - * @expectedExceptionMessage Unknown error occurred - */ - public function testGetUserSubAdminGroupsWithoutGroups() { - $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); - $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)); - - $this->api->getUserSubAdminGroups('RequestedUser'); - } - - public function testEnableUser() { + public function testEnableUser(): void { $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetUser->expects($this->once()) ->method('setEnabled') @@ -2807,25 +3773,25 @@ class UsersControllerTest extends TestCase { ->expects($this->once()) ->method('get') ->with('RequestedUser') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser - ->expects($this->exactly(2)) + ->expects($this->exactly(3)) ->method('getUID') - ->will($this->returnValue('admin')); + ->willReturn('admin'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') - ->will($this->returnValue(true)); + ->willReturn(true); $this->assertEquals([], $this->api->enableUser('RequestedUser')->getData()); } - public function testDisableUser() { + public function testDisableUser(): void { $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $targetUser->expects($this->once()) ->method('setEnabled') @@ -2834,61 +3800,78 @@ class UsersControllerTest extends TestCase { ->expects($this->once()) ->method('get') ->with('RequestedUser') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock(); $loggedInUser - ->expects($this->exactly(2)) + ->expects($this->exactly(3)) ->method('getUID') - ->will($this->returnValue('admin')); + ->willReturn('admin'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') - ->will($this->returnValue(true)); + ->willReturn(true); $this->assertEquals([], $this->api->disableUser('RequestedUser')->getData()); } - public function testGetCurrentUserLoggedIn() { + public function testGetCurrentUserLoggedIn(): void { $user = $this->createMock(IUser::class); $user->expects($this->once())->method('getUID')->willReturn('UID'); $this->userSession->expects($this->once())->method('getUser') ->willReturn($user); - /** @var UsersController | PHPUnit_Framework_MockObject_MockObject $api */ - $api = $this->getMockBuilder('OCA\Provisioning_API\Controller\UsersController') + /** @var UsersController | MockObject $api */ + $api = $this->getMockBuilder(UsersController::class) ->setConstructorArgs([ 'provisioning_api', $this->request, $this->userManager, $this->config, - $this->appManager, $this->groupManager, $this->userSession, $this->accountManager, - $this->logger, + $this->subAdminManager, $this->l10nFactory, - $this->newUserMailHelper + $this->rootFolder, + $this->urlGenerator, + $this->logger, + $this->newUserMailHelper, + $this->secureRandom, + $this->remoteWipe, + $this->knownUserService, + $this->eventDispatcher, + $this->phoneNumberUtil, + $this->appManager, ]) - ->setMethods(['getUserData']) + ->onlyMethods(['getUserData']) ->getMock(); - $api->expects($this->once())->method('getUserData')->with('UID') + $api->expects($this->once())->method('getUserData')->with('UID', true) ->willReturn( [ 'id' => 'UID', 'enabled' => 'true', 'quota' => ['DummyValue'], - 'email' => 'demo@owncloud.org', + 'email' => 'demo@nextcloud.com', 'displayname' => 'Demo User', + 'display-name' => 'Demo User', 'phone' => 'phone', 'address' => 'address', 'website' => 'website', - 'twitter' => 'twitter' + 'twitter' => 'twitter', + 'bluesky' => 'bluesky', + 'fediverse' => 'fediverse', + 'organisation' => 'organisation', + 'role' => 'role', + 'headline' => 'headline', + 'biography' => 'biography', + 'profile_enabled' => '1', + 'pronouns' => 'they/them', ] ); @@ -2896,21 +3879,30 @@ class UsersControllerTest extends TestCase { 'id' => 'UID', 'enabled' => 'true', 'quota' => ['DummyValue'], - 'email' => 'demo@owncloud.org', + 'email' => 'demo@nextcloud.com', + 'displayname' => 'Demo User', + 'display-name' => 'Demo User', 'phone' => 'phone', 'address' => 'address', 'website' => 'website', 'twitter' => 'twitter', - 'display-name' => 'Demo User' + 'bluesky' => 'bluesky', + 'fediverse' => 'fediverse', + 'organisation' => 'organisation', + 'role' => 'role', + 'headline' => 'headline', + 'biography' => 'biography', + 'profile_enabled' => '1', + 'pronouns' => 'they/them', ]; $this->assertSame($expected, $api->getCurrentUser()->getData()); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - */ - public function testGetCurrentUserNotLoggedIn() { + + public function testGetCurrentUserNotLoggedIn(): void { + $this->expectException(OCSException::class); + $this->userSession->expects($this->once())->method('getUser') ->willReturn(null); @@ -2918,88 +3910,117 @@ class UsersControllerTest extends TestCase { $this->api->getCurrentUser(); } + public function testGetUser(): void { + $loggedInUser = $this->createMock(IUser::class); + $loggedInUser + ->method('getUID') + ->willReturn('currentuser'); + $this->userSession + ->method('getUser') + ->willReturn($loggedInUser); - public function testGetUser() { - /** @var UsersController | PHPUnit_Framework_MockObject_MockObject $api */ - $api = $this->getMockBuilder('OCA\Provisioning_API\Controller\UsersController') + /** @var UsersController | MockObject $api */ + $api = $this->getMockBuilder(UsersController::class) ->setConstructorArgs([ 'provisioning_api', $this->request, $this->userManager, $this->config, - $this->appManager, $this->groupManager, $this->userSession, $this->accountManager, - $this->logger, + $this->subAdminManager, $this->l10nFactory, - $this->newUserMailHelper + $this->rootFolder, + $this->urlGenerator, + $this->logger, + $this->newUserMailHelper, + $this->secureRandom, + $this->remoteWipe, + $this->knownUserService, + $this->eventDispatcher, + $this->phoneNumberUtil, + $this->appManager, ]) - ->setMethods(['getUserData']) + ->onlyMethods(['getUserData']) ->getMock(); $expected = [ 'id' => 'UID', 'enabled' => 'true', 'quota' => ['DummyValue'], - 'email' => 'demo@owncloud.org', + 'email' => 'demo@nextcloud.com', 'phone' => 'phone', 'address' => 'address', 'website' => 'website', 'twitter' => 'twitter', - 'displayname' => 'Demo User' + 'bluesky' => 'bluesky', + 'fediverse' => 'fediverse', + 'displayname' => 'Demo User', + 'display-name' => 'Demo User', + 'organisation' => 'organisation', + 'role' => 'role', + 'headline' => 'headline', + 'biography' => 'biography', + 'profile_enabled' => '1', + 'pronouns' => 'they/them', ]; - $api->expects($this->once())->method('getUserData') - ->with('uid') - ->willReturn($expected); + $api->expects($this->exactly(2)) + ->method('getUserData') + ->willReturnMap([ + ['uid', false, $expected], + ['currentuser', true, $expected], + ]); $this->assertSame($expected, $api->getUser('uid')->getData()); + + $this->assertSame($expected, $api->getUser('currentuser')->getData()); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 998 - */ - public function testResendWelcomeMessageWithNotExistingTargetUser() { + + public function testResendWelcomeMessageWithNotExistingTargetUser(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(998); + $this->userManager ->expects($this->once()) ->method('get') ->with('NotExistingUser') - ->will($this->returnValue(null)); + ->willReturn(null); $this->api->resendWelcomeMessage('NotExistingUser'); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 997 - */ - public function testResendWelcomeMessageAsSubAdminAndUserIsNotAccessible() { + + public function testResendWelcomeMessageAsSubAdminAndUserIsNotAccessible(): void { + $this->expectException(OCSException::class); + $this->expectExceptionCode(998); + $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $loggedInUser - ->expects($this->exactly(1)) + ->expects($this->exactly(2)) ->method('getUID') - ->will($this->returnValue('subadmin')); + ->willReturn('subadmin'); $targetUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToGet') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $this->groupManager ->expects($this->once()) ->method('isAdmin') ->with('subadmin') - ->will($this->returnValue(false)); + ->willReturn(false); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor() ->getMock(); @@ -3007,21 +4028,21 @@ class UsersControllerTest extends TestCase { ->expects($this->once()) ->method('isUserAccessible') ->with($loggedInUser, $targetUser) - ->will($this->returnValue(false)); + ->willReturn(false); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $this->api->resendWelcomeMessage('UserToGet'); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 101 - * @expectedExceptionMessage Email address not available - */ - public function testResendWelcomeMessageNoEmail() { + + public function testResendWelcomeMessageNoEmail(): void { + $this->expectException(OCSException::class); + $this->expectExceptionMessage('Email address not available'); + $this->expectExceptionCode(101); + $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); @@ -3031,12 +4052,12 @@ class UsersControllerTest extends TestCase { $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToGet') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor() ->getMock(); @@ -3044,25 +4065,29 @@ class UsersControllerTest extends TestCase { ->expects($this->once()) ->method('isUserAccessible') ->with($loggedInUser, $targetUser) - ->will($this->returnValue(true)); + ->willReturn(true); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); + $loggedInUser + ->expects($this->exactly(2)) + ->method('getUID') + ->willReturn('logged-user-id'); $targetUser ->expects($this->once()) ->method('getEmailAddress') - ->will($this->returnValue('')); + ->willReturn(''); $this->api->resendWelcomeMessage('UserToGet'); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 101 - * @expectedExceptionMessage Email address not available - */ - public function testResendWelcomeMessageNullEmail() { + + public function testResendWelcomeMessageNullEmail(): void { + $this->expectException(OCSException::class); + $this->expectExceptionMessage('Email address not available'); + $this->expectExceptionCode(101); + $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); @@ -3072,12 +4097,12 @@ class UsersControllerTest extends TestCase { $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToGet') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor() ->getMock(); @@ -3085,38 +4110,45 @@ class UsersControllerTest extends TestCase { ->expects($this->once()) ->method('isUserAccessible') ->with($loggedInUser, $targetUser) - ->will($this->returnValue(true)); + ->willReturn(true); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); + $loggedInUser + ->expects($this->exactly(2)) + ->method('getUID') + ->willReturn('logged-user-id'); $targetUser ->expects($this->once()) ->method('getEmailAddress') - ->will($this->returnValue(null)); + ->willReturn(null); $this->api->resendWelcomeMessage('UserToGet'); } - public function testResendWelcomeMessageSuccess() { + public function testResendWelcomeMessageSuccess(): void { $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $targetUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); + $loggedInUser + ->method('getUID') + ->willReturn('logged-user-id'); $targetUser ->method('getUID') ->willReturn('user-id'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToGet') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor() ->getMock(); @@ -3124,69 +4156,50 @@ class UsersControllerTest extends TestCase { ->expects($this->once()) ->method('isUserAccessible') ->with($loggedInUser, $targetUser) - ->will($this->returnValue(true)); + ->willReturn(true); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $targetUser ->expects($this->once()) ->method('getEmailAddress') - ->will($this->returnValue('abc@example.org')); - $this->config - ->expects($this->at(0)) - ->method('getUserValue') - ->with('user-id', 'core', 'lang') - ->willReturn('es'); - $l10n = $this->getMockBuilder(IL10N::class) - ->disableOriginalConstructor() - ->getMock(); - $this->l10nFactory - ->expects($this->at(0)) - ->method('languageExists') - ->with('settings', 'es') - ->willReturn(true); - $this->l10nFactory - ->expects($this->at(1)) - ->method('get') - ->with('settings', 'es') - ->willReturn($l10n); + ->willReturn('abc@example.org'); $emailTemplate = $this->createMock(IEMailTemplate::class); $this->newUserMailHelper - ->expects($this->at(0)) - ->method('setL10N') - ->willReturn($l10n); - $this->newUserMailHelper - ->expects($this->at(1)) + ->expects($this->once()) ->method('generateTemplate') ->willReturn($emailTemplate); $this->newUserMailHelper - ->expects($this->at(2)) + ->expects($this->once()) ->method('sendMail') ->with($targetUser, $emailTemplate); $this->api->resendWelcomeMessage('UserToGet'); } - public function testResendWelcomeMessageSuccessWithFallbackLanguage() { + public function testResendWelcomeMessageSuccessWithFallbackLanguage(): void { $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $targetUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); + $loggedInUser + ->method('getUID') + ->willReturn('logged-user-id'); $targetUser ->method('getUID') ->willReturn('user-id'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToGet') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor() ->getMock(); @@ -3194,74 +4207,56 @@ class UsersControllerTest extends TestCase { ->expects($this->once()) ->method('isUserAccessible') ->with($loggedInUser, $targetUser) - ->will($this->returnValue(true)); + ->willReturn(true); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $targetUser ->expects($this->once()) ->method('getEmailAddress') - ->will($this->returnValue('abc@example.org')); - $this->config - ->expects($this->at(0)) - ->method('getUserValue') - ->with('user-id', 'core', 'lang') - ->willReturn('es'); - $l10n = $this->getMockBuilder(IL10N::class) - ->disableOriginalConstructor() - ->getMock(); - $this->l10nFactory - ->expects($this->at(0)) - ->method('languageExists') - ->with('settings', 'es') - ->willReturn(false); - $this->l10nFactory - ->expects($this->at(1)) - ->method('get') - ->with('settings', 'en') - ->willReturn($l10n); + ->willReturn('abc@example.org'); $emailTemplate = $this->createMock(IEMailTemplate::class); $this->newUserMailHelper - ->expects($this->at(0)) - ->method('setL10N') - ->willReturn($l10n); - $this->newUserMailHelper - ->expects($this->at(1)) + ->expects($this->once()) ->method('generateTemplate') ->willReturn($emailTemplate); $this->newUserMailHelper - ->expects($this->at(2)) + ->expects($this->once()) ->method('sendMail') ->with($targetUser, $emailTemplate); $this->api->resendWelcomeMessage('UserToGet'); } - /** - * @expectedException \OCP\AppFramework\OCS\OCSException - * @expectedExceptionCode 102 - * @expectedExceptionMessage Sending email failed - */ - public function testResendWelcomeMessageFailed() { + + public function testResendWelcomeMessageFailed(): void { + $this->expectException(OCSException::class); + $this->expectExceptionMessage('Sending email failed'); + $this->expectExceptionCode(102); + $loggedInUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $targetUser = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); + $loggedInUser + ->expects($this->exactly(2)) + ->method('getUID') + ->willReturn('logged-user-id'); $targetUser ->method('getUID') ->willReturn('user-id'); $this->userSession ->expects($this->once()) ->method('getUser') - ->will($this->returnValue($loggedInUser)); + ->willReturn($loggedInUser); $this->userManager ->expects($this->once()) ->method('get') ->with('UserToGet') - ->will($this->returnValue($targetUser)); + ->willReturn($targetUser); $subAdminManager = $this->getMockBuilder('OC\SubAdmin') ->disableOriginalConstructor() ->getMock(); @@ -3269,48 +4264,200 @@ class UsersControllerTest extends TestCase { ->expects($this->once()) ->method('isUserAccessible') ->with($loggedInUser, $targetUser) - ->will($this->returnValue(true)); + ->willReturn(true); $this->groupManager ->expects($this->once()) ->method('getSubAdmin') - ->will($this->returnValue($subAdminManager)); + ->willReturn($subAdminManager); $targetUser ->expects($this->once()) ->method('getEmailAddress') - ->will($this->returnValue('abc@example.org')); - $this->config - ->expects($this->at(0)) - ->method('getUserValue') - ->with('user-id', 'core', 'lang') - ->willReturn('es'); - $l10n = $this->getMockBuilder(IL10N::class) - ->disableOriginalConstructor() - ->getMock(); - $this->l10nFactory - ->expects($this->at(0)) - ->method('languageExists') - ->with('settings', 'es') - ->willReturn(true); - $this->l10nFactory - ->expects($this->at(1)) - ->method('get') - ->with('settings', 'es') - ->willReturn($l10n); + ->willReturn('abc@example.org'); $emailTemplate = $this->createMock(IEMailTemplate::class); $this->newUserMailHelper - ->expects($this->at(0)) - ->method('setL10N') - ->willReturn($l10n); - $this->newUserMailHelper - ->expects($this->at(1)) + ->expects($this->once()) ->method('generateTemplate') ->willReturn($emailTemplate); $this->newUserMailHelper - ->expects($this->at(2)) + ->expects($this->once()) ->method('sendMail') ->with($targetUser, $emailTemplate) ->willThrowException(new \Exception()); $this->api->resendWelcomeMessage('UserToGet'); } + + + public static function dataGetEditableFields(): array { + return [ + [false, true, ISetDisplayNameBackend::class, [ + IAccountManager::PROPERTY_EMAIL, + IAccountManager::COLLECTION_EMAIL, + IAccountManager::PROPERTY_PHONE, + IAccountManager::PROPERTY_ADDRESS, + IAccountManager::PROPERTY_WEBSITE, + IAccountManager::PROPERTY_TWITTER, + IAccountManager::PROPERTY_BLUESKY, + IAccountManager::PROPERTY_FEDIVERSE, + IAccountManager::PROPERTY_ORGANISATION, + IAccountManager::PROPERTY_ROLE, + IAccountManager::PROPERTY_HEADLINE, + IAccountManager::PROPERTY_BIOGRAPHY, + IAccountManager::PROPERTY_PROFILE_ENABLED, + IAccountManager::PROPERTY_PRONOUNS, + ]], + [true, false, ISetDisplayNameBackend::class, [ + IAccountManager::PROPERTY_DISPLAYNAME, + IAccountManager::COLLECTION_EMAIL, + IAccountManager::PROPERTY_PHONE, + IAccountManager::PROPERTY_ADDRESS, + IAccountManager::PROPERTY_WEBSITE, + IAccountManager::PROPERTY_TWITTER, + IAccountManager::PROPERTY_BLUESKY, + IAccountManager::PROPERTY_FEDIVERSE, + IAccountManager::PROPERTY_ORGANISATION, + IAccountManager::PROPERTY_ROLE, + IAccountManager::PROPERTY_HEADLINE, + IAccountManager::PROPERTY_BIOGRAPHY, + IAccountManager::PROPERTY_PROFILE_ENABLED, + IAccountManager::PROPERTY_PRONOUNS, + ]], + [true, true, ISetDisplayNameBackend::class, [ + IAccountManager::PROPERTY_DISPLAYNAME, + IAccountManager::PROPERTY_EMAIL, + IAccountManager::COLLECTION_EMAIL, + IAccountManager::PROPERTY_PHONE, + IAccountManager::PROPERTY_ADDRESS, + IAccountManager::PROPERTY_WEBSITE, + IAccountManager::PROPERTY_TWITTER, + IAccountManager::PROPERTY_BLUESKY, + IAccountManager::PROPERTY_FEDIVERSE, + IAccountManager::PROPERTY_ORGANISATION, + IAccountManager::PROPERTY_ROLE, + IAccountManager::PROPERTY_HEADLINE, + IAccountManager::PROPERTY_BIOGRAPHY, + IAccountManager::PROPERTY_PROFILE_ENABLED, + IAccountManager::PROPERTY_PRONOUNS, + ]], + [false, false, ISetDisplayNameBackend::class, [ + IAccountManager::COLLECTION_EMAIL, + IAccountManager::PROPERTY_PHONE, + IAccountManager::PROPERTY_ADDRESS, + IAccountManager::PROPERTY_WEBSITE, + IAccountManager::PROPERTY_TWITTER, + IAccountManager::PROPERTY_BLUESKY, + IAccountManager::PROPERTY_FEDIVERSE, + IAccountManager::PROPERTY_ORGANISATION, + IAccountManager::PROPERTY_ROLE, + IAccountManager::PROPERTY_HEADLINE, + IAccountManager::PROPERTY_BIOGRAPHY, + IAccountManager::PROPERTY_PROFILE_ENABLED, + IAccountManager::PROPERTY_PRONOUNS, + ]], + [false, true, UserInterface::class, [ + IAccountManager::PROPERTY_EMAIL, + IAccountManager::COLLECTION_EMAIL, + IAccountManager::PROPERTY_PHONE, + IAccountManager::PROPERTY_ADDRESS, + IAccountManager::PROPERTY_WEBSITE, + IAccountManager::PROPERTY_TWITTER, + IAccountManager::PROPERTY_BLUESKY, + IAccountManager::PROPERTY_FEDIVERSE, + IAccountManager::PROPERTY_ORGANISATION, + IAccountManager::PROPERTY_ROLE, + IAccountManager::PROPERTY_HEADLINE, + IAccountManager::PROPERTY_BIOGRAPHY, + IAccountManager::PROPERTY_PROFILE_ENABLED, + IAccountManager::PROPERTY_PRONOUNS, + ]], + [true, false, UserInterface::class, [ + IAccountManager::COLLECTION_EMAIL, + IAccountManager::PROPERTY_PHONE, + IAccountManager::PROPERTY_ADDRESS, + IAccountManager::PROPERTY_WEBSITE, + IAccountManager::PROPERTY_TWITTER, + IAccountManager::PROPERTY_BLUESKY, + IAccountManager::PROPERTY_FEDIVERSE, + IAccountManager::PROPERTY_ORGANISATION, + IAccountManager::PROPERTY_ROLE, + IAccountManager::PROPERTY_HEADLINE, + IAccountManager::PROPERTY_BIOGRAPHY, + IAccountManager::PROPERTY_PROFILE_ENABLED, + IAccountManager::PROPERTY_PRONOUNS, + ]], + [true, true, UserInterface::class, [ + IAccountManager::PROPERTY_EMAIL, + IAccountManager::COLLECTION_EMAIL, + IAccountManager::PROPERTY_PHONE, + IAccountManager::PROPERTY_ADDRESS, + IAccountManager::PROPERTY_WEBSITE, + IAccountManager::PROPERTY_TWITTER, + IAccountManager::PROPERTY_BLUESKY, + IAccountManager::PROPERTY_FEDIVERSE, + IAccountManager::PROPERTY_ORGANISATION, + IAccountManager::PROPERTY_ROLE, + IAccountManager::PROPERTY_HEADLINE, + IAccountManager::PROPERTY_BIOGRAPHY, + IAccountManager::PROPERTY_PROFILE_ENABLED, + IAccountManager::PROPERTY_PRONOUNS, + ]], + [false, false, UserInterface::class, [ + IAccountManager::COLLECTION_EMAIL, + IAccountManager::PROPERTY_PHONE, + IAccountManager::PROPERTY_ADDRESS, + IAccountManager::PROPERTY_WEBSITE, + IAccountManager::PROPERTY_TWITTER, + IAccountManager::PROPERTY_BLUESKY, + IAccountManager::PROPERTY_FEDIVERSE, + IAccountManager::PROPERTY_ORGANISATION, + IAccountManager::PROPERTY_ROLE, + IAccountManager::PROPERTY_HEADLINE, + IAccountManager::PROPERTY_BIOGRAPHY, + IAccountManager::PROPERTY_PROFILE_ENABLED, + IAccountManager::PROPERTY_PRONOUNS, + ]], + ]; + } + + #[\PHPUnit\Framework\Attributes\DataProvider('dataGetEditableFields')] + public function testGetEditableFields(bool $allowedToChangeDisplayName, bool $allowedToChangeEmail, string $userBackend, array $expected): void { + $this->config->method('getSystemValue')->willReturnCallback(fn (string $key, mixed $default) => match ($key) { + 'allow_user_to_change_display_name' => $allowedToChangeDisplayName, + 'allow_user_to_change_email' => $allowedToChangeEmail, + default => throw new RuntimeException('Unexpected system config key: ' . $key), + }); + + $user = $this->createMock(IUser::class); + $this->userSession->method('getUser') + ->willReturn($user); + + $backend = $this->createMock($userBackend); + + $user->method('getUID') + ->willReturn('userId'); + $user->method('getBackend') + ->willReturn($backend); + + $expectedResp = new DataResponse($expected); + $this->assertEquals($expectedResp, $this->api->getEditableFields('userId')); + } + + private function mockAccount($targetUser, $accountProperties) { + $mockedProperties = []; + + foreach ($accountProperties as $propertyName => $data) { + $mockedProperty = $this->createMock(IAccountProperty::class); + $mockedProperty->method('getValue')->willReturn($data['value'] ?? ''); + $mockedProperty->method('getScope')->willReturn($data['scope'] ?? ''); + $mockedProperties[] = [$propertyName, $mockedProperty]; + } + + $account = $this->createMock(IAccount::class); + $account->method('getProperty') + ->willReturnMap($mockedProperties); + + $this->accountManager->expects($this->any())->method('getAccount') + ->with($targetUser) + ->willReturn($account); + } } |