@@ -19,7 +19,7 @@
- {{ bodyText }}
+ {{ copy.body }}
@@ -65,22 +65,19 @@ export default defineComponent({
return this.token.type === TokenType.WIPING_TOKEN
},
- dialogTitle(): string {
- return this.wiping
- ? t('settings', 'Revoke and cancel pending wipe?')
- : t('settings', 'Revoke app password?')
- },
-
- bodyText(): string {
- 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', 'Revoke and cancel wipe')
- : t('settings', 'Revoke')
+ copy(): { title: string, body: string, action: string } {
+ if (this.wiping) {
+ return {
+ title: t('settings', 'Revoke and cancel pending wipe?'),
+ body: t('settings', 'Only continue if you no longer need the device to be wiped.'),
+ action: t('settings', 'Revoke and cancel wipe'),
+ }
+ }
+ return {
+ title: t('settings', 'Revoke app password?'),
+ body: t('settings', 'The app or device will lose access on its next sync. This cannot be undone.'),
+ action: t('settings', 'Revoke'),
+ }
},
buttons(): IDialogButton[] {
@@ -93,7 +90,7 @@ export default defineComponent({
},
},
{
- label: this.destructiveLabel,
+ label: this.copy.action,
variant: 'error',
callback: () => {
this.$emit('confirm')
diff --git a/apps/settings/tests/Controller/AuthSettingsControllerTest.php b/apps/settings/tests/Controller/AuthSettingsControllerTest.php
index 5d75a1aa09a..805e810144a 100644
--- a/apps/settings/tests/Controller/AuthSettingsControllerTest.php
+++ b/apps/settings/tests/Controller/AuthSettingsControllerTest.php
@@ -233,6 +233,43 @@ class AuthSettingsControllerTest extends TestCase {
$this->assertSame([], $this->controller->destroy($tokenId));
}
+ public function testDestroyWipePendingEmitsCancelledSubject(): void {
+ $tokenId = 125;
+ $token = $this->createMock(PublicKeyToken::class);
+
+ $token->method('getId')->willReturn($tokenId);
+ $token->method('getName')->willReturn('My phone');
+
+ $this->tokenProvider->expects($this->once())
+ ->method('getTokenById')
+ ->with($tokenId)
+ ->willThrowException(new \OCP\Authentication\Exceptions\WipeTokenException($token));
+
+ // The token is still invalidated (the user opted into cancelling the wipe).
+ $this->tokenProvider->expects($this->once())
+ ->method('invalidateTokenById')
+ ->with($this->uid, $tokenId);
+
+ // Activity event must use the distinguishing subject.
+ $event = $this->createMock(IEvent::class);
+ $event->method('setApp')->willReturnSelf();
+ $event->method('setType')->willReturnSelf();
+ $event->method('setAffectedUser')->willReturnSelf();
+ $event->method('setAuthor')->willReturnSelf();
+ $event->method('setObject')->willReturnSelf();
+ $event->expects($this->once())
+ ->method('setSubject')
+ ->with(\OCA\Settings\Activity\Provider::APP_TOKEN_DELETED_WIPE_CANCELLED, ['name' => 'My phone'])
+ ->willReturnSelf();
+ $this->activityManager->expects($this->once())
+ ->method('generateEvent')
+ ->willReturn($event);
+ $this->activityManager->expects($this->once())
+ ->method('publish');
+
+ $this->assertEquals([], $this->controller->destroy($tokenId));
+ }
+
public function testDestroyWrongUser(): void {
$tokenId = 124;
$token = $this->createMock(PublicKeyToken::class);
diff --git a/core/Command/User/AuthTokens/Delete.php b/core/Command/User/AuthTokens/Delete.php
index 2c7a958d9a7..803bcf6a0b9 100644
--- a/core/Command/User/AuthTokens/Delete.php
+++ b/core/Command/User/AuthTokens/Delete.php
@@ -9,6 +9,8 @@ namespace OC\Core\Command\User\AuthTokens;
use DateTimeImmutable;
use OC\Authentication\Token\IProvider;
use OC\Core\Command\Base;
+use OCP\Authentication\Exceptions\InvalidTokenException;
+use OCP\Authentication\Exceptions\WipeTokenException;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Exception\RuntimeException;
use Symfony\Component\Console\Input\InputArgument;
@@ -43,6 +45,12 @@ class Delete extends Base {
null,
InputOption::VALUE_REQUIRED,
'Delete tokens last used before a given date.'
+ )
+ ->addOption(
+ 'cancel-wipe',
+ null,
+ InputOption::VALUE_NONE,
+ 'Allow deleting a token that is marked for remote wipe. The pending wipe will not run.'
);
}
@@ -51,6 +59,7 @@ class Delete extends Base {
$uid = $input->getArgument('uid');
$id = (int)$input->getArgument('id');
$before = $input->getOption('last-used-before');
+ $cancelWipe = (bool)$input->getOption('cancel-wipe');
if ($before) {
if ($id) {
@@ -63,6 +72,19 @@ class Delete extends Base {
if (!$id) {
throw new RuntimeException('Not enough arguments. Specify the token