diff --git a/api/controllers/console/workspace/plugin.py b/api/controllers/console/workspace/plugin.py index f4c32ede2b..3700f007f1 100644 --- a/api/controllers/console/workspace/plugin.py +++ b/api/controllers/console/workspace/plugin.py @@ -236,7 +236,7 @@ class PluginFetchManifestApi(Resource): @setup_required @login_required @account_initialization_required - @plugin_permission_required(debug_required=True) + @plugin_permission_required(install_required=True) def get(self): tenant_id = current_user.current_tenant_id @@ -260,7 +260,7 @@ class PluginFetchInstallTasksApi(Resource): @setup_required @login_required @account_initialization_required - @plugin_permission_required(debug_required=True) + @plugin_permission_required(install_required=True) def get(self): tenant_id = current_user.current_tenant_id @@ -281,7 +281,7 @@ class PluginFetchInstallTaskApi(Resource): @setup_required @login_required @account_initialization_required - @plugin_permission_required(debug_required=True) + @plugin_permission_required(install_required=True) def get(self, task_id: str): tenant_id = current_user.current_tenant_id @@ -295,7 +295,7 @@ class PluginDeleteInstallTaskApi(Resource): @setup_required @login_required @account_initialization_required - @plugin_permission_required(debug_required=True) + @plugin_permission_required(install_required=True) def post(self, task_id: str): tenant_id = current_user.current_tenant_id @@ -309,7 +309,7 @@ class PluginDeleteAllInstallTaskItemsApi(Resource): @setup_required @login_required @account_initialization_required - @plugin_permission_required(debug_required=True) + @plugin_permission_required(install_required=True) def post(self): tenant_id = current_user.current_tenant_id @@ -323,7 +323,7 @@ class PluginDeleteInstallTaskItemApi(Resource): @setup_required @login_required @account_initialization_required - @plugin_permission_required(debug_required=True) + @plugin_permission_required(install_required=True) def post(self, task_id: str, identifier: str): tenant_id = current_user.current_tenant_id @@ -337,7 +337,7 @@ class PluginUpgradeFromMarketplaceApi(Resource): @setup_required @login_required @account_initialization_required - @plugin_permission_required(debug_required=True) + @plugin_permission_required(install_required=True) def post(self): tenant_id = current_user.current_tenant_id @@ -360,7 +360,7 @@ class PluginUpgradeFromGithubApi(Resource): @setup_required @login_required @account_initialization_required - @plugin_permission_required(debug_required=True) + @plugin_permission_required(install_required=True) def post(self): tenant_id = current_user.current_tenant_id @@ -391,7 +391,7 @@ class PluginUninstallApi(Resource): @setup_required @login_required @account_initialization_required - @plugin_permission_required(debug_required=True) + @plugin_permission_required(install_required=True) def post(self): req = reqparse.RequestParser() req.add_argument("plugin_installation_id", type=str, required=True, location="json") diff --git a/web/app/components/plugins/plugin-page/use-permission.ts b/web/app/components/plugins/plugin-page/use-permission.ts index 07790b63e8..9803c713d1 100644 --- a/web/app/components/plugins/plugin-page/use-permission.ts +++ b/web/app/components/plugins/plugin-page/use-permission.ts @@ -5,9 +5,6 @@ import { useTranslation } from 'react-i18next' import { useInvalidatePermissions, useMutationPermissions, usePermissions } from '@/service/use-plugins' const hasPermission = (permission: PermissionType | undefined, isAdmin: boolean) => { - if (isAdmin) - return true // Administrators always have permissions - if (!permission) return false @@ -17,7 +14,7 @@ const hasPermission = (permission: PermissionType | undefined, isAdmin: boolean) if (permission === PermissionType.everyone) return true - return false + return isAdmin } const usePermission = () => {