upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

fix(settings): confirm before revoking app tokens

Browse source 
Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>
This commit is contained in:
Peter Ringelmann 2026-05-20 19:06:00 +02:00 committed by Peter R.
parent 05a188e3a8
commit 16ca990bdb
3 changed files with 27 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/settings/src/components/AuthToken.spec.ts
View file

@ -181,13 +181,13 @@ describe('AuthTokenDeleteDialog wipe-pending warning', () => {
expect(wrapper.findComponent(NcNoteCard).exists()).toBe(false)
})
it('renders an accessible warning NcNoteCard for a wipe-pending token', () => {
it('renders an accessible error NcNoteCard for a wipe-pending token', () => {
const token = makeToken({ type: TokenType.WIPING_TOKEN })
const wrapper = mountDeleteDialog(token)
const noteCard = wrapper.findComponent(NcNoteCard)
expect(noteCard.exists()).toBe(true)
expect(noteCard.props('type')).toBe('warning')
expect(noteCard.props('type')).toBe('error')
expect(noteCard.text()).toMatch(/wipe/i)
})
})

33
apps/settings/src/components/AuthTokenDeleteDialog.vue
View file

@ -10,9 +10,12 @@
:buttons="buttons"
size="normal"
@update:open="onUpdateOpen">
<NcNoteCard v-if="wiping" type="warning">
<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', 'The remote wipe for this device has not finished yet. Revoking the app password now will cancel the pending wipe and the device will keep its access to previously synced data.') }}
{{ t('settings', 'Revoking now cancels the wipe. The device keeps its synced data.') }}
</p>
</NcNoteCard>
<p class="auth-token-delete-dialog__body">
@ -64,20 +67,19 @@ export default defineComponent({
dialogTitle(): string {
return this.wiping
? t('settings', 'Cancel pending remote wipe and revoke app password?')
? t('settings', 'Revoke and cancel pending wipe?')
: t('settings', 'Revoke app password?')
},
bodyText(): string {
if (this.wiping) {
return t('settings', 'Continuing will cancel the pending remote wipe and permanently revoke this app password. The device will retain any data it has already synced.')
}
return t('settings', 'This will permanently revoke the app password. The connected app or device will lose access on its next sync.')
return this.wiping
? t('settings', 'Only continue if you no longer need the device to be wiped.')
: t('settings', 'The app or device will lose access on its next sync. This cannot be undone.')
},
destructiveLabel(): string {
return this.wiping
? t('settings', 'Cancel wipe and revoke')
? t('settings', 'Revoke and cancel wipe')
: t('settings', 'Revoke')
},
@ -85,15 +87,14 @@ export default defineComponent({
return [
{
label: t('settings', 'Cancel'),
// @ts-expect-error 'value' is missing from upstream types
type: 'tertiary',
variant: 'tertiary',
callback: () => {
this.$emit('update:open', false)
},
},
{
label: this.destructiveLabel,
type: 'error',
variant: 'error',
callback: () => {
this.$emit('confirm')
this.$emit('update:open', false)
@ -113,7 +114,13 @@ export default defineComponent({
</script>
<style lang="scss" scoped>
.auth-token-delete-dialog__body {
margin-block-start: calc(var(--default-grid-baseline) * 2);
.auth-token-delete-dialog {
&__warning-headline {
margin-block-end: calc(var(--default-grid-baseline) / 2);
}
&__body {
margin-block-start: calc(var(--default-grid-baseline) * 2);
}
}
</style>

24
apps/settings/src/components/AuthTokenWipeDialog.vue
View file

@ -6,17 +6,12 @@
<template>
<NcDialog
:open="open"
:name="t('settings', 'Wipe device?')"
:name="t('settings', 'Confirm wipe')"
:buttons="buttons"
size="normal"
@update:open="onUpdateOpen">
<NcNoteCard type="warning">
<p>
{{ t('settings', 'This will mark the device for remote wipe. The next time it connects, all synced data will be removed.') }}
</p>
</NcNoteCard>
<p class="auth-token-wipe-dialog__body">
{{ t('settings', 'Do you really want to wipe your data from "{name}"?', { name: token.name }) }}
<p>
{{ t('settings', 'Do you really want to wipe your data from this device?') }}
</p>
</NcDialog>
</template>
@ -29,14 +24,12 @@ import type { IToken } from '../store/authtoken.ts'
import { translate as t } from '@nextcloud/l10n'
import { defineComponent } from 'vue'
import NcDialog from '@nextcloud/vue/components/NcDialog'
import NcNoteCard from '@nextcloud/vue/components/NcNoteCard'
export default defineComponent({
name: 'AuthTokenWipeDialog',
components: {
NcDialog,
NcNoteCard,
},
props: {
@ -61,15 +54,14 @@ export default defineComponent({
return [
{
label: t('settings', 'Cancel'),
// @ts-expect-error 'value' is missing from upstream types
type: 'tertiary',
variant: 'tertiary',
callback: () => {
this.$emit('update:open', false)
},
},
{
label: t('settings', 'Wipe device'),
type: 'error',
variant: 'error',
callback: () => {
this.$emit('confirm')
this.$emit('update:open', false)
@ -87,9 +79,3 @@ export default defineComponent({
},
})
</script>
<style lang="scss" scoped>
.auth-token-wipe-dialog__body {
margin-block-start: calc(var(--default-grid-baseline) * 2);
}
</style>