fix: PR feedback

Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>

Author: pringelmann

apps/settings/appinfo/routes.php

@@ -13,7 +13,7 @@
 
 		['name' => 'AuthSettings#create', 'url' => '/settings/personal/authtokens', 'verb' => 'POST' , 'root' => ''],
 		['name' => 'AuthSettings#update', 'url' => '/settings/personal/authtokens/{id}', 'verb' => 'PUT' , 'root' => ''],
-		['name' => 'AuthSettings#destroyAll', 'url' => '/settings/personal/authtokens', 'verb' => 'DELETE' , 'root' => ''],
+		['name' => 'AuthSettings#destroyOthers', 'url' => '/settings/personal/authtokens', 'verb' => 'DELETE' , 'root' => ''],
 		['name' => 'AuthSettings#destroy', 'url' => '/settings/personal/authtokens/{id}', 'verb' => 'DELETE' , 'root' => ''],
 		['name' => 'AuthSettings#wipe', 'url' => '/settings/personal/authtokens/wipe/{id}', 'verb' => 'POST' , 'root' => ''],
 

apps/settings/lib/Controller/AuthSettingsController.php

@@ -189,13 +189,15 @@ public function destroy(int $id): JSONResponse {
 	}
 
 	/**
-	 * Wipe-pending tokens are kept: revoking one cancels its pending wipe, so that
-	 * stays a per-token decision.
+	 * Revoke the tokens of the current user other than the session's own.
+	 *
+	 * Wipe-pending tokens are kept too: revoking one cancels its pending wipe, so
+	 * that stays a per-token decision.
 	 */
 	#[NoSubAdminRequired]
 	#[NoAdminRequired]
 	#[PasswordConfirmationRequired(strict: true)]
-	public function destroyAll(): JSONResponse {
+	public function destroyOthers(): JSONResponse {
 		if ($this->checkAppToken()) {
 			return new JSONResponse([], Http::STATUS_BAD_REQUEST);
 		}

apps/settings/src/store/authtoken.ts

@@ -62,7 +62,7 @@ export const useAuthTokenStore = defineStore('auth-token', {
 	},
 	getters: {
 		/**
-		 * Must stay in step with `destroyAll()` server side, or the confirmation
+		 * Must stay in step with `destroyOthers()` server side, or the confirmation
 		 * count disagrees with what actually gets revoked.
 		 *
 		 * @param state Current store state

apps/settings/tests/Controller/AuthSettingsControllerTest.php

@@ -272,7 +272,7 @@ public function testDestroyWipePendingEmitsCancelledSubject(): void {
 		$this->assertEquals([], $this->controller->destroy($tokenId)->getData());
 	}
 
-	public function testDestroyAllRevokesEveryTokenButTheCurrent(): void {
+	public function testDestroyOthersRevokesEveryTokenButTheCurrent(): void {
 		$currentToken = $this->mockAuthToken(10);
 		$otherToken = $this->mockAuthToken(11);
 		$appPassword = $this->mockAuthToken(12);
@@ -297,13 +297,13 @@ public function testDestroyAllRevokesEveryTokenButTheCurrent(): void {
 
 		$this->mockActivityManager();
 
-		$response = $this->controller->destroyAll();
+		$response = $this->controller->destroyOthers();
 
 		$this->assertSame([11, 12], $revokedIds, 'the current session token must not be revoked');
 		$this->assertSame(['revoked' => [11, 12]], $response->getData());
 	}
 
-	public function testDestroyAllKeepsWipePendingTokens(): void {
+	public function testDestroyOthersKeepsWipePendingTokens(): void {
 		$currentToken = $this->mockAuthToken(10);
 		$otherToken = $this->mockAuthToken(11);
 		$wipingToken = $this->mockAuthToken(12, IToken::WIPE_TOKEN);
@@ -318,10 +318,10 @@ public function testDestroyAllKeepsWipePendingTokens(): void {
 
 		$this->mockActivityManager();
 
-		$this->assertSame(['revoked' => [11]], $this->controller->destroyAll()->getData());
+		$this->assertSame(['revoked' => [11]], $this->controller->destroyOthers()->getData());
 	}
 
-	public function testDestroyAllPublishesOneAggregateActivity(): void {
+	public function testDestroyOthersPublishesOneAggregateActivity(): void {
 		$currentToken = $this->mockAuthToken(10);
 
 		$this->session->method('getId')->willReturn('sessionid');
@@ -348,10 +348,10 @@ public function testDestroyAllPublishesOneAggregateActivity(): void {
 		$this->activityManager->expects($this->once())
 			->method('publish');
 
-		$this->controller->destroyAll();
+		$this->controller->destroyOthers();
 	}
 
-	public function testDestroyAllWithNothingToRevokePublishesNoActivity(): void {
+	public function testDestroyOthersWithNothingToRevokePublishesNoActivity(): void {
 		$currentToken = $this->mockAuthToken(10);
 
 		$this->session->method('getId')->willReturn('sessionid');
@@ -361,48 +361,48 @@ public function testDestroyAllWithNothingToRevokePublishesNoActivity(): void {
 		$this->tokenProvider->expects($this->never())->method('invalidateTokenById');
 		$this->activityManager->expects($this->never())->method('publish');
 
-		$this->assertSame(['revoked' => []], $this->controller->destroyAll()->getData());
+		$this->assertSame(['revoked' => []], $this->controller->destroyOthers()->getData());
 	}
 
-	public function testDestroyAllWithAppPassword(): void {
+	public function testDestroyOthersWithAppPassword(): void {
 		$this->session->expects($this->once())
 			->method('exists')
 			->with('app_password')
 			->willReturn(true);
 
 		$this->tokenProvider->expects($this->never())->method('invalidateTokenById');
 
-		$response = $this->controller->destroyAll();
+		$response = $this->controller->destroyOthers();
 		$this->assertSame(Http::STATUS_BAD_REQUEST, $response->getStatus());
 	}
 
-	public function testDestroyAllWhileImpersonating(): void {
+	public function testDestroyOthersWhileImpersonating(): void {
 		$this->userSession->method('getImpersonatingUserID')->willReturn('admin');
 
 		$this->tokenProvider->expects($this->never())->method('invalidateTokenById');
 
-		$response = $this->controller->destroyAll();
+		$response = $this->controller->destroyOthers();
 		$this->assertSame(Http::STATUS_SERVICE_UNAVAILABLE, $response->getStatus());
 	}
 
-	public function testDestroyAllSessionNotAvailable(): void {
+	public function testDestroyOthersSessionNotAvailable(): void {
 		$this->session->method('getId')
 			->willThrowException(new SessionNotAvailableException());
 
 		$this->tokenProvider->expects($this->never())->method('invalidateTokenById');
 
-		$response = $this->controller->destroyAll();
+		$response = $this->controller->destroyOthers();
 		$this->assertSame(Http::STATUS_SERVICE_UNAVAILABLE, $response->getStatus());
 	}
 
-	public function testDestroyAllInvalidSessionToken(): void {
+	public function testDestroyOthersInvalidSessionToken(): void {
 		$this->session->method('getId')->willReturn('sessionid');
 		$this->tokenProvider->method('getToken')
 			->willThrowException(new InvalidTokenException('Token does not exist'));
 
 		$this->tokenProvider->expects($this->never())->method('invalidateTokenById');
 
-		$response = $this->controller->destroyAll();
+		$response = $this->controller->destroyOthers();
 		$this->assertSame(Http::STATUS_SERVICE_UNAVAILABLE, $response->getStatus());
 	}