Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63e2ed0b authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch 'webauthn-regression-fix' into 'main' 

Fix web authn login regression

See merge request !115
parents 5fac2537 431e19e0

patches/002-login-without-domain.patch

+2 −2
Original line number Diff line number Diff line
@@ -45,9 +45,9 @@ diff --git ./core/Controller/LoginController.php ./core/Controller/LoginControll 
 		$uid = $loginName;

+		$uid = trim($uid);

+		$uid = mb_strtolower($uid, 'UTF-8');

+		$domain = $this->config->getSystemValue('mail_domain', '');

+		$domain = \OC::$server->getConfig()->getSystemValue('mail_domain', '');

+		$domain_suffix = !empty($domain) ? '@' . $domain : '';

+		$alt_domain = $this->config->getSystemValue('alt_mail_domain', '');

+		$alt_domain = \OC::$server->getConfig()->getSystemValue('alt_mail_domain', '');

+		$alt_domain_suffix = !empty($alt_domain) ? '@'  . $alt_domain : '';

+		$admin_username = $_ENV["NEXTCLOUD_ADMIN_USER"];

+		$is_admin = strcmp($uid, $admin_username) === 0;