Loading lib/Controller/AccountController.php +3 −0 Original line number Diff line number Diff line Loading @@ -138,6 +138,7 @@ class AccountController extends Controller { } try { $username = mb_strtolower($username, 'UTF-8'); $mainDomain = $this->userService->getMainDomain(); $userEmail = $username.'@'.$mainDomain; $this->userService->registerUser($displayname, $recoveryEmail, $username, $userEmail, $password); Loading Loading @@ -215,6 +216,7 @@ class AccountController extends Controller { * @return \OCP\AppFramework\Http\DataResponse */ public function checkUsernameAvailable(string $username) : DataResponse { $this->session->remove(self::SESSION_USERNAME_CHECK); $response = new DataResponse(); $response->setStatus(400); Loading @@ -223,6 +225,7 @@ class AccountController extends Controller { } try { $username = mb_strtolower($username, 'UTF-8'); if (!$this->userService->userExists($username) && !$this->userService->isUsernameTaken($username)) { $response->setStatus(200); $this->session->set(self::SESSION_USERNAME_CHECK, true); Loading lib/Service/UserService.php +1 −1 Original line number Diff line number Diff line Loading @@ -249,7 +249,7 @@ class UserService { */ public function registerUser(string $displayname, string $recoveryEmail, string $username, string $userEmail, string $password): void { if ($this->userExists($username)) { if ($this->userExists($username) || $this->isUsernameTaken($username)) { throw new Exception("Username '$username' is already taken."); } if (!empty($recoveryEmail)) { Loading Loading
lib/Controller/AccountController.php +3 −0 Original line number Diff line number Diff line Loading @@ -138,6 +138,7 @@ class AccountController extends Controller { } try { $username = mb_strtolower($username, 'UTF-8'); $mainDomain = $this->userService->getMainDomain(); $userEmail = $username.'@'.$mainDomain; $this->userService->registerUser($displayname, $recoveryEmail, $username, $userEmail, $password); Loading Loading @@ -215,6 +216,7 @@ class AccountController extends Controller { * @return \OCP\AppFramework\Http\DataResponse */ public function checkUsernameAvailable(string $username) : DataResponse { $this->session->remove(self::SESSION_USERNAME_CHECK); $response = new DataResponse(); $response->setStatus(400); Loading @@ -223,6 +225,7 @@ class AccountController extends Controller { } try { $username = mb_strtolower($username, 'UTF-8'); if (!$this->userService->userExists($username) && !$this->userService->isUsernameTaken($username)) { $response->setStatus(200); $this->session->set(self::SESSION_USERNAME_CHECK, true); Loading
lib/Service/UserService.php +1 −1 Original line number Diff line number Diff line Loading @@ -249,7 +249,7 @@ class UserService { */ public function registerUser(string $displayname, string $recoveryEmail, string $username, string $userEmail, string $password): void { if ($this->userExists($username)) { if ($this->userExists($username) || $this->isUsernameTaken($username)) { throw new Exception("Username '$username' is already taken."); } if (!empty($recoveryEmail)) { Loading