Skip to content

[stable19] Fix account data visibility after disabling public addressbook upload #25974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 11 commits into from
Apr 29, 2021
Merged

[stable19] Fix account data visibility after disabling public addressbook upload #25974

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
eaedf5f
Use constants from interface rather than class
danxuliu Jan 29, 2021
5a49784
Extract default test data to a helper getter
danxuliu Jan 29, 2021
f2e4023
Change default test data to values less similar to empty values
danxuliu Jan 29, 2021
c130b88
Add more unit tests for setting user settings
danxuliu Jan 29, 2021
e30271b
Respect additional user settings not covered by the controller
danxuliu Jan 29, 2021
3304d33
Fix TypeError when "email" is not given in the controller request
danxuliu Jan 31, 2021
d2f1225
Fix deleting properties of user settings when not given explicitly
danxuliu Jan 31, 2021
bc9b213
Make possible to set body in requesttoken requests in integration tests
danxuliu Dec 3, 2020
60b8ede
Add integration tests for searching users in contacts menu
danxuliu Jan 31, 2021
828865a
Fix settings scope menu hidden when lookup server upload is disabled
danxuliu Feb 1, 2021
184a7ca
Handle corrupted scope values
danxuliu Feb 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add more unit tests for setting user settings 
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu
danxuliu committed Apr 23, 2021
commit c130b880043214fc2e2730ec189603671f24599f
145 changes: 145 additions & 0 deletions apps/settings/tests/Controller/UsersControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,151 @@ public function dataTestSetUserSettings() {
];
}

public function testSetUserSettingsWhenUserDisplayNameChangeNotAllowed() {
$controller = $this->getController(false, ['saveUserSettings']);
$user = $this->createMock(IUser::class);

$this->userSession->method('getUser')->willReturn($user);

$defaultProperties = $this->getDefaultAccountManagerUserData();

$this->accountManager->expects($this->once())
->method('getUser')
->with($user)
->willReturn($defaultProperties);

$this->config->expects($this->once())
->method('getSystemValue')
->with('allow_user_to_change_display_name')
->willReturn(false);

$this->appManager->expects($this->once())
->method('isEnabledForUser')
->with('federatedfilesharing')
->willReturn(true);

$avatarScope = IAccountManager::VISIBILITY_PUBLIC;
$displayName = 'Display name';
$displayNameScope = IAccountManager::VISIBILITY_PUBLIC;
$phone = '47658468';
$phoneScope = IAccountManager::VISIBILITY_PUBLIC;
$email = '[email protected]';
$emailScope = IAccountManager::VISIBILITY_PUBLIC;
$website = 'nextcloud.com';
$websiteScope = IAccountManager::VISIBILITY_PUBLIC;
$address = 'street and city';
$addressScope = IAccountManager::VISIBILITY_PUBLIC;
$twitter = '@nextclouders';
$twitterScope = IAccountManager::VISIBILITY_PUBLIC;

// Display name and email are not changed.
$expectedProperties = $defaultProperties;
$expectedProperties[IAccountManager::PROPERTY_AVATAR]['scope'] = $avatarScope;
$expectedProperties[IAccountManager::PROPERTY_PHONE]['value'] = $phone;
$expectedProperties[IAccountManager::PROPERTY_PHONE]['scope'] = $phoneScope;
unset($expectedProperties[IAccountManager::PROPERTY_PHONE]['verified']);
$expectedProperties[IAccountManager::PROPERTY_WEBSITE]['value'] = $website;
$expectedProperties[IAccountManager::PROPERTY_WEBSITE]['scope'] = $websiteScope;
unset($expectedProperties[IAccountManager::PROPERTY_WEBSITE]['verified']);
$expectedProperties[IAccountManager::PROPERTY_ADDRESS]['value'] = $address;
$expectedProperties[IAccountManager::PROPERTY_ADDRESS]['scope'] = $addressScope;
unset($expectedProperties[IAccountManager::PROPERTY_ADDRESS]['verified']);
$expectedProperties[IAccountManager::PROPERTY_TWITTER]['value'] = $twitter;
$expectedProperties[IAccountManager::PROPERTY_TWITTER]['scope'] = $twitterScope;
unset($expectedProperties[IAccountManager::PROPERTY_TWITTER]['verified']);

$this->mailer->expects($this->once())->method('validateMailAddress')
->willReturn(true);

$controller->expects($this->once())
->method('saveUserSettings')
->with($user, $expectedProperties)
->willReturnArgument(1);

$result = $controller->setUserSettings(
$avatarScope,
$displayName,
$displayNameScope,
$phone,
$phoneScope,
$email,
$emailScope,
$website,
$websiteScope,
$address,
$addressScope,
$twitter,
$twitterScope
);
}

public function testSetUserSettingsWhenFederatedFilesharingNotEnabled() {
$controller = $this->getController(false, ['saveUserSettings']);
$user = $this->createMock(IUser::class);

$this->userSession->method('getUser')->willReturn($user);

$defaultProperties = $this->getDefaultAccountManagerUserData();

$this->accountManager->expects($this->once())
->method('getUser')
->with($user)
->willReturn($defaultProperties);

$this->appManager->expects($this->once())
->method('isEnabledForUser')
->with('federatedfilesharing')
->willReturn(false);

$avatarScope = IAccountManager::VISIBILITY_PUBLIC;
$displayName = 'Display name';
$displayNameScope = IAccountManager::VISIBILITY_PUBLIC;
$phone = '47658468';
$phoneScope = IAccountManager::VISIBILITY_PUBLIC;
$email = '[email protected]';
$emailScope = IAccountManager::VISIBILITY_PUBLIC;
$website = 'nextcloud.com';
$websiteScope = IAccountManager::VISIBILITY_PUBLIC;
$address = 'street and city';
$addressScope = IAccountManager::VISIBILITY_PUBLIC;
$twitter = '@nextclouders';
$twitterScope = IAccountManager::VISIBILITY_PUBLIC;

// Phone, website, address and twitter are not changed.
$expectedProperties = $defaultProperties;
$expectedProperties[IAccountManager::PROPERTY_AVATAR]['scope'] = $avatarScope;
$expectedProperties[IAccountManager::PROPERTY_DISPLAYNAME]['value'] = $displayName;
$expectedProperties[IAccountManager::PROPERTY_DISPLAYNAME]['scope'] = $displayNameScope;
unset($expectedProperties[IAccountManager::PROPERTY_DISPLAYNAME]['verified']);
$expectedProperties[IAccountManager::PROPERTY_EMAIL]['value'] = $email;
$expectedProperties[IAccountManager::PROPERTY_EMAIL]['scope'] = $emailScope;
unset($expectedProperties[IAccountManager::PROPERTY_EMAIL]['verified']);

$this->mailer->expects($this->once())->method('validateMailAddress')
->willReturn(true);

$controller->expects($this->once())
->method('saveUserSettings')
->with($user, $expectedProperties)
->willReturnArgument(1);

$result = $controller->setUserSettings(
$avatarScope,
$displayName,
$displayNameScope,
$phone,
$phoneScope,
$email,
$emailScope,
$website,
$websiteScope,
$address,
$addressScope,
$twitter,
$twitterScope
);
}

/**
* @dataProvider dataTestSaveUserSettings
*
Expand Down