use specific email getter where necessary

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
nextcloud · Sep 1, 2021 · 1b7519f · 1b7519f
1 parent c2aed8d
commit 1b7519f
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 16 deletions.
diff --git a/apps/dav/lib/Connector/Sabre/Principal.php b/apps/dav/lib/Connector/Sabre/Principal.php
@@ -300,16 +300,13 @@ protected function searchUserPrincipals(array $searchProperties, $test = 'allof'
 					if (!$allowEnumeration) {
 						if ($allowEnumerationFullMatch) {
 							$users = $this->userManager->getByEmail($value);
-							$users = \array_filter($users, static function (IUser $user) use ($value) {
-								return $user->getEMailAddress() === $value;
-							});
 						} else {
 							$users = [];
 						}
 					} else {
 						$users = $this->userManager->getByEmail($value);
 						$users = \array_filter($users, function (IUser $user) use ($currentUser, $value, $limitEnumerationPhone, $limitEnumerationGroup, $allowEnumerationFullMatch, $currentUserGroups) {
-							if ($allowEnumerationFullMatch && $user->getEMailAddress() === $value) {
+							if ($allowEnumerationFullMatch && $user->getSystemEMailAddress() === $value) {
 								return true;
 							}
 
@@ -516,7 +513,7 @@ protected function userToPrincipal($user) {
 			'{http://nextcloud.com/ns}language' => $this->languageFactory->getUserLanguage($user),
 		];
 
-		$email = $user->getEMailAddress();
+		$email = $user->getSystemEMailAddress();
 		if (!empty($email)) {
 			$principal['{http://sabredav.org/ns}email-address'] = $email;
 		}

diff --git a/apps/dav/lib/DAV/GroupPrincipalBackend.php b/apps/dav/lib/DAV/GroupPrincipalBackend.php
@@ -331,7 +331,7 @@ protected function userToPrincipal($user) {
 			'{urn:ietf:params:xml:ns:caldav}calendar-user-type' => 'INDIVIDUAL',
 		];
 
-		$email = $user->getEMailAddress();
+		$email = $user->getSystemEMailAddress();
 		if (!empty($email)) {
 			$principal['{http://sabredav.org/ns}email-address'] = $email;
 		}

diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php
@@ -238,7 +238,7 @@ protected function formatShare(IShare $share, Node $recipientNode = null): array
 			$result['share_with'] = $share->getSharedWith();
 			$result['share_with_displayname'] = $sharedWith !== null ? $sharedWith->getDisplayName() : $share->getSharedWith();
 			$result['share_with_displayname_unique'] = $sharedWith !== null ? (
-				 $sharedWith->getEMailAddress() !== '' ? $sharedWith->getEMailAddress() : $sharedWith->getUID()
+				 $sharedWith->getEMailAddress() !== '' ? $sharedWith->getSystemEMailAddress() : $sharedWith->getUID()
 			) : $share->getSharedWith();
 			$result['status'] = [];
 

diff --git a/apps/provisioning_api/lib/Controller/AUserData.php b/apps/provisioning_api/lib/Controller/AUserData.php
@@ -153,7 +153,7 @@ protected function getUserData(string $userId, bool $includeScopes = false): arr
 				$data[IAccountManager::PROPERTY_AVATAR . self::SCOPE_SUFFIX] = $userAccount->getProperty(IAccountManager::PROPERTY_AVATAR)->getScope();
 			}
 
-			$data[IAccountManager::PROPERTY_EMAIL] = $targetUserObject->getEMailAddress();
+			$data[IAccountManager::PROPERTY_EMAIL] = $targetUserObject->getSystemEMailAddress();
 			if ($includeScopes) {
 				$data[IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX] = $userAccount->getProperty(IAccountManager::PROPERTY_EMAIL)->getScope();
 			}

diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php
@@ -867,7 +867,7 @@ public function editUser(string $userId, string $key, string $value): DataRespon
 				}
 				break;
 			case IAccountManager::COLLECTION_EMAIL:
-				if (filter_var($value, FILTER_VALIDATE_EMAIL) && $value !== $targetUser->getEMailAddress()) {
+				if (filter_var($value, FILTER_VALIDATE_EMAIL) && $value !== $targetUser->getSystemEMailAddress()) {
 					$userAccount = $this->accountManager->getAccount($targetUser);
 					$mailCollection = $userAccount->getPropertyCollection(IAccountManager::COLLECTION_EMAIL);
 					foreach ($mailCollection->getProperties() as $property) {

diff --git a/apps/settings/lib/Controller/UsersController.php b/apps/settings/lib/Controller/UsersController.php
@@ -482,15 +482,15 @@ protected function saveUserSettings(IAccount $userAccount): void {
 			}
 		}
 
-		$oldEmailAddress = $userAccount->getUser()->getEMailAddress();
+		$oldEmailAddress = $userAccount->getUser()->getSystemEMailAddress();
 		$oldEmailAddress = strtolower((string)$oldEmailAddress);
 		if ($oldEmailAddress !== $userAccount->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue()) {
 			// this is the only permission a backend provides and is also used
 			// for the permission of setting a email address
 			if (!$userAccount->getUser()->canChangeDisplayName()) {
 				throw new ForbiddenException($this->l10n->t('Unable to change email address'));
 			}
-			$userAccount->getUser()->setEMailAddress($userAccount->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue());
+			$userAccount->getUser()->setSystemEMailAddress($userAccount->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue());
 		}
 
 		try {

diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php
@@ -448,7 +448,7 @@ public function updateEmail($valueFromLDAP = null) {
 		if ($email !== '') {
 			$user = $this->userManager->get($this->uid);
 			if (!is_null($user)) {
-				$currentEmail = (string)$user->getEMailAddress();
+				$currentEmail = (string)$user->getSystemEMailAddress();
 				if ($currentEmail !== $email) {
 					$user->setEMailAddress($email);
 				}

diff --git a/core/Command/User/Info.php b/core/Command/User/Info.php
@@ -76,7 +76,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		$data = [
 			'user_id' => $user->getUID(),
 			'display_name' => $user->getDisplayName(),
-			'email' => $user->getEMailAddress() ? $user->getEMailAddress() : '',
+			'email' => (string)$user->getSystemEMailAddress(),
 			'cloud_id' => $user->getCloudId(),
 			'enabled' => $user->isEnabled(),
 			'groups' => $groups,

diff --git a/core/Command/User/ListCommand.php b/core/Command/User/ListCommand.php
@@ -104,7 +104,7 @@ private function formatUsers(array $users, bool $detailed = false) {
 				return [
 					'user_id' => $user->getUID(),
 					'display_name' => $user->getDisplayName(),
-					'email' => $user->getEMailAddress() ? $user->getEMailAddress() : '',
+					'email' => (string)$user->getSystemEMailAddress(),
 					'cloud_id' => $user->getCloudId(),
 					'enabled' => $user->isEnabled(),
 					'groups' => $groups,

diff --git a/lib/private/Collaboration/Collaborators/UserPlugin.php b/lib/private/Collaboration/Collaborators/UserPlugin.php
@@ -157,7 +157,7 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 		$userStatuses = $this->userStatusManager->getUserStatuses(array_keys($users));
 		foreach ($users as $uid => $user) {
 			$userDisplayName = $user->getDisplayName();
-			$userEmail = $user->getEMailAddress();
+			$userEmail = $user->getSystemEMailAddress();
 			$uid = (string) $uid;
 
 			$status = [];
@@ -244,7 +244,7 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 				if ($addUser) {
 					$status = [];
 					$uid = $user->getUID();
-					$userEmail = $user->getEMailAddress();
+					$userEmail = $user->getSystemEMailAddress();
 					if (array_key_exists($user->getUID(), $userStatuses)) {
 						$userStatus = $userStatuses[$user->getUID()];
 						$status = [