From a4c816d07cf80d9f2872f75690920e60117bc5a2 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Sat, 21 Jun 2025 09:15:46 -0400 Subject: [PATCH] move admin permissions to a separate folder --- locales/index.d.ts | 18 ++++++++------ .../src/components/MkTokenGenerateWindow.vue | 24 +++++++++++++++---- sharkey-locales/en-US.yml | 4 ++-- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/locales/index.d.ts b/locales/index.d.ts index e80b71075a..782918e82b 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -13455,14 +13455,18 @@ export interface Locale extends ILocale { * Custom font size */ "customFontSize": string; - /** - * Hide ads - */ - "hideAds": string; - /** - * Apps using this token will only have access to the functions listed below. - */ + /** + * Hide ads + */ + "hideAds": string; + /** + * Apps using this token will have no API access except for the functions listed below. + */ "permissionsDescription": string; + /** + * Apps using this token will have no administrative access except for the functions enabled below. + */ + "adminPermissionsDescription": string; /** * Shared account */ diff --git a/packages/frontend/src/components/MkTokenGenerateWindow.vue b/packages/frontend/src/components/MkTokenGenerateWindow.vue index c5f2773876..ebfa3dd314 100644 --- a/packages/frontend/src/components/MkTokenGenerateWindow.vue +++ b/packages/frontend/src/components/MkTokenGenerateWindow.vue @@ -39,11 +39,19 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._permissions[kind] }}
-
-
{{ i18n.ts.adminPermission }}
-
- {{ i18n.ts._permissions[kind] }} -
+ + + + + + +
+ {{ i18n.ts.disableAll }} + {{ i18n.ts.enableAll }} +
+ +
+ {{ i18n.ts._permissions[kind] }}
@@ -138,6 +146,9 @@ function disableAll(): void { for (const p in permissionSwitches.value) { permissionSwitches.value[p] = false; } +} + +function disableAllAdmin(): void { if (iAmAdmin) { for (const p in permissionSwitchesForAdmin.value) { permissionSwitchesForAdmin.value[p] = false; @@ -149,6 +160,9 @@ function enableAll(): void { for (const p in permissionSwitches.value) { permissionSwitches.value[p] = true; } +} + +function enableAllAdmin(): void { if (iAmAdmin) { for (const p in permissionSwitchesForAdmin.value) { permissionSwitchesForAdmin.value[p] = true; diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml index 141966db98..68bc7ca624 100644 --- a/sharkey-locales/en-US.yml +++ b/sharkey-locales/en-US.yml @@ -679,8 +679,8 @@ customFontSize: "Custom font size" hideAds: "Hide ads" -permissionsDescription: "Apps using this token will only have access to the functions listed below." - +permissionsDescription: "Apps using this token will have no API access except for the functions listed below." +adminPermissionsDescription: "Apps using this token will have no administrative access except for the functions enabled below." sharedAccount: "Shared account" sharedAccess: "Shared access" sharedAccessDescription: "Any accounts listed here will be granted access to the token and may use it to access this account."