1 files changed, 15 insertions, 51 deletions

diff --git a/apps/settings/lib/Settings/Personal/Security/Authtokens.php b/apps/settings/lib/Settings/Personal/Security/Authtokens.php
index a0758933525..e0509b22a9c 100644
--- a/apps/settings/lib/Settings/Personal/Security/Authtokens.php
+++ b/apps/settings/lib/Settings/Personal/Security/Authtokens.php
@@ -3,68 +3,32 @@
 declare(strict_types=1);
 
 /**
- * @copyright Copyright (c) 2019, Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-
 namespace OCA\Settings\Settings\Personal\Security;
 
-use OCP\AppFramework\Services\IInitialState;
-use OCP\IUserSession;
-use function array_map;
-use OC\Authentication\Exceptions\InvalidTokenException;
 use OC\Authentication\Token\INamedToken;
 use OC\Authentication\Token\IProvider as IAuthTokenProvider;
 use OC\Authentication\Token\IToken;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Services\IInitialState;
+use OCP\Authentication\Exceptions\InvalidTokenException;
 use OCP\ISession;
+use OCP\IUserSession;
 use OCP\Session\Exceptions\SessionNotAvailableException;
 use OCP\Settings\ISettings;
+use function array_map;
 
 class Authtokens implements ISettings {
 
-	/** @var IAuthTokenProvider */
-	private $tokenProvider;
-
-	/** @var ISession */
-	private $session;
-
-	/** @var IInitialState */
-	private $initialState;
-
-	/** @var string|null */
-	private $uid;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	public function __construct(IAuthTokenProvider $tokenProvider,
-								ISession $session,
-								IUserSession $userSession,
-								IInitialState $initialState,
-								?string $UserId) {
-		$this->tokenProvider = $tokenProvider;
-		$this->session = $session;
-		$this->initialState = $initialState;
-		$this->uid = $UserId;
-		$this->userSession = $userSession;
+	public function __construct(
+		private IAuthTokenProvider $tokenProvider,
+		private ISession $session,
+		private IUserSession $userSession,
+		private IInitialState $initialState,
+		private ?string $userId,
+	) {
 	}
 
 	public function getForm(): TemplateResponse {
@@ -90,7 +54,7 @@ class Authtokens implements ISettings {
 	}
 
 	private function getAppTokens(): array {
-		$tokens = $this->tokenProvider->getTokenByUser($this->uid);
+		$tokens = $this->tokenProvider->getTokenByUser($this->userId);
 
 		try {
 			$sessionId = $this->session->getId();
@@ -106,7 +70,7 @@ class Authtokens implements ISettings {
 		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;
 			if ($sessionToken->getId() === $token->getId()) {
 				$data['canDelete'] = false;
 				$data['canRename'] = false;