Loading patches/034-verification-token-private.patch→patches/033-verification-token-private.patch +4 −4 Original line number Diff line number Diff line --- lib/private/Security/VerificationToken/VerificationToken.php 2023-12-10 23:05:06 +++ lib/private/Security/VerificationToken/VerificationToken-new.php 2023-12-10 23:19:20 --- /Users/ronak/Desktop/murena/nextcloud/ecloud_dev_example/volumes/nextcloud/html/lib/private/Security/VerificationToken/VerificationToken.php 2023-12-10 23:05:06 +++ /Users/ronak/Desktop/murena/nextcloud/ecloud_dev_example/volumes/nextcloud/html/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 = 0): string { + public function create(IUser $user, string $subject, string $passwordPrefix = '', int $expirationTime = self::TOKEN_LIFETIME): string { $token = $this->secureRandom->generate( 21, ISecureRandom::CHAR_DIGITS. Loading @@ -14,7 +14,7 @@ 'subject' => $subject, 'pp' => $passwordPrefix, - 'notBefore' => $this->timeFactory->getTime() + self::TOKEN_LIFETIME * 2, // multiply to provide a grace period + 'notBefore' => ($expirationTime > 0) ? $expirationTime : $this->timeFactory->getTime() + self::TOKEN_LIFETIME * 2, // multiply to provide a grace period + 'notBefore' => $this->timeFactory->getTime() + $expirationTime * 2, // multiply to provide a grace period ]); $this->jobList->add(CleanUpJob::class, $jobArgs); patches/033-verification-token-public.patchdeleted 100644 → 0 +0 −11 Original line number Diff line number Diff line --- lib/public/Security/VerificationToken/IVerificationToken.php 2023-05-17 00:32:43 +++ lib/public/Security/VerificationToken/IVerificationToken-new.php 2023-12-10 23:19:31 @@ -51,7 +51,7 @@ /** * @since 23.0.0 */ - public function create(IUser $user, string $subject, string $passwordPrefix = ''): string; + public function create(IUser $user, string $subject, string $passwordPrefix = '', int $expirationTime = 0): string; /** * Deletes the token identified by the provided parameters Loading
patches/034-verification-token-private.patch→patches/033-verification-token-private.patch +4 −4 Original line number Diff line number Diff line --- lib/private/Security/VerificationToken/VerificationToken.php 2023-12-10 23:05:06 +++ lib/private/Security/VerificationToken/VerificationToken-new.php 2023-12-10 23:19:20 --- /Users/ronak/Desktop/murena/nextcloud/ecloud_dev_example/volumes/nextcloud/html/lib/private/Security/VerificationToken/VerificationToken.php 2023-12-10 23:05:06 +++ /Users/ronak/Desktop/murena/nextcloud/ecloud_dev_example/volumes/nextcloud/html/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 = 0): string { + public function create(IUser $user, string $subject, string $passwordPrefix = '', int $expirationTime = self::TOKEN_LIFETIME): string { $token = $this->secureRandom->generate( 21, ISecureRandom::CHAR_DIGITS. Loading @@ -14,7 +14,7 @@ 'subject' => $subject, 'pp' => $passwordPrefix, - 'notBefore' => $this->timeFactory->getTime() + self::TOKEN_LIFETIME * 2, // multiply to provide a grace period + 'notBefore' => ($expirationTime > 0) ? $expirationTime : $this->timeFactory->getTime() + self::TOKEN_LIFETIME * 2, // multiply to provide a grace period + 'notBefore' => $this->timeFactory->getTime() + $expirationTime * 2, // multiply to provide a grace period ]); $this->jobList->add(CleanUpJob::class, $jobArgs);
patches/033-verification-token-public.patchdeleted 100644 → 0 +0 −11 Original line number Diff line number Diff line --- lib/public/Security/VerificationToken/IVerificationToken.php 2023-05-17 00:32:43 +++ lib/public/Security/VerificationToken/IVerificationToken-new.php 2023-12-10 23:19:31 @@ -51,7 +51,7 @@ /** * @since 23.0.0 */ - public function create(IUser $user, string $subject, string $passwordPrefix = ''): string; + public function create(IUser $user, string $subject, string $passwordPrefix = '', int $expirationTime = 0): string; /** * Deletes the token identified by the provided parameters