Merge branch 'dev/lowercase-username' into 'main' (5e09ef4a) · Commits · e / infra / ecloud / nextcloud-apps / Ecloud Accounts

lib/Controller/AccountController.php

+3 −0

Original line number	Diff line number	Diff line
		@@ -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);
		@@ -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);

		@@ -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);

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)) {