fix(settings): confirm app-token revoke and preserve wipe state#60644
Open
pringelmann wants to merge 4 commits into
Open
fix(settings): confirm app-token revoke and preserve wipe state#60644pringelmann wants to merge 4 commits into
pringelmann wants to merge 4 commits into
Conversation
Adds an NcDialog confirmation to the Revoke action; deletion was previously instant on click. When the token is marked for remote wipe, the dialog surfaces a warning and the destructive button switches to "Cancel wipe and revoke" so cancelling an in-flight wipe is an explicit opt-in. Also migrates the existing Wipe confirm from the legacy window.OC.dialogs.confirm helper to NcDialog, matching the new delete dialog. The auth token store actions are now pure API callers; the UI does the gating. Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>
Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>
Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>
Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>
pringelmann
added
enhancement
3. to review
pringelmann
requested review from
come-nc,
nfebe,
provokateurin,
sorbaugh and
susnux
and removed request for
a team
CarlSchwan
approved these changes
May 22, 2026
susnux
approved these changes
May 22, 2026
susnux
reviewed
May 22, 2026
Comment on lines
+13
to
+20
| <NcNoteCard v-if="wiping" type="error"> | ||
| <p class="auth-token-delete-dialog__warning-headline"> | ||
| <strong>{{ t('settings', 'Remote wipe has not started yet.') }}</strong> | ||
| </p> | ||
| <p> | ||
| {{ t('settings', 'Revoking now cancels the wipe. The device keeps its synced data.') }} | ||
| </p> | ||
| </NcNoteCard> |
Contributor
There was a problem hiding this comment.
I think for consistent styling just use the components props
Suggested change
| <NcNoteCard v-if="wiping" type="error"> | |
| <p class="auth-token-delete-dialog__warning-headline"> | |
| <strong>{{ t('settings', 'Remote wipe has not started yet.') }}</strong> | |
| </p> | |
| <p> | |
| {{ t('settings', 'Revoking now cancels the wipe. The device keeps its synced data.') }} | |
| </p> | |
| </NcNoteCard> | |
| <NcNoteCard | |
| v-if="wiping" | |
| :heading="t('settings', 'Remote wipe has not started yet.')" | |
| type="error"> | |
| {{ t('settings', 'Revoking now cancels the wipe. The device keeps its synced data.') }} | |
| </NcNoteCard> |
susnux
reviewed
May 22, 2026
| return this.token.type === TokenType.WIPING_TOKEN | ||
| }, | ||
|
|
||
| copy(): { title: string, body: string, action: string } { |
Contributor
There was a problem hiding this comment.
What is "copy"?
A would prefer a more self explaining variable name here
susnux
reviewed
May 22, 2026
| </NcDialog> | ||
| </template> | ||
|
|
||
| <script lang="ts"> |
Contributor
There was a problem hiding this comment.
Would be great to always use script setup for all new files so we do not have to do migration work in the future when we want to support vapor mode
Contributor
There was a problem hiding this comment.
(also typing is much nicer and its less boiler plate code)
susnux
reviewed
May 22, 2026
| </NcDialog> | ||
| </template> | ||
|
|
||
| <script lang="ts"> |
Contributor
There was a problem hiding this comment.
similar here would be great to only add new vue files as script setup
susnux
reviewed
May 22, 2026
Contributor
susnux
left a comment
susnux
left a comment
There was a problem hiding this comment.
functionality wise approved, some code comments
Comment on lines
+94
to
+95
| :open="wipeDialogOpen" | ||
| @update:open="wipeDialogOpen = $event" |
Contributor
There was a problem hiding this comment.
Suggested change
| :open="wipeDialogOpen" | |
| @update:open="wipeDialogOpen = $event" | |
| :open.sync="wipeDialogOpen" |
Comment on lines
+88
to
+89
| :open="deleteDialogOpen" | ||
| @update:open="deleteDialogOpen = $event" |
Contributor
There was a problem hiding this comment.
Suggested change
| :open="deleteDialogOpen" | |
| @update:open="deleteDialogOpen = $event" | |
| :open.sync="deleteDialogOpen" |
|
|
||
| wipe() { | ||
| this.actionOpen = false | ||
| this.wipeDialogOpen = true |
Contributor
There was a problem hiding this comment.
In theory this dialog component could be replaced with just a call to showConfirmation
https://nextcloud-libraries.github.io/nextcloud-dialogs/functions/showConfirmation.html
But both is fine
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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
Revoking an app password now opens an
NcDialogconfirmation. For tokens marked for remote wipe the dialog uses a red error card and the destructive button reads "Revoke and cancel wipe", so cancelling an in-flight wipe is a deliberate click rather than a side effect of clicking the trash icon.Two admin-only deletion paths used to drop the wipe marker the same way the user-facing controller did. Both are guarded now:
occ user:auth-tokens:deleterefuses wipe-pending tokens unless--cancel-wipeis passed, and OAuth2 client revocation skips matching wipe-pending tokens (with a log line) so the wipe outlives the client.Backports needed for
stable33,stable32,stable31.Screenshot
Checklist
3. to review, feature component)stable32)