Do not change the old behavior of user creation

owncloud · Dec 6, 2019 · 0e8df13 · 0e8df13
1 parent cc59490
commit 0e8df13
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/core/Command/User/Add.php b/core/Command/User/Add.php
@@ -91,6 +91,14 @@ protected function configure() {
 			);
 	}
 
+	/**
+	 * @param InputInterface $input
+	 * @param OutputInterface $output
+	 * @return int
+	 * @throws CannotCreateUserException
+	 * @throws InvalidEmailException
+	 * @throws UserAlreadyExistsException
+	 */
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		$uid = $input->getArgument('uid');
 		$email = $input->getOption('email');
@@ -131,18 +139,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 			}
 		}
 
-		try {
-			$user = $this->createUserService->createUser(['username' => $uid, 'password' => $password, 'email' => $email]);
-		} catch (InvalidEmailException $e) {
-			$output->writeln('<error>Invalid email address supplied</error>');
-			return 1;
-		} catch (CannotCreateUserException $e) {
-			$output->writeln("<error>" . $e->getMessage() .  "</error>");
-			return 1;
-		} catch (UserAlreadyExistsException $e) {
-			$output->writeln("<error>" . $e->getMessage() .  "</error>");
-			return 1;
-		}
+		$user = $this->createUserService->createUser(['username' => $uid, 'password' => $password, 'email' => $email]);
 
 		if ($user instanceof IUser) {
 			$output->writeln('<info>The user "' . $user->getUID() . '" was created successfully</info>');

diff --git a/lib/private/User/Service/CreateUserService.php b/lib/private/User/Service/CreateUserService.php
@@ -92,7 +92,7 @@ public function __construct(IUserSession $userSession, IGroupManager $groupManag
 	 * @throws UserAlreadyExistsException
 	 */
 	public function createUser($arguments) {
-		$username = $password = $email = '';
+		$password = $email = '';
 		if (\array_key_exists('username', $arguments)) {
 			$username = $arguments['username'];
 		} else {
@@ -125,7 +125,7 @@ public function createUser($arguments) {
 			}
 			$user = $this->userManager->createUser($username, $password);
 		} catch (\Exception $exception) {
-			throw new CannotCreateUserException("Unable to create user due to exception: {$exception->getMessage()}");
+			throw new CannotCreateUserException($exception->getMessage());
 		}
 
 		if ($user === false) {

diff --git a/tests/lib/User/Service/CreateUserServiceTest.php b/tests/lib/User/Service/CreateUserServiceTest.php
@@ -140,7 +140,7 @@ public function testAlreadyExistingUser() {
 	}
 
 	/**
-	 * @expectedExceptionMessage Unable to create user due to exception:
+	 * @expectedExceptionMessage Exception Message
 	 * @expectedException  \OCP\User\Exceptions\CannotCreateUserException
 	 */
 	public function testUserCreateException() {
@@ -151,7 +151,7 @@ public function testUserCreateException() {
 			->willReturn(false);
 
 		$this->userManager->method('createUser')
-			->willThrowException(new \Exception());
+			->willThrowException(new \Exception("Exception Message"));
 		$this->createUserService->createUser(['username' => 'foo', 'password' => '', 'email' => '[email protected]']);
 	}