Added Validation Exception to show error message (2ec95571) · Commits · e / infra / ecloud / nextcloud-apps / Ecloud Accounts

appinfo/info.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@
		<description><![CDATA[in /e/OS cloud, nextcloud accounts are linked to mail accounts. This app ensures both are coordinated: it sets the e-mail address, quota and storage of the user upon creation.
		It also completes the account deletion by cleaning other parts of the /e/OS cloud setup to ensure no more data is retained when a user requests an account deletion.
		This app uses the UserDeletedEvent to invoke scripts in the docker-welcome container of /e/OS cloud setup]]></description>
		<version>6.0.3</version>
		<version>6.0.4</version>
		<licence>agpl</licence>
		<author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
		<namespace>EcloudAccounts</namespace>

+5 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ use OCA\EcloudAccounts\AppInfo\Application;
		use OCA\EcloudAccounts\Exception\AddUsernameToCommonStoreException;
		use OCA\EcloudAccounts\Exception\BlacklistedEmailException;
		use OCA\EcloudAccounts\Exception\LDAPUserCreationException;
		use OCA\EcloudAccounts\Exception\RecoveryEmailValidationException;
		use OCA\EcloudAccounts\Service\CaptchaService;
		use OCA\EcloudAccounts\Service\NewsLetterService;
		use OCA\EcloudAccounts\Service\UserService;
		@@ -176,6 +177,10 @@ class AccountController extends Controller {
		$this->logger->logException($e, ['app' => Application::APP_ID]);
		$response->setStatus(200);
		$response->setData(['success' => true]);
		} catch (RecoveryEmailValidationException \| Error $e) {
		$this->logger->logException($e, ['app' => Application::APP_ID]);
		$response->setData(['message' => $e->getMessage(), 'success' => false]);
		$response->setStatus(500);
		} catch (Exception $e) {
		$this->logger->logException($e, ['app' => Application::APP_ID]);
		$response->setData(['message' => 'An error occurred while creating your account!', 'success' => false]);

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		<?php

		namespace OCA\EcloudAccounts\Exception;

		class RecoveryEmailValidationException extends \Exception {
		public function __construct($message = null, $code = 0) {
		parent::__construct($message, $code);
		}
		}

+4 −3

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ use OCA\EcloudAccounts\AppInfo\Application;
		use OCA\EcloudAccounts\Exception\AddUsernameToCommonStoreException;
		use OCA\EcloudAccounts\Exception\BlacklistedEmailException;
		use OCA\EcloudAccounts\Exception\LDAPUserCreationException;
		use OCA\EcloudAccounts\Exception\RecoveryEmailValidationException;
		use OCP\Defaults;
		use OCP\IConfig;
		use OCP\ILogger;
		@@ -266,13 +267,13 @@ class UserService {
		*/
		public function validateRecoveryEmail(string $recoveryEmail): void {
		if (!$this->isValidEmailFormat($recoveryEmail)) {
		throw new Exception('Recovery email address has an incorrect format.');
		throw new RecoveryEmailValidationException('Recovery email address has an incorrect format.');
		}
		if ($this->checkRecoveryEmailAvailable($recoveryEmail)) {
		throw new Exception('Recovery email address is already taken.');
		throw new RecoveryEmailValidationException('Recovery email address is already taken.');
		}
		if ($this->isRecoveryEmailDomainDisallowed($recoveryEmail)) {
		throw new Exception('You cannot set an email address with a Murena domain as recovery email address.');
		throw new RecoveryEmailValidationException('You cannot set an email address with a Murena domain as recovery email address.');
		}
		if ($this->isBlacklistedEmail($recoveryEmail)) {
		throw new BlacklistedEmailException('The domain of this email address is blacklisted. Please provide another recovery address.');