fix: patch-002 file to support nc32 upgrade (5fe7b88e) · Commits · e / infra / ecloud / nextcloud

patches/002-login-without-domain.patch

+11 −11

Original line number	Diff line number	Diff line
		@@ -7,9 +7,9 @@ This patch auto append the domain handled by nc, configured in env var.
		only the admin user (also configured in env var) will not have his login appended with a @domain suffix

		diff --git ./core/Controller/LoginController.php ./core/Controller/LoginController-new.php
		--- ./core/Controller/LoginController.php 2024-04-26 15:08:54.979407062 +0530
		+++ ./core/Controller/LoginController-new.php 2024-04-26 15:16:48.582366408 +0530
		@@ -315,6 +315,27 @@
		--- ./core/Controller/LoginController.php 2026-03-23 17:46:38.368004410 +0600
		+++ ./core/Controller/LoginController-new.php 2026-03-23 17:56:15.665110462 +0600
		@@ -341,6 +341,27 @@
		);
		}

		@@ -37,7 +37,7 @@ diff --git ./core/Controller/LoginController.php ./core/Controller/LoginControll
		$data = new LoginData(
		$this->request,
		$user,
		@@ -327,7 +348,7 @@
		@@ -354,7 +375,7 @@
		if (!$result->isSuccess()) {
		return $this->createLoginFailedResponse(
		$data->getUsername(),
		@@ -47,8 +47,8 @@ diff --git ./core/Controller/LoginController.php ./core/Controller/LoginControll
		$result->getErrorMessage()
		);

		--- ./core/Controller/WebAuthnController.php 2023-04-21 15:18:58.813220092 +0530
		+++ ./core/Controller/WebAuthnController-new.php 2023-04-21 15:24:40.036538414 +0530
		--- ./core/Controller/WebAuthnController.php 2026-03-23 18:12:33.546326153 +0600
		+++ ./core/Controller/WebAuthnController-new.php 2026-03-23 18:12:26.157698882 +0600
		@@ -48,6 +48,27 @@

		$this->logger->debug('Converting login name to UID');
		@@ -78,9 +78,9 @@ diff --git ./core/Controller/LoginController.php ./core/Controller/LoginControll
		'\OCA\Files_Sharing\API\Server2Server',
		'preLoginNameUsedAsUserName',

		--- ./lib/private/User/Session.php 2023-04-21 15:27:00.417034490 +0530
		+++ ./lib/private/User/Session-new.php 2023-04-21 15:28:18.309111435 +0530
		@@ -383,6 +383,10 @@
		--- ./lib/private/User/Session.php 2026-03-23 17:46:39.585001447 +0600
		+++ ./lib/private/User/Session-new.php 2026-03-23 17:59:52.577453313 +0600
		@@ -384,6 +384,10 @@
		$remoteAddress = $request->getRemoteAddress();
		$currentDelay = $throttler->sleepDelayOrThrowOnMax($remoteAddress, 'login');