Loading Dockerfile +1 −1 Original line number Diff line number Diff line Loading @@ -6,7 +6,7 @@ ARG NOTES_VERSION="4.10.1" ARG CONTACTS_JOB_ID="881946" ARG CALENDAR_JOB_ID="991372" ARG EMAIL_RECOVERY_JOB_ID="1004020" ARG EA_JOB_ID="1004028" ARG EA_JOB_ID="1004029" ARG LAUNCHER_JOB_ID="991418" ARG GOOGLE_INTEGRATION_VERSION="2.2.0" ARG DASHBOARD_JOB_ID="1004045" Loading patches/013-revert-token-password-update.patch +5 −5 Original line number Diff line number Diff line Loading @@ -7,15 +7,15 @@ This patch reverts to only update when there are expired tokens. --- ./lib/private/Authentication/Token/PublicKeyTokenProvider.php 2024-07-25 17:51:37 +0530 +++ ./lib/private/Authentication/Token/PublicKeyTokenProvider-new.php 2024-07-25 17:53:16 +0530 @@ -509,6 +509,11 @@ @@ -517,6 +517,11 @@ } public function updatePasswords(string $uid, string $password) { + + if (!$this->mapper->hasExpiredTokens($uid)) { + //Nothing to do here + return; + } + // prevent setting an empty pw as result of pw-less-login if ($password === '' || !$this->config->getSystemValueBool('auth.storeCryptedPassword', true)) { return; Loading
Dockerfile +1 −1 Original line number Diff line number Diff line Loading @@ -6,7 +6,7 @@ ARG NOTES_VERSION="4.10.1" ARG CONTACTS_JOB_ID="881946" ARG CALENDAR_JOB_ID="991372" ARG EMAIL_RECOVERY_JOB_ID="1004020" ARG EA_JOB_ID="1004028" ARG EA_JOB_ID="1004029" ARG LAUNCHER_JOB_ID="991418" ARG GOOGLE_INTEGRATION_VERSION="2.2.0" ARG DASHBOARD_JOB_ID="1004045" Loading
patches/013-revert-token-password-update.patch +5 −5 Original line number Diff line number Diff line Loading @@ -7,15 +7,15 @@ This patch reverts to only update when there are expired tokens. --- ./lib/private/Authentication/Token/PublicKeyTokenProvider.php 2024-07-25 17:51:37 +0530 +++ ./lib/private/Authentication/Token/PublicKeyTokenProvider-new.php 2024-07-25 17:53:16 +0530 @@ -509,6 +509,11 @@ @@ -517,6 +517,11 @@ } public function updatePasswords(string $uid, string $password) { + + if (!$this->mapper->hasExpiredTokens($uid)) { + //Nothing to do here + return; + } + // prevent setting an empty pw as result of pw-less-login if ($password === '' || !$this->config->getSystemValueBool('auth.storeCryptedPassword', true)) { return;