fix: check permissions even for pats

tolgee · Dec 6, 2023 · 7cf05d3 · 7cf05d3
1 parent 4478476
commit 7cf05d3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/packages/web/src/ui/KeyDialog/dialogContext/index.ts b/packages/web/src/ui/KeyDialog/dialogContext/index.ts
@@ -78,7 +78,6 @@ export const [DialogProvider, useDialogActions, useDialogContext] =
 
     const [selectedNs, setSelectedNs] = useState<string>(props.namespace);
     const [tags, setTags] = useState<string[]>([]);
-    const isPat = getApiKeyType(props.uiProps.apiKey) === 'tgpat';
 
     const {
       screenshots,
@@ -98,8 +97,8 @@ export const [DialogProvider, useDialogActions, useDialogContext] =
     const scopesLoadable = useApiQuery({
       url: '/v2/api-keys/current-permissions',
       method: 'get',
-      options: {
-        enabled: !isPat,
+      query: {
+        projectId: props.uiProps.projectId,
       },
     });
 
@@ -426,16 +425,15 @@ export const [DialogProvider, useDialogActions, useDialogContext] =
     const scopes = scopesLoadable.data?.scopes;
 
     const canEditSomething =
-      isAuthorizedTo('screenshots.upload', scopes, isPat) ||
-      isAuthorizedTo('screenshots.delete', scopes, isPat) ||
+      isAuthorizedTo('screenshots.upload', scopes) ||
+      isAuthorizedTo('screenshots.delete', scopes) ||
       (translationsLoadable.data?._embedded?.keys?.length
-        ? isAuthorizedTo('translations.edit', scopes, isPat)
-        : isAuthorizedTo('keys.edit', scopes, isPat));
+        ? isAuthorizedTo('translations.edit', scopes)
+        : isAuthorizedTo('keys.edit', scopes));
 
-    const formDisabled = !isPat && (loading || !canEditSomething);
+    const formDisabled = loading || !canEditSomething;
 
-    const canEditTags =
-      !formDisabled && isAuthorizedTo('keys.edit', scopes, isPat);
+    const canEditTags = !formDisabled && isAuthorizedTo('keys.edit', scopes);
 
     const keyExists = Boolean(
       translationsLoadable.data?._embedded?.keys?.length
@@ -469,7 +467,6 @@ export const [DialogProvider, useDialogActions, useDialogContext] =
       stateChangableLanguageIds,
       tags,
       canEditTags,
-      isPat,
     } as const;
 
     const actions = {

diff --git a/packages/web/src/ui/KeyDialog/dialogContext/tools.ts b/packages/web/src/ui/KeyDialog/dialogContext/tools.ts
@@ -95,10 +95,6 @@ export function getImgSize(url: string) {
   });
 }
 
-export function isAuthorizedTo(
-  scope: string,
-  scopes: string[] | undefined,
-  isPat: boolean
-) {
-  return Boolean(scopes?.includes(scope)) || isPat;
+export function isAuthorizedTo(scope: string, scopes: string[] | undefined) {
+  return Boolean(scopes?.includes(scope));
 }
diff --git a/packages/web/src/ui/KeyDialog/dialogContext/usePermissions.ts b/packages/web/src/ui/KeyDialog/dialogContext/usePermissions.ts
@@ -3,7 +3,6 @@ import { isAuthorizedTo } from './tools';
 
 export const usePermissions = () => {
   const scopes = useDialogContext((c) => c.scopes);
-  const isPat = useDialogContext((c) => c.isPat);
 
-  return (scope: string) => isAuthorizedTo(scope, scopes, isPat);
+  return (scope: string) => isAuthorizedTo(scope, scopes);
 };