Merge branch 'dev/verification-token' into 'main'

RUN patch -u ${BASE_DIR}/apps/dav/lib/Connector/Sabre/Principal.php -i ${TMP_PATCH_DIR}/027-displayname-user-leak-dav.patch

RUN patch -u ${BASE_DIR}/apps/dav/lib/HookManager.php -i ${TMP_PATCH_DIR}/028-default-task-calendar.patch

RUN patch -u ${BASE_DIR}/apps/provisioning_api/lib/Controller/UsersController.php -i ${TMP_PATCH_DIR}/029-restrict-user-to-change-primary-email.patch

RUN patch -u ${BASE_DIR}/lib/private/Security/VerificationToken/VerificationToken.php -i ${TMP_PATCH_DIR}/033-verification-token-private.patch

RUN rm -rf ${TMP_PATCH_DIR}

RUN curl -fsSL -o ldap_write_support.tar.gz \

--- lib/private/Security/VerificationToken/VerificationToken.php	2023-12-10 23:05:06

+++ lib/private/Security/VerificationToken/VerificationToken-new.php	2023-12-11 23:29:24

@@ -107,7 +107,7 @@

 		}

 	}

-	public function create(IUser $user, string $subject, string $passwordPrefix = ''): string {

+	public function create(IUser $user, string $subject, string $passwordPrefix = '', int $expirationTime = self::TOKEN_LIFETIME * 2): string {

 		$token = $this->secureRandom->generate(

 			21,

 			ISecureRandom::CHAR_DIGITS.

@@ -121,7 +121,7 @@

 			'userId' => $user->getUID(),

 			'subject' => $subject,

 			'pp' => $passwordPrefix,

-			'notBefore' => $this->timeFactory->getTime() + self::TOKEN_LIFETIME * 2, // multiply to provide a grace period

+			'notBefore' => $this->timeFactory->getTime() + $expirationTime, // multiply to provide a grace period

 		]);

 		$this->jobList->add(CleanUpJob::class, $jobArgs);