Merge pull request #43195 from nextcloud/backport/42331/stable28

[stable28] fix(settings): Disable renaming for tokens marked to be wiped
nextcloud · Feb 1, 2024 · d501f2d · d501f2d
2 parents 619dd93 + a61c11f
commit d501f2d
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/apps/settings/lib/Settings/Personal/Security/Authtokens.php b/apps/settings/lib/Settings/Personal/Security/Authtokens.php
@@ -105,7 +105,7 @@ private function getAppTokens(): array {
 		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;

diff --git a/apps/settings/src/store/authtoken.ts b/apps/settings/src/store/authtoken.ts
@@ -153,6 +153,7 @@ export const useAuthTokenStore = defineStore('auth-token', {
 				logger.debug('App token marked for wipe', { token })
 
 				token.type = TokenType.WIPING_TOKEN
+				token.canRename = false // wipe tokens can not be renamed
 				return true
 			} catch (error) {
 				logger.error('Could not wipe app token', { error })

diff --git a/dist/core-common.js b/dist/core-common.js
diff --git a/dist/core-common.js.map b/dist/core-common.js.map
diff --git a/dist/settings-vue-settings-personal-security.js b/dist/settings-vue-settings-personal-security.js
diff --git a/dist/settings-vue-settings-personal-security.js.map b/dist/settings-vue-settings-personal-security.js.map