Merge pull request #25417 from nextcloud/fix-account-data-visibility-after-disabling-public-addressbook-upload
Fix account data visibility after disabling public addressbook upload
This commit is contained in:
Daniel Calviño Sánchez
GitHub
commit
8fc8451004
25
.drone.yml
25
.drone.yml
|
|
@ -1164,6 +1164,31 @@ trigger:
|
|||
- pull_request
|
||||
- push
|
||||
|
||||
---
|
||||
kind: pipeline
|
||||
name: integration-contacts-menu
|
||||
|
||||
steps:
|
||||
- name: submodules
|
||||
image: docker:git
|
||||
commands:
|
||||
- git submodule update --init
|
||||
- name: integration-contacts-menu
|
||||
image: nextcloudci/integration-php7.3:integration-php7.3-2
|
||||
commands:
|
||||
- bash tests/drone-run-integration-tests.sh || exit 0
|
||||
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
|
||||
- cd build/integration
|
||||
- ./run.sh features/contacts-menu.feature
|
||||
|
||||
trigger:
|
||||
branch:
|
||||
- master
|
||||
- stable*
|
||||
event:
|
||||
- pull_request
|
||||
- push
|
||||
|
||||
---
|
||||
kind: pipeline
|
||||
name: integration-favorites
|
||||
|
|
|
|||
|
|
@ -425,6 +425,16 @@ select {
|
|||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
|
||||
&.disabled {
|
||||
opacity: .5;
|
||||
|
||||
cursor: default;
|
||||
|
||||
* {
|
||||
cursor: default;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
className: 'federationScopeMenu popovermenu bubble menu menu-center',
|
||||
field: undefined,
|
||||
_scopes: undefined,
|
||||
_excludedScopes: [],
|
||||
|
||||
initialize: function(options) {
|
||||
this.field = options.field;
|
||||
|
|
@ -58,9 +59,7 @@
|
|||
];
|
||||
|
||||
if (options.excludedScopes && options.excludedScopes.length) {
|
||||
this._scopes = this._scopes.filter(function(scopeEntry) {
|
||||
return options.excludedScopes.indexOf(scopeEntry.name) === -1;
|
||||
})
|
||||
this._excludedScopes = options.excludedScopes
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -122,6 +121,17 @@
|
|||
} else {
|
||||
this._scopes[i].active = false;
|
||||
}
|
||||
|
||||
var isExcludedScope = this._excludedScopes.includes(this._scopes[i].name)
|
||||
if (isExcludedScope && !this._scopes[i].active) {
|
||||
this._scopes[i].hidden = true
|
||||
} else if (isExcludedScope && this._scopes[i].active) {
|
||||
this._scopes[i].hidden = false
|
||||
this._scopes[i].disabled = true
|
||||
} else {
|
||||
this._scopes[i].hidden = false
|
||||
this._scopes[i].disabled = false
|
||||
}
|
||||
}
|
||||
|
||||
this.render();
|
||||
|
|
|
|||
|
|
@ -1,6 +1,15 @@
|
|||
(function() {
|
||||
var template = Handlebars.template, templates = OC.Settings.Templates = OC.Settings.Templates || {};
|
||||
templates['federationscopemenu'] = template({"1":function(container,depth0,helpers,partials,data) {
|
||||
var stack1, lookupProperty = container.lookupProperty || function(parent, propertyName) {
|
||||
if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
|
||||
return parent[propertyName];
|
||||
}
|
||||
return undefined
|
||||
};
|
||||
|
||||
return ((stack1 = lookupProperty(helpers,"unless").call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? lookupProperty(depth0,"hidden") : depth0),{"name":"unless","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":3,"column":2},"end":{"line":25,"column":13}}})) != null ? stack1 : "");
|
||||
},"2":function(container,depth0,helpers,partials,data) {
|
||||
var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=container.hooks.helperMissing, alias3="function", alias4=container.escapeExpression, lookupProperty = container.lookupProperty || function(parent, propertyName) {
|
||||
if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
|
||||
return parent[propertyName];
|
||||
|
|
@ -8,22 +17,49 @@ templates['federationscopemenu'] = template({"1":function(container,depth0,helpe
|
|||
return undefined
|
||||
};
|
||||
|
||||
return " <li>\n <a href=\"#\" class=\"menuitem action action-"
|
||||
+ alias4(((helper = (helper = lookupProperty(helpers,"name") || (depth0 != null ? lookupProperty(depth0,"name") : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data,"loc":{"start":{"line":4,"column":45},"end":{"line":4,"column":53}}}) : helper)))
|
||||
+ " permanent "
|
||||
+ ((stack1 = lookupProperty(helpers,"if").call(alias1,(depth0 != null ? lookupProperty(depth0,"active") : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":4,"column":64},"end":{"line":4,"column":91}}})) != null ? stack1 : "")
|
||||
+ "\" data-action=\""
|
||||
+ alias4(((helper = (helper = lookupProperty(helpers,"name") || (depth0 != null ? lookupProperty(depth0,"name") : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data,"loc":{"start":{"line":4,"column":106},"end":{"line":4,"column":114}}}) : helper)))
|
||||
+ "\">\n"
|
||||
+ ((stack1 = lookupProperty(helpers,"if").call(alias1,(depth0 != null ? lookupProperty(depth0,"iconClass") : depth0),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.program(6, data, 0),"data":data,"loc":{"start":{"line":5,"column":4},"end":{"line":9,"column":11}}})) != null ? stack1 : "")
|
||||
return " <li>\n"
|
||||
+ ((stack1 = lookupProperty(helpers,"if").call(alias1,(depth0 != null ? lookupProperty(depth0,"disabled") : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.program(6, data, 0),"data":data,"loc":{"start":{"line":5,"column":3},"end":{"line":9,"column":10}}})) != null ? stack1 : "")
|
||||
+ ((stack1 = lookupProperty(helpers,"if").call(alias1,(depth0 != null ? lookupProperty(depth0,"iconClass") : depth0),{"name":"if","hash":{},"fn":container.program(8, data, 0),"inverse":container.program(10, data, 0),"data":data,"loc":{"start":{"line":10,"column":4},"end":{"line":14,"column":11}}})) != null ? stack1 : "")
|
||||
+ " <p>\n <strong class=\"menuitem-text\">"
|
||||
+ alias4(((helper = (helper = lookupProperty(helpers,"displayName") || (depth0 != null ? lookupProperty(depth0,"displayName") : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"displayName","hash":{},"data":data,"loc":{"start":{"line":11,"column":35},"end":{"line":11,"column":50}}}) : helper)))
|
||||
+ alias4(((helper = (helper = lookupProperty(helpers,"displayName") || (depth0 != null ? lookupProperty(depth0,"displayName") : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"displayName","hash":{},"data":data,"loc":{"start":{"line":16,"column":35},"end":{"line":16,"column":50}}}) : helper)))
|
||||
+ "</strong><br>\n <span class=\"menuitem-text-detail\">"
|
||||
+ alias4(((helper = (helper = lookupProperty(helpers,"tooltip") || (depth0 != null ? lookupProperty(depth0,"tooltip") : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"tooltip","hash":{},"data":data,"loc":{"start":{"line":12,"column":40},"end":{"line":12,"column":51}}}) : helper)))
|
||||
+ "</span>\n </p>\n </a>\n </li>\n";
|
||||
},"2":function(container,depth0,helpers,partials,data) {
|
||||
return "active";
|
||||
+ alias4(((helper = (helper = lookupProperty(helpers,"tooltip") || (depth0 != null ? lookupProperty(depth0,"tooltip") : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"tooltip","hash":{},"data":data,"loc":{"start":{"line":17,"column":40},"end":{"line":17,"column":51}}}) : helper)))
|
||||
+ "</span>\n </p>\n"
|
||||
+ ((stack1 = lookupProperty(helpers,"if").call(alias1,(depth0 != null ? lookupProperty(depth0,"disabled") : depth0),{"name":"if","hash":{},"fn":container.program(12, data, 0),"inverse":container.program(14, data, 0),"data":data,"loc":{"start":{"line":19,"column":3},"end":{"line":23,"column":10}}})) != null ? stack1 : "")
|
||||
+ " </li>\n";
|
||||
},"3":function(container,depth0,helpers,partials,data) {
|
||||
var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=container.hooks.helperMissing, alias3="function", alias4=container.escapeExpression, lookupProperty = container.lookupProperty || function(parent, propertyName) {
|
||||
if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
|
||||
return parent[propertyName];
|
||||
}
|
||||
return undefined
|
||||
};
|
||||
|
||||
return " <div class=\"menuitem action action-"
|
||||
+ alias4(((helper = (helper = lookupProperty(helpers,"name") || (depth0 != null ? lookupProperty(depth0,"name") : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data,"loc":{"start":{"line":6,"column":38},"end":{"line":6,"column":46}}}) : helper)))
|
||||
+ " permanent "
|
||||
+ ((stack1 = lookupProperty(helpers,"if").call(alias1,(depth0 != null ? lookupProperty(depth0,"active") : depth0),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":6,"column":57},"end":{"line":6,"column":84}}})) != null ? stack1 : "")
|
||||
+ " disabled\" data-action=\""
|
||||
+ alias4(((helper = (helper = lookupProperty(helpers,"name") || (depth0 != null ? lookupProperty(depth0,"name") : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data,"loc":{"start":{"line":6,"column":108},"end":{"line":6,"column":116}}}) : helper)))
|
||||
+ "\">\n";
|
||||
},"4":function(container,depth0,helpers,partials,data) {
|
||||
return "active";
|
||||
},"6":function(container,depth0,helpers,partials,data) {
|
||||
var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=container.hooks.helperMissing, alias3="function", alias4=container.escapeExpression, lookupProperty = container.lookupProperty || function(parent, propertyName) {
|
||||
if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
|
||||
return parent[propertyName];
|
||||
}
|
||||
return undefined
|
||||
};
|
||||
|
||||
return " <a href=\"#\" class=\"menuitem action action-"
|
||||
+ alias4(((helper = (helper = lookupProperty(helpers,"name") || (depth0 != null ? lookupProperty(depth0,"name") : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data,"loc":{"start":{"line":8,"column":45},"end":{"line":8,"column":53}}}) : helper)))
|
||||
+ " permanent "
|
||||
+ ((stack1 = lookupProperty(helpers,"if").call(alias1,(depth0 != null ? lookupProperty(depth0,"active") : depth0),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":8,"column":64},"end":{"line":8,"column":91}}})) != null ? stack1 : "")
|
||||
+ "\" data-action=\""
|
||||
+ alias4(((helper = (helper = lookupProperty(helpers,"name") || (depth0 != null ? lookupProperty(depth0,"name") : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data,"loc":{"start":{"line":8,"column":106},"end":{"line":8,"column":114}}}) : helper)))
|
||||
+ "\">\n";
|
||||
},"8":function(container,depth0,helpers,partials,data) {
|
||||
var helper, lookupProperty = container.lookupProperty || function(parent, propertyName) {
|
||||
if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
|
||||
return parent[propertyName];
|
||||
|
|
@ -32,10 +68,14 @@ templates['federationscopemenu'] = template({"1":function(container,depth0,helpe
|
|||
};
|
||||
|
||||
return " <span class=\"icon "
|
||||
+ container.escapeExpression(((helper = (helper = lookupProperty(helpers,"iconClass") || (depth0 != null ? lookupProperty(depth0,"iconClass") : depth0)) != null ? helper : container.hooks.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"iconClass","hash":{},"data":data,"loc":{"start":{"line":6,"column":23},"end":{"line":6,"column":36}}}) : helper)))
|
||||
+ container.escapeExpression(((helper = (helper = lookupProperty(helpers,"iconClass") || (depth0 != null ? lookupProperty(depth0,"iconClass") : depth0)) != null ? helper : container.hooks.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"iconClass","hash":{},"data":data,"loc":{"start":{"line":11,"column":23},"end":{"line":11,"column":36}}}) : helper)))
|
||||
+ "\"></span>\n";
|
||||
},"6":function(container,depth0,helpers,partials,data) {
|
||||
},"10":function(container,depth0,helpers,partials,data) {
|
||||
return " <span class=\"no-icon\"></span>\n";
|
||||
},"12":function(container,depth0,helpers,partials,data) {
|
||||
return " </div>\n";
|
||||
},"14":function(container,depth0,helpers,partials,data) {
|
||||
return " </a>\n";
|
||||
},"compiler":[8,">= 4.3.0"],"main":function(container,depth0,helpers,partials,data) {
|
||||
var stack1, lookupProperty = container.lookupProperty || function(parent, propertyName) {
|
||||
if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
|
||||
|
|
@ -45,7 +85,7 @@ templates['federationscopemenu'] = template({"1":function(container,depth0,helpe
|
|||
};
|
||||
|
||||
return "<ul>\n"
|
||||
+ ((stack1 = lookupProperty(helpers,"each").call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? lookupProperty(depth0,"items") : depth0),{"name":"each","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":2,"column":1},"end":{"line":16,"column":10}}})) != null ? stack1 : "")
|
||||
+ ((stack1 = lookupProperty(helpers,"each").call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? lookupProperty(depth0,"items") : depth0),{"name":"each","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":2,"column":1},"end":{"line":26,"column":10}}})) != null ? stack1 : "")
|
||||
+ "</ul>\n";
|
||||
},"useData":true});
|
||||
})();
|
||||
|
|
@ -1,7 +1,12 @@
|
|||
<ul>
|
||||
{{#each items}}
|
||||
{{#unless hidden}}
|
||||
<li>
|
||||
{{#if disabled}}
|
||||
<div class="menuitem action action-{{name}} permanent {{#if active}}active{{/if}} disabled" data-action="{{name}}">
|
||||
{{else}}
|
||||
<a href="#" class="menuitem action action-{{name}} permanent {{#if active}}active{{/if}}" data-action="{{name}}">
|
||||
{{/if}}
|
||||
{{#if iconClass}}
|
||||
<span class="icon {{iconClass}}"></span>
|
||||
{{else}}
|
||||
|
|
@ -11,7 +16,12 @@
|
|||
<strong class="menuitem-text">{{displayName}}</strong><br>
|
||||
<span class="menuitem-text-detail">{{tooltip}}</span>
|
||||
</p>
|
||||
{{#if disabled}}
|
||||
</div>
|
||||
{{else}}
|
||||
</a>
|
||||
{{/if}}
|
||||
</li>
|
||||
{{/unless}}
|
||||
{{/each}}
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -380,7 +380,7 @@ class UsersController extends Controller {
|
|||
);
|
||||
}
|
||||
|
||||
$email = strtolower($email);
|
||||
$email = !is_null($email) ? strtolower($email) : $email;
|
||||
if (!empty($email) && !$this->mailer->validateMailAddress($email)) {
|
||||
return new DataResponse(
|
||||
[
|
||||
|
|
@ -395,15 +395,47 @@ class UsersController extends Controller {
|
|||
|
||||
$data = $this->accountManager->getUser($user);
|
||||
$beforeData = $data;
|
||||
$data[IAccountManager::PROPERTY_AVATAR] = ['scope' => $avatarScope];
|
||||
if ($this->config->getSystemValue('allow_user_to_change_display_name', true) !== false) {
|
||||
$data[IAccountManager::PROPERTY_DISPLAYNAME] = ['value' => $displayname, 'scope' => $displaynameScope];
|
||||
$data[IAccountManager::PROPERTY_EMAIL] = ['value' => $email, 'scope' => $emailScope];
|
||||
if (!is_null($avatarScope)) {
|
||||
$data[IAccountManager::PROPERTY_AVATAR]['scope'] = $avatarScope;
|
||||
}
|
||||
if ($this->config->getSystemValue('allow_user_to_change_display_name', true) !== false) {
|
||||
if (!is_null($displayname)) {
|
||||
$data[IAccountManager::PROPERTY_DISPLAYNAME]['value'] = $displayname;
|
||||
}
|
||||
if (!is_null($displaynameScope)) {
|
||||
$data[IAccountManager::PROPERTY_DISPLAYNAME]['scope'] = $displaynameScope;
|
||||
}
|
||||
if (!is_null($email)) {
|
||||
$data[IAccountManager::PROPERTY_EMAIL]['value'] = $email;
|
||||
}
|
||||
if (!is_null($emailScope)) {
|
||||
$data[IAccountManager::PROPERTY_EMAIL]['scope'] = $emailScope;
|
||||
}
|
||||
}
|
||||
if (!is_null($website)) {
|
||||
$data[IAccountManager::PROPERTY_WEBSITE]['value'] = $website;
|
||||
}
|
||||
if (!is_null($websiteScope)) {
|
||||
$data[IAccountManager::PROPERTY_WEBSITE]['scope'] = $websiteScope;
|
||||
}
|
||||
if (!is_null($address)) {
|
||||
$data[IAccountManager::PROPERTY_ADDRESS]['value'] = $address;
|
||||
}
|
||||
if (!is_null($addressScope)) {
|
||||
$data[IAccountManager::PROPERTY_ADDRESS]['scope'] = $addressScope;
|
||||
}
|
||||
if (!is_null($phone)) {
|
||||
$data[IAccountManager::PROPERTY_PHONE]['value'] = $phone;
|
||||
}
|
||||
if (!is_null($phoneScope)) {
|
||||
$data[IAccountManager::PROPERTY_PHONE]['scope'] = $phoneScope;
|
||||
}
|
||||
if (!is_null($twitter)) {
|
||||
$data[IAccountManager::PROPERTY_TWITTER]['value'] = $twitter;
|
||||
}
|
||||
if (!is_null($twitterScope)) {
|
||||
$data[IAccountManager::PROPERTY_TWITTER]['scope'] = $twitterScope;
|
||||
}
|
||||
$data[IAccountManager::PROPERTY_WEBSITE] = ['value' => $website, 'scope' => $websiteScope];
|
||||
$data[IAccountManager::PROPERTY_ADDRESS] = ['value' => $address, 'scope' => $addressScope];
|
||||
$data[IAccountManager::PROPERTY_PHONE] = ['value' => $phone, 'scope' => $phoneScope];
|
||||
$data[IAccountManager::PROPERTY_TWITTER] = ['value' => $twitter, 'scope' => $twitterScope];
|
||||
|
||||
try {
|
||||
$data = $this->saveUserSettings($user, $data);
|
||||
|
|
@ -523,14 +555,14 @@ class UsersController extends Controller {
|
|||
|
||||
switch ($account) {
|
||||
case 'verify-twitter':
|
||||
$accountData[IAccountManager::PROPERTY_TWITTER]['verified'] = AccountManager::VERIFICATION_IN_PROGRESS;
|
||||
$accountData[IAccountManager::PROPERTY_TWITTER]['verified'] = IAccountManager::VERIFICATION_IN_PROGRESS;
|
||||
$msg = $this->l10n->t('In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):');
|
||||
$code = $codeMd5;
|
||||
$type = IAccountManager::PROPERTY_TWITTER;
|
||||
$accountData[IAccountManager::PROPERTY_TWITTER]['signature'] = $signature;
|
||||
break;
|
||||
case 'verify-website':
|
||||
$accountData[IAccountManager::PROPERTY_WEBSITE]['verified'] = AccountManager::VERIFICATION_IN_PROGRESS;
|
||||
$accountData[IAccountManager::PROPERTY_WEBSITE]['verified'] = IAccountManager::VERIFICATION_IN_PROGRESS;
|
||||
$msg = $this->l10n->t('In order to verify your Website, store the following content in your web-root at \'.well-known/CloudIdVerificationCode.txt\' (please make sure that the complete text is in one line):');
|
||||
$type = IAccountManager::PROPERTY_WEBSITE;
|
||||
$accountData[IAccountManager::PROPERTY_WEBSITE]['signature'] = $signature;
|
||||
|
|
|
|||
|
|
@ -122,9 +122,7 @@ script('settings', [
|
|||
<?php } ?>
|
||||
<span class="icon-checkmark hidden"></span>
|
||||
<span class="icon-error hidden" ></span>
|
||||
<?php if ($_['lookupServerUploadEnabled']) { ?>
|
||||
<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
|
||||
<?php } ?>
|
||||
</form>
|
||||
</div>
|
||||
<div class="personal-settings-setting-box">
|
||||
|
|
@ -172,9 +170,7 @@ script('settings', [
|
|||
<?php if ($_['displayNameChangeSupported']) { ?>
|
||||
<em><?php p($l->t('For password reset and notifications')); ?></em>
|
||||
<?php } ?>
|
||||
<?php if ($_['lookupServerUploadEnabled']) { ?>
|
||||
<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
|
||||
<?php } ?>
|
||||
<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
|
||||
</form>
|
||||
</div>
|
||||
<div class="personal-settings-setting-box">
|
||||
|
|
|
|||
|
|
@ -180,6 +180,51 @@ class UsersControllerTest extends \Test\TestCase {
|
|||
}
|
||||
}
|
||||
|
||||
protected function getDefaultAccountManagerUserData() {
|
||||
return [
|
||||
IAccountManager::PROPERTY_DISPLAYNAME =>
|
||||
[
|
||||
'value' => 'Default display name',
|
||||
'scope' => IAccountManager::SCOPE_FEDERATED,
|
||||
'verified' => IAccountManager::VERIFIED,
|
||||
],
|
||||
IAccountManager::PROPERTY_ADDRESS =>
|
||||
[
|
||||
'value' => 'Default address',
|
||||
'scope' => IAccountManager::SCOPE_LOCAL,
|
||||
'verified' => IAccountManager::VERIFIED,
|
||||
],
|
||||
IAccountManager::PROPERTY_WEBSITE =>
|
||||
[
|
||||
'value' => 'Default website',
|
||||
'scope' => IAccountManager::SCOPE_LOCAL,
|
||||
'verified' => IAccountManager::VERIFIED,
|
||||
],
|
||||
IAccountManager::PROPERTY_EMAIL =>
|
||||
[
|
||||
'value' => 'Default email',
|
||||
'scope' => IAccountManager::SCOPE_FEDERATED,
|
||||
'verified' => IAccountManager::VERIFIED,
|
||||
],
|
||||
IAccountManager::PROPERTY_AVATAR =>
|
||||
[
|
||||
'scope' => IAccountManager::SCOPE_FEDERATED
|
||||
],
|
||||
IAccountManager::PROPERTY_PHONE =>
|
||||
[
|
||||
'value' => 'Default phone',
|
||||
'scope' => IAccountManager::SCOPE_LOCAL,
|
||||
'verified' => IAccountManager::VERIFIED,
|
||||
],
|
||||
IAccountManager::PROPERTY_TWITTER =>
|
||||
[
|
||||
'value' => 'Default twitter',
|
||||
'scope' => IAccountManager::SCOPE_LOCAL,
|
||||
'verified' => IAccountManager::VERIFIED,
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider dataTestSetUserSettings
|
||||
*
|
||||
|
|
@ -205,48 +250,7 @@ class UsersControllerTest extends \Test\TestCase {
|
|||
$this->accountManager->expects($this->once())
|
||||
->method('getUser')
|
||||
->with($user)
|
||||
->willReturn([
|
||||
IAccountManager::PROPERTY_DISPLAYNAME =>
|
||||
[
|
||||
'value' => 'Display name',
|
||||
'scope' => AccountManager::SCOPE_FEDERATED,
|
||||
'verified' => AccountManager::NOT_VERIFIED,
|
||||
],
|
||||
IAccountManager::PROPERTY_ADDRESS =>
|
||||
[
|
||||
'value' => '',
|
||||
'scope' => AccountManager::SCOPE_LOCAL,
|
||||
'verified' => AccountManager::NOT_VERIFIED,
|
||||
],
|
||||
IAccountManager::PROPERTY_WEBSITE =>
|
||||
[
|
||||
'value' => '',
|
||||
'scope' => AccountManager::SCOPE_LOCAL,
|
||||
'verified' => AccountManager::NOT_VERIFIED,
|
||||
],
|
||||
IAccountManager::PROPERTY_EMAIL =>
|
||||
[
|
||||
'value' => '',
|
||||
'scope' => AccountManager::SCOPE_FEDERATED,
|
||||
'verified' => AccountManager::NOT_VERIFIED,
|
||||
],
|
||||
IAccountManager::PROPERTY_AVATAR =>
|
||||
[
|
||||
'scope' => AccountManager::SCOPE_FEDERATED
|
||||
],
|
||||
IAccountManager::PROPERTY_PHONE =>
|
||||
[
|
||||
'value' => '',
|
||||
'scope' => AccountManager::SCOPE_LOCAL,
|
||||
'verified' => AccountManager::NOT_VERIFIED,
|
||||
],
|
||||
IAccountManager::PROPERTY_TWITTER =>
|
||||
[
|
||||
'value' => '',
|
||||
'scope' => AccountManager::SCOPE_LOCAL,
|
||||
'verified' => AccountManager::NOT_VERIFIED,
|
||||
],
|
||||
]);
|
||||
->willReturn($this->getDefaultAccountManagerUserData());
|
||||
|
||||
$controller->expects($this->once())
|
||||
->method('saveUserSettings')
|
||||
|
|
@ -283,6 +287,276 @@ class UsersControllerTest extends \Test\TestCase {
|
|||
];
|
||||
}
|
||||
|
||||
public function testSetUserSettingsWhenUserDisplayNameChangeNotAllowed() {
|
||||
$controller = $this->getController(false, ['saveUserSettings']);
|
||||
$user = $this->createMock(IUser::class);
|
||||
$user->method('getUID')->willReturn('johndoe');
|
||||
|
||||
$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->any())
|
||||
->method('isEnabledForUser')
|
||||
->with('federatedfilesharing')
|
||||
->willReturn(true);
|
||||
|
||||
$avatarScope = IAccountManager::SCOPE_PUBLISHED;
|
||||
$displayName = 'Display name';
|
||||
$displayNameScope = IAccountManager::SCOPE_PUBLISHED;
|
||||
$phone = '47658468';
|
||||
$phoneScope = IAccountManager::SCOPE_PUBLISHED;
|
||||
$email = 'john@example.com';
|
||||
$emailScope = IAccountManager::SCOPE_PUBLISHED;
|
||||
$website = 'nextcloud.com';
|
||||
$websiteScope = IAccountManager::SCOPE_PUBLISHED;
|
||||
$address = 'street and city';
|
||||
$addressScope = IAccountManager::SCOPE_PUBLISHED;
|
||||
$twitter = '@nextclouders';
|
||||
$twitterScope = IAccountManager::SCOPE_PUBLISHED;
|
||||
|
||||
// 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;
|
||||
$expectedProperties[IAccountManager::PROPERTY_WEBSITE]['value'] = $website;
|
||||
$expectedProperties[IAccountManager::PROPERTY_WEBSITE]['scope'] = $websiteScope;
|
||||
$expectedProperties[IAccountManager::PROPERTY_ADDRESS]['value'] = $address;
|
||||
$expectedProperties[IAccountManager::PROPERTY_ADDRESS]['scope'] = $addressScope;
|
||||
$expectedProperties[IAccountManager::PROPERTY_TWITTER]['value'] = $twitter;
|
||||
$expectedProperties[IAccountManager::PROPERTY_TWITTER]['scope'] = $twitterScope;
|
||||
|
||||
$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);
|
||||
$user->method('getUID')->willReturn('johndoe');
|
||||
|
||||
$this->userSession->method('getUser')->willReturn($user);
|
||||
|
||||
$defaultProperties = $this->getDefaultAccountManagerUserData();
|
||||
|
||||
$this->accountManager->expects($this->once())
|
||||
->method('getUser')
|
||||
->with($user)
|
||||
->willReturn($defaultProperties);
|
||||
|
||||
$this->appManager->expects($this->any())
|
||||
->method('isEnabledForUser')
|
||||
->with('federatedfilesharing')
|
||||
->willReturn(false);
|
||||
|
||||
$avatarScope = IAccountManager::SCOPE_PUBLISHED;
|
||||
$displayName = 'Display name';
|
||||
$displayNameScope = IAccountManager::SCOPE_PUBLISHED;
|
||||
$phone = '47658468';
|
||||
$phoneScope = IAccountManager::SCOPE_PUBLISHED;
|
||||
$email = 'john@example.com';
|
||||
$emailScope = IAccountManager::SCOPE_PUBLISHED;
|
||||
$website = 'nextcloud.com';
|
||||
$websiteScope = IAccountManager::SCOPE_PUBLISHED;
|
||||
$address = 'street and city';
|
||||
$addressScope = IAccountManager::SCOPE_PUBLISHED;
|
||||
$twitter = '@nextclouders';
|
||||
$twitterScope = IAccountManager::SCOPE_PUBLISHED;
|
||||
|
||||
// All settings are changed (in the past phone, website, address and
|
||||
// twitter were not changed).
|
||||
$expectedProperties = $defaultProperties;
|
||||
$expectedProperties[IAccountManager::PROPERTY_AVATAR]['scope'] = $avatarScope;
|
||||
$expectedProperties[IAccountManager::PROPERTY_DISPLAYNAME]['value'] = $displayName;
|
||||
$expectedProperties[IAccountManager::PROPERTY_DISPLAYNAME]['scope'] = $displayNameScope;
|
||||
$expectedProperties[IAccountManager::PROPERTY_EMAIL]['value'] = $email;
|
||||
$expectedProperties[IAccountManager::PROPERTY_EMAIL]['scope'] = $emailScope;
|
||||
$expectedProperties[IAccountManager::PROPERTY_PHONE]['value'] = $phone;
|
||||
$expectedProperties[IAccountManager::PROPERTY_PHONE]['scope'] = $phoneScope;
|
||||
$expectedProperties[IAccountManager::PROPERTY_WEBSITE]['value'] = $website;
|
||||
$expectedProperties[IAccountManager::PROPERTY_WEBSITE]['scope'] = $websiteScope;
|
||||
$expectedProperties[IAccountManager::PROPERTY_ADDRESS]['value'] = $address;
|
||||
$expectedProperties[IAccountManager::PROPERTY_ADDRESS]['scope'] = $addressScope;
|
||||
$expectedProperties[IAccountManager::PROPERTY_TWITTER]['value'] = $twitter;
|
||||
$expectedProperties[IAccountManager::PROPERTY_TWITTER]['scope'] = $twitterScope;
|
||||
|
||||
$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 dataTestSetUserSettingsSubset
|
||||
*
|
||||
* @param string $property
|
||||
* @param string $propertyValue
|
||||
*/
|
||||
public function testSetUserSettingsSubset($property, $propertyValue) {
|
||||
$controller = $this->getController(false, ['saveUserSettings']);
|
||||
$user = $this->createMock(IUser::class);
|
||||
$user->method('getUID')->willReturn('johndoe');
|
||||
|
||||
$this->userSession->method('getUser')->willReturn($user);
|
||||
|
||||
$defaultProperties = $this->getDefaultAccountManagerUserData();
|
||||
|
||||
$this->accountManager->expects($this->once())
|
||||
->method('getUser')
|
||||
->with($user)
|
||||
->willReturn($defaultProperties);
|
||||
|
||||
$avatarScope = ($property === 'avatarScope') ? $propertyValue : null;
|
||||
$displayName = ($property === 'displayName') ? $propertyValue : null;
|
||||
$displayNameScope = ($property === 'displayNameScope') ? $propertyValue : null;
|
||||
$phone = ($property === 'phone') ? $propertyValue : null;
|
||||
$phoneScope = ($property === 'phoneScope') ? $propertyValue : null;
|
||||
$email = ($property === 'email') ? $propertyValue : null;
|
||||
$emailScope = ($property === 'emailScope') ? $propertyValue : null;
|
||||
$website = ($property === 'website') ? $propertyValue : null;
|
||||
$websiteScope = ($property === 'websiteScope') ? $propertyValue : null;
|
||||
$address = ($property === 'address') ? $propertyValue : null;
|
||||
$addressScope = ($property === 'addressScope') ? $propertyValue : null;
|
||||
$twitter = ($property === 'twitter') ? $propertyValue : null;
|
||||
$twitterScope = ($property === 'twitterScope') ? $propertyValue : null;
|
||||
|
||||
$expectedProperties = $defaultProperties;
|
||||
if ($property === 'avatarScope') {
|
||||
$expectedProperties[IAccountManager::PROPERTY_AVATAR]['scope'] = $propertyValue;
|
||||
}
|
||||
if ($property === 'displayName') {
|
||||
$expectedProperties[IAccountManager::PROPERTY_DISPLAYNAME]['value'] = $propertyValue;
|
||||
}
|
||||
if ($property === 'displayNameScope') {
|
||||
$expectedProperties[IAccountManager::PROPERTY_DISPLAYNAME]['scope'] = $propertyValue;
|
||||
}
|
||||
if ($property === 'phone') {
|
||||
$expectedProperties[IAccountManager::PROPERTY_PHONE]['value'] = $propertyValue;
|
||||
}
|
||||
if ($property === 'phoneScope') {
|
||||
$expectedProperties[IAccountManager::PROPERTY_PHONE]['scope'] = $propertyValue;
|
||||
}
|
||||
if ($property === 'email') {
|
||||
$expectedProperties[IAccountManager::PROPERTY_EMAIL]['value'] = $propertyValue;
|
||||
}
|
||||
if ($property === 'emailScope') {
|
||||
$expectedProperties[IAccountManager::PROPERTY_EMAIL]['scope'] = $propertyValue;
|
||||
}
|
||||
if ($property === 'website') {
|
||||
$expectedProperties[IAccountManager::PROPERTY_WEBSITE]['value'] = $propertyValue;
|
||||
}
|
||||
if ($property === 'websiteScope') {
|
||||
$expectedProperties[IAccountManager::PROPERTY_WEBSITE]['scope'] = $propertyValue;
|
||||
}
|
||||
if ($property === 'address') {
|
||||
$expectedProperties[IAccountManager::PROPERTY_ADDRESS]['value'] = $propertyValue;
|
||||
}
|
||||
if ($property === 'addressScope') {
|
||||
$expectedProperties[IAccountManager::PROPERTY_ADDRESS]['scope'] = $propertyValue;
|
||||
}
|
||||
if ($property === 'twitter') {
|
||||
$expectedProperties[IAccountManager::PROPERTY_TWITTER]['value'] = $propertyValue;
|
||||
}
|
||||
if ($property === 'twitterScope') {
|
||||
$expectedProperties[IAccountManager::PROPERTY_TWITTER]['scope'] = $propertyValue;
|
||||
}
|
||||
|
||||
if (!empty($email)) {
|
||||
$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 dataTestSetUserSettingsSubset() {
|
||||
return [
|
||||
['avatarScope', IAccountManager::SCOPE_PUBLISHED],
|
||||
['displayName', 'Display name'],
|
||||
['displayNameScope', IAccountManager::SCOPE_PUBLISHED],
|
||||
['phone', '47658468'],
|
||||
['phoneScope', IAccountManager::SCOPE_PUBLISHED],
|
||||
['email', 'john@example.com'],
|
||||
['emailScope', IAccountManager::SCOPE_PUBLISHED],
|
||||
['website', 'nextcloud.com'],
|
||||
['websiteScope', IAccountManager::SCOPE_PUBLISHED],
|
||||
['address', 'street and city'],
|
||||
['addressScope', IAccountManager::SCOPE_PUBLISHED],
|
||||
['twitter', '@nextclouders'],
|
||||
['twitterScope', IAccountManager::SCOPE_PUBLISHED],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider dataTestSaveUserSettings
|
||||
*
|
||||
|
|
@ -504,18 +778,18 @@ class UsersControllerTest extends \Test\TestCase {
|
|||
|
||||
public function dataTestGetVerificationCode() {
|
||||
$accountDataBefore = [
|
||||
IAccountManager::PROPERTY_WEBSITE => ['value' => 'https://nextcloud.com', 'verified' => AccountManager::NOT_VERIFIED],
|
||||
IAccountManager::PROPERTY_TWITTER => ['value' => '@nextclouders', 'verified' => AccountManager::NOT_VERIFIED, 'signature' => 'theSignature'],
|
||||
IAccountManager::PROPERTY_WEBSITE => ['value' => 'https://nextcloud.com', 'verified' => IAccountManager::NOT_VERIFIED],
|
||||
IAccountManager::PROPERTY_TWITTER => ['value' => '@nextclouders', 'verified' => IAccountManager::NOT_VERIFIED, 'signature' => 'theSignature'],
|
||||
];
|
||||
|
||||
$accountDataAfterWebsite = [
|
||||
IAccountManager::PROPERTY_WEBSITE => ['value' => 'https://nextcloud.com', 'verified' => AccountManager::VERIFICATION_IN_PROGRESS, 'signature' => 'theSignature'],
|
||||
IAccountManager::PROPERTY_TWITTER => ['value' => '@nextclouders', 'verified' => AccountManager::NOT_VERIFIED, 'signature' => 'theSignature'],
|
||||
IAccountManager::PROPERTY_WEBSITE => ['value' => 'https://nextcloud.com', 'verified' => IAccountManager::VERIFICATION_IN_PROGRESS, 'signature' => 'theSignature'],
|
||||
IAccountManager::PROPERTY_TWITTER => ['value' => '@nextclouders', 'verified' => IAccountManager::NOT_VERIFIED, 'signature' => 'theSignature'],
|
||||
];
|
||||
|
||||
$accountDataAfterTwitter = [
|
||||
IAccountManager::PROPERTY_WEBSITE => ['value' => 'https://nextcloud.com', 'verified' => AccountManager::NOT_VERIFIED],
|
||||
IAccountManager::PROPERTY_TWITTER => ['value' => '@nextclouders', 'verified' => AccountManager::VERIFICATION_IN_PROGRESS, 'signature' => 'theSignature'],
|
||||
IAccountManager::PROPERTY_WEBSITE => ['value' => 'https://nextcloud.com', 'verified' => IAccountManager::NOT_VERIFIED],
|
||||
IAccountManager::PROPERTY_TWITTER => ['value' => '@nextclouders', 'verified' => IAccountManager::VERIFICATION_IN_PROGRESS, 'signature' => 'theSignature'],
|
||||
];
|
||||
|
||||
return [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,69 @@
|
|||
<?php
|
||||
/**
|
||||
* @copyright Copyright (c) 2021 Daniel Calviño Sánchez <danxuliu@gmail.com>
|
||||
*
|
||||
* @author Daniel Calviño Sánchez <danxuliu@gmail.com>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* 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
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
use PHPUnit\Framework\Assert;
|
||||
|
||||
trait ContactsMenu {
|
||||
|
||||
// BasicStructure trait is expected to be used in the class that uses this
|
||||
// trait.
|
||||
|
||||
/**
|
||||
* @When /^searching for contacts matching with "([^"]*)"$/
|
||||
*
|
||||
* @param string $filter
|
||||
*/
|
||||
public function searchingForContactsMatchingWith(string $filter) {
|
||||
$url = '/index.php/contactsmenu/contacts';
|
||||
|
||||
$parameters[] = 'filter=' . $filter;
|
||||
|
||||
$url .= '?' . implode('&', $parameters);
|
||||
|
||||
$this->sendingAToWithRequesttoken('POST', $url);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Then /^the list of searched contacts has "(\d+)" contacts$/
|
||||
*/
|
||||
public function theListOfSearchedContactsHasContacts(int $count) {
|
||||
$this->theHTTPStatusCodeShouldBe(200);
|
||||
|
||||
$searchedContacts = json_decode($this->response->getBody(), $asAssociativeArray = true)['contacts'];
|
||||
|
||||
Assert::assertEquals($count, count($searchedContacts));
|
||||
}
|
||||
|
||||
/**
|
||||
* @Then /^searched contact "(\d+)" is named "([^"]*)"$/
|
||||
*
|
||||
* @param int $index
|
||||
* @param string $expectedName
|
||||
*/
|
||||
public function searchedContactXIsNamed(int $index, string $expectedName) {
|
||||
$searchedContacts = json_decode($this->response->getBody(), $asAssociativeArray = true)['contacts'];
|
||||
$searchedContact = $searchedContacts[$index];
|
||||
|
||||
Assert::assertEquals($expectedName, $searchedContact['fullName']);
|
||||
}
|
||||
}
|
||||
|
|
@ -33,6 +33,7 @@ require __DIR__ . '/../../vendor/autoload.php';
|
|||
* Features context.
|
||||
*/
|
||||
class FeatureContext implements Context, SnippetAcceptingContext {
|
||||
use ContactsMenu;
|
||||
use Search;
|
||||
use WebDav;
|
||||
use Trashbin;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,188 @@
|
|||
Feature: contacts-menu
|
||||
|
||||
Scenario: users can be searched by display name
|
||||
Given user "user0" exists
|
||||
And user "user1" exists
|
||||
And As an "admin"
|
||||
And sending "PUT" to "/cloud/users/user1" with
|
||||
| key | displayname |
|
||||
| value | Test name |
|
||||
When Logging in using web as "user0"
|
||||
And searching for contacts matching with "test"
|
||||
Then the list of searched contacts has "1" contacts
|
||||
And searched contact "0" is named "Test name"
|
||||
|
||||
Scenario: users can be searched by email
|
||||
Given user "user0" exists
|
||||
And user "user1" exists
|
||||
And As an "admin"
|
||||
And sending "PUT" to "/cloud/users/user1" with
|
||||
| key | email |
|
||||
| value | test@example.com |
|
||||
When Logging in using web as "user0"
|
||||
And searching for contacts matching with "test"
|
||||
Then the list of searched contacts has "1" contacts
|
||||
And searched contact "0" is named "user1"
|
||||
|
||||
Scenario: users can not be searched by id
|
||||
Given user "user0" exists
|
||||
And user "user1" exists
|
||||
And As an "admin"
|
||||
And sending "PUT" to "/cloud/users/user1" with
|
||||
| key | displayname |
|
||||
| value | Test name |
|
||||
When Logging in using web as "user0"
|
||||
And searching for contacts matching with "user"
|
||||
Then the list of searched contacts has "0" contacts
|
||||
|
||||
Scenario: search several users
|
||||
Given user "user0" exists
|
||||
And user "user1" exists
|
||||
And user "user2" exists
|
||||
And user "user3" exists
|
||||
And user "user4" exists
|
||||
And user "user5" exists
|
||||
And As an "admin"
|
||||
And sending "PUT" to "/cloud/users/user1" with
|
||||
| key | displayname |
|
||||
| value | Test name |
|
||||
And sending "PUT" to "/cloud/users/user2" with
|
||||
| key | email |
|
||||
| value | test@example.com |
|
||||
And sending "PUT" to "/cloud/users/user3" with
|
||||
| key | displayname |
|
||||
| value | Unmatched name |
|
||||
And sending "PUT" to "/cloud/users/user4" with
|
||||
| key | email |
|
||||
| value | unmatched@example.com |
|
||||
And sending "PUT" to "/cloud/users/user5" with
|
||||
| key | displayname |
|
||||
| value | Another test name |
|
||||
And sending "PUT" to "/cloud/users/user5" with
|
||||
| key | email |
|
||||
| value | another_test@example.com |
|
||||
When Logging in using web as "user0"
|
||||
And searching for contacts matching with "test"
|
||||
Then the list of searched contacts has "3" contacts
|
||||
# Results are sorted alphabetically
|
||||
And searched contact "0" is named "Another test name"
|
||||
And searched contact "1" is named "Test name"
|
||||
And searched contact "2" is named "user2"
|
||||
|
||||
|
||||
|
||||
Scenario: users can not be found by display name if visibility is private
|
||||
Given user "user0" exists
|
||||
And user "user1" exists
|
||||
And user "user2" exists
|
||||
And Logging in using web as "user1"
|
||||
And Sending a "PUT" to "/settings/users/user1/settings" with requesttoken
|
||||
| displayname | Test name |
|
||||
| displaynameScope | private |
|
||||
And Logging in using web as "user2"
|
||||
And Sending a "PUT" to "/settings/users/user2/settings" with requesttoken
|
||||
| displayname | Another test name |
|
||||
| displaynameScope | contacts |
|
||||
When Logging in using web as "user0"
|
||||
And searching for contacts matching with "test"
|
||||
Then the list of searched contacts has "1" contacts
|
||||
And searched contact "0" is named "Another test name"
|
||||
|
||||
Scenario: users can not be found by email if visibility is private
|
||||
Given user "user0" exists
|
||||
And user "user1" exists
|
||||
And user "user2" exists
|
||||
And Logging in using web as "user1"
|
||||
And Sending a "PUT" to "/settings/users/user1/settings" with requesttoken
|
||||
| email | test@example.com |
|
||||
| emailScope | private |
|
||||
And Logging in using web as "user2"
|
||||
And Sending a "PUT" to "/settings/users/user2/settings" with requesttoken
|
||||
| email | another_test@example.com |
|
||||
| emailScope | contacts |
|
||||
When Logging in using web as "user0"
|
||||
And searching for contacts matching with "test"
|
||||
Then the list of searched contacts has "1" contacts
|
||||
And searched contact "0" is named "user2"
|
||||
|
||||
Scenario: users can be found by other properties if the visibility of one is private
|
||||
Given user "user0" exists
|
||||
And user "user1" exists
|
||||
And user "user2" exists
|
||||
And Logging in using web as "user1"
|
||||
And Sending a "PUT" to "/settings/users/user1/settings" with requesttoken
|
||||
| displayname | Test name |
|
||||
| displaynameScope | contacts |
|
||||
| email | test@example.com |
|
||||
| emailScope | private |
|
||||
And Logging in using web as "user2"
|
||||
And Sending a "PUT" to "/settings/users/user2/settings" with requesttoken
|
||||
| displayname | Another test name |
|
||||
| displaynameScope | private |
|
||||
| email | another_test@example.com |
|
||||
| emailScope | contacts |
|
||||
When Logging in using web as "user0"
|
||||
And searching for contacts matching with "test"
|
||||
Then the list of searched contacts has "2" contacts
|
||||
And searched contact "0" is named ""
|
||||
And searched contact "1" is named "Test name"
|
||||
|
||||
|
||||
|
||||
Scenario: users can be searched by display name if visibility is increased again
|
||||
Given user "user0" exists
|
||||
And user "user1" exists
|
||||
And Logging in using web as "user1"
|
||||
And Sending a "PUT" to "/settings/users/user1/settings" with requesttoken
|
||||
| displayname | Test name |
|
||||
| displaynameScope | private |
|
||||
And Sending a "PUT" to "/settings/users/user1/settings" with requesttoken
|
||||
| displaynameScope | contacts |
|
||||
When Logging in using web as "user0"
|
||||
And searching for contacts matching with "test"
|
||||
Then the list of searched contacts has "1" contacts
|
||||
And searched contact "0" is named "Test name"
|
||||
|
||||
Scenario: users can be searched by email if visibility is increased again
|
||||
Given user "user0" exists
|
||||
And user "user1" exists
|
||||
And Logging in using web as "user1"
|
||||
And Sending a "PUT" to "/settings/users/user1/settings" with requesttoken
|
||||
| email | test@example.com |
|
||||
| emailScope | private |
|
||||
And Sending a "PUT" to "/settings/users/user1/settings" with requesttoken
|
||||
| emailScope | contacts |
|
||||
When Logging in using web as "user0"
|
||||
And searching for contacts matching with "test"
|
||||
Then the list of searched contacts has "1" contacts
|
||||
And searched contact "0" is named "user1"
|
||||
|
||||
|
||||
|
||||
Scenario: users can not be searched by display name if visibility is private even if updated with provisioning
|
||||
Given user "user0" exists
|
||||
And user "user1" exists
|
||||
And Logging in using web as "user1"
|
||||
And Sending a "PUT" to "/settings/users/user1/settings" with requesttoken
|
||||
| displaynameScope | private |
|
||||
And As an "admin"
|
||||
And sending "PUT" to "/cloud/users/user1" with
|
||||
| key | displayname |
|
||||
| value | Test name |
|
||||
When Logging in using web as "user0"
|
||||
And searching for contacts matching with "test"
|
||||
Then the list of searched contacts has "0" contacts
|
||||
|
||||
Scenario: users can not be searched by email if visibility is private even if updated with provisioning
|
||||
Given user "user0" exists
|
||||
And user "user1" exists
|
||||
And Logging in using web as "user1"
|
||||
And Sending a "PUT" to "/settings/users/user1/settings" with requesttoken
|
||||
| emailScope | private |
|
||||
And As an "admin"
|
||||
And sending "PUT" to "/cloud/users/user1" with
|
||||
| key | email |
|
||||
| value | test@example.com |
|
||||
When Logging in using web as "user0"
|
||||
And searching for contacts matching with "test"
|
||||
Then the list of searched contacts has "0" contacts
|
||||
|
|
@ -134,6 +134,9 @@ class AccountManager implements IAccountManager {
|
|||
$updated = true;
|
||||
|
||||
if (isset($data[self::PROPERTY_PHONE]) && $data[self::PROPERTY_PHONE]['value'] !== '') {
|
||||
// Sanitize null value.
|
||||
$data[self::PROPERTY_PHONE]['value'] = $data[self::PROPERTY_PHONE]['value'] ?? '';
|
||||
|
||||
try {
|
||||
$data[self::PROPERTY_PHONE]['value'] = $this->parsePhoneNumber($data[self::PROPERTY_PHONE]['value']);
|
||||
} catch (\InvalidArgumentException $e) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue