Fix missing token update when another field (e.g. last checked) changed #29681
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Joas Schilling <[email protected]>
nickvergessen
added
3. to review
|
/backport to stable23 |
|
/backport to stable22 |
Closed
Signed-off-by: Joas Schilling <[email protected]>
CarlSchwan
reviewed
Nov 12, 2021
Signed-off-by: Joas Schilling <[email protected]>
| @@ -128,6 +128,8 @@ public function updateTokenActivity(IToken $token) { | |||
| // Update token only once per minute | |||
| $token->setLastActivity($now); | |||
| $this->mapper->update($token); | |||
| } elseif (!empty($token->getUpdatedFields())) { | |||
| $this->mapper->update($token); | |||
There was a problem hiding this comment.
while this fixes the issue it's weird that we do this regular update in a updateTokenActivity method, isn't it?
There was a problem hiding this comment.
Only alternate approach is to either bring the double update back, or to move the acivity time calculation to the session and make the "which update to use" decision there:
server/lib/private/User/Session.php
Lines 809 to 811 in a143337
There was a problem hiding this comment.
I think the double update is the subjectively cleanest as changes are written right where they are made
|
Replaced by #29682 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Conflicting improvements from:
Fix #29678