Skip to content

[stable22] Multiple Emails UI and Integration #28001

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
skjnldsv merged 5 commits into from
Jul 16, 2021
Merged

[stable22] Multiple Emails UI and Integration #28001

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a130d11
Provide initial state
Pytal Jun 29, 2021
84d1398
Create personal info service
Pytal Jun 29, 2021
f0c78d4
Make emails Vuetiful
Pytal Jun 29, 2021
efefffa
Refine UX for primary email deletion
Pytal Jul 6, 2021
66f07cf
Build
Pytal Jul 16, 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
Next Next commit
Provide initial state 
Signed-off-by: Christopher Ng <[email protected]>
(cherry picked from commit 94e469f)
  • Loading branch information
@Pytal
Pytal committed Jul 16, 2021
commit a130d113c833f012f5ebf96025f9b73ce87f0103
50 changes: 49 additions & 1 deletion apps/settings/lib/Settings/Personal/PersonalInfo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*
* @author Arthur Schiwon <[email protected]>
* @author Christoph Wurst <[email protected]>
* @author Christopher Ng <[email protected]>
* @author Georg Ehrke <[email protected]>
* @author Joas Schilling <[email protected]>
* @author John Molakvoæ <[email protected]>
Expand Down Expand Up @@ -48,6 +49,8 @@
use OCP\IUserManager;
use OCP\L10N\IFactory;
use OCP\Settings\ISettings;
use OCP\Accounts\IAccountProperty;
use OCP\AppFramework\Services\IInitialState;

class PersonalInfo implements ISettings {

Expand All @@ -65,6 +68,8 @@ class PersonalInfo implements ISettings {
private $l10nFactory;
/** @var IL10N */
private $l;
/** @var IInitialState */
private $initialStateService;

public function __construct(
IConfig $config,
Expand All @@ -73,7 +78,8 @@ public function __construct(
IAccountManager $accountManager,
IAppManager $appManager,
IFactory $l10nFactory,
IL10N $l
IL10N $l,
IInitialState $initialStateService
) {
$this->config = $config;
$this->userManager = $userManager;
Expand All @@ -82,6 +88,7 @@ public function __construct(
$this->appManager = $appManager;
$this->l10nFactory = $l10nFactory;
$this->l = $l;
$this->initialStateService = $initialStateService;
}

public function getForm(): TemplateResponse {
Expand Down Expand Up @@ -138,6 +145,14 @@ public function getForm(): TemplateResponse {
'groups' => $this->getGroups($user),
] + $messageParameters + $languageParameters + $localeParameters;

$emails = $this->getEmails($account);

$accountParameters = [
'displayNameChangeSupported' => $user->canChangeDisplayName(),
];

$this->initialStateService->provideInitialState('emails', $emails);
$this->initialStateService->provideInitialState('accountParameters', $accountParameters);

return new TemplateResponse('settings', 'settings/personal/personal.info', $parameters, '');
}
Expand Down Expand Up @@ -180,6 +195,39 @@ static function (IGroup $group) {
return $groups;
}

/**
* returns the primary email and additional emails in an
* associative array
*
* @param IAccount $account
* @return array
*/
private function getEmails(IAccount $account): array {
$primaryEmail = [
'value' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue(),
'scope' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getScope(),
'verified' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getVerified(),
];

$additionalEmails = array_map(
function (IAccountProperty $property) {
return [
'value' => $property->getValue(),
'scope' => $property->getScope(),
'verified' => $property->getVerified(),
];
},
$account->getPropertyCollection(IAccountManager::COLLECTION_EMAIL)->getProperties()
);

$emails = [
'primaryEmail' => $primaryEmail,
'additionalEmails' => $additionalEmails,
];

return $emails;
}

/**
* returns the user language, common language and other languages in an
* associative array
Expand Down