Make the throwing optional, so background tasks don't break

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Dec 3, 2020 · 0fd3621 · 0fd3621
1 parent 4640547
commit 0fd3621
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php
@@ -654,7 +654,7 @@ public function editUser(string $userId, string $key, string $value): DataRespon
 				if ($userAccount[$key]['value'] !== $value) {
 					$userAccount[$key]['value'] = $value;
 					try {
-						$this->accountManager->updateUser($targetUser, $userAccount);
+						$this->accountManager->updateUser($targetUser, $userAccount, true);
 					} catch (\InvalidArgumentException $e) {
 						throw new OCSException('Invalid ' . $e->getMessage(), 102);
 					}

diff --git a/apps/settings/lib/Controller/UsersController.php b/apps/settings/lib/Controller/UsersController.php
@@ -466,7 +466,7 @@ protected function saveUserSettings(IUser $user, array $data): array {
 		}
 
 		try {
-			return $this->accountManager->updateUser($user, $data);
+			return $this->accountManager->updateUser($user, $data, true);
 		} catch (\InvalidArgumentException $e) {
 			if ($e->getMessage() === IAccountManager::PROPERTY_PHONE) {
 				throw new \InvalidArgumentException($this->l10n->t('Unable to set invalid phone number'));

diff --git a/lib/private/Accounts/AccountManager.php b/lib/private/Accounts/AccountManager.php
@@ -125,15 +125,23 @@ protected function parsePhoneNumber(string $input): string {
 	 *
 	 * @param IUser $user
 	 * @param array $data
+	 * @param bool $throwOnData Set to true if you can inform the user about invalid data
 	 * @return array The potentially modified data (e.g. phone numbers are converted to E.164 format)
 	 * @throws \InvalidArgumentException Message is the property that was invalid
 	 */
-	public function updateUser(IUser $user, array $data): array {
+	public function updateUser(IUser $user, array $data, bool $throwOnData = false): array {
 		$userData = $this->getUser($user);
 		$updated = true;
 
-		if (isset($data[self::PROPERTY_PHONE])) {
-			$data[self::PROPERTY_PHONE]['value'] = $this->parsePhoneNumber($data[self::PROPERTY_PHONE]['value']);
+		if (isset($data[self::PROPERTY_PHONE]) && $data[self::PROPERTY_PHONE]['value'] !== '') {
+			try {
+				$data[self::PROPERTY_PHONE]['value'] = $this->parsePhoneNumber($data[self::PROPERTY_PHONE]['value']);
+			} catch (\InvalidArgumentException $e) {
+				if ($throwOnData) {
+					throw $e;
+				}
+				$data[self::PROPERTY_PHONE]['value'] = '';
+			}
 		}
 
 		if (empty($userData)) {