-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(settings): Disable renaming for tokens marked to be wiped #42331
Merged
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
susnux
requested review from
a team,
icewind1991,
Altahrim and
nfebe
and removed request for
a team
December 16, 2023 17:32
@@ -105,7 +105,7 @@ | |||
return array_map(function (IToken $token) use ($sessionToken) { | |||
$data = $token->jsonSerialize(); | |||
$data['canDelete'] = true; | |||
$data['canRename'] = $token instanceof INamedToken; | |||
$data['canRename'] = $token instanceof INamedToken && $data['type'] !== IToken::WIPE_TOKEN; |
Check notice
Code scanning / Psalm
DeprecatedClass Note
Class OC\Authentication\Token\IToken is deprecated
come-nc
approved these changes
Dec 18, 2023
emoral435
approved these changes
Dec 21, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
susnux
force-pushed
the
fix/auth-token-settings
branch
from
December 21, 2023 17:29
15f7e5d
to
1a35635
Compare
emoral435
force-pushed
the
fix/auth-token-settings
branch
from
December 22, 2023 15:43
1a35635
to
9e47461
Compare
This otherwise a WipeException will be thrown when trying to rename Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
/backport to stable28 |
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
susnux
force-pushed
the
fix/auth-token-settings
branch
from
January 29, 2024 13:01
9e47461
to
bba6813
Compare
2 tasks
Merged
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.
Summary
This otherwise a WipeException will be thrown when trying to rename (by
getTokenById
inPublicKeyTokenProvider
).Checklist