Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

feat: implement profile permissions v2 api (#50966)

Hieufffb1e23ca5b
diff --git a/apps/studio/components/interfaces/APIKeys/APIKeyDeleteDialog.tsx b/apps/studio/components/interfaces/APIKeys/APIKeyDeleteDialog.tsx
index 10fe18ed6a4..79b8dab88d8 100644
--- a/apps/studio/components/interfaces/APIKeys/APIKeyDeleteDialog.tsx
+++ b/apps/studio/components/interfaces/APIKeys/APIKeyDeleteDialog.tsx
@@ -1,9 +1,8 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { Trash2Icon } from 'lucide-react'
import { DropdownMenuItemTooltip } from '@/components/ui/DropdownMenuItemTooltip'
import type { APIKeysData } from '@/data/api-keys/api-keys-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
interface APIKeyDeleteDialogProps {
apiKey: Extract<APIKeysData[number], { type: 'secret' | 'publishable' }>
@@ -11,9 +10,8 @@ interface APIKeyDeleteDialogProps {
}
export const APIKeyDeleteDialog = ({ apiKey, setKeyToDelete }: APIKeyDeleteDialogProps) => {
- const { can: canDeleteAPIKeys } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- '*'
+ const { can: canDeleteAPIKeys } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_WRITE
)
return (
diff --git a/apps/studio/components/interfaces/APIKeys/ApiKeyPill.test.tsx b/apps/studio/components/interfaces/APIKeys/ApiKeyPill.test.tsx
index 8b5ba531696..d3ad7680dd1 100644
--- a/apps/studio/components/interfaces/APIKeys/ApiKeyPill.test.tsx
+++ b/apps/studio/components/interfaces/APIKeys/ApiKeyPill.test.tsx
@@ -15,8 +15,9 @@ type ApiKeyResponse = components['schemas']['ApiKeyResponse_Output']
const { mockUseAsyncCheckPermissions } = vi.hoisted(() => ({
mockUseAsyncCheckPermissions: vi.fn(),
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: mockUseAsyncCheckPermissions,
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: mockUseAsyncCheckPermissions,
+ FGA_PERMISSIONS: { PROJECT: { API_GATEWAY_KEYS_SECRET_READ: 'api_gateway_keys_secret_read' } },
}))
// CopyButton writes via copyToClipboard from 'ui'. Stub just that export so we can
diff --git a/apps/studio/components/interfaces/APIKeys/ApiKeyPill.tsx b/apps/studio/components/interfaces/APIKeys/ApiKeyPill.tsx
index 0c903982bf5..dee56dd2c70 100644
--- a/apps/studio/components/interfaces/APIKeys/ApiKeyPill.tsx
+++ b/apps/studio/components/interfaces/APIKeys/ApiKeyPill.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { EyeIcon, EyeOffIcon } from 'lucide-react'
import { useEffect, useState } from 'react'
@@ -8,7 +7,7 @@ import { Button, cn, InputVariants, Tooltip, TooltipContent, TooltipTrigger } fr
import { useRevealedSecret } from './useRevealedSecret'
import CopyButton from '@/components/ui/CopyButton'
import { APIKeysData } from '@/data/api-keys/api-keys-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
export function ApiKeyPill({
apiKey,
@@ -20,10 +19,9 @@ export function ApiKeyPill({
const isSecret = apiKey.type === 'secret'
- const { can: canManageSecretKeys, isLoading: isLoadingPermission } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'service_api_keys'
- )
+ const { can: canManageSecretKeys, isLoading: isLoadingPermission } = useAsyncCheckPermissionsV2([
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_SECRET_READ,
+ ])
const {
data: revealedKey,
diff --git a/apps/studio/components/interfaces/APIKeys/PublishableAPIKeys.test.tsx b/apps/studio/components/interfaces/APIKeys/PublishableAPIKeys.test.tsx
index 0ad7a85a061..289e19dade6 100644
--- a/apps/studio/components/interfaces/APIKeys/PublishableAPIKeys.test.tsx
+++ b/apps/studio/components/interfaces/APIKeys/PublishableAPIKeys.test.tsx
@@ -35,8 +35,9 @@ vi.mock('@/data/api-keys/api-key-delete-mutation', () => ({
useAPIKeyDeleteMutation: mockUseAPIKeyDeleteMutation,
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: mockUseAsyncCheckPermissions,
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: mockUseAsyncCheckPermissions,
+ FGA_PERMISSIONS: { PROJECT: { API_GATEWAY_KEYS_READ: 'api_gateway_keys_read' } },
}))
vi.mock('./CreatePublishableAPIKeyDialog', () => ({
diff --git a/apps/studio/components/interfaces/APIKeys/PublishableAPIKeys.tsx b/apps/studio/components/interfaces/APIKeys/PublishableAPIKeys.tsx
index 0c4b3ecfb52..1c2f0b02ad3 100644
--- a/apps/studio/components/interfaces/APIKeys/PublishableAPIKeys.tsx
+++ b/apps/studio/components/interfaces/APIKeys/PublishableAPIKeys.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { IS_PLATFORM, useParams } from 'common'
import { parseAsString, useQueryState } from 'nuqs'
import { useEffect, useMemo } from 'react'
@@ -23,13 +22,12 @@ import { FormHeader } from '@/components/ui/Forms/FormHeader'
import { NoPermission } from '@/components/ui/NoPermission'
import { useAPIKeyDeleteMutation } from '@/data/api-keys/api-key-delete-mutation'
import { APIKeysData, useAPIKeysQuery } from '@/data/api-keys/api-keys-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
export const PublishableAPIKeys = () => {
const { ref: projectRef } = useParams()
- const { can: canReadAPIKeys, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(
- PermissionAction.SECRETS_READ,
- '*'
+ const { can: canReadAPIKeys, isLoading: isLoadingPermissions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ
)
const {
diff --git a/apps/studio/components/interfaces/APIKeys/SecretAPIKeys.tsx b/apps/studio/components/interfaces/APIKeys/SecretAPIKeys.tsx
index a863818bf62..9a8924adfae 100644
--- a/apps/studio/components/interfaces/APIKeys/SecretAPIKeys.tsx
+++ b/apps/studio/components/interfaces/APIKeys/SecretAPIKeys.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { IS_PLATFORM, useParams } from 'common'
import { parseAsString, useQueryState } from 'nuqs'
import { useEffect, useMemo } from 'react'
@@ -14,13 +13,12 @@ import { NoPermission } from '@/components/ui/NoPermission'
import { useAPIKeyDeleteMutation } from '@/data/api-keys/api-key-delete-mutation'
import type { APIKeysData } from '@/data/api-keys/api-keys-query'
import { useAPIKeysQuery } from '@/data/api-keys/api-keys-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
export const SecretAPIKeys = () => {
const { ref: projectRef } = useParams()
- const { can: canReadAPIKeys, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(
- PermissionAction.SECRETS_READ,
- '*'
+ const { can: canReadAPIKeys, isLoading: isLoadingPermissions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ
)
const {
diff --git a/apps/studio/components/interfaces/Account/AccessTokens/AccessToken.fixtures.ts b/apps/studio/components/interfaces/Account/AccessTokens/AccessToken.fixtures.ts
index 6946336fa94..6017d4c1415 100644
--- a/apps/studio/components/interfaces/Account/AccessTokens/AccessToken.fixtures.ts
+++ b/apps/studio/components/interfaces/Account/AccessTokens/AccessToken.fixtures.ts
@@ -3,76 +3,47 @@ import { HttpResponse } from 'msw'
import { createMockOrganizationResponse, createMockProject } from '@/tests/helpers'
import { addAPIMock } from '@/tests/lib/msw'
-import type { Permission } from '@/types'
/**
* Test-only fixtures for the scoped-access-token surfaces.
*
- * The permission-row builders mirror the shape of /platform/profile/permissions rows for each
- * base role, per the ABAC default_permissions seeds (platform: middleware-db). Roles inherit
- * lower roles' rows. Keep the rows in lockstep with ROLE_PROBES in AccessToken.roles.ts.
+ * The role builders mirror the shape of /platform/profile/permissions/v2 organization entries.
+ * Token role logic only reads `role` (org and project level), so `permissions` stays empty.
*/
-type AccessControlPermission = components['schemas']['AccessControlPermission']
type OrganizationResponse = components['schemas']['OrganizationResponse_Output']
type ProjectsResponse = components['schemas']['ListProjectsPaginatedResponse_Output']
type OrganizationProjectsResponse = components['schemas']['OrganizationProjectsResponse_Output']
type OrganizationProject = OrganizationProjectsResponse['projects'][number]
+type PermissionsV2Response = components['schemas']['UserPermissionsResponse_Output']
+export type PermissionOrgFixture = PermissionsV2Response['organizations'][number]
+type Role = PermissionOrgFixture['role']
-/** Satisfies both Studio's `Permission` type and the API's `AccessControlPermission` row shape. */
-export type PermissionRowFixture = Permission & {
- organization_id: number | null
- project_ids: number[] | null
-}
-
-export const permissionRow = (
- organization_slug: string,
- actions: string[],
- resources: string[],
- // Org-wide rows serialize as [] or null on the wire (nullable in the API contract; the
- // view-synthesized admin rows for auth.subject_roles/user_invites are null).
- project_refs: string[] | null = []
-): PermissionRowFixture => ({
- actions: actions as Permission['actions'],
- condition: null as unknown as Permission['condition'],
- organization_id: null,
- organization_slug,
- project_ids: null,
- resources,
- restrictive: false,
- project_refs,
-})
-
-export const memberRows = (slug: string, refs: string[] = []) => [
- permissionRow(slug, ['read:Read'], ['members', 'organizations', 'auth.subject_roles'], refs),
-]
+/**
+ * Org-wide role when `refs` is empty. With `refs`, the user only holds the role on those
+ * projects and is a plain org `member`.
+ */
+export const roleEntry = (slug: string, role: Role, refs: string[] = []): PermissionOrgFixture =>
+ refs.length === 0
+ ? { slug, role, permissions: [], projects: [] }
+ : {
+ slug,
+ role: 'member',
+ permissions: [],
+ projects: refs.map((ref) => ({ ref, role, permissions: [] })),
+ }
+export const memberRows = (slug: string, refs: string[] = []) => [roleEntry(slug, 'member', refs)]
export const readonlyRows = (slug: string, refs: string[] = []) => [
- ...memberRows(slug, refs),
- permissionRow(slug, ['analytics:Read', 'tenant:Sql:Read:Select'], ['%'], refs),
+ roleEntry(slug, 'readonly', refs),
]
-
export const developerRows = (slug: string, refs: string[] = []) => [
- ...readonlyRows(slug, refs),
- permissionRow(
- slug,
- ['functions:Write', 'tenant:Sql:Admin:Write', 'tenant:Sql:Query'],
- ['%'],
- refs
- ),
+ roleEntry(slug, 'developer', refs),
]
-
export const administratorRows = (slug: string, refs: string[] = []) => [
- ...developerRows(slug, refs),
- permissionRow(slug, ['write:Create', 'write:Update'], ['projects'], refs),
- permissionRow(slug, ['billing:Write', 'infra:Execute'], ['%'], refs),
-]
-
-export const ownerRows = (slug: string, refs: string[] = []) => [
- ...administratorRows(slug, refs),
- permissionRow(slug, ['write:Update'], ['organizations'], refs),
- permissionRow(slug, ['write:Create', 'write:Delete'], ['auth.subject_roles'], refs),
+ roleEntry(slug, 'administrator', refs),
]
+export const ownerRows = (slug: string, refs: string[] = []) => [roleEntry(slug, 'owner', refs)]
export const MOCK_ORG = { slug: 'acme-prod', name: 'Acme Production' }
export const MOCK_ORG_2 = { slug: 'acme-staging', name: 'Acme Staging' }
@@ -145,12 +116,9 @@ export const mockScopedTokenEnvironment = () => {
})
}
-export const mockPermissionsApi = (rows: PermissionRowFixture[]) =>
+export const mockPermissionsApi = (organizations: PermissionOrgFixture[]) =>
addAPIMock({
method: 'get',
- path: '/platform/profile/permissions',
- // Permission['condition'] (jsonLogic operator interfaces) has no index signature, so TS won't
- // match it against the API row's `{ [key: string]: unknown }` — the runtime shape is fine.
- response: () =>
- HttpResponse.json<AccessControlPermission[]>(rows as unknown as AccessControlPermission[]),
+ path: '/platform/profile/permissions/v2',
+ response: () => HttpResponse.json<PermissionsV2Response>({ organizations }),
})
diff --git a/apps/studio/components/interfaces/Account/AccessTokens/AccessToken.roles.test.ts b/apps/studio/components/interfaces/Account/AccessTokens/AccessToken.roles.test.ts
index e6011571470..04ee4805edf 100644
--- a/apps/studio/components/interfaces/Account/AccessTokens/AccessToken.roles.test.ts
+++ b/apps/studio/components/interfaces/Account/AccessTokens/AccessToken.roles.test.ts
@@ -1,31 +1,20 @@
import { permissions } from '@supabase/shared-types'
import { describe, expect, it } from 'vitest'
-import {
- administratorRows,
- developerRows,
- memberRows,
- ownerRows,
- readonlyRows,
- permissionRow as row,
-} from './AccessToken.fixtures'
import { getCatalogEntry, type PermissionSelection } from './AccessToken.permissions'
import {
applySelectionToRoleContext,
computeTokenRoleContext,
- estimateRoleLevel,
FGA_SCOPE_MINIMUM_ROLE,
getIsProjectScopedOnly,
+ getRoleLevel,
requiredRoleForEntry,
type TokenRoleContextArgs,
} from './AccessToken.roles'
+import type { PermissionsV2Data } from '@/data/permissions/permissions-query-v2'
type EvaluateTokenAccessArgs = TokenRoleContextArgs & { selection: PermissionSelection }
-/**
- * Composes the two production entry points the way a consumer should: resolve the (expensive)
- * role context once from its inputs, then apply the (cheap) selection to it on every change.
- */
const evaluateTokenAccess = ({ selection, ...contextArgs }: EvaluateTokenAccessArgs) =>
applySelectionToRoleContext(computeTokenRoleContext(contextArgs), selection)
@@ -34,6 +23,21 @@ const OTHER_ORG = { slug: 'globex' }
const PROJECT = { ref: 'abcdefghij1234567890', organization_slug: 'acme' }
const OTHER_PROJECT = { ref: 'klmnopqrst1234567890', organization_slug: 'acme' }
+const orgEntry = (
+ slug: string,
+ role: PermissionsV2Data['organizations'][number]['role'],
+ projects: { ref: string; role: PermissionsV2Data['organizations'][number]['role'] }[] = []
+): PermissionsV2Data['organizations'][number] => ({
+ slug,
+ role,
+ permissions: [],
+ projects: projects.map((p) => ({ ...p, permissions: [] })),
+})
+
+const v2 = (...organizations: PermissionsV2Data['organizations']): PermissionsV2Data => ({
+ organizations,
+})
+
const baseArgs: Omit<EvaluateTokenAccessArgs, 'permissions'> = {
selection: {},
resourceAccess: 'organization',
@@ -50,58 +54,55 @@ describe('FGA_SCOPE_MINIMUM_ROLE', () => {
.map((permission) => permission.id)
.sort()
const mappedIds = Object.keys(FGA_SCOPE_MINIMUM_ROLE).sort()
- // If this fails, a scope was added/removed upstream: re-transcribe the role unions from the
- // OpenFGA model (platform: openfga/model/supabase.fga) into FGA_SCOPE_MINIMUM_ROLE.
expect(mappedIds).toEqual(publishedIds)
})
})
-describe('estimateRoleLevel', () => {
- it('identifies each base role from its permission rows', () => {
- expect(estimateRoleLevel(ownerRows(ORG.slug), ORG.slug)).toBe('owner')
- expect(estimateRoleLevel(administratorRows(ORG.slug), ORG.slug)).toBe('administrator')
- expect(estimateRoleLevel(developerRows(ORG.slug), ORG.slug)).toBe('developer')
- expect(estimateRoleLevel(readonlyRows(ORG.slug), ORG.slug)).toBe('readonly')
- expect(estimateRoleLevel(memberRows(ORG.slug), ORG.slug)).toBe('member')
- expect(estimateRoleLevel([], ORG.slug)).toBe('none')
+describe('getRoleLevel', () => {
+ it('reads each base role from the v2 response', () => {
+ expect(getRoleLevel(v2(orgEntry(ORG.slug, 'owner')), ORG.slug)).toBe('owner')
+ expect(getRoleLevel(v2(orgEntry(ORG.slug, 'administrator')), ORG.slug)).toBe('administrator')
+ expect(getRoleLevel(v2(orgEntry(ORG.slug, 'developer')), ORG.slug)).toBe('developer')
+ expect(getRoleLevel(v2(orgEntry(ORG.slug, 'readonly')), ORG.slug)).toBe('readonly')
+ expect(getRoleLevel(v2(orgEntry(ORG.slug, 'member')), ORG.slug)).toBe('member')
+ expect(getRoleLevel(v2(), ORG.slug)).toBe('none')
})
- it('scopes the estimate to the queried organization', () => {
- const rows = [...ownerRows(ORG.slug), ...readonlyRows(OTHER_ORG.slug)]
- expect(estimateRoleLevel(rows, ORG.slug)).toBe('owner')
- expect(estimateRoleLevel(rows, OTHER_ORG.slug)).toBe('readonly')
+ it('scopes the role to the queried organization', () => {
+ const data = v2(orgEntry(ORG.slug, 'owner'), orgEntry(OTHER_ORG.slug, 'readonly'))
+ expect(getRoleLevel(data, ORG.slug)).toBe('owner')
+ expect(getRoleLevel(data, OTHER_ORG.slug)).toBe('readonly')
})
it('resolves project-scoped roles only for their projects', () => {
- const rows = developerRows(ORG.slug, [PROJECT.ref])
- expect(estimateRoleLevel(rows, ORG.slug, PROJECT.ref)).toBe('developer')
- // Org-level (no project) the same user is only a member.
- expect(estimateRoleLevel(rows, ORG.slug)).toBe('member')
+ const data = v2(orgEntry(ORG.slug, 'member', [{ ref: PROJECT.ref, role: 'developer' }]))
+ expect(getRoleLevel(data, ORG.slug, PROJECT.ref)).toBe('developer')
+ expect(getRoleLevel(data, ORG.slug, OTHER_PROJECT.ref)).toBe('member')
+ expect(getRoleLevel(data, ORG.slug)).toBe('member')
+ })
+
+ it('takes the max of org and project role (additive semantics)', () => {
+ const data = v2(orgEntry(ORG.slug, 'developer', [{ ref: PROJECT.ref, role: 'readonly' }]))
+ expect(getRoleLevel(data, ORG.slug, PROJECT.ref)).toBe('developer')
})
})
describe('project-scoped membership helpers', () => {
it('detects project-scoped-only membership', () => {
- expect(getIsProjectScopedOnly(developerRows(ORG.slug, [PROJECT.ref]), ORG.slug)).toBe(true)
- expect(getIsProjectScopedOnly(developerRows(ORG.slug), ORG.slug)).toBe(false)
- expect(getIsProjectScopedOnly([], ORG.slug)).toBe(false)
- })
-
- it('treats project_refs: null rows as org-wide, in any row order', () => {
- // The real /platform/profile/permissions response serializes the view-synthesized
- // Administrator/Owner rows (auth.subject_roles, user_invites) with project_refs: null, and
- // the response carries no ordering guarantee.
- const nullRow = row(ORG.slug, ['write:Create', 'write:Delete'], ['auth.subject_roles'])
- nullRow.project_refs = null
-
- expect(getIsProjectScopedOnly([nullRow, ...administratorRows(ORG.slug)], ORG.slug)).toBe(false)
- expect(getIsProjectScopedOnly([...administratorRows(ORG.slug), nullRow], ORG.slug)).toBe(false)
- // A lone null row is org-wide too, not project-scoped.
- expect(getIsProjectScopedOnly([nullRow], ORG.slug)).toBe(false)
+ expect(
+ getIsProjectScopedOnly(
+ v2(orgEntry(ORG.slug, 'member', [{ ref: PROJECT.ref, role: 'developer' }])),
+ ORG.slug
+ )
+ ).toBe(true)
+ expect(getIsProjectScopedOnly(v2(orgEntry(ORG.slug, 'developer')), ORG.slug)).toBe(false)
+ expect(getIsProjectScopedOnly(v2(orgEntry(ORG.slug, 'member')), ORG.slug)).toBe(false)
+ expect(getIsProjectScopedOnly(v2(), ORG.slug)).toBe(false)
})
})
describe('requiredRoleForEntry', () => {
+ // unchanged -- role table, not permission rows
it('maps read and readwrite modes to the FGA role unions', () => {
const database = getCatalogEntry('project:database')!
expect(requiredRoleForEntry(database, 'read')).toBe('readonly')
@@ -116,7 +117,6 @@ describe('requiredRoleForEntry', () => {
})
it('takes the strictest scope when readwrite spans multiple write scopes', () => {
- // branching_production_write is developer, but create/delete require administrator.
const branching = getCatalogEntry('project:branching_production')!
expect(requiredRoleForEntry(branching, 'readwrite')).toBe('administrator')
})
@@ -142,24 +142,24 @@ describe('evaluateTokenAccess', () => {
}
const expected = { 'project:database': 'readwrite' }
- // Unknown path (permissions still loading)
expect(
evaluateTokenAccess({ ...baseArgs, selection, permissions: undefined }).effectiveSelection
).toEqual(expected)
- // Account path (selection tracks the owner by definition)
expect(
evaluateTokenAccess({
...baseArgs,
selection,
resourceAccess: 'account',
organizationSlugs: [],
- permissions: ownerRows(ORG.slug),
+ permissions: v2(orgEntry(ORG.slug, 'owner')),
}).effectiveSelection
).toEqual(expected)
- // Evaluated path
expect(
- evaluateTokenAccess({ ...baseArgs, selection, permissions: ownerRows(ORG.slug) })
- .effectiveSelection
+ evaluateTokenAccess({
+ ...baseArgs,
+ selection,
+ permissions: v2(orgEntry(ORG.slug, 'owner')),
+ }).effectiveSelection
).toEqual(expected)
})
@@ -167,7 +167,7 @@ describe('evaluateTokenAccess', () => {
const result = evaluateTokenAccess({
...baseArgs,
selection: { 'project:database': 'readwrite', 'organization:members': 'readwrite' },
- permissions: administratorRows(ORG.slug),
+ permissions: v2(orgEntry(ORG.slug, 'administrator')),
})
expect(result.status).toBe('evaluated')
expect(result.exceedingEntryKeys).toEqual([])
@@ -181,10 +181,10 @@ describe('evaluateTokenAccess', () => {
const result = evaluateTokenAccess({
...baseArgs,
selection: {
- 'project:database': 'readwrite', // requires developer
- 'project:advisors': 'read', // requires readonly
+ 'project:database': 'readwrite',
+ 'project:advisors': 'read',
},
- permissions: readonlyRows(ORG.slug),
+ permissions: v2(orgEntry(ORG.slug, 'readonly')),
})
expect(result.exceedingEntryKeys).toEqual(['project:database'])
expect(result.entries['project:database']).toMatchObject({
@@ -201,8 +201,8 @@ describe('evaluateTokenAccess', () => {
it('drops entries whose read mode already exceeds the role', () => {
const result = evaluateTokenAccess({
...baseArgs,
- selection: { 'project:api_gateway_keys': 'read' }, // read requires developer
- permissions: readonlyRows(ORG.slug),
+ selection: { 'project:api_gateway_keys': 'read' },
+ permissions: v2(orgEntry(ORG.slug, 'readonly')),
})
expect(result.entries['project:api_gateway_keys']).toMatchObject({
status: 'exceeds-role',
@@ -216,10 +216,9 @@ describe('evaluateTokenAccess', () => {
...baseArgs,
organizationSlugs: [ORG.slug, OTHER_ORG.slug],
selection: { 'project:database': 'readwrite' },
- permissions: [...ownerRows(ORG.slug), ...readonlyRows(OTHER_ORG.slug)],
+ permissions: v2(orgEntry(ORG.slug, 'owner'), orgEntry(OTHER_ORG.slug, 'readonly')),
})
expect(result.exceedingEntryKeys).toEqual(['project:database'])
- // Only the org where the role is insufficient is called out.
expect(result.entries['project:database'].failingResources).toEqual([
{
type: 'organization',
@@ -237,12 +236,9 @@ describe('evaluateTokenAccess', () => {
resourceAccess: 'project',
projectRefs: [PROJECT.ref],
selection: { 'project:database': 'readwrite', 'organization:members': 'read' },
- permissions: developerRows(ORG.slug, [PROJECT.ref]),
+ permissions: v2(orgEntry(ORG.slug, 'member', [{ ref: PROJECT.ref, role: 'developer' }])),
})
- // Developer on the bound project: database readwrite is fine.
expect(result.entries['project:database'].status).toBe('ok')
- // Org-level scopes can never be exercised through a project-scoped token — platform rejects
- // them outright regardless of the owner's role, so no role evaluation applies.
expect(result.entries['organization:members'].status).toBe('unavailable-for-scope')
expect(result.entries['organization:members'].effectiveMode).toBe('none')
expect(result.entries['organization:members'].failingResources).toEqual([])
@@ -252,13 +248,10 @@ describe('evaluateTokenAccess', () => {
})
it('honors project-scoped roles for project entries on organization-scoped tokens', () => {
- // An org member invited as Developer to one project: platform checks the owner's permission
- // against the project object, so an org-bound token really can database_write there. Only the
- // projects where the role is insufficient may be reported as failing.
const result = evaluateTokenAccess({
...baseArgs,
selection: { 'project:database': 'readwrite' },
- permissions: developerRows(ORG.slug, [PROJECT.ref]),
+ permissions: v2(orgEntry(ORG.slug, 'member', [{ ref: PROJECT.ref, role: 'developer' }])),
organizations: [ORG],
projects: [PROJECT, OTHER_PROJECT],
})
@@ -267,11 +260,15 @@ describe('evaluateTokenAccess', () => {
{ type: 'project', id: OTHER_PROJECT.ref, label: OTHER_PROJECT.ref, role: 'member' },
])
- // Developer on every project of the org: nothing fails, despite the org role being member.
const allProjects = evaluateTokenAccess({
...baseArgs,
selection: { 'project:database': 'readwrite' },
- permissions: developerRows(ORG.slug, [PROJECT.ref, OTHER_PROJECT.ref]),
+ permissions: v2(
+ orgEntry(ORG.slug, 'member', [
+ { ref: PROJECT.ref, role: 'developer' },
+ { ref: OTHER_PROJECT.ref, role: 'developer' },
+ ])
+ ),
organizations: [ORG],
projects: [PROJECT, OTHER_PROJECT],
})
@@ -283,7 +280,7 @@ describe('evaluateTokenAccess', () => {
const result = evaluateTokenAccess({
...baseArgs,
selection: { 'project:database': 'readwrite' },
- permissions: readonlyRows(ORG.slug),
+ permissions: v2(orgEntry(ORG.slug, 'readonly')),
organizations: [ORG],
projects: [],
})
@@ -300,31 +297,24 @@ describe('evaluateTokenAccess', () => {
})
it('marks org-level entries unavailable on project-scoped tokens even for org owners', () => {
- // Platform's getChecks throws for project-scoped tokens on organization endpoints before
- // any FGA evaluation, so even an org owner's project token can never call them.
const result = evaluateTokenAccess({
...baseArgs,
resourceAccess: 'project',
projectRefs: [PROJECT.ref],
selection: { 'organization:members': 'readwrite', 'user:organizations': 'read' },
- permissions: ownerRows(ORG.slug),
+ permissions: v2(orgEntry(ORG.slug, 'owner')),
})
expect(result.entries['organization:members'].status).toBe('unavailable-for-scope')
- // User-level scopes are granted by the token grant alone (token -> scope tuple checks), so
- // they stay exercisable for any resource binding.
expect(result.entries['user:organizations'].status).toBe('ok')
expect(result.effectiveSelection).toEqual({ 'user:organizations': 'read' })
})
it('explains org-level failures for members invited only to a project', () => {
- // Read-only on one project, selecting Organization Settings read-write (requires Owner) on
- // an organization-scoped token — the failure carries their real per-project role so the UI
- // can explain the distinction.
const result = evaluateTokenAccess({
...baseArgs,
resourceAccess: 'organization',
selection: { 'organization:admin': 'readwrite' },
- permissions: readonlyRows(ORG.slug, [PROJECT.ref]),
+ permissions: v2(orgEntry(ORG.slug, 'member', [{ ref: PROJECT.ref, role: 'readonly' }])),
organizations: [{ ...ORG, name: 'Acme Corp' }],
projects: [{ ...PROJECT, name: 'Acme production' }],
})
@@ -343,33 +333,11 @@ describe('evaluateTokenAccess', () => {
})
})
- it('attaches project-scoped detail even when stray org-level rows exist', () => {
- // Real permissions data can include org-level rows (e.g. restrictive rules) alongside a
- // project-scoped role; the per-project detail must still resolve.
- const strayOrgRow = row(ORG.slug, ['read:Read'], ['notifications'])
- const result = evaluateTokenAccess({
- ...baseArgs,
- resourceAccess: 'organization',
- selection: { 'organization:admin': 'readwrite' },
- permissions: [...readonlyRows(ORG.slug, [PROJECT.ref]), strayOrgRow],
- projects: [{ ...PROJECT, name: 'Acme production' }],
- })
- expect(result.entries['organization:admin'].failingResources).toEqual([
- {
- type: 'organization',
- id: ORG.slug,
- label: ORG.slug,
- role: 'member',
- projectScopedRoles: [{ label: 'Acme production', role: 'readonly' }],
- },
- ])
- })
-
it('does not attach project-scoped detail for organization-wide members', () => {
const result = evaluateTokenAccess({
...baseArgs,
selection: { 'organization:admin': 'readwrite' },
- permissions: developerRows(ORG.slug),
+ permissions: v2(orgEntry(ORG.slug, 'developer')),
})
expect(result.entries['organization:admin'].failingResources).toEqual([
{
@@ -388,7 +356,7 @@ describe('evaluateTokenAccess', () => {
resourceAccess: 'project',
projectRefs: [PROJECT.ref],
selection: { 'project:database': 'readwrite' },
- permissions: readonlyRows(ORG.slug),
+ permissions: v2(orgEntry(ORG.slug, 'readonly')),
projects: [{ ...PROJECT, name: 'Acme production' }],
})
expect(result.entries['project:database'].failingResources).toEqual([
@@ -401,7 +369,7 @@ describe('evaluateTokenAccess', () => {
...baseArgs,
organizationSlugs: ['departed-org'],
selection: { 'project:database': 'read' },
- permissions: readonlyRows(ORG.slug),
+ permissions: v2(orgEntry(ORG.slug, 'readonly')),
organizations: [ORG],
})
expect(result.inaccessibleOrgSlugs).toEqual(['departed-org'])
@@ -415,7 +383,7 @@ describe('evaluateTokenAccess', () => {
resourceAccess: 'project',
projectRefs: [PROJECT.ref, 'gone-project-ref-123'],
selection: { 'project:database': 'read' },
- permissions: readonlyRows(ORG.slug),
+ permissions: v2(orgEntry(ORG.slug, 'readonly')),
})
expect(result.inaccessibleProjectRefs).toEqual(['gone-project-ref-123'])
expect(result.hasNoAccessibleResource).toBe(false)
@@ -429,7 +397,7 @@ describe('evaluateTokenAccess', () => {
organizationSlugs: [ORG.slug],
projectRefs: [],
selection: { 'project:database': 'readwrite' },
- permissions: readonlyRows(ORG.slug),
+ permissions: v2(orgEntry(ORG.slug, 'readonly')),
})
expect(result.status).toBe('unknown')
expect(result.exceedingEntryKeys).toEqual([])
@@ -441,7 +409,7 @@ describe('evaluateTokenAccess', () => {
resourceAccess: 'account',
organizationSlugs: [],
selection: { 'project:database': 'readwrite' },
- permissions: memberRows(ORG.slug),
+ permissions: v2(orgEntry(ORG.slug, 'member')),
})
expect(result.exceedingEntryKeys).toEqual([])
expect(result.entries['project:database'].status).toBe('ok')
diff --git a/apps/studio/components/interfaces/Account/AccessTokens/AccessToken.roles.ts b/apps/studio/components/interfaces/Account/AccessTokens/AccessToken.roles.ts
index 3af91a727ef..7a52082e4cf 100644
--- a/apps/studio/components/interfaces/Account/AccessTokens/AccessToken.roles.ts
+++ b/apps/studio/components/interfaces/Account/AccessTokens/AccessToken.roles.ts
@@ -1,5 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
-
import type {
PermissionCatalogEntry,
PermissionMode,
@@ -7,8 +5,7 @@ import type {
ResourceAccessMode,
} from './AccessToken.permissions'
import { getCatalogEntry, getEntryScopes } from './AccessToken.permissions'
-import { doPermissionsCheck } from '@/hooks/misc/useCheckPermissions'
-import type { Permission } from '@/types'
+import { PermissionsV2Data } from '@/data/permissions/permissions-query-v2'
/**
* Client-side estimation of what a scoped token can actually do, given its owner's current role.
@@ -77,6 +74,11 @@ export const FGA_SCOPE_MINIMUM_ROLE: Record<string, TokenRoleLevel> = {
// organization
organization_admin_read: 'member',
organization_admin_write: 'owner',
+ organization_config_read: 'administrator',
+ organization_config_write: 'administrator',
+ audit_logs_read: 'administrator',
+ billing_read: 'administrator',
+ billing_write: 'administrator',
organization_projects_read: 'member',
organization_projects_create: 'administrator',
members_read: 'readonly',
@@ -99,6 +101,10 @@ export const FGA_SCOPE_MINIMUM_ROLE: Record<string, TokenRoleLevel> = {
api_gateway_keys_write: 'administrator',
auth_config_read: 'readonly',
auth_config_write: 'developer',
+ auth_hooks_read: 'readonly',
+ auth_hooks_write: 'developer',
+ auth_users_read: 'readonly',
+ auth_users_write: 'developer',
auth_signing_keys_read: 'developer',
auth_signing_keys_write: 'developer',
backups_read: 'readonly',
@@ -146,6 +152,7 @@ export const FGA_SCOPE_MINIMUM_ROLE: Record<string, TokenRoleLevel> = {
infra_disk_config_write: 'administrator',
infra_read_replicas_read: 'readonly',
infra_read_replicas_write: 'administrator',
+ project_operations_write: 'developer',
project_notebooks_read: 'readonly',
project_notebooks_write: 'developer',
project_snippets_read: 'readonly',
@@ -165,62 +172,34 @@ export const FGA_SCOPE_MINIMUM_ROLE: Record<string, TokenRoleLevel> = {
}
/**
- * ABAC checks that identify the user's base role from their own permission rows (the ungated
- * /platform/profile/permissions response). Base roles inherit each other's rows
- * (Owner ⊃ Administrator ⊃ Developer ⊃ Read-only), so the first probe that passes, walking
- * top-down, is the user's level. Each probe is a permission only that role and above holds.
- */
-const ROLE_PROBES: { role: TokenRoleLevel; action: string; resource: string }[] = [
- { role: 'owner', action: PermissionAction.UPDATE, resource: 'organizations' },
- { role: 'administrator', action: PermissionAction.CREATE, resource: 'projects' },
- { role: 'developer', action: PermissionAction.FUNCTIONS_WRITE, resource: 'functions' },
- { role: 'readonly', action: PermissionAction.TENANT_SQL_SELECT, resource: 'sql' },
-]
-
-/**
- * Estimates the user's base role in an organization (or on a specific project, when the user's
- * access is project-scoped). Custom roles resolve to the nearest base role by capability, which
- * matches how they behave in the FGA model.
+ * The user's base role in an organization, or on a specific project. Read directly
+ * from the v2 permissions response (which reports FGA role tuples).
+ * Project entries are additive on top of the org-level role, so the project-level answer is the max of both.
*/
-export const estimateRoleLevel = (
- permissions: Permission[],
+export const getRoleLevel = (
+ data: PermissionsV2Data,
organizationSlug: string,
projectRef?: string
): TokenRoleLevel => {
- for (const probe of ROLE_PROBES) {
- if (
- doPermissionsCheck(
- permissions,
- probe.action,
- probe.resource,
- undefined,
- organizationSlug,
- projectRef
- )
- ) {
- return probe.role
- }
- }
- const isMember = permissions.some(
- (permission) => permission.organization_slug === organizationSlug
- )
- return isMember ? 'member' : 'none'
+ const org = data.organizations.find((o) => o.slug === organizationSlug)
+ if (!org) return 'none'
+
+ // project-scoped users hold the org-level 'member' role; null only on malformed data
+ const orgRole: TokenRoleLevel = org.role ?? 'member'
+ if (!projectRef) return orgRole
+
+ const projectRole = org.projects.find((p) => p.ref === projectRef)?.role
+ return projectRole ? maxRole(orgRole, projectRole) : orgRole
}
-/**
- * True when every permission row the user holds in the org is limited to specific projects.
- * Org-wide rows arrive as [] or null (the API contract is nullable) — both mean not scoped.
- */
+/** True when the user's access in the org is only through project scoped roles. */
export const getIsProjectScopedOnly = (
- permissions: Permission[],
+ data: PermissionsV2Data,
organizationSlug: string
): boolean => {
- const orgRows = permissions.filter(
- (permission) => permission.organization_slug === organizationSlug
- )
- if (orgRows.length === 0) return false
- return orgRows.every(
- (permission) => Array.isArray(permission.project_refs) && permission.project_refs.length > 0
+ const org = data.organizations.find((o) => o.slug === organizationSlug)
+ return (
+ org !== undefined && (org.role === null || org.role === 'member') && org.projects.length > 0
)
}
@@ -306,7 +285,7 @@ export interface TokenRoleContextArgs {
/** Token-bound project refs (project mode). */
projectRefs: string[]
/** The user's own ABAC permission rows; undefined while loading. */
- permissions: Permission[] | undefined
+ permissions: PermissionsV2Data | undefined
/** Organizations the user can currently access. */
organizations: { slug: string; name?: string }[]
/** Projects the user can currently access. */
@@ -413,7 +392,7 @@ export const computeTokenRoleContext = ({
const cacheKey = `${slug}|${ref ?? ''}`
const cached = roleCache.get(cacheKey)
if (cached !== undefined) return cached
- const role = estimateRoleLevel(permissions, slug, ref)
+ const role = getRoleLevel(permissions, slug, ref)
roleCache.set(cacheKey, role)
return role
}
@@ -436,14 +415,19 @@ export const computeTokenRoleContext = ({
orgRole: TokenRoleLevel
): FailingResource['projectScopedRoles'] => {
if (rankOf(orgRole) >= ROLE_RANK.readonly) return undefined
- const candidates =
+ const org = permissions.organizations.find((o) => o.slug === slug)
+ if (!org) return undefined
+
+ const boundRefs =
resourceAccess === 'project'
- ? accessibleProjects.filter((project) => project.organization_slug === slug)
- : projects.filter((project) => project.organization_slug === slug)
- const roles = candidates.flatMap((project) => {
- const role = roleFor(slug, project.ref)
- if (rankOf(role) < ROLE_RANK.readonly) return []
- return [{ label: project.name ?? project.ref, role }]
+ ? new Set(accessibleProjects.map((project) => project.ref))
+ : undefined
+
+ const roles = org.projects.flatMap((entry) => {
+ if (boundRefs && !boundRefs.has(entry.ref)) return []
+ if (rankOf(entry.role) < ROLE_RANK.readonly) return []
+ const project = projectsByRef.get(entry.ref)
+ return [{ label: project?.name ?? entry.ref, role: entry.role }]
})
return roles.length > 0 ? roles : undefined
}
diff --git a/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/ResourceAccessStep.tsx b/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/ResourceAccessStep.tsx
index 05cad762ff3..37799ec2280 100644
--- a/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/ResourceAccessStep.tsx
+++ b/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/ResourceAccessStep.tsx
@@ -28,7 +28,7 @@ import { getIsProjectScopedOnly } from '../../AccessToken.roles'
import type { TokenFormValues } from './NewScopedTokenForm.utils'
import { InlineLinkClassName } from '@/components/ui/InlineLink'
import { useOrganizationsQuery } from '@/data/organizations/organizations-query'
-import { usePermissionsQuery } from '@/data/permissions/permissions-query'
+import { usePermissionsQueryV2 } from '@/data/permissions/permissions-query-v2'
import {
OrgProject,
OrgProjectsResponse,
@@ -111,7 +111,7 @@ export const ResourceAccessStep = ({
// org-wide token. Skipped while permissions are still loading so nothing gets disabled by
// mistake. The project list itself needs no permission filter — the org projects endpoint is
// already scoped server-side to what the user can access.
- const { data: permissions } = usePermissionsQuery()
+ const { data: permissions } = usePermissionsQueryV2()
const projectScopedOrgSlugs = useMemo(() => {
if (permissions === undefined) return new Set<string>()
return new Set(
diff --git a/apps/studio/components/interfaces/Account/AccessTokens/hooks/useTokenAccessEvaluation.ts b/apps/studio/components/interfaces/Account/AccessTokens/hooks/useTokenAccessEvaluation.ts
index 4d18186d5bc..a9621c52f8f 100644
--- a/apps/studio/components/interfaces/Account/AccessTokens/hooks/useTokenAccessEvaluation.ts
+++ b/apps/studio/components/interfaces/Account/AccessTokens/hooks/useTokenAccessEvaluation.ts
@@ -7,7 +7,7 @@ import {
type TokenAccessEvaluation,
} from '../AccessToken.roles'
import { useOrgAndProjectData } from './useOrgAndProjectData'
-import { usePermissionsQuery } from '@/data/permissions/permissions-query'
+import { usePermissionsQueryV2 } from '@/data/permissions/permissions-query-v2'
interface UseTokenAccessEvaluationArgs {
selection: PermissionSelection
@@ -33,7 +33,7 @@ export const useTokenAccessEvaluation = ({
projectRefs,
enabled = true,
}: UseTokenAccessEvaluationArgs): TokenAccessEvaluation => {
- const { data: permissions } = usePermissionsQuery({ enabled })
+ const { data: permissions } = usePermissionsQueryV2({ enabled })
const { organizations, projects, isLoadingOrgs, isLoadingProjects } = useOrgAndProjectData({
enabled,
})
diff --git a/apps/studio/components/interfaces/App/CommandMenu/ApiKeys.test.tsx b/apps/studio/components/interfaces/App/CommandMenu/ApiKeys.test.tsx
index 24ead7407b6..631f1470775 100644
--- a/apps/studio/components/interfaces/App/CommandMenu/ApiKeys.test.tsx
+++ b/apps/studio/components/interfaces/App/CommandMenu/ApiKeys.test.tsx
@@ -19,8 +19,9 @@ const { mockUseAsyncCheckPermissions, mockUseHighAvailability, mockUseSelectedPr
mockUseSelectedProjectQuery: vi.fn(),
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: mockUseAsyncCheckPermissions,
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: mockUseAsyncCheckPermissions,
+ FGA_PERMISSIONS: { PROJECT: { API_GATEWAY_KEYS_READ: 'api_gateway_keys_read' } },
}))
vi.mock('@/hooks/misc/useHighAvailability', () => ({
@@ -80,7 +81,7 @@ async function renderCommandPage() {
describe('useApiKeysCommands', () => {
beforeEach(() => {
- mockUseAsyncCheckPermissions.mockReturnValue({ can: true })
+ mockUseAsyncCheckPermissions.mockReturnValue({ can: true, isLoading: false })
mockUseSelectedProjectQuery.mockReturnValue({
data: { id: 1, ref: 'default', name: 'default' },
})
diff --git a/apps/studio/components/interfaces/App/CommandMenu/ApiKeys.tsx b/apps/studio/components/interfaces/App/CommandMenu/ApiKeys.tsx
index 182f9a13145..1c57df23f40 100644
--- a/apps/studio/components/interfaces/App/CommandMenu/ApiKeys.tsx
+++ b/apps/studio/components/interfaces/App/CommandMenu/ApiKeys.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { KeyIcon } from 'lucide-react'
import { useMemo } from 'react'
import { toast } from 'sonner'
@@ -16,7 +15,7 @@ import {
import { COMMAND_MENU_SECTIONS } from './CommandMenu.utils'
import { orderCommandSectionsByPriority } from './ordering'
import { useAPIKeys } from '@/data/api-keys/api-keys-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useHighAvailability } from '@/hooks/misc/useHighAvailability'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
@@ -30,7 +29,9 @@ export function useApiKeysCommands() {
const { data: project } = useSelectedProjectQuery()
const ref = project?.ref || '_'
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ
+ )
const { isHighAvailability } = useHighAvailability()
const { data: apiKeysData } = useAPIKeys(
diff --git a/apps/studio/components/interfaces/App/IndirectTaxDeclarationModal.tsx b/apps/studio/components/interfaces/App/IndirectTaxDeclarationModal.tsx
index b18f9556fb9..fa058035211 100644
--- a/apps/studio/components/interfaces/App/IndirectTaxDeclarationModal.tsx
+++ b/apps/studio/components/interfaces/App/IndirectTaxDeclarationModal.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { parseAsBoolean, useQueryState } from 'nuqs'
import { useEffect, useState } from 'react'
import { toast } from 'sonner'
@@ -18,7 +17,7 @@ import {
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { useOrganizationCustomerProfileUpdateMutation } from '@/data/organizations/organization-customer-profile-update-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { IS_PLATFORM } from '@/lib/constants'
@@ -40,9 +39,8 @@ export const IndirectTaxDeclarationModal = () => {
setResponse('')
}, [organization?.slug])
- const { can: canUpdateBillingInfo, isSuccess: permissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.BILLING_WRITE,
- 'stripe.customer'
+ const { can: canUpdateBillingInfo, isSuccess: permissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_WRITE
)
const { mutate: updateCustomerProfile, isPending } = useOrganizationCustomerProfileUpdateMutation(
diff --git a/apps/studio/components/interfaces/Auth/AuditLogsForm.tsx b/apps/studio/components/interfaces/Auth/AuditLogsForm.tsx
index afd5feea018..42c01be13e2 100644
--- a/apps/studio/components/interfaces/Auth/AuditLogsForm.tsx
+++ b/apps/studio/components/interfaces/Auth/AuditLogsForm.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useFlag, useParams } from 'common'
import { useEffect } from 'react'
import { useForm, useWatch } from 'react-hook-form'
@@ -24,7 +23,7 @@ import { useAuthConfigUpdateMutation } from '@/data/auth/auth-config-update-muta
import { pickLogsQueryBuilder } from '@/data/logs/logs-endpoint'
import { safeSql } from '@/data/logs/safe-analytics-sql'
import { useTablesQuery } from '@/data/tables/tables-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
const schema = z.object({
@@ -64,9 +63,8 @@ export const AuditLogsForm = () => {
)
const authAuditLogsUrl = `/project/${projectRef}/logs/explorer?q=${encodeURIComponent(authAuditLogsQuery)}`
- const { can: canUpdateConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'custom_config_gotrue'
+ const { can: canUpdateConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_WRITE
)
const { data: tables = [] } = useTablesQuery({
diff --git a/apps/studio/components/interfaces/Auth/AuthProvidersForm/ProviderForm.tsx b/apps/studio/components/interfaces/Auth/AuthProvidersForm/ProviderForm.tsx
index e3740d6e7e6..d568c6ac245 100644
--- a/apps/studio/components/interfaces/Auth/AuthProvidersForm/ProviderForm.tsx
+++ b/apps/studio/components/interfaces/Auth/AuthProvidersForm/ProviderForm.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { useTheme } from 'next-themes'
import { useQueryState } from 'nuqs'
@@ -34,7 +33,7 @@ import type { components } from '@/data/api'
import { useAuthConfigUpdateMutation } from '@/data/auth/auth-config-update-mutation'
import { useProjectApiUrl } from '@/data/config/project-endpoint-query'
import { useHasEntitlementAccess } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { BASE_PATH } from '@/lib/constants'
@@ -57,9 +56,8 @@ export const ProviderForm = ({ config, provider, isActive }: ProviderFormProps)
const { data: endpoint } = useProjectApiUrl({ projectRef })
- const { can: canUpdateConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'custom_config_gotrue'
+ const { can: canUpdateConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_WRITE
)
const shouldDisableField = (field: string): boolean => {
diff --git a/apps/studio/components/interfaces/Auth/BasicAuthSettingsForm.tsx b/apps/studio/components/interfaces/Auth/BasicAuthSettingsForm.tsx
index ccacf338ba7..63745354b7f 100644
--- a/apps/studio/components/interfaces/Auth/BasicAuthSettingsForm.tsx
+++ b/apps/studio/components/interfaces/Auth/BasicAuthSettingsForm.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { ExternalLinkIcon } from 'lucide-react'
import Link from 'next/link'
@@ -37,7 +36,7 @@ import { InlineLink } from '@/components/ui/InlineLink'
import { NoPermission } from '@/components/ui/NoPermission'
import { useAuthConfigQuery } from '@/data/auth/auth-config-query'
import { useAuthConfigUpdateMutation } from '@/data/auth/auth-config-update-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { DOCS_URL } from '@/lib/constants'
@@ -62,13 +61,11 @@ export const BasicAuthSettingsForm = () => {
} = useAuthConfigQuery({ projectRef })
const { mutate: updateAuthConfig, isPending: isUpdatingConfig } = useAuthConfigUpdateMutation()
- const { can: canReadConfig, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'custom_config_gotrue'
+ const { can: canReadConfig, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_READ
)
- const { can: canUpdateConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'custom_config_gotrue'
+ const { can: canUpdateConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_WRITE
)
const form = useForm({
diff --git a/apps/studio/components/interfaces/Auth/EmailTemplates/EmailTemplates.tsx b/apps/studio/components/interfaces/Auth/EmailTemplates/EmailTemplates.tsx
index b88904b5802..27acd0f280e 100644
--- a/apps/studio/components/interfaces/Auth/EmailTemplates/EmailTemplates.tsx
+++ b/apps/studio/components/interfaces/Auth/EmailTemplates/EmailTemplates.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { ChevronRightIcon } from 'lucide-react'
import Link from 'next/link'
@@ -31,7 +30,7 @@ import { AlertError } from '@/components/ui/AlertError'
import { InlineLink } from '@/components/ui/InlineLink'
import { useAuthConfigQuery } from '@/data/auth/auth-config-query'
import { useAuthConfigUpdateMutation } from '@/data/auth/auth-config-update-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL } from '@/lib/constants'
@@ -57,9 +56,8 @@ export const EmailTemplates = () => {
const { data: selectedOrganization } = useSelectedOrganizationQuery()
const { data: selectedProject } = useSelectedProjectQuery()
- const { can: canUpdateConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'custom_config_gotrue'
+ const { can: canUpdateConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_WRITE
)
const {
diff --git a/apps/studio/components/interfaces/Auth/EmailTemplates/ResetTemplateDialog.tsx b/apps/studio/components/interfaces/Auth/EmailTemplates/ResetTemplateDialog.tsx
index a82e493a6f1..d70b2617890 100644
--- a/apps/studio/components/interfaces/Auth/EmailTemplates/ResetTemplateDialog.tsx
+++ b/apps/studio/components/interfaces/Auth/EmailTemplates/ResetTemplateDialog.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { useState } from 'react'
import { toast } from 'sonner'
@@ -21,7 +20,7 @@ import { type AuthTemplate } from './EmailTemplates.types'
import { getAuthTemplateType } from './EmailTemplates.utils'
import { AuthConfigResponse } from '@/data/auth/auth-config-query'
import { useAuthTemplateResetMutation } from '@/data/auth/auth-template-reset-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
export const ResetTemplateDialog = ({
template,
@@ -35,9 +34,8 @@ export const ResetTemplateDialog = ({
const { ref: projectRef } = useParams()
const [open, setOpen] = useState(false)
const [error, setError] = useState<string | null>(null)
- const { can: canUpdateConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'custom_config_gotrue'
+ const { can: canUpdateConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_WRITE
)
const { id } = template
diff --git a/apps/studio/components/interfaces/Auth/EmailTemplates/TemplateEditor.test.tsx b/apps/studio/components/interfaces/Auth/EmailTemplates/TemplateEditor.test.tsx
index 8b7b6653b93..86f35351d94 100644
--- a/apps/studio/components/interfaces/Auth/EmailTemplates/TemplateEditor.test.tsx
+++ b/apps/studio/components/interfaces/Auth/EmailTemplates/TemplateEditor.test.tsx
@@ -70,8 +70,11 @@ vi.mock('@/data/auth/validate-spam-mutation', () => ({
useValidateSpamMutation: () => ({ mutate: validateSpamMock }),
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: useAsyncCheckPermissionsMock,
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: useAsyncCheckPermissionsMock,
+ FGA_PERMISSIONS: {
+ PROJECT: { AUTH_CONFIG_WRITE: 'auth_config_write' },
+ },
}))
vi.mock('sonner', () => ({
diff --git a/apps/studio/components/interfaces/Auth/EmailTemplates/TemplateEditor.tsx b/apps/studio/components/interfaces/Auth/EmailTemplates/TemplateEditor.tsx
index ab117cd05ba..be8a3dda755 100644
--- a/apps/studio/components/interfaces/Auth/EmailTemplates/TemplateEditor.tsx
+++ b/apps/studio/components/interfaces/Auth/EmailTemplates/TemplateEditor.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import type { editor } from 'monaco-editor'
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
@@ -40,7 +39,7 @@ import type { AuthConfigResponse } from '@/data/auth/auth-config-query'
import { useAuthConfigQuery } from '@/data/auth/auth-config-query'
import { useAuthConfigUpdateMutation } from '@/data/auth/auth-config-update-mutation'
import { useValidateSpamMutation, ValidateSpamResponse } from '@/data/auth/validate-spam-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { usePreventNavigationOnUnsavedChanges } from '@/hooks/ui/usePreventNavigationOnUnsavedChanges'
import { DOCS_URL } from '@/lib/constants'
@@ -89,9 +88,8 @@ const getPreviewSrcDoc = (html: string) => {
export const TemplateEditor = ({ template, isReadOnly = false }: TemplateEditorProps) => {
const { ref: projectRef } = useParams()
- const { can: canUpdateConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'custom_config_gotrue'
+ const { can: canUpdateConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_WRITE
)
const canEdit = canUpdateConfig && !isReadOnly
diff --git a/apps/studio/components/interfaces/Auth/Hooks/AddHookDropdown.tsx b/apps/studio/components/interfaces/Auth/Hooks/AddHookDropdown.tsx
index b53dd0bd241..1114f3d6026 100644
--- a/apps/studio/components/interfaces/Auth/Hooks/AddHookDropdown.tsx
+++ b/apps/studio/components/interfaces/Auth/Hooks/AddHookDropdown.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { ChevronDownIcon } from 'lucide-react'
import { useMemo } from 'react'
@@ -18,7 +17,7 @@ import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { InlineLink } from '@/components/ui/InlineLink'
import { useAuthConfigQuery } from '@/data/auth/auth-config-query'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
interface AddHookDropdownProps {
@@ -42,7 +41,9 @@ export const AddHookDropdown = ({
const { data: organization } = useSelectedOrganizationQuery()
const { data: authConfig } = useAuthConfigQuery({ projectRef })
- const { can: canUpdateAuthHook } = useAsyncCheckPermissions(PermissionAction.AUTH_EXECUTE, '*')
+ const { can: canUpdateAuthHook } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_HOOKS_WRITE
+ )
const { getEntitlementSetValues: getEntitledHookSet } = useCheckEntitlements('auth.hooks')
const entitledHookSet = getEntitledHookSet()
diff --git a/apps/studio/components/interfaces/Auth/Hooks/HookCard.tsx b/apps/studio/components/interfaces/Auth/Hooks/HookCard.tsx
index 0b227de3793..13f75abd3f0 100644
--- a/apps/studio/components/interfaces/Auth/Hooks/HookCard.tsx
+++ b/apps/studio/components/interfaces/Auth/Hooks/HookCard.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import {
BookOpenIcon,
CheckIcon,
@@ -20,7 +19,7 @@ import { Input } from 'ui-patterns/DataInputs/Input'
import { Hook } from './hooks.constants'
import { DropdownMenuItemTooltip } from '@/components/ui/DropdownMenuItemTooltip'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { DOCS_URL } from '@/lib/constants'
interface HookCardProps {
@@ -30,7 +29,9 @@ interface HookCardProps {
}
export const HookCard = ({ hook, onSelectEdit, onSelectDelete }: HookCardProps) => {
- const { can: canUpdateAuthHook } = useAsyncCheckPermissions(PermissionAction.AUTH_EXECUTE, '*')
+ const { can: canUpdateAuthHook } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_HOOKS_WRITE
+ )
return (
<div className="bg-surface-100 border-default overflow-hidden border shadow-sm px-5 py-4 flex flex-row first:rounded-t-md last:rounded-b-md space-x-4">
diff --git a/apps/studio/components/interfaces/Auth/MfaAuthSettingsForm/MfaAuthSettingsForm.tsx b/apps/studio/components/interfaces/Auth/MfaAuthSettingsForm/MfaAuthSettingsForm.tsx
index b40c292275a..08a92dc2b9b 100644
--- a/apps/studio/components/interfaces/Auth/MfaAuthSettingsForm/MfaAuthSettingsForm.tsx
+++ b/apps/studio/components/interfaces/Auth/MfaAuthSettingsForm/MfaAuthSettingsForm.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { useEffect, useState } from 'react'
import { SubmitHandler, useForm, useWatch } from 'react-hook-form'
@@ -46,7 +45,7 @@ import { UpgradeToPro } from '@/components/ui/UpgradeToPro'
import { useAuthConfigQuery } from '@/data/auth/auth-config-query'
import { useAuthConfigUpdateMutation } from '@/data/auth/auth-config-update-mutation'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { IS_PLATFORM } from '@/lib/constants'
import { preprocessEmptyNumberInput } from '@/lib/forms/zod-number-input'
@@ -127,13 +126,11 @@ export const MfaAuthSettingsForm = () => {
const [isConfirmationModalVisible, setIsConfirmationModalVisible] = useState(false)
- const { can: canReadConfig } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'custom_config_gotrue'
+ const { can: canReadConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_READ
)
- const { can: canUpdateConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'custom_config_gotrue'
+ const { can: canUpdateConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_WRITE
)
const { hasAccess: hasAccessToMFAEntitlement, isLoading: isLoadingEntitlement } =
diff --git a/apps/studio/components/interfaces/Auth/OAuthApps/OAuthServerSettingsForm.tsx b/apps/studio/components/interfaces/Auth/OAuthApps/OAuthServerSettingsForm.tsx
index 16e6609b680..049a879cca8 100644
--- a/apps/studio/components/interfaces/Auth/OAuthApps/OAuthServerSettingsForm.tsx
+++ b/apps/studio/components/interfaces/Auth/OAuthApps/OAuthServerSettingsForm.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import Link from 'next/link'
import { useEffect, useState } from 'react'
@@ -29,7 +28,7 @@ import { NoPermission } from '@/components/ui/NoPermission'
import { useAuthConfigQuery } from '@/data/auth/auth-config-query'
import { useAuthConfigUpdateMutation } from '@/data/auth/auth-config-update-mutation'
import { useOAuthServerAppsQuery } from '@/data/oauth-server-apps/oauth-server-apps-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { DOCS_URL } from '@/lib/constants'
const configUrlSchema = z.object({
@@ -106,15 +105,14 @@ export const OAuthServerSettingsForm = () => {
can: canReadConfig,
isLoading: isLoadingPermissions,
isSuccess: isPermissionsLoaded,
- } = useAsyncCheckPermissions(PermissionAction.READ, 'custom_config_gotrue')
+ } = useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_READ)
const { data: oAuthAppsData } = useOAuthServerAppsQuery({ projectRef })
const oauthApps = oAuthAppsData?.clients || []
- const { can: canUpdateConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'custom_config_gotrue'
+ const { can: canUpdateConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_WRITE
)
const form = useForm<OAuthServerSettings>({
diff --git a/apps/studio/components/interfaces/Auth/Passkeys/PasskeysSettingsForm.tsx b/apps/studio/components/interfaces/Auth/Passkeys/PasskeysSettingsForm.tsx
index 57c0b36910f..7c3a57536e0 100644
--- a/apps/studio/components/interfaces/Auth/Passkeys/PasskeysSettingsForm.tsx
+++ b/apps/studio/components/interfaces/Auth/Passkeys/PasskeysSettingsForm.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { useForm } from 'react-hook-form'
import { toast } from 'sonner'
@@ -25,7 +24,7 @@ import { NoPermission } from '@/components/ui/NoPermission'
import type { components } from '@/data/api'
import { useAuthConfigQuery } from '@/data/auth/auth-config-query'
import { useAuthConfigUpdateMutation } from '@/data/auth/auth-config-update-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL } from '@/lib/constants'
@@ -164,11 +163,10 @@ export const PasskeysSettingsForm = () => {
can: canReadConfig,
isLoading: isLoadingPermissions,
isSuccess: isPermissionsLoaded,
- } = useAsyncCheckPermissions(PermissionAction.READ, 'custom_config_gotrue')
+ } = useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_READ)
- const { can: canUpdateConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'custom_config_gotrue'
+ const { can: canUpdateConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_WRITE
)
const formValues =
diff --git a/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.test.tsx b/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.test.tsx
index 0aaed1efefe..dac51ffbf2f 100644
--- a/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.test.tsx
+++ b/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.test.tsx
@@ -19,8 +19,14 @@ vi.mock('@/hooks/misc/useCheckEntitlements', () => ({
useCheckEntitlements: () => ({ hasAccess: true, isLoading: false }),
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: () => ({ can: true, isLoading: false, isSuccess: true }),
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: () => ({ can: true, isLoading: false, isSuccess: true }),
+ FGA_PERMISSIONS: {
+ PROJECT: {
+ AUTH_CONFIG_READ: 'auth_config_read',
+ AUTH_CONFIG_WRITE: 'auth_config_write',
+ },
+ },
}))
function mockAuthConfig(overrides: Record<string, unknown>) {
diff --git a/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.tsx b/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.tsx
index 37878d70cf8..0443a629f96 100644
--- a/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.tsx
+++ b/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useEffect, useState } from 'react'
import { useForm, useWatch } from 'react-hook-form'
import { toast } from 'sonner'
@@ -34,7 +33,7 @@ import { useAuthConfigQuery } from '@/data/auth/auth-config-query'
import { useAuthConfigUpdateMutation } from '@/data/auth/auth-config-update-mutation'
import { useMaxConnectionsQuery } from '@/data/database/max-connections-query'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { IS_PLATFORM } from '@/lib/constants'
@@ -68,13 +67,11 @@ export const PerformanceSettingsForm = () => {
const { data: project } = useSelectedProjectQuery()
const { hasAccess: hasAccessToPerformance, isLoading: isLoadingEntitlement } =
useCheckEntitlements('auth.performance_settings')
- const { can: canReadConfig } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'custom_config_gotrue'
+ const { can: canReadConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_READ
)
- const { can: canUpdateConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'custom_config_gotrue'
+ const { can: canUpdateConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_WRITE
)
const [isUpdatingRequestDurationForm, setIsUpdatingRequestDurationForm] = useState(false)
diff --git a/apps/studio/components/interfaces/Auth/ProtectionAuthSettingsForm/ProtectionAuthSettingsForm.tsx b/apps/studio/components/interfaces/Auth/ProtectionAuthSettingsForm/ProtectionAuthSettingsForm.tsx
index 9ecf4b68a64..c34fccbc659 100644
--- a/apps/studio/components/interfaces/Auth/ProtectionAuthSettingsForm/ProtectionAuthSettingsForm.tsx
+++ b/apps/studio/components/interfaces/Auth/ProtectionAuthSettingsForm/ProtectionAuthSettingsForm.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import Link from 'next/link'
import { useEffect } from 'react'
@@ -38,7 +37,7 @@ import { InlineLink } from '@/components/ui/InlineLink'
import { NoPermission } from '@/components/ui/NoPermission'
import { useAuthConfigQuery } from '@/data/auth/auth-config-query'
import { useAuthConfigUpdateMutation } from '@/data/auth/auth-config-update-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { DOCS_URL } from '@/lib/constants'
const CAPTCHA_PROVIDERS = [
@@ -93,13 +92,11 @@ export const ProtectionAuthSettingsForm = () => {
},
})
- const { can: canReadConfig } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'custom_config_gotrue'
+ const { can: canReadConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_READ
)
- const { can: canUpdateConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'custom_config_gotrue'
+ const { can: canUpdateConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_WRITE
)
const protectionForm = useForm<FormSchema>({
diff --git a/apps/studio/components/interfaces/Auth/RateLimits/RateLimits.tsx b/apps/studio/components/interfaces/Auth/RateLimits/RateLimits.tsx
index b0a90619d4f..5ef16f5beb0 100644
--- a/apps/studio/components/interfaces/Auth/RateLimits/RateLimits.tsx
+++ b/apps/studio/components/interfaces/Auth/RateLimits/RateLimits.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import Link from 'next/link'
import { useEffect } from 'react'
@@ -40,18 +39,16 @@ import { InlineLink } from '@/components/ui/InlineLink'
import { NoPermission } from '@/components/ui/NoPermission'
import { useAuthConfigQuery } from '@/data/auth/auth-config-query'
import { useAuthConfigUpdateMutation } from '@/data/auth/auth-config-update-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { DOCS_URL } from '@/lib/constants'
export const RateLimits = () => {
const { ref: projectRef } = useParams()
- const { can: canUpdateConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'custom_config_gotrue'
+ const { can: canUpdateConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_WRITE
)
- const { can: canReadConfig } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'custom_config_gotrue'
+ const { can: canReadConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_READ
)
const {
diff --git a/apps/studio/components/interfaces/Auth/RedirectUrls/RedirectUrlList.tsx b/apps/studio/components/interfaces/Auth/RedirectUrls/RedirectUrlList.tsx
index cb51c1327b1..f00e3a2dbb5 100644
--- a/apps/studio/components/interfaces/Auth/RedirectUrls/RedirectUrlList.tsx
+++ b/apps/studio/components/interfaces/Auth/RedirectUrls/RedirectUrlList.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { GlobeIcon, TrashIcon } from 'lucide-react'
import { Button, Checkbox } from 'ui'
@@ -6,7 +5,7 @@ import { ValueContainer } from './ValueContainer'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { EmptyListState } from '@/components/ui/EmptyListState'
import { Shortcut } from '@/components/ui/Shortcut'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
interface RedirectUrlListProps {
@@ -26,9 +25,8 @@ export const RedirectUrlList = ({
onSelectRemoveURLs,
onSelectClearSelection,
}: RedirectUrlListProps) => {
- const { can: canUpdateConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'custom_config_gotrue'
+ const { can: canUpdateConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_WRITE
)
// [Joshen] One for next time: maybe shift this into a reusable logic since it
diff --git a/apps/studio/components/interfaces/Auth/SessionsAuthSettingsForm/SessionsAuthSettingsForm.test.tsx b/apps/studio/components/interfaces/Auth/SessionsAuthSettingsForm/SessionsAuthSettingsForm.test.tsx
index 4353ea49a46..a9b9c3b690e 100644
--- a/apps/studio/components/interfaces/Auth/SessionsAuthSettingsForm/SessionsAuthSettingsForm.test.tsx
+++ b/apps/studio/components/interfaces/Auth/SessionsAuthSettingsForm/SessionsAuthSettingsForm.test.tsx
@@ -25,8 +25,14 @@ vi.mock('@/hooks/misc/useCheckEntitlements', () => ({
useCheckEntitlements: () => ({ hasAccess: true, isLoading: false }),
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: () => ({ can: true, isLoading: false, isSuccess: true }),
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: () => ({ can: true, isLoading: false, isSuccess: true }),
+ FGA_PERMISSIONS: {
+ PROJECT: {
+ AUTH_CONFIG_READ: 'auth_config_read',
+ AUTH_CONFIG_WRITE: 'auth_config_write',
+ },
+ },
}))
function mockAuthConfig(overrides: Record<string, unknown> = {}) {
diff --git a/apps/studio/components/interfaces/Auth/SessionsAuthSettingsForm/SessionsAuthSettingsForm.tsx b/apps/studio/components/interfaces/Auth/SessionsAuthSettingsForm/SessionsAuthSettingsForm.tsx
index e0c84aa5ff8..23ac97224f2 100644
--- a/apps/studio/components/interfaces/Auth/SessionsAuthSettingsForm/SessionsAuthSettingsForm.tsx
+++ b/apps/studio/components/interfaces/Auth/SessionsAuthSettingsForm/SessionsAuthSettingsForm.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { useEffect, useMemo, useState } from 'react'
import { useForm } from 'react-hook-form'
@@ -43,7 +42,7 @@ import { UpgradeToPro } from '@/components/ui/UpgradeToPro'
import { useAuthConfigQuery } from '@/data/auth/auth-config-query'
import { useAuthConfigUpdateMutation } from '@/data/auth/auth-config-update-mutation'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { IS_PLATFORM } from '@/lib/constants'
function HoursOrNeverText({ value }: { value: number }) {
@@ -71,13 +70,12 @@ export const SessionsAuthSettingsForm = () => {
const [isUpdatingRefreshTokens, setIsUpdatingRefreshTokens] = useState(false)
const [isUpdatingUserSessions, setIsUpdatingUserSessions] = useState(false)
- const { can: canReadConfig } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'custom_config_gotrue'
+ const { can: canReadConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_READ
)
- const { can: canUpdateConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'custom_config_gotrue'
+
+ const { can: canUpdateConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_WRITE
)
const { hasAccess: hasUserSessionsEntitlement, isLoading: isLoadingEntitlements } =
diff --git a/apps/studio/components/interfaces/Auth/SiteUrl/SiteUrl.test.tsx b/apps/studio/components/interfaces/Auth/SiteUrl/SiteUrl.test.tsx
index cb791814773..46236efab80 100644
--- a/apps/studio/components/interfaces/Auth/SiteUrl/SiteUrl.test.tsx
+++ b/apps/studio/components/interfaces/Auth/SiteUrl/SiteUrl.test.tsx
@@ -16,8 +16,11 @@ vi.mock('sonner', () => ({
},
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: () => ({ can: true, isSuccess: true }),
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: () => ({ can: true, isLoading: false, isSuccess: true }),
+ FGA_PERMISSIONS: {
+ PROJECT: { AUTH_CONFIG_WRITE: 'auth_config_write' },
+ },
}))
vi.mock('@/lib/constants', async () => {
diff --git a/apps/studio/components/interfaces/Auth/SiteUrl/SiteUrl.tsx b/apps/studio/components/interfaces/Auth/SiteUrl/SiteUrl.tsx
index 13bcdf74ec3..bf1942d5977 100644
--- a/apps/studio/components/interfaces/Auth/SiteUrl/SiteUrl.tsx
+++ b/apps/studio/components/interfaces/Auth/SiteUrl/SiteUrl.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { useEffect, useState } from 'react'
import { useForm } from 'react-hook-form'
@@ -19,7 +18,7 @@ import * as z from 'zod'
import { AlertError } from '@/components/ui/AlertError'
import { useAuthConfigQuery } from '@/data/auth/auth-config-query'
import { useAuthConfigUpdateMutation } from '@/data/auth/auth-config-update-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
const schema = z.object({
SITE_URL: z.string().trim().min(1, 'Must have a Site URL'),
@@ -36,9 +35,8 @@ const SiteUrl = () => {
const { mutate: updateAuthConfig } = useAuthConfigUpdateMutation()
const [isUpdatingSiteUrl, setIsUpdatingSiteUrl] = useState(false)
- const { can: canUpdateConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'custom_config_gotrue'
+ const { can: canUpdateConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_WRITE
)
const siteUrlForm = useForm({
diff --git a/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.test.tsx b/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.test.tsx
index 595b4a4a78b..d1ad7675c58 100644
--- a/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.test.tsx
+++ b/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.test.tsx
@@ -19,8 +19,14 @@ vi.mock('@/hooks/misc/useSelectedProject', () => ({
useSelectedProjectQuery: () => ({ data: { ref: 'default', inserted_at: null } }),
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: () => ({ can: true, isLoading: false, isSuccess: true }),
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: () => ({ can: true, isLoading: false, isSuccess: true }),
+ FGA_PERMISSIONS: {
+ PROJECT: {
+ AUTH_CONFIG_READ: 'auth_config_read',
+ AUTH_CONFIG_WRITE: 'auth_config_write',
+ },
+ },
}))
const SMTP_CONFIGURED_CONFIG = {
diff --git a/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.tsx b/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.tsx
index 2bc9dc5719b..a00cb22b0c0 100644
--- a/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.tsx
+++ b/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { useEffect, useState } from 'react'
import { SubmitHandler, useForm, useWatch } from 'react-hook-form'
@@ -32,7 +31,7 @@ import { NoPermission } from '@/components/ui/NoPermission'
import { useAuthConfigQuery } from '@/data/auth/auth-config-query'
import { useAuthConfigUpdateMutation } from '@/data/auth/auth-config-update-mutation'
import { useAuthTemplateResetMutation } from '@/data/auth/auth-template-reset-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { preprocessEmptyNumberInput } from '@/lib/forms/zod-number-input'
@@ -92,13 +91,12 @@ export const SmtpForm = () => {
const [showDisableConfirmation, setShowDisableConfirmation] = useState(false)
const [pendingValues, setPendingValues] = useState<SmtpFormValues | null>(null)
- const { can: canReadConfig } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'custom_config_gotrue'
+ const { can: canReadConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_READ
)
- const { can: canUpdateConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'custom_config_gotrue'
+
+ const { can: canUpdateConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_WRITE
)
const blockEditingOnReset =
diff --git a/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/index.tsx b/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/index.tsx
index 03a8eaed8d2..eab28db879d 100644
--- a/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/index.tsx
+++ b/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/index.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQuery } from '@tanstack/react-query'
import { useParams } from 'common'
import { Loader2Icon } from 'lucide-react'
@@ -38,7 +37,7 @@ import {
ThirdPartyAuthIntegration,
thirdPartyAuthIntegrationsQueryOptions,
} from '@/data/third-party-auth/integrations-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { DOCS_URL } from '@/lib/constants'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
import { useShortcut } from '@/state/shortcuts/useShortcut'
@@ -64,9 +63,8 @@ export const ThirdPartyAuthForm = () => {
})
const { mutateAsync: deleteIntegration } = useDeleteThirdPartyAuthIntegrationMutation()
- const { can: canUpdateConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'custom_config_gotrue'
+ const { can: canUpdateConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_WRITE
)
if (isError) {
diff --git a/apps/studio/components/interfaces/Auth/Users/AddUserDropdown.tsx b/apps/studio/components/interfaces/Auth/Users/AddUserDropdown.tsx
index ed451c45472..f6d501fb898 100644
--- a/apps/studio/components/interfaces/Auth/Users/AddUserDropdown.tsx
+++ b/apps/studio/components/interfaces/Auth/Users/AddUserDropdown.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { ChevronDownIcon, MailIcon, UserPlusIcon } from 'lucide-react'
import { parseAsBoolean, useQueryState } from 'nuqs'
import { Button, DropdownMenu, DropdownMenuContent, DropdownMenuTrigger } from 'ui'
@@ -7,20 +6,19 @@ import CreateUserModal from './CreateUserModal'
import InviteUserModal from './InviteUserModal'
import { DropdownMenuItemTooltip } from '@/components/ui/DropdownMenuItemTooltip'
import { ShortcutBadge } from '@/components/ui/ShortcutBadge'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
export const AddUserDropdown = () => {
const showSendInvitation = useIsFeatureEnabled('authentication:show_send_invitation')
- const { can: canInviteUsers } = useAsyncCheckPermissions(
- PermissionAction.AUTH_EXECUTE,
- 'invite_user'
+ const { can: canInviteUsers } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_USERS_WRITE
)
- const { can: canCreateUsers } = useAsyncCheckPermissions(
- PermissionAction.AUTH_EXECUTE,
- 'create_user'
+
+ const { can: canCreateUsers } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_USERS_WRITE
)
const [inviteVisible, setInviteVisible] = useQueryState(
diff --git a/apps/studio/components/interfaces/Auth/Users/CreateUserModal.tsx b/apps/studio/components/interfaces/Auth/Users/CreateUserModal.tsx
index 218211f25cc..e300c448dc8 100644
--- a/apps/studio/components/interfaces/Auth/Users/CreateUserModal.tsx
+++ b/apps/studio/components/interfaces/Auth/Users/CreateUserModal.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { LockIcon, MailIcon } from 'lucide-react'
import { SubmitHandler, useForm } from 'react-hook-form'
@@ -23,7 +22,7 @@ import {
import * as z from 'zod'
import { useUserCreateMutation } from '@/data/auth/user-create-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
export type CreateUserModalProps = {
visible: boolean
@@ -38,9 +37,8 @@ const CreateUserFormSchema = z.object({
const CreateUserModal = ({ visible, setVisible }: CreateUserModalProps) => {
const { ref: projectRef } = useParams()
- const { can: canCreateUsers } = useAsyncCheckPermissions(
- PermissionAction.AUTH_EXECUTE,
- 'create_user'
+ const { can: canCreateUsers } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_USERS_WRITE
)
const { mutate: createUser, isPending: isCreatingUser } = useUserCreateMutation({
diff --git a/apps/studio/components/interfaces/Auth/Users/InviteUserModal.tsx b/apps/studio/components/interfaces/Auth/Users/InviteUserModal.tsx
index a41303ad5b8..0443da24493 100644
--- a/apps/studio/components/interfaces/Auth/Users/InviteUserModal.tsx
+++ b/apps/studio/components/interfaces/Auth/Users/InviteUserModal.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { SubmitHandler, useForm } from 'react-hook-form'
import { toast } from 'sonner'
@@ -21,7 +20,7 @@ import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
import * as z from 'zod'
import { useUserInviteMutation } from '@/data/auth/user-invite-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
export type InviteUserModalProps = {
visible: boolean
@@ -49,9 +48,8 @@ const InviteUserModal = ({ visible, setVisible }: InviteUserModalProps) => {
setVisible(false)
},
})
- const { can: canInviteUsers } = useAsyncCheckPermissions(
- PermissionAction.AUTH_EXECUTE,
- 'invite_user'
+ const { can: canInviteUsers } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_USERS_WRITE
)
const onInviteUser: SubmitHandler<z.infer<typeof formSchema>> = async (values) => {
diff --git a/apps/studio/components/interfaces/Auth/Users/UserOverview.tsx b/apps/studio/components/interfaces/Auth/Users/UserOverview.tsx
index c5b7c506ac0..ee6820bf391 100644
--- a/apps/studio/components/interfaces/Auth/Users/UserOverview.tsx
+++ b/apps/studio/components/interfaces/Auth/Users/UserOverview.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import dayjs from 'dayjs'
import {
@@ -32,7 +31,7 @@ import { useUserSendMagicLinkMutation } from '@/data/auth/user-send-magic-link-m
import { useUserSendOTPMutation } from '@/data/auth/user-send-otp-mutation'
import { useUserUpdateMutation } from '@/data/auth/user-update-mutation'
import { User } from '@/data/auth/users-infinite-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { BASE_PATH } from '@/lib/constants'
import { timeout } from '@/lib/helpers'
@@ -73,23 +72,21 @@ export const UserOverview = ({ user, onDeleteSuccess }: UserOverviewProps) => {
}
)
- const { can: canUpdateUser } = useAsyncCheckPermissions(PermissionAction.AUTH_EXECUTE, '*')
- const { can: canSendMagicLink } = useAsyncCheckPermissions(
- PermissionAction.AUTH_EXECUTE,
- 'send_magic_link'
+ const { can: canUpdateUser } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_USERS_WRITE
)
- const { can: canSendRecovery } = useAsyncCheckPermissions(
- PermissionAction.AUTH_EXECUTE,
- 'send_recovery'
+ const { can: canSendMagicLink } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_USERS_WRITE
)
- const { can: canSendOtp } = useAsyncCheckPermissions(PermissionAction.AUTH_EXECUTE, 'send_otp')
- const { can: canRemoveUser } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_DELETE,
- 'auth.users'
+ const { can: canSendRecovery } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_USERS_WRITE
)
- const { can: canRemoveMFAFactors } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_DELETE,
- 'auth.mfa_factors'
+ const { can: canSendOtp } = useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.AUTH_USERS_WRITE)
+ const { can: canRemoveUser } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_USERS_WRITE
+ )
+ const { can: canRemoveMFAFactors } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_USERS_WRITE
)
const [successAction, setSuccessAction] = useState<
diff --git a/apps/studio/components/interfaces/Auth/Users/useAuthUsersShortcuts.ts b/apps/studio/components/interfaces/Auth/Users/useAuthUsersShortcuts.ts
index d29c6a3417c..2cb2554c004 100644
--- a/apps/studio/components/interfaces/Auth/Users/useAuthUsersShortcuts.ts
+++ b/apps/studio/components/interfaces/Auth/Users/useAuthUsersShortcuts.ts
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import {
parseAsArrayOf,
parseAsBoolean,
@@ -11,7 +10,7 @@ import type { CellKeyboardEvent, DataGridHandle } from 'react-data-grid'
import { MAX_BULK_DELETE } from './Users.constants'
import type { User } from '@/data/auth/users-infinite-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
import { useShortcut } from '@/state/shortcuts/useShortcut'
@@ -75,13 +74,11 @@ export function useAuthUsersShortcuts({
parseAsBoolean.withDefault(false).withOptions({ history: 'push', clearOnDefault: true })
)
- const { can: canCreateUsers } = useAsyncCheckPermissions(
- PermissionAction.AUTH_EXECUTE,
- 'create_user'
+ const { can: canCreateUsers } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_USERS_WRITE
)
- const { can: canInviteUsers } = useAsyncCheckPermissions(
- PermissionAction.AUTH_EXECUTE,
- 'invite_user'
+ const { can: canInviteUsers } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_USERS_WRITE
)
const showSendInvitation = useIsFeatureEnabled('authentication:show_send_invitation')
diff --git a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.test.tsx b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.test.tsx
index b1325eefd02..1cadd65e73f 100644
--- a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.test.tsx
+++ b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.test.tsx
@@ -34,8 +34,9 @@ vi.mock('@/data/organizations/organization-payment-methods-query', () => ({
useOrganizationPaymentMethodsQuery: () => mockPaymentMethodsQuery(),
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: () => ({ can: true, isSuccess: true }),
+vi.mock('@/hooks/misc/useCheckPermissionsV2', async (importOriginal) => ({
+ ...(await importOriginal<typeof import('@/hooks/misc/useCheckPermissionsV2')>()),
+ useAsyncCheckPermissionsV2: () => ({ can: true, isSuccess: true }),
}))
vi.mock('@/components/ui/PartnerManagedResource', () => ({
diff --git a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.tsx b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.tsx
index d588920cd80..4649b34c781 100644
--- a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.tsx
+++ b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.tsx
@@ -1,4 +1,4 @@
-import { PermissionAction, SupportCategories } from '@supabase/shared-types/out/constants'
+import { SupportCategories } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { CreditCardIcon, ExternalLinkIcon, PlusIcon } from 'lucide-react'
import { useState } from 'react'
@@ -26,7 +26,7 @@ import PartnerManagedResource from '@/components/ui/PartnerManagedResource'
import { isPartnerBillingOrganization } from '@/data/organizations/managed-by-utils'
import { useOrganizationPaymentMethodsQuery } from '@/data/organizations/organization-payment-methods-query'
import { useOrgSubscriptionQuery } from '@/data/subscriptions/org-subscription-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { MANAGED_BY } from '@/lib/constants/infrastructure'
import { getURL } from '@/lib/helpers'
@@ -48,13 +48,11 @@ const PaymentMethods = () => {
isSuccess,
} = useOrganizationPaymentMethodsQuery({ slug }, { enabled: inView })
- const { can: canReadPaymentMethods, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.BILLING_READ,
- 'stripe.payment_methods'
+ const { can: canReadPaymentMethods, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_READ
)
- const { can: canUpdatePaymentMethods } = useAsyncCheckPermissions(
- PermissionAction.BILLING_WRITE,
- 'stripe.payment_methods'
+ const { can: canUpdatePaymentMethods } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_WRITE
)
const isPartnerBilledOrganization = isPartnerBillingOrganization(
selectedOrganization?.billing_partner
diff --git a/apps/studio/components/interfaces/BranchManagement/CreateBranchButton.tsx b/apps/studio/components/interfaces/BranchManagement/CreateBranchButton.tsx
index d63ecf9ad18..6c418e5a574 100644
--- a/apps/studio/components/interfaces/BranchManagement/CreateBranchButton.tsx
+++ b/apps/studio/components/interfaces/BranchManagement/CreateBranchButton.tsx
@@ -1,15 +1,11 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
-
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useAppStateSnapshot } from '@/state/app-state'
export const CreateBranchButton = () => {
const snap = useAppStateSnapshot()
- const { can: canCreateBranches } = useAsyncCheckPermissions(
- PermissionAction.CREATE,
- 'preview_branches',
- { resource: { is_default: false } }
+ const { can: canCreateBranches } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.BRANCHING_DEVELOPMENT_CREATE
)
return (
diff --git a/apps/studio/components/interfaces/BranchManagement/CreateBranchModal.tsx b/apps/studio/components/interfaces/BranchManagement/CreateBranchModal.tsx
index d40310bc906..5d87e23ce72 100644
--- a/apps/studio/components/interfaces/BranchManagement/CreateBranchModal.tsx
+++ b/apps/studio/components/interfaces/BranchManagement/CreateBranchModal.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQueryClient } from '@tanstack/react-query'
import { useDebounce } from '@uidotdev/usehooks'
import { useFlag, useParams } from 'common'
@@ -57,7 +56,7 @@ import { projectKeys } from '@/data/projects/keys'
import { DesiredInstanceSize, instanceSizeSpecs } from '@/data/projects/new-project.constants'
import { useProjectAddonsQuery } from '@/data/subscriptions/project-addons-query'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { BASE_PATH, IS_PLATFORM } from '@/lib/constants'
@@ -76,9 +75,8 @@ export const CreateBranchModal = () => {
const [isGitBranchValid, setIsGitBranchValid] = useState(false)
- const { can: canCreateBranch } = useAsyncCheckPermissions(
- PermissionAction.CREATE,
- 'preview_branches'
+ const { can: canCreateBranch } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.BRANCHING_DEVELOPMENT_CREATE
)
const { hasAccess: hasAccessToBranching, isLoading: isLoadingEntitlement } =
diff --git a/apps/studio/components/interfaces/BranchManagement/Overview.tsx b/apps/studio/components/interfaces/BranchManagement/Overview.tsx
index 2b758089ab9..7c78e9254cf 100644
--- a/apps/studio/components/interfaces/BranchManagement/Overview.tsx
+++ b/apps/studio/components/interfaces/BranchManagement/Overview.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQueryClient } from '@tanstack/react-query'
import { useParams } from 'common'
import { partition } from 'lodash'
@@ -42,7 +41,7 @@ import { useBranchUpdateMutation } from '@/data/branches/branch-update-mutation'
import type { Branch } from '@/data/branches/branches-query'
import { branchKeys } from '@/data/branches/keys'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { IS_PLATFORM } from '@/lib/constants'
@@ -252,13 +251,11 @@ const PreviewBranchActions = ({
const queryClient = useQueryClient()
const { project_ref: branchRef, parent_project_ref: projectRef } = branch
- const { can: canDeleteBranches } = useAsyncCheckPermissions(
- PermissionAction.DELETE,
- 'preview_branches'
+ const { can: canDeleteBranches } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.BRANCHING_DEVELOPMENT_DELETE
)
- const { can: canUpdateBranches } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'preview_branches'
+ const { can: canUpdateBranches } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.BRANCHING_DEVELOPMENT_WRITE
)
// If user can update branches, they can restore branches
const canRestoreBranches = canUpdateBranches
@@ -583,9 +580,8 @@ const PreviewBranchActions = ({
const MainBranchActions = ({ branch, repo }: { branch: Branch; repo: string }) => {
const { project_ref: branchRef, parent_project_ref: projectRef } = branch
- const { can: canUpdateBranches } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'preview_branches'
+ const { can: canUpdateBranches } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.BRANCHING_PRODUCTION_WRITE
)
const { mutate: branchPushMutate, isPending: isRetriggering } = useBranchPushMutation({
onSuccess() {
diff --git a/apps/studio/components/interfaces/Compute/ComputeEmptyState.tsx b/apps/studio/components/interfaces/Compute/ComputeEmptyState.tsx
index c05f4787322..46cdb88d46e 100644
--- a/apps/studio/components/interfaces/Compute/ComputeEmptyState.tsx
+++ b/apps/studio/components/interfaces/Compute/ComputeEmptyState.tsx
@@ -1,19 +1,17 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { BoxPlus } from 'icons'
import { PlusIcon } from 'lucide-react'
import { EmptyStatePresentational } from 'ui-patterns/EmptyStatePresentational'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
interface ComputeEmptyStateProps {
onDeploy: () => void
}
export const ComputeEmptyState = ({ onDeploy }: ComputeEmptyStateProps) => {
- const { can: canDeployInstances } = useAsyncCheckPermissions(
- PermissionAction.FUNCTIONS_WRITE,
- '*'
+ const { can: canDeployInstances } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.WORKERS_WRITE
)
return (
diff --git a/apps/studio/components/interfaces/ConnectSheet/ConnectSheet.tsx b/apps/studio/components/interfaces/ConnectSheet/ConnectSheet.tsx
index 0e07d435664..68f42998916 100644
--- a/apps/studio/components/interfaces/ConnectSheet/ConnectSheet.tsx
+++ b/apps/studio/components/interfaces/ConnectSheet/ConnectSheet.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { parseAsBoolean, useQueryState } from 'nuqs'
import { useEffect, useMemo, useRef } from 'react'
@@ -18,7 +17,7 @@ import { useConnectState } from './useConnectState'
import { WarehouseTab } from './WarehouseTab'
import { useAPIKeys } from '@/data/api-keys/api-keys-query'
import { useProjectApiUrl } from '@/data/config/project-endpoint-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useTrack } from '@/lib/telemetry/track'
import { useAppStateSnapshot } from '@/state/app-state'
@@ -107,9 +106,8 @@ export const ConnectSheet = () => {
const { data: endpoint = '' } = useProjectApiUrl({ projectRef }, { enabled: showConnect })
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'service_api_keys'
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ
)
const { data: apiKeysData } = useAPIKeys({ projectRef }, { enabled: canReadAPIKeys })
diff --git a/apps/studio/components/interfaces/ConnectSheet/__tests__/useConnectServerEnv.revealRace.test.ts b/apps/studio/components/interfaces/ConnectSheet/__tests__/useConnectServerEnv.revealRace.test.ts
index 29e95c7dc55..475c3e63778 100644
--- a/apps/studio/components/interfaces/ConnectSheet/__tests__/useConnectServerEnv.revealRace.test.ts
+++ b/apps/studio/components/interfaces/ConnectSheet/__tests__/useConnectServerEnv.revealRace.test.ts
@@ -5,12 +5,15 @@ import { useConnectServerEnv } from '../useConnectServerEnv'
import { getAPIKeysById } from '@/data/api-keys/api-key-id-query'
import { useAPIKeys } from '@/data/api-keys/api-keys-query'
import { useProjectApiUrl } from '@/data/config/project-endpoint-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
// Uses the real useRevealedSecret (not mocked) so the requestId invalidation
// in clear() actually interacts with revealPromiseRef in useConnectServerEnv.
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: vi.fn(),
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: vi.fn(),
+ FGA_PERMISSIONS: {
+ PROJECT: {},
+ },
}))
vi.mock('@/data/config/project-endpoint-query', () => ({
useProjectApiUrl: vi.fn(),
@@ -35,7 +38,7 @@ function deferred<T>() {
describe('useConnectServerEnv secret reveal (real useRevealedSecret)', () => {
beforeEach(() => {
- vi.mocked(useAsyncCheckPermissions).mockReturnValue({
+ vi.mocked(useAsyncCheckPermissionsV2).mockReturnValue({
can: true,
isLoading: false,
} as any)
diff --git a/apps/studio/components/interfaces/ConnectSheet/__tests__/useConnectServerEnv.test.ts b/apps/studio/components/interfaces/ConnectSheet/__tests__/useConnectServerEnv.test.ts
index 6497fae5e94..699e95d2193 100644
--- a/apps/studio/components/interfaces/ConnectSheet/__tests__/useConnectServerEnv.test.ts
+++ b/apps/studio/components/interfaces/ConnectSheet/__tests__/useConnectServerEnv.test.ts
@@ -5,10 +5,13 @@ import { useConnectServerEnv } from '../useConnectServerEnv'
import { useRevealedSecret } from '@/components/interfaces/APIKeys/useRevealedSecret'
import { useAPIKeys } from '@/data/api-keys/api-keys-query'
import { useProjectApiUrl } from '@/data/config/project-endpoint-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: vi.fn(),
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: vi.fn(),
+ FGA_PERMISSIONS: {
+ PROJECT: {},
+ },
}))
vi.mock('@/data/config/project-endpoint-query', () => ({
useProjectApiUrl: vi.fn(),
@@ -38,7 +41,7 @@ describe('useConnectServerEnv secret reveal', () => {
let revealMock: ReturnType<typeof vi.fn>
beforeEach(() => {
- vi.mocked(useAsyncCheckPermissions).mockReturnValue({
+ vi.mocked(useAsyncCheckPermissionsV2).mockReturnValue({
can: true,
isLoading: false,
} as any)
diff --git a/apps/studio/components/interfaces/ConnectSheet/content/server/env/content.test.tsx b/apps/studio/components/interfaces/ConnectSheet/content/server/env/content.test.tsx
index c9ebd1d78c8..b0e1d70bb7e 100644
--- a/apps/studio/components/interfaces/ConnectSheet/content/server/env/content.test.tsx
+++ b/apps/studio/components/interfaces/ConnectSheet/content/server/env/content.test.tsx
@@ -13,9 +13,9 @@ type ProjectSettingsResponse = components['schemas']['ProjectSettingsResponse_Ou
const { mockUseAsyncCheckPermissions } = vi.hoisted(() => ({
mockUseAsyncCheckPermissions: vi.fn(),
}))
-vi.mock('@/hooks/misc/useCheckPermissions', async (importOriginal) => ({
- ...(await importOriginal<typeof import('@/hooks/misc/useCheckPermissions')>()),
- useAsyncCheckPermissions: mockUseAsyncCheckPermissions,
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: mockUseAsyncCheckPermissions,
+ FGA_PERMISSIONS: { PROJECT: { API_GATEWAY_KEYS_READ: 'api_gateway_keys_read' } },
}))
// CopyButton writes via copyToClipboard from 'ui'. Stub just that export
diff --git a/apps/studio/components/interfaces/ConnectSheet/useConnectServerEnv.ts b/apps/studio/components/interfaces/ConnectSheet/useConnectServerEnv.ts
index 7de676027af..48b70bb5a22 100644
--- a/apps/studio/components/interfaces/ConnectSheet/useConnectServerEnv.ts
+++ b/apps/studio/components/interfaces/ConnectSheet/useConnectServerEnv.ts
@@ -1,11 +1,10 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { useCallback, useEffect, useRef, useState } from 'react'
import { useRevealedSecret } from '@/components/interfaces/APIKeys/useRevealedSecret'
import { useAPIKeys } from '@/data/api-keys/api-keys-query'
import { useProjectApiUrl } from '@/data/config/project-endpoint-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useLatest } from '@/hooks/misc/useLatest'
const AUTO_HIDE_MS = 10_000
@@ -48,9 +47,8 @@ export interface UseConnectServerEnvResult {
export function useConnectServerEnv(): UseConnectServerEnvResult {
const { ref: projectRef } = useParams()
- const { can: canReadAPIKeys, isLoading: isLoadingPermission } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'service_api_keys'
+ const { can: canReadAPIKeys, isLoading: isLoadingPermission } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ
)
const [isRevealed, setIsRevealed] = useState(false)
diff --git a/apps/studio/components/interfaces/Database/Backups/BackupItem.test.tsx b/apps/studio/components/interfaces/Database/Backups/BackupItem.test.tsx
index 5c8b1416687..bc32ce3048f 100644
--- a/apps/studio/components/interfaces/Database/Backups/BackupItem.test.tsx
+++ b/apps/studio/components/interfaces/Database/Backups/BackupItem.test.tsx
@@ -9,8 +9,9 @@ const { mockUseAsyncCheckPermissions } = vi.hoisted(() => ({
mockUseAsyncCheckPermissions: vi.fn(),
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: mockUseAsyncCheckPermissions,
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: mockUseAsyncCheckPermissions,
+ FGA_PERMISSIONS: { PROJECT: { BACKUPS_WRITE: 'backups_write' } },
}))
const backup: DatabaseBackup = {
diff --git a/apps/studio/components/interfaces/Database/Backups/BackupItem.tsx b/apps/studio/components/interfaces/Database/Backups/BackupItem.tsx
index 3fbfb91b44d..a215512328f 100644
--- a/apps/studio/components/interfaces/Database/Backups/BackupItem.tsx
+++ b/apps/studio/components/interfaces/Database/Backups/BackupItem.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { DownloadIcon } from 'lucide-react'
import { Badge, Tooltip, TooltipContent, TooltipTrigger } from 'ui'
@@ -8,7 +7,7 @@ import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { InlineLink } from '@/components/ui/InlineLink'
import { useBackupDownloadMutation } from '@/data/database/backup-download-mutation'
import type { DatabaseBackup } from '@/data/database/backups-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
interface BackupItemProps {
index: number
@@ -26,9 +25,8 @@ export const BackupItem = ({
onSelectBackup,
}: BackupItemProps) => {
const { ref: projectRef } = useParams()
- const { can: canTriggerScheduledBackups } = useAsyncCheckPermissions(
- PermissionAction.INFRA_EXECUTE,
- 'queue_job.restore.prepare'
+ const { can: canTriggerScheduledBackups } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.BACKUPS_WRITE
)
const { mutate: downloadBackup, isPending: isDownloading } = useBackupDownloadMutation({
diff --git a/apps/studio/components/interfaces/Database/Backups/PITR/PITRNotice.tsx b/apps/studio/components/interfaces/Database/Backups/PITR/PITRNotice.tsx
index b07101a837d..fca3af26291 100644
--- a/apps/studio/components/interfaces/Database/Backups/PITR/PITRNotice.tsx
+++ b/apps/studio/components/interfaces/Database/Backups/PITR/PITRNotice.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { CalendarIcon } from 'lucide-react'
import Link from 'next/link'
@@ -7,16 +6,15 @@ import { getPITRRetentionDuration } from './PITR.utils'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { FormPanel } from '@/components/ui/Forms/FormPanel'
import { useProjectAddonsQuery } from '@/data/subscriptions/project-addons-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
export const PITRNotice = () => {
const { ref: projectRef } = useParams()
const { data: addonsResponse } = useProjectAddonsQuery({ projectRef })
const retentionPeriod = getPITRRetentionDuration(addonsResponse?.selected_addons ?? [])
- const { can: canUpdateSubscription } = useAsyncCheckPermissions(
- PermissionAction.BILLING_WRITE,
- 'stripe.subscriptions'
+ const { can: canUpdateSubscription } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.INFRA_ADDONS_WRITE
)
return (
diff --git a/apps/studio/components/interfaces/Database/Backups/PITR/PITRStatus.tsx b/apps/studio/components/interfaces/Database/Backups/PITR/PITRStatus.tsx
index 8cd5e7cac37..09628b38c03 100644
--- a/apps/studio/components/interfaces/Database/Backups/PITR/PITRStatus.tsx
+++ b/apps/studio/components/interfaces/Database/Backups/PITR/PITRStatus.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import dayjs from 'dayjs'
import { AlertCircleIcon } from 'lucide-react'
@@ -8,7 +7,7 @@ import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { FormPanel } from '@/components/ui/Forms/FormPanel'
import { useBackupsQuery } from '@/data/database/backups-query'
import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import type { Timezone } from '@/lib/constants/timezones'
interface PITRStatusProps {
@@ -41,9 +40,8 @@ const PITRStatus = ({
.tz(selectedTimezone?.utc[0])
.format('DD MMM YYYY, HH:mm:ss')
- const { can: canTriggerPhysicalBackup } = useAsyncCheckPermissions(
- PermissionAction.INFRA_EXECUTE,
- 'queue_job.walg.prepare_restore'
+ const { can: canTriggerPhysicalBackup } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.BACKUPS_WRITE
)
return (
diff --git a/apps/studio/components/interfaces/Database/Extensions/ExtensionRow.tsx b/apps/studio/components/interfaces/Database/Extensions/ExtensionRow.tsx
index 58242681e1c..3622202aa7d 100644
--- a/apps/studio/components/interfaces/Database/Extensions/ExtensionRow.tsx
+++ b/apps/studio/components/interfaces/Database/Extensions/ExtensionRow.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { BookIcon, Loader2Icon } from 'lucide-react'
import Link from 'next/link'
import { useState } from 'react'
@@ -22,7 +21,7 @@ import { EnableExtensionModal } from './EnableExtensionModal'
import { EXTENSION_DISABLE_WARNINGS } from './Extensions.constants'
import { useDatabaseExtensionDisableMutation } from '@/data/database-extensions/database-extension-disable-mutation'
import { DatabaseExtension } from '@/data/database-extensions/database-extensions-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useIsOrioleDb, useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL } from '@/lib/constants'
@@ -38,9 +37,8 @@ export const ExtensionRow = ({ extension }: ExtensionRowProps) => {
const [isDisableModalOpen, setIsDisableModalOpen] = useState(false)
const [showConfirmEnableModal, setShowConfirmEnableModal] = useState(false)
- const { can: canUpdateExtensions } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'extensions'
+ const { can: canUpdateExtensions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const orioleDbCheck = isOrioleDb && extension.name === 'orioledb'
const disabled = !canUpdateExtensions || orioleDbCheck
diff --git a/apps/studio/components/interfaces/Database/Extensions/Extensions.tsx b/apps/studio/components/interfaces/Database/Extensions/Extensions.tsx
index ead81fc1142..dc840f09b54 100644
--- a/apps/studio/components/interfaces/Database/Extensions/Extensions.tsx
+++ b/apps/studio/components/interfaces/Database/Extensions/Extensions.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { isNull, partition } from 'lodash'
import { AlertCircleIcon, SearchIcon } from 'lucide-react'
@@ -22,7 +21,7 @@ import { HIDDEN_EXTENSIONS, SEARCH_TERMS } from './Extensions.constants'
import InformationBox from '@/components/ui/InformationBox'
import { NoSearchResults } from '@/components/ui/NoSearchResults'
import { useDatabaseExtensionsQuery } from '@/data/database-extensions/database-extensions-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { onSearchInputEscape } from '@/lib/keyboard'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
@@ -68,9 +67,8 @@ export const Extensions = () => {
(ext) => !isNull(ext.installed_version)
)
- const { can: canUpdateExtensions, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'extensions'
+ const { can: canUpdateExtensions, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
useEffect(() => {
diff --git a/apps/studio/components/interfaces/Database/Functions/FunctionsList/FunctionList.tsx b/apps/studio/components/interfaces/Database/Functions/FunctionsList/FunctionList.tsx
index 34eac0c4c6a..afed98414d5 100644
--- a/apps/studio/components/interfaces/Database/Functions/FunctionsList/FunctionList.tsx
+++ b/apps/studio/components/interfaces/Database/Functions/FunctionsList/FunctionList.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { noop } from 'lodash'
import {
@@ -36,7 +35,7 @@ import {
useDatabaseFunctionsQuery,
type SavedDatabaseFunction,
} from '@/data/database-functions/database-functions-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useQuerySchemaState } from '@/hooks/misc/useSchemaQueryState'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useAiAssistantStateSnapshot } from '@/state/ai-assistant-state'
@@ -80,9 +79,8 @@ export const FunctionList = ({
[functions, filterString, returnTypeFilter, schema, securityFilter]
)
- const { can: canUpdateFunctions } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'functions'
+ const { can: canUpdateFunctions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
if (_functions.length === 0 && filterString.length === 0) {
diff --git a/apps/studio/components/interfaces/Database/Functions/FunctionsList/FunctionsList.tsx b/apps/studio/components/interfaces/Database/Functions/FunctionsList/FunctionsList.tsx
index 357ac3b4b7e..b25acddc62c 100644
--- a/apps/studio/components/interfaces/Database/Functions/FunctionsList/FunctionsList.tsx
+++ b/apps/studio/components/interfaces/Database/Functions/FunctionsList/FunctionsList.tsx
@@ -1,5 +1,4 @@
import { safeSql } from '@supabase/pg-meta'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { DatabaseIcon, PlusIcon, SearchIcon } from 'lucide-react'
import { parseAsBoolean, parseAsJson, parseAsString, useQueryState } from 'nuqs'
import { useEffect, useRef, useState } from 'react'
@@ -36,7 +35,7 @@ import { useDatabaseFunctionDeleteMutation } from '@/data/database-functions/dat
import type { SavedDatabaseFunction } from '@/data/database-functions/database-functions-query'
import { useDatabaseFunctionsQuery } from '@/data/database-functions/database-functions-query'
import { useSchemasQuery } from '@/data/database/schemas-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useQuerySchemaState } from '@/hooks/misc/useSchemaQueryState'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useIsProtectedSchema } from '@/hooks/useProtectedSchemas'
@@ -124,9 +123,8 @@ export const FunctionsList = () => {
const [schemaSelectorOpen, setSchemaSelectorOpen] = useState(false)
const searchInputRef = useRef<HTMLInputElement>(null)
- const { can: canCreateFunctions } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'functions'
+ const { can: canCreateFunctions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const { isSchemaLocked } = useIsProtectedSchema({ schema: selectedSchema })
@@ -420,9 +418,8 @@ const CreateFunctionButton = ({
createFunction: () => void
}) => {
const { selectedSchema } = useQuerySchemaState()
- const { can: canCreateFunctions } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'functions'
+ const { can: canCreateFunctions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const { isSchemaLocked } = useIsProtectedSchema({ schema: selectedSchema })
const canAddFunctions = canCreateFunctions && !isSchemaLocked
diff --git a/apps/studio/components/interfaces/Database/Hooks/FormContents.tsx b/apps/studio/components/interfaces/Database/Hooks/FormContents.tsx
index 00b586b202b..6dd5a6b62d1 100644
--- a/apps/studio/components/interfaces/Database/Hooks/FormContents.tsx
+++ b/apps/studio/components/interfaces/Database/Hooks/FormContents.tsx
@@ -1,5 +1,4 @@
import type { PGTrigger } from '@supabase/pg-meta'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import Image from 'next/legacy/image'
import { useEffect } from 'react'
@@ -36,7 +35,7 @@ import {
import { getKeys, useAPIKeysQuery } from '@/data/api-keys/api-keys-query'
import { useEdgeFunctionsQuery } from '@/data/edge-functions/edge-functions-query'
import { useTableNamesQuery } from '@/data/tables/table-names-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { buildDatabaseEdgeFunctionUrl, isEdgeFunctionUrl } from '@/lib/api/edgeFunctions'
import { uuidv4 } from '@/lib/helpers'
@@ -52,7 +51,10 @@ export const FormContents = ({ form, selectedHook }: FormContentsProps) => {
const restUrl = project?.restUrl
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2([
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ,
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_SECRET_READ,
+ ])
const { data: keys = [] } = useAPIKeysQuery(
{ projectRef: ref, reveal: true },
{ enabled: canReadAPIKeys }
diff --git a/apps/studio/components/interfaces/Database/Hooks/HTTPHeaders.tsx b/apps/studio/components/interfaces/Database/Hooks/HTTPHeaders.tsx
index a0bf26bd380..5426cc21535 100644
--- a/apps/studio/components/interfaces/Database/Hooks/HTTPHeaders.tsx
+++ b/apps/studio/components/interfaces/Database/Hooks/HTTPHeaders.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { UseFormReturn } from 'react-hook-form'
import { useWatch } from 'ui'
@@ -12,7 +11,7 @@ import {
FormSectionLabel,
} from '@/components/ui/Forms/FormSection'
import { useAPIKeys } from '@/data/api-keys/api-keys-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { uuidv4 } from '@/lib/helpers'
interface HTTPHeadersProps {
@@ -21,7 +20,10 @@ interface HTTPHeadersProps {
export const HTTPHeaders = ({ form }: HTTPHeadersProps) => {
const { ref } = useParams()
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2([
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ,
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_SECRET_READ,
+ ])
const { data: apiKeyData } = useAPIKeys(
{
diff --git a/apps/studio/components/interfaces/Database/Hooks/HooksList/HookList.tsx b/apps/studio/components/interfaces/Database/Hooks/HooksList/HookList.tsx
index e21635bb6aa..3dea99ed6de 100644
--- a/apps/studio/components/interfaces/Database/Hooks/HooksList/HookList.tsx
+++ b/apps/studio/components/interfaces/Database/Hooks/HooksList/HookList.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { includes } from 'lodash'
import { Edit3Icon, MoreVerticalIcon, TrashIcon } from 'lucide-react'
@@ -20,7 +19,7 @@ import {
import Table from '@/components/to-be-cleaned/Table'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { useDatabaseHooksQuery } from '@/data/database-triggers/database-triggers-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { isEdgeFunctionUrl } from '@/lib/api/edgeFunctions'
import { BASE_PATH } from '@/lib/constants'
@@ -49,9 +48,8 @@ export const HookList = ({ schema, filterString }: HookListProps) => {
x.schema === schema &&
x.function_args.length >= 2
)
- const { can: canUpdateWebhook } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'triggers'
+ const { can: canUpdateWebhook } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
return (
diff --git a/apps/studio/components/interfaces/Database/Hooks/HooksList/HooksList.tsx b/apps/studio/components/interfaces/Database/Hooks/HooksList/HooksList.tsx
index 3d9be70524b..c79d478b746 100644
--- a/apps/studio/components/interfaces/Database/Hooks/HooksList/HooksList.tsx
+++ b/apps/studio/components/interfaces/Database/Hooks/HooksList/HooksList.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { includes, map as lodashMap, uniqBy } from 'lodash'
import { SearchIcon } from 'lucide-react'
import { parseAsBoolean, useQueryState } from 'nuqs'
@@ -13,7 +12,7 @@ import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { DocsButton } from '@/components/ui/DocsButton'
import { NoSearchResults } from '@/components/ui/NoSearchResults'
import { useDatabaseHooksQuery } from '@/data/database-triggers/database-triggers-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL } from '@/lib/constants'
import { onSearchInputEscape } from '@/lib/keyboard'
@@ -42,9 +41,8 @@ export const HooksList = () => {
)
const filteredHookSchemas = lodashMap(uniqBy(filteredHooks, 'schema'), 'schema')
- const { can: canCreateWebhooks, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'triggers'
+ const { can: canCreateWebhooks, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const searchInputRef = useRef<HTMLInputElement>(null)
diff --git a/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/PolicyDetailsV2.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/PolicyDetailsV2.tsx
index eecc4bb6270..0d2b891486a 100644
--- a/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/PolicyDetailsV2.tsx
+++ b/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/PolicyDetailsV2.tsx
@@ -4,7 +4,6 @@ import {
safeSql,
type SafeSqlFragment,
} from '@supabase/pg-meta/src/pg-format'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { CheckIcon, ChevronsUpDownIcon } from 'lucide-react'
import { useEffect, useState } from 'react'
import { UseFormReturn } from 'react-hook-form'
@@ -45,7 +44,7 @@ import {
import { useDatabaseRolesQuery } from '@/data/database-roles/database-roles-query'
import { useTablesQuery } from '@/data/tables/tables-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
interface PolicyDetailsV2Props {
@@ -77,9 +76,8 @@ export const PolicyDetailsV2 = ({
}: PolicyDetailsV2Props) => {
const { data: project } = useSelectedProjectQuery()
const [open, setOpen] = useState(false)
- const { can: canUpdatePolicies } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'tables'
+ const { can: canUpdatePolicies } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const { data: tables, isSuccess: isSuccessTables } = useTablesQuery({
diff --git a/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/index.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/index.tsx
index 667381d9114..10c77019aff 100644
--- a/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/index.tsx
+++ b/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/index.tsx
@@ -9,7 +9,6 @@ import {
type DisplayableSqlFragment,
type SafeSqlFragment,
} from '@supabase/pg-meta/src/pg-format'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQueryClient } from '@tanstack/react-query'
import { useParams } from 'common'
import { memo, useCallback, useEffect, useRef, useState } from 'react'
@@ -50,7 +49,7 @@ import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { useDatabasePolicyUpdateMutation } from '@/data/database-policies/database-policy-update-mutation'
import { databasePoliciesKeys } from '@/data/database-policies/keys'
import { QueryResponseError, useExecuteSqlMutation } from '@/data/sql/execute-sql-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useLatest } from '@/hooks/misc/useLatest'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useConfirmOnClose } from '@/hooks/ui/useConfirmOnClose'
@@ -97,9 +96,8 @@ export const PolicyEditorPanel = memo(function ({
const queryClient = useQueryClient()
const { data: selectedProject } = useSelectedProjectQuery()
- const { can: canUpdatePolicies } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'tables'
+ const { can: canUpdatePolicies } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
// [Joshen] Hyrid form fields, just spit balling to get a decent POC out
diff --git a/apps/studio/components/interfaces/Database/Policies/PolicyTableRow/PolicyRow.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyTableRow/PolicyRow.tsx
index 9487341878c..38a10468d4d 100644
--- a/apps/studio/components/interfaces/Database/Policies/PolicyTableRow/PolicyRow.tsx
+++ b/apps/studio/components/interfaces/Database/Policies/PolicyTableRow/PolicyRow.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { noop } from 'lodash'
import { EditIcon, MoreVerticalIcon, TrashIcon } from 'lucide-react'
import {
@@ -20,7 +19,7 @@ import type { Policy } from './PolicyTableRow.utils'
import { SIDEBAR_KEYS } from '@/components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
import { DropdownMenuItemTooltip } from '@/components/ui/DropdownMenuItemTooltip'
import { useAuthConfigQuery } from '@/data/auth/auth-config-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useAiAssistantStateSnapshot } from '@/state/ai-assistant-state'
import { useSidebarManagerSnapshot } from '@/state/sidebar-manager-state'
@@ -40,9 +39,8 @@ export const PolicyRow = ({
}: PolicyRowProps) => {
const aiSnap = useAiAssistantStateSnapshot()
const { openSidebar } = useSidebarManagerSnapshot()
- const { can: canUpdatePolicies } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'policies'
+ const { can: canUpdatePolicies } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const { data: project } = useSelectedProjectQuery()
diff --git a/apps/studio/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRowHeader.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRowHeader.tsx
index 69a3c946e22..809990f4ced 100644
--- a/apps/studio/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRowHeader.tsx
+++ b/apps/studio/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRowHeader.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { noop } from 'lodash'
import { LockIcon, TableIcon } from 'lucide-react'
@@ -8,7 +7,7 @@ import type { PolicyTable } from './PolicyTableRow.types'
import { SIDEBAR_KEYS } from '@/components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { EditorTablePageLink } from '@/data/prefetchers/project.$ref.editor.$id'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useAiAssistantStateSnapshot } from '@/state/ai-assistant-state'
import { useSidebarManagerSnapshot } from '@/state/sidebar-manager-state'
@@ -33,14 +32,10 @@ export const PolicyTableRowHeader = ({
const aiSnap = useAiAssistantStateSnapshot()
const { openSidebar } = useSidebarManagerSnapshot()
- const { can: canCreatePolicies } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'policies'
- )
- const { can: canToggleRLS } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'tables'
+ const { can: canCreatePolicies } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
+ const { can: canToggleRLS } = useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.DATABASE_WRITE)
const isRealtimeSchema = table.schema === 'realtime'
const isRealtimeMessagesTable = isRealtimeSchema && table.name === 'messages'
diff --git a/apps/studio/components/interfaces/Database/Publications/PublicationsList.tsx b/apps/studio/components/interfaces/Database/Publications/PublicationsList.tsx
index be9ef71dc0f..0524e87f2cf 100644
--- a/apps/studio/components/interfaces/Database/Publications/PublicationsList.tsx
+++ b/apps/studio/components/interfaces/Database/Publications/PublicationsList.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { AlertCircleIcon, InfoIcon, SearchIcon } from 'lucide-react'
import Link from 'next/link'
@@ -27,7 +26,7 @@ import InformationBox from '@/components/ui/InformationBox'
import { NoSearchResults } from '@/components/ui/NoSearchResults'
import { useDatabasePublicationsQuery } from '@/data/database-publications/database-publications-query'
import { useDatabasePublicationUpdateMutation } from '@/data/database-publications/database-publications-update-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { onSearchInputEscape } from '@/lib/keyboard'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
@@ -74,9 +73,8 @@ export const PublicationsList = () => {
},
})
- const { can: canUpdatePublications, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'publications'
+ const { can: canUpdatePublications, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const publicationEvents: PublicationEvent[] = [
diff --git a/apps/studio/components/interfaces/Database/Publications/PublicationsTableItem.tsx b/apps/studio/components/interfaces/Database/Publications/PublicationsTableItem.tsx
index 18be132aaae..35543a44e98 100644
--- a/apps/studio/components/interfaces/Database/Publications/PublicationsTableItem.tsx
+++ b/apps/studio/components/interfaces/Database/Publications/PublicationsTableItem.tsx
@@ -1,11 +1,10 @@
import type { PGPublication, PGTable } from '@supabase/pg-meta'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useState } from 'react'
import { toast } from 'sonner'
import { Badge, Switch, TableCell, TableRow, Tooltip, TooltipContent, TooltipTrigger } from 'ui'
import { useDatabasePublicationUpdateMutation } from '@/data/database-publications/database-publications-update-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useProtectedSchemas } from '@/hooks/useProtectedSchemas'
@@ -28,9 +27,8 @@ export const PublicationsTableItem = ({
selectedPublication.tables?.find((x) => x.id == table.id) != undefined
)
- const { can: canUpdatePublications } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'publications'
+ const { can: canUpdatePublications } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const { mutate: updatePublications, isPending } = useDatabasePublicationUpdateMutation()
diff --git a/apps/studio/components/interfaces/Database/Publications/PublicationsTables.tsx b/apps/studio/components/interfaces/Database/Publications/PublicationsTables.tsx
index 385931b7003..96de817bff3 100644
--- a/apps/studio/components/interfaces/Database/Publications/PublicationsTables.tsx
+++ b/apps/studio/components/interfaces/Database/Publications/PublicationsTables.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { SearchIcon } from 'lucide-react'
import { useMemo, useRef, useState } from 'react'
@@ -14,7 +13,7 @@ import { SchemaSelector } from '@/components/ui/SchemaSelector'
import { Shortcut } from '@/components/ui/Shortcut'
import { useDatabasePublicationsQuery } from '@/data/database-publications/database-publications-query'
import { useTablesQuery } from '@/data/tables/tables-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useQuerySchemaState } from '@/hooks/misc/useSchemaQueryState'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { onSearchInputEscape } from '@/lib/keyboard'
@@ -30,10 +29,8 @@ export const PublicationsTables = () => {
const [schemaSelectorOpen, setSchemaSelectorOpen] = useState(false)
const searchInputRef = useRef<HTMLInputElement>(null)
- const { can: canUpdatePublications, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'publications'
- )
+ const { can: canUpdatePublications, isLoading: isLoadingPermissions } =
+ useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.DATABASE_WRITE)
useShortcut(
SHORTCUT_IDS.LIST_PAGE_FOCUS_SEARCH,
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/index.test.tsx b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/index.test.tsx
index d32c6663712..7df4616dc2c 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/index.test.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/index.test.tsx
@@ -206,8 +206,14 @@ vi.mock('./useDestinationForm', () => ({
}),
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: () => ({ can: false }),
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: () => ({ can: true, isLoading: false, isSuccess: true }),
+ FGA_PERMISSIONS: {
+ PROJECT: {
+ API_GATEWAY_KEYS_READ: 'api_gateway_keys_read',
+ API_GATEWAY_KEYS_SECRET_READ: 'api_gateway_keys_secret_read',
+ },
+ },
}))
vi.mock('./DestinationNameInput', () => ({ DestinationNameInput: () => null }))
diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/index.tsx b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/index.tsx
index f14a89b8a37..d4c8661aa9f 100644
--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/index.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/index.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { Loader2Icon } from 'lucide-react'
import { AnimatePresence, motion } from 'motion/react'
@@ -68,7 +67,7 @@ import { useReplicationPipelineByIdQuery } from '@/data/replication/pipeline-by-
import { useReplicationPublicationNamesQuery } from '@/data/replication/publication-names-query'
import { useReplicationPublicationQuery } from '@/data/replication/publication-query'
import { useReplicationSourceId } from '@/data/replication/sources-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
const formId = 'destination-editor'
@@ -98,7 +97,11 @@ export const DestinationForm = ({
const etlEnableDucklake = useIsETLDucklakePrivateAlpha()
const etlEnableSnowflake = useIsETLSnowflakePrivateAlpha()
const etlEnableClickHouse = useIsETLClickHousePrivateAlpha()
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2([
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ,
+ // api keys reveal = true will require this perms
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_SECRET_READ,
+ ])
const [showValidationWarningsDialog, setShowValidationWarningsDialog] = useState(false)
const [showCostDialog, setShowCostDialog] = useState(false)
diff --git a/apps/studio/components/interfaces/Database/RestoreToNewProject/RestoreToNewProject.tsx b/apps/studio/components/interfaces/Database/RestoreToNewProject/RestoreToNewProject.tsx
index 3a0bb528b6b..abcf2860e39 100644
--- a/apps/studio/components/interfaces/Database/RestoreToNewProject/RestoreToNewProject.tsx
+++ b/apps/studio/components/interfaces/Database/RestoreToNewProject/RestoreToNewProject.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { Loader2Icon } from 'lucide-react'
import Link from 'next/link'
import { useEffect, useState } from 'react'
@@ -24,7 +23,7 @@ import { useDiskAttributesQuery } from '@/data/config/disk-attributes-query'
import { useCloneBackupsQuery } from '@/data/projects/clone-query'
import { useCloneStatusQuery } from '@/data/projects/clone-status-query'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import {
useIsAwsK8sCloudProvider,
@@ -64,13 +63,10 @@ export const RestoreToNewProject = () => {
const isActiveHealthy = project?.status === PROJECT_STATUS.ACTIVE_HEALTHY
- const { can: canReadPhysicalBackups, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'physical_backups'
- )
- const { can: canTriggerPhysicalBackups } = useAsyncCheckPermissions(
- PermissionAction.INFRA_EXECUTE,
- 'queue_job.restore.prepare'
+ const { can: canReadPhysicalBackups, isSuccess: isPermissionsLoaded } =
+ useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.BACKUPS_READ)
+ const { can: canTriggerPhysicalBackups } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.BACKUPS_WRITE
)
const PITR_ENABLED = cloneBackups?.pitr_enabled
const PHYSICAL_BACKUPS_ENABLED = project?.is_physical_backups_enabled
diff --git a/apps/studio/components/interfaces/Database/Roles/RolesList.tsx b/apps/studio/components/interfaces/Database/Roles/RolesList.tsx
index e1c00721df5..fdf5f45436f 100644
--- a/apps/studio/components/interfaces/Database/Roles/RolesList.tsx
+++ b/apps/studio/components/interfaces/Database/Roles/RolesList.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { partition, sortBy } from 'lodash'
import { PlusIcon, SearchIcon, XIcon } from 'lucide-react'
import { parseAsBoolean, parseAsString, useQueryState } from 'nuqs'
@@ -19,7 +18,7 @@ import { SparkBar } from '@/components/ui/SparkBar'
import { useDatabaseRoleDeleteMutation } from '@/data/database-roles/database-role-delete-mutation'
import { useDatabaseRolesQuery } from '@/data/database-roles/database-roles-query'
import { useMaxConnectionsQuery } from '@/data/database/max-connections-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { onSearchInputEscape } from '@/lib/keyboard'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
@@ -34,10 +33,7 @@ export const RolesList = () => {
const [filterType, setFilterType] = useState<'all' | 'active'>('all')
const searchInputRef = useRef<HTMLInputElement>(null)
- const { can: canUpdateRoles } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'roles'
- )
+ const { can: canUpdateRoles } = useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.DATABASE_WRITE)
useShortcut(
SHORTCUT_IDS.LIST_PAGE_FOCUS_SEARCH,
diff --git a/apps/studio/components/interfaces/Database/Schemas/SchemaGraph.tsx b/apps/studio/components/interfaces/Database/Schemas/SchemaGraph.tsx
index c9953186c3b..231289ff7e1 100644
--- a/apps/studio/components/interfaces/Database/Schemas/SchemaGraph.tsx
+++ b/apps/studio/components/interfaces/Database/Schemas/SchemaGraph.tsx
@@ -1,5 +1,4 @@
import type { PGSchema } from '@supabase/pg-meta'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import {
Background,
BackgroundVariant,
@@ -70,7 +69,7 @@ import { useDatabasePoliciesQuery } from '@/data/database-policies/database-poli
import { useSchemasQuery } from '@/data/database/schemas-query'
import { useEnumeratedTypesQuery } from '@/data/enumerated-types/enumerated-types-query'
import { useInfiniteTablesQuery } from '@/data/tables/tables-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useLocalStorage } from '@/hooks/misc/useLocalStorage'
import { useQuerySchemaState } from '@/hooks/misc/useSchemaQueryState'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
@@ -168,9 +167,8 @@ export const SchemaGraph = () => {
{}
)
- const { can: canUpdateTables } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'tables'
+ const { can: canUpdateTables } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const { isSchemaLocked } = useIsProtectedSchema({ schema: selectedSchema })
diff --git a/apps/studio/components/interfaces/Database/Schemas/SchemaTableNode.tsx b/apps/studio/components/interfaces/Database/Schemas/SchemaTableNode.tsx
index c8f45489bb2..5768db49170 100644
--- a/apps/studio/components/interfaces/Database/Schemas/SchemaTableNode.tsx
+++ b/apps/studio/components/interfaces/Database/Schemas/SchemaTableNode.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { Handle, Node, NodeProps } from '@xyflow/react'
import { TableEditor } from 'icons'
import {
@@ -34,7 +33,7 @@ import { TableNodeData } from './Schemas.constants'
import { getTableDefinitionAsMarkdown } from './Schemas.utils'
import { buildTableEditorUrl } from '@/components/grid/SupabaseGrid.utils'
import { getTableDefinition } from '@/data/database/table-definition-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { formatSql } from '@/lib/formatSql'
@@ -56,9 +55,8 @@ const TableNodeComponent = ({
const hiddenNodeConnector = 'h-px! w-px! min-w-0! min-h-0! cursor-grab! border-0! opacity-0!'
const schemaGraphContext = useSchemaGraphContext()
const { data: project } = useSelectedProjectQuery()
- const { can: canUpdateColumns } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'columns'
+ const { can: canUpdateColumns } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const router = useRouter()
const itemHeight = 'h-[22px]'
diff --git a/apps/studio/components/interfaces/Database/Tables/ColumnList.tsx b/apps/studio/components/interfaces/Database/Tables/ColumnList.tsx
index 0bbd9bf6aa5..c640eda677f 100644
--- a/apps/studio/components/interfaces/Database/Tables/ColumnList.tsx
+++ b/apps/studio/components/interfaces/Database/Tables/ColumnList.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { noop } from 'lodash'
import {
@@ -54,7 +53,7 @@ import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { NoSearchResults } from '@/components/ui/NoSearchResults'
import { useTableEditorQuery } from '@/data/table-editor/table-editor-query'
import { isTableLike } from '@/data/table-editor/table-editor-types'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useIsProtectedSchema } from '@/hooks/useProtectedSchemas'
import type { SafePostgresColumn } from '@/lib/postgres-types'
@@ -139,9 +138,8 @@ export const ColumnList = ({
)) ?? []
const { isSchemaLocked } = useIsProtectedSchema({ schema: selectedTable?.schema ?? '' })
- const { can: canUpdateColumns } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'columns'
+ const { can: canUpdateColumns } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
return (
diff --git a/apps/studio/components/interfaces/Database/Tables/TableList.tsx b/apps/studio/components/interfaces/Database/Tables/TableList.tsx
index b72921baca7..a8cb70dd488 100644
--- a/apps/studio/components/interfaces/Database/Tables/TableList.tsx
+++ b/apps/studio/components/interfaces/Database/Tables/TableList.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useDebounce, useIntersectionObserver } from '@uidotdev/usehooks'
import { useParams } from 'common'
import { noop } from 'lodash'
@@ -62,7 +61,7 @@ import { useMaterializedViewsQuery } from '@/data/materialized-views/materialize
import { usePrefetchEditorTablePage } from '@/data/prefetchers/project.$ref.editor.$id'
import { useInfiniteTablesQuery } from '@/data/tables/tables-query'
import { useViewsQuery } from '@/data/views/views-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useQuerySchemaState } from '@/hooks/misc/useSchemaQueryState'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useIsProtectedSchema } from '@/hooks/useProtectedSchemas'
@@ -98,9 +97,8 @@ export const TableList = ({
const [schemaSelectorOpen, setSchemaSelectorOpen] = useState(false)
const searchInputRef = useRef<HTMLInputElement>(null)
- const { can: canUpdateTables } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'tables'
+ const { can: canUpdateTables } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const {
diff --git a/apps/studio/components/interfaces/Database/Triggers/EventTriggersList/EventTriggersList.tsx b/apps/studio/components/interfaces/Database/Triggers/EventTriggersList/EventTriggersList.tsx
index 733e55e21cd..6eba3a04534 100644
--- a/apps/studio/components/interfaces/Database/Triggers/EventTriggersList/EventTriggersList.tsx
+++ b/apps/studio/components/interfaces/Database/Triggers/EventTriggersList/EventTriggersList.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { DatabaseZapIcon, PlusIcon, SearchIcon } from 'lucide-react'
import { parseAsJson, parseAsString, useQueryState } from 'nuqs'
import { useMemo, useRef, useState } from 'react'
@@ -33,7 +32,7 @@ import { DocsButton } from '@/components/ui/DocsButton'
import { Shortcut } from '@/components/ui/Shortcut'
import { useDatabaseEventTriggerDeleteMutation } from '@/data/database-event-triggers/database-event-trigger-delete-mutation'
import { useDatabaseEventTriggersQuery } from '@/data/database-event-triggers/database-event-triggers-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL } from '@/lib/constants'
import { onSearchInputEscape } from '@/lib/keyboard'
@@ -67,9 +66,8 @@ export const EventTriggersList = () => {
setInitialPrompt: setEditorPanelInitialPrompt,
} = useEditorPanelStateSnapshot()
- const { can: canUpdateEventTriggers } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'triggers'
+ const { can: canUpdateEventTriggers } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const {
diff --git a/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggerList.tsx b/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggerList.tsx
index 7c829e7989b..536204ca822 100644
--- a/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggerList.tsx
+++ b/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggerList.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { includes, sortBy } from 'lodash'
import {
@@ -37,7 +36,7 @@ import { SIDEBAR_KEYS } from '@/components/layouts/ProjectLayout/LayoutSidebar/L
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { TableRowNoResults } from '@/components/ui/TableRowNoResults'
import { useDatabaseTriggersQuery } from '@/data/database-triggers/database-triggers-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useQuerySchemaState } from '@/hooks/misc/useSchemaQueryState'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useIsProtectedSchema } from '@/hooks/useProtectedSchemas'
@@ -56,9 +55,8 @@ export const TriggerList = ({ editTrigger, duplicateTrigger, deleteTrigger }: Tr
const aiSnap = useAiAssistantStateSnapshot()
const { openSidebar } = useSidebarManagerSnapshot()
- const { can: canUpdateTriggers } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'triggers'
+ const { can: canUpdateTriggers } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const { selectedSchema: schema } = useQuerySchemaState()
diff --git a/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggersList.tsx b/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggersList.tsx
index 1d8f09f52f0..6fc057d54f1 100644
--- a/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggersList.tsx
+++ b/apps/studio/components/interfaces/Database/Triggers/TriggersList/TriggersList.tsx
@@ -1,5 +1,4 @@
import { safeSql } from '@supabase/pg-meta'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { DatabaseZapIcon, SearchIcon } from 'lucide-react'
import { parseAsBoolean, parseAsJson, parseAsString, useQueryState } from 'nuqs'
import { useEffect, useRef, useState } from 'react'
@@ -37,7 +36,7 @@ import { TextConfirmModal } from '@/components/ui/TextConfirmModalWrapper'
import { useDatabaseTriggerDeleteMutation } from '@/data/database-triggers/database-trigger-delete-mutation'
import { useDatabaseTriggersQuery } from '@/data/database-triggers/database-triggers-query'
import { useTablesQuery } from '@/data/tables/tables-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useQuerySchemaState } from '@/hooks/misc/useSchemaQueryState'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useIsProtectedSchema, useProtectedSchemas } from '@/hooks/useProtectedSchemas'
@@ -92,9 +91,8 @@ export const TriggersList = () => {
connectionString: project?.connectionString,
})
- const { can: canCreateTriggers } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'triggers'
+ const { can: canCreateTriggers } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const [showCreateTriggerForm, setShowCreateTriggerForm] = useQueryState(
diff --git a/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx b/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx
index ac680505521..fd0108f078a 100644
--- a/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx
+++ b/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { AnimatePresence, motion } from 'motion/react'
import { useEffect, useRef, useState, type ReactNode } from 'react'
@@ -54,7 +53,7 @@ import { useProjectAddonsQuery } from '@/data/subscriptions/project-addons-query
import { AddonVariantId } from '@/data/subscriptions/types'
import { useResourceWarningsQuery } from '@/data/usage/resource-warnings-query'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import {
useIsAwsCloudProvider,
@@ -105,11 +104,7 @@ export function DiskManagementForm({
const isHighAvailability = useIsHighAvailability()
const { can: canUpdateDiskConfiguration, isSuccess: isPermissionsLoaded } =
- useAsyncCheckPermissions(PermissionAction.UPDATE, 'projects', {
- resource: {
- project_id: project?.id,
- },
- })
+ useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.INFRA_DISK_CONFIG_WRITE)
const { hasAccess, isSuccess: isEntitlementsLoaded } = useCheckEntitlements(
'instances.compute_update_available_sizes'
diff --git a/apps/studio/components/interfaces/DiskManagement/DiskManagementReviewAndSubmitDialog/DiskManagementReviewAndSubmitDialog.tsx b/apps/studio/components/interfaces/DiskManagement/DiskManagementReviewAndSubmitDialog/DiskManagementReviewAndSubmitDialog.tsx
index d4441a2604b..9c29e4c8a9f 100644
--- a/apps/studio/components/interfaces/DiskManagement/DiskManagementReviewAndSubmitDialog/DiskManagementReviewAndSubmitDialog.tsx
+++ b/apps/studio/components/interfaces/DiskManagement/DiskManagementReviewAndSubmitDialog/DiskManagementReviewAndSubmitDialog.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { ArrowRightIcon } from 'lucide-react'
import { UseFormReturn } from 'react-hook-form'
import {
@@ -29,8 +28,7 @@ import {
import { useDiskManagementReviewChanges } from './DiskManagementReviewAndSubmitDialog.hooks'
import { TaxDisclaimer } from '@/components/interfaces/Billing/TaxDisclaimer'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
-import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { formatCurrency } from '@/lib/helpers'
interface DiskManagementReviewAndSubmitDialogProps {
@@ -56,12 +54,8 @@ export const DiskManagementReviewAndSubmitDialog = ({
message,
buttonSize = 'medium',
}: DiskManagementReviewAndSubmitDialogProps) => {
- const { data: project } = useSelectedProjectQuery()
-
- const { can: canUpdateDiskConfiguration } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'projects',
- { resource: { project_id: project?.id } }
+ const { can: canUpdateDiskConfiguration } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.INFRA_DISK_CONFIG_WRITE
)
const isDirty = !!Object.keys(form.formState.dirtyFields).length
diff --git a/apps/studio/components/interfaces/Docs/Authentication.tsx b/apps/studio/components/interfaces/Docs/Authentication.tsx
index d0937e1c7e3..39379dbeade 100644
--- a/apps/studio/components/interfaces/Docs/Authentication.tsx
+++ b/apps/studio/components/interfaces/Docs/Authentication.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import CodeSnippet from './CodeSnippet'
@@ -7,7 +6,7 @@ import Snippets from './Snippets'
import { InlineLink } from '@/components/ui/InlineLink'
import { useAPIKeys } from '@/data/api-keys/api-keys-query'
import { useProjectSettingsV2Query } from '@/data/config/project-settings-v2-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
interface AuthenticationProps {
selectedLang: 'bash' | 'js'
@@ -16,7 +15,9 @@ interface AuthenticationProps {
const Authentication = ({ selectedLang, showApiKey }: AuthenticationProps) => {
const { ref: projectRef } = useParams()
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ
+ )
const { data: apiKeyData } = useAPIKeys({ projectRef }, { enabled: canReadAPIKeys })
const { anonKey, serviceKey } = apiKeyData ?? {}
diff --git a/apps/studio/components/interfaces/Docs/Description.tsx b/apps/studio/components/interfaces/Docs/Description.tsx
index 2eab2aa8b0a..651f56742c4 100644
--- a/apps/studio/components/interfaces/Docs/Description.tsx
+++ b/apps/studio/components/interfaces/Docs/Description.tsx
@@ -1,5 +1,4 @@
import { ident, literal, safeSql, type SafeSqlFragment } from '@supabase/pg-meta/src/pg-format'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { noop } from 'lodash'
import { LoaderIcon } from 'lucide-react'
import { useState } from 'react'
@@ -7,7 +6,7 @@ import { toast } from 'sonner'
import { Button, ExpandingTextArea } from 'ui'
import { executeSql } from '@/data/sql/execute-sql-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { timeout } from '@/lib/helpers'
@@ -42,9 +41,8 @@ const Description = ({ content, metadata, onChange = noop }: DescrptionProps) =>
const hasChanged = value != contentText
const animateCss = `transition duration-150`
- const { can: canUpdateDescription } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_QUERY,
- '*'
+ const { can: canUpdateDescription } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const updateDescription = async () => {
diff --git a/apps/studio/components/interfaces/Docs/LangSelector.tsx b/apps/studio/components/interfaces/Docs/LangSelector.tsx
index 48f564d925c..90353cadcf7 100644
--- a/apps/studio/components/interfaces/Docs/LangSelector.tsx
+++ b/apps/studio/components/interfaces/Docs/LangSelector.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { EyeOffIcon, KeyIcon } from 'lucide-react'
import { useMemo } from 'react'
@@ -18,7 +17,7 @@ import {
import type { ShowApiKey } from '@/components/interfaces/Docs/Docs.types'
import { useAPIKeysQuery } from '@/data/api-keys/api-keys-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
const DEFAULT_KEY = { name: 'hide', key: 'SUPABASE_KEY' }
@@ -37,7 +36,9 @@ export const LangSelector = ({
}: LangSelectorProps) => {
const { ref: projectRef } = useParams()
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ
+ )
const { data: apiKeys = [], isPending: isLoadingAPIKeys } = useAPIKeysQuery(
{
projectRef,
diff --git a/apps/studio/components/interfaces/ErrorHandling/RestartProjectDialog.tsx b/apps/studio/components/interfaces/ErrorHandling/RestartProjectDialog.tsx
index 2eaaef9142e..39a2fe7b8cf 100644
--- a/apps/studio/components/interfaces/ErrorHandling/RestartProjectDialog.tsx
+++ b/apps/studio/components/interfaces/ErrorHandling/RestartProjectDialog.tsx
@@ -1,6 +1,5 @@
'use client'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useRouter } from 'next/router'
import { toast } from 'sonner'
import { ConfirmationModal } from 'ui-patterns/Dialogs/ConfirmationModal'
@@ -8,7 +7,7 @@ import { ConfirmationModal } from 'ui-patterns/Dialogs/ConfirmationModal'
import { useSetProjectStatus } from '@/data/projects/project-detail-query'
import { useProjectRestartMutation } from '@/data/projects/project-restart-mutation'
import { useProjectRestartServicesMutation } from '@/data/projects/project-restart-services-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { PROJECT_STATUS } from '@/lib/constants'
@@ -28,9 +27,8 @@ export function RestartProjectDialog({
const { data: project } = useSelectedProjectQuery()
const { setProjectStatus } = useSetProjectStatus()
- const { can: canRestartProject } = useAsyncCheckPermissions(
- PermissionAction.INFRA_EXECUTE,
- 'reboot'
+ const { can: canRestartProject } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.OPERATIONS_WRITE
)
const { mutate: restartProject, isPending: isRestartingProject } = useProjectRestartMutation({
diff --git a/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionDetails.tsx b/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionDetails.tsx
index 3e7fcc88027..33ffb29c4f3 100644
--- a/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionDetails.tsx
+++ b/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionDetails.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { IS_PLATFORM, useParams } from 'common'
import { useRouter } from 'next/router'
import { useEffect, useMemo, useState } from 'react'
@@ -47,7 +46,7 @@ import { useProjectApiUrl } from '@/data/config/project-endpoint-query'
import { useEdgeFunctionQuery } from '@/data/edge-functions/edge-function-query'
import { useEdgeFunctionDeleteMutation } from '@/data/edge-functions/edge-functions-delete-mutation'
import { useEdgeFunctionUpdateMutation } from '@/data/edge-functions/edge-functions-update-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
const FormSchema = z.object({
@@ -71,14 +70,15 @@ export const EdgeFunctionDetails = () => {
const [selectedTab, setSelectedTab] = useState(invocationTabs[0].id)
const [showDeleteModal, setShowDeleteModal] = useState(false)
- const { can: canUpdateEdgeFunctionPermission } = useAsyncCheckPermissions(
- PermissionAction.FUNCTIONS_WRITE,
- '*'
+ const { can: canUpdateEdgeFunctionPermission } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.EDGE_FUNCTIONS_WRITE
)
const canUpdateEdgeFunction = IS_PLATFORM && canUpdateEdgeFunctionPermission
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ
+ )
const { data: apiKeyData } = useAPIKeys({ projectRef }, { enabled: canReadAPIKeys })
const { anonKey, publishableKey } = apiKeyData ?? {}
diff --git a/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionTesterSheet.tsx b/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionTesterSheet.tsx
index edcd38ad004..c10c0d7ee26 100644
--- a/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionTesterSheet.tsx
+++ b/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionTesterSheet.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { BookOpenIcon, Loader2Icon, SendIcon } from 'lucide-react'
import { useState } from 'react'
@@ -44,7 +43,7 @@ import { ShortcutTooltip } from '@/components/ui/ShortcutTooltip'
import { useAPIKeys } from '@/data/api-keys/api-keys-query'
import { useProjectSettingsV2Query } from '@/data/config/project-settings-v2-query'
import { useEdgeFunctionTestMutation } from '@/data/edge-functions/edge-function-test-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { prettifyJSON } from '@/lib/helpers'
import { useTrack } from '@/lib/telemetry/track'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
@@ -84,7 +83,10 @@ export const EdgeFunctionTesterSheet = ({ visible, onClose }: EdgeFunctionTester
const [error, setError] = useState<string | null>(null)
const errorDocs = response ? getEdgeFunctionErrorDocs(response.headers) : undefined
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2([
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ,
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_SECRET_READ,
+ ])
const { data: apiKeysData } = useAPIKeys(
{ projectRef, reveal: true },
{ enabled: canReadAPIKeys }
diff --git a/apps/studio/components/interfaces/Functions/EdgeFunctionOverview/EdgeFunctionOverview.tsx b/apps/studio/components/interfaces/Functions/EdgeFunctionOverview/EdgeFunctionOverview.tsx
index 60fc7d7f676..845367ff051 100644
--- a/apps/studio/components/interfaces/Functions/EdgeFunctionOverview/EdgeFunctionOverview.tsx
+++ b/apps/studio/components/interfaces/Functions/EdgeFunctionOverview/EdgeFunctionOverview.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { IS_PLATFORM, useParams } from 'common'
import { ExternalLinkIcon } from 'lucide-react'
import { useRouter } from 'next/router'
@@ -30,7 +29,7 @@ import {
} from '@/data/analytics/functions-combined-stats-query'
import { useEdgeFunctionQuery } from '@/data/edge-functions/edge-function-query'
import { useFillTimeseriesSorted } from '@/hooks/analytics/useFillTimeseriesSorted'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
export const EdgeFunctionOverview = () => {
const router = useRouter()
@@ -166,9 +165,8 @@ export const EdgeFunctionOverview = () => {
},
})
- const { isLoading: permissionsLoading, can: canReadFunction } = useAsyncCheckPermissions(
- PermissionAction.FUNCTIONS_READ,
- functionSlug as string
+ const { isLoading: permissionsLoading, can: canReadFunction } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.EDGE_FUNCTIONS_READ
)
useEffect(() => {
diff --git a/apps/studio/components/interfaces/Functions/EdgeFunctionSecrets/EdgeFunctionSecret.tsx b/apps/studio/components/interfaces/Functions/EdgeFunctionSecrets/EdgeFunctionSecret.tsx
index 5fdcd5d8afd..03afbda90e9 100644
--- a/apps/studio/components/interfaces/Functions/EdgeFunctionSecrets/EdgeFunctionSecret.tsx
+++ b/apps/studio/components/interfaces/Functions/EdgeFunctionSecrets/EdgeFunctionSecret.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { Edit2Icon, MoreVerticalIcon, TrashIcon } from 'lucide-react'
import { toast } from 'sonner'
import {
@@ -19,7 +18,7 @@ import { TimestampInfo } from 'ui-patterns/TimestampInfo'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import type { ProjectSecret } from '@/data/secrets/secrets-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
interface EdgeFunctionSecretProps {
secret: ProjectSecret
@@ -28,7 +27,9 @@ interface EdgeFunctionSecretProps {
}
const EdgeFunctionSecret = ({ secret, onSelectEdit, onSelectDelete }: EdgeFunctionSecretProps) => {
- const { can: canUpdateSecrets } = useAsyncCheckPermissions(PermissionAction.SECRETS_WRITE, '*')
+ const { can: canUpdateSecrets } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.EDGE_FUNCTIONS_SECRETS_WRITE
+ )
return (
<TableRow>
diff --git a/apps/studio/components/interfaces/Functions/EdgeFunctionSecrets/EdgeFunctionSecrets.tsx b/apps/studio/components/interfaces/Functions/EdgeFunctionSecrets/EdgeFunctionSecrets.tsx
index 94cc385fad4..5a918c8fc57 100644
--- a/apps/studio/components/interfaces/Functions/EdgeFunctionSecrets/EdgeFunctionSecrets.tsx
+++ b/apps/studio/components/interfaces/Functions/EdgeFunctionSecrets/EdgeFunctionSecrets.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useFlag, useParams } from 'common'
import { SearchIcon } from 'lucide-react'
import { parseAsString, useQueryState } from 'nuqs'
@@ -23,7 +22,7 @@ import { NoPermission } from '@/components/ui/NoPermission'
import { TableRowNoResults } from '@/components/ui/TableRowNoResults'
import { useSecretsDeleteMutation } from '@/data/secrets/secrets-delete-mutation'
import { useSecretsQuery } from '@/data/secrets/secrets-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { DOCS_URL } from '@/lib/constants'
export const EdgeFunctionSecrets = () => {
@@ -31,11 +30,11 @@ export const EdgeFunctionSecrets = () => {
const computeEnabled = useFlag('compute')
const [searchString, setSearchString] = useState('')
- const { can: canReadSecrets, isLoading: isLoadingSecretsPermissions } = useAsyncCheckPermissions(
- PermissionAction.FUNCTIONS_SECRET_READ,
- '*'
+ const { can: canReadSecrets, isLoading: isLoadingSecretsPermissions } =
+ useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.EDGE_FUNCTIONS_SECRETS_READ)
+ const { can: canUpdateSecrets } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.EDGE_FUNCTIONS_SECRETS_WRITE
)
- const { can: canUpdateSecrets } = useAsyncCheckPermissions(PermissionAction.SECRETS_WRITE, '*')
const {
data = [],
diff --git a/apps/studio/components/interfaces/Functions/TerminalInstructions.tsx b/apps/studio/components/interfaces/Functions/TerminalInstructions.tsx
index 17bc7950696..f981d93ae47 100644
--- a/apps/studio/components/interfaces/Functions/TerminalInstructions.tsx
+++ b/apps/studio/components/interfaces/Functions/TerminalInstructions.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { ExternalLinkIcon, Maximize2Icon, Minimize2Icon, TerminalIcon } from 'lucide-react'
import { useRouter } from 'next/router'
@@ -11,7 +10,7 @@ import { DocsButton } from '@/components/ui/DocsButton'
import { useAccessTokensQuery } from '@/data/access-tokens/access-tokens-query'
import { useAPIKeys } from '@/data/api-keys/api-keys-query'
import { useProjectApiUrl } from '@/data/config/project-endpoint-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { DOCS_URL } from '@/lib/constants'
interface TerminalInstructionsProps extends ComponentPropsWithoutRef<typeof Collapsible> {
@@ -28,7 +27,9 @@ export const TerminalInstructions = forwardRef<
const [showInstructions, setShowInstructions] = useState(!closable)
const { data: tokens } = useAccessTokensQuery()
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ
+ )
const { data: apiKeyData } = useAPIKeys({ projectRef }, { enabled: canReadAPIKeys })
const { anonKey, publishableKey } = apiKeyData ?? {}
diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.tsx
index b1677a32d23..760d64770b2 100644
--- a/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.tsx
+++ b/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { parseAsString, useQueryState } from 'nuqs'
import { useEffect, useState } from 'react'
@@ -53,7 +52,7 @@ import { getDatabaseCronJob } from '@/data/database-cron-jobs/database-cron-job-
import { useDatabaseCronJobCreateMutation } from '@/data/database-cron-jobs/database-cron-jobs-create-mutation'
import { CronJob } from '@/data/database-cron-jobs/database-cron-jobs-infinite-query'
import { useDatabaseExtensionsQuery } from '@/data/database-extensions/database-extensions-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useConfirmOnClose } from '@/hooks/ui/useConfirmOnClose'
import { isGreaterThanOrEqual } from '@/lib/semver'
@@ -118,9 +117,8 @@ export const CreateCronJobSheet = ({ open, selectedCronJob, onClose }: CreateCro
const { mutate: upsertCronJob, isPending: isUpserting } = useDatabaseCronJobCreateMutation()
const isLoading = isLoadingGetCronJob || isUpserting
- const { can: canToggleExtensions } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'extensions'
+ const { can: canToggleExtensions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const cronJobValues = parseCronJobCommand(
diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/HttpHeaderFieldsSection.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/HttpHeaderFieldsSection.tsx
index 6d6fdb10263..17dafd56b7b 100644
--- a/apps/studio/components/interfaces/Integrations/CronJobs/HttpHeaderFieldsSection.tsx
+++ b/apps/studio/components/interfaces/Integrations/CronJobs/HttpHeaderFieldsSection.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { useFormContext } from 'react-hook-form'
import { FormLabel, SheetSection } from 'ui'
@@ -7,7 +6,7 @@ import { KeyValueFieldArray } from 'ui-patterns/form/KeyValueFieldArray/KeyValue
import { CreateCronJobForm } from './CreateCronJobSheet/CreateCronJobSheet.constants'
import { buildEdgeFunctionHeaderAddActions } from '@/components/interfaces/Functions/httpHeaderAddActions'
import { useAPIKeys } from '@/data/api-keys/api-keys-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
interface HTTPHeaderFieldsSectionProps {
variant: 'edge_function' | 'http_request'
@@ -17,7 +16,10 @@ export const HTTPHeaderFieldsSection = ({ variant }: HTTPHeaderFieldsSectionProp
const form = useFormContext<CreateCronJobForm>()
const { ref } = useParams()
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2([
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ,
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_SECRET_READ,
+ ])
const { data: apiKeysData } = useAPIKeys(
{ projectRef: ref, reveal: true },
{ enabled: canReadAPIKeys }
diff --git a/apps/studio/components/interfaces/Integrations/GraphQL/GraphiQLTab.tsx b/apps/studio/components/interfaces/Integrations/GraphQL/GraphiQLTab.tsx
index f567932e459..5e60a84acfd 100644
--- a/apps/studio/components/interfaces/Integrations/GraphQL/GraphiQLTab.tsx
+++ b/apps/studio/components/interfaces/Integrations/GraphQL/GraphiQLTab.tsx
@@ -3,7 +3,6 @@ import './graphiql-styles.css'
import { useMonaco, type GraphiQLPlugin } from '@graphiql/react'
import { createGraphiQLFetcher, Fetcher } from '@graphiql/toolkit'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { GraphiQL, HISTORY_PLUGIN } from 'graphiql'
import { UserIcon } from 'lucide-react'
@@ -22,7 +21,7 @@ import { RoleImpersonationSelector } from '@/components/interfaces/RoleImpersona
import { BASE_MONACO_EDITOR_OPTIONS } from '@/components/ui/CodeEditor/CodeEditor.utils'
import { useSessionAccessTokenQuery } from '@/data/auth/session-access-token-query'
import { useProjectPostgrestConfigQuery } from '@/data/config/project-postgrest-config-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { API_URL, IS_PLATFORM } from '@/lib/constants'
import { getRoleImpersonationJWT } from '@/lib/role-impersonation'
@@ -82,10 +81,10 @@ export const GraphiQLTab = () => {
const getImpersonatedRoleState = useGetImpersonatedRoleState()
- const { can: canReadJWTSecret } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'field.jwt_secret'
- )
+ const { can: canReadJWTSecret } = useAsyncCheckPermissionsV2([
+ FGA_PERMISSIONS.PROJECT.DATA_API_CONFIG_READ,
+ FGA_PERMISSIONS.PROJECT.DATA_API_CONFIG_SECRET_READ,
+ ])
const { notice, schemaComment } = usePgGraphqlIntrospectionStatus({
projectRef,
diff --git a/apps/studio/components/interfaces/Integrations/Integration/MarketplaceIntegrationSettingsTab.test.tsx b/apps/studio/components/interfaces/Integrations/Integration/MarketplaceIntegrationSettingsTab.test.tsx
index 85478a4ef6b..7b418d66e5f 100644
--- a/apps/studio/components/interfaces/Integrations/Integration/MarketplaceIntegrationSettingsTab.test.tsx
+++ b/apps/studio/components/interfaces/Integrations/Integration/MarketplaceIntegrationSettingsTab.test.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { fireEvent, screen, waitFor } from '@testing-library/react'
import { mockAnimationsApi } from 'jsdom-testing-mocks'
import { HttpResponse } from 'msw'
@@ -10,6 +9,7 @@ import { type components } from '@/data/api'
import { type APIKey } from '@/data/api-keys/api-keys-query'
import { type AuthConfigResponse } from '@/data/auth/auth-config-query'
import { type ProjectSecret } from '@/data/secrets/secrets-query'
+import { FGA_PERMISSIONS } from '@/hooks/misc/useCheckPermissionsV2'
import { customRender } from '@/tests/lib/custom-render'
import { addAPIMock } from '@/tests/lib/msw'
@@ -17,9 +17,7 @@ import { addAPIMock } from '@/tests/lib/msw'
// the MSW resolver) is the raw OpenAPI `OAuthAppResponse`. Build fixtures against the API shape.
type OAuthAppResponse = components['schemas']['OAuthAppResponse_Output']
type PartnerIntegrationListResponse = components['schemas']['PartnerIntegrationListResponse_Output']
-// Same story for permissions: the frontend `Permission` type narrows nullable wire fields, so build
-// the fixture against the raw `AccessControlPermission` shape the MSW resolver actually returns.
-type AccessControlPermission = components['schemas']['AccessControlPermission']
+type PermissionsV2Response = components['schemas']['UserPermissionsResponse_Output']
// `useIntegrationDetail` resolves the integration definition from the route, the marketplace query
// and feature flags — none of which is the subject of this test. Mock it so each test can drive a
@@ -84,15 +82,15 @@ const authorizedApp = (appId: string): OAuthAppResponse => ({
registration_type: 'manual',
})
-const CAN_READ_OAUTH_APPS_PERMISSION: AccessControlPermission = {
- actions: [PermissionAction.READ],
- condition: null,
- organization_id: null,
- organization_slug: 'acme',
- project_ids: null,
- project_refs: [],
- resources: ['oauth_apps'],
- restrictive: false,
+const CAN_READ_OAUTH_APPS_PERMISSIONS: PermissionsV2Response = {
+ organizations: [
+ {
+ slug: 'acme',
+ role: 'administrator',
+ permissions: [FGA_PERMISSIONS.ORGANIZATION.CONFIG_READ],
+ projects: [],
+ },
+ ],
}
/**
@@ -107,8 +105,8 @@ const mockProjectResources = ({
} = {}) => {
addAPIMock({
method: 'get',
- path: '/platform/profile/permissions',
- response: () => HttpResponse.json<AccessControlPermission[]>([CAN_READ_OAUTH_APPS_PERMISSION]),
+ path: '/platform/profile/permissions/v2',
+ response: () => HttpResponse.json<PermissionsV2Response>(CAN_READ_OAUTH_APPS_PERMISSIONS),
})
addAPIMock({
method: 'get',
diff --git a/apps/studio/components/interfaces/Integrations/Landing/Landing.utils.ts b/apps/studio/components/interfaces/Integrations/Landing/Landing.utils.ts
index f524a3ba675..39cb9ca7a07 100644
--- a/apps/studio/components/interfaces/Integrations/Landing/Landing.utils.ts
+++ b/apps/studio/components/interfaces/Integrations/Landing/Landing.utils.ts
@@ -1,5 +1,4 @@
import { parseSchemaComment } from '@stripe/sync-engine/supabase'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useMemo } from 'react'
import { type WrapperMeta } from '../Wrappers/Wrappers.types'
@@ -20,7 +19,7 @@ import {
usePartnerIntegrationsQuery,
} from '@/data/partners/integration-status-query'
import { useSecretsQuery, type ProjectSecret } from '@/data/secrets/secrets-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { ResponseError } from '@/types'
@@ -75,10 +74,8 @@ export const useProjectOAuthIntegrationData = (
// `isLoading` remount on each refetch, which loops. Transient failures still recover: the retry
// policy gives 5xx three attempts, and refetch-on-focus/reconnect are staleness-driven, so they
// are unaffected by this.
- const { can: canReadOAuthApps } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'oauth_apps',
- undefined,
+ const { can: canReadOAuthApps } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.CONFIG_READ,
{
organizationSlug: org?.slug,
projectRef: null,
diff --git a/apps/studio/components/interfaces/Integrations/Landing/useInstalledIntegrations.tsx b/apps/studio/components/interfaces/Integrations/Landing/useInstalledIntegrations.tsx
index 63456814b78..21f2526a1f6 100644
--- a/apps/studio/components/interfaces/Integrations/Landing/useInstalledIntegrations.tsx
+++ b/apps/studio/components/interfaces/Integrations/Landing/useInstalledIntegrations.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useMemo } from 'react'
import {
@@ -12,7 +11,7 @@ import { useAvailableIntegrations } from './useAvailableIntegrations'
import { useDatabaseExtensionsQuery } from '@/data/database-extensions/database-extensions-query'
import { useSchemasQuery } from '@/data/database/schemas-query'
import { useFDWsQuery } from '@/data/fdw/fdws-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { EMPTY_ARR } from '@/lib/void'
@@ -21,10 +20,8 @@ export const useInstalledIntegrations = () => {
const { data: project } = useSelectedProjectQuery()
const { data: org } = useSelectedOrganizationQuery()
- const { can: canReadOAuthApps } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'oauth_apps',
- undefined,
+ const { can: canReadOAuthApps } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.CONFIG_READ,
{
organizationSlug: org?.slug,
projectRef: null,
diff --git a/apps/studio/components/interfaces/Integrations/Queues/QueuesSettings.tsx b/apps/studio/components/interfaces/Integrations/Queues/QueuesSettings.tsx
index f1a453c73ae..b4f736327b6 100644
--- a/apps/studio/components/interfaces/Integrations/Queues/QueuesSettings.tsx
+++ b/apps/studio/components/interfaces/Integrations/Queues/QueuesSettings.tsx
@@ -1,6 +1,5 @@
import { zodResolver } from '@hookform/resolvers/zod'
import { QUEUES_SCHEMA } from '@supabase/pg-meta'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useEffect, useState } from 'react'
import { useForm, useWatch } from 'react-hook-form'
import { toast } from 'sonner'
@@ -27,15 +26,14 @@ import { useDatabaseQueueToggleExposeMutation } from '@/data/database-queues/dat
import { useDatabaseQueuesVersionQuery } from '@/data/database-queues/database-queues-version-query'
import { useTableUpdateMutation } from '@/data/tables/table-update-mutation'
import { useTablesQuery } from '@/data/tables/tables-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL, IS_PLATFORM } from '@/lib/constants'
export const QueuesSettings = () => {
const { data: project } = useSelectedProjectQuery()
- const { can: canUpdatePostgrestConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'custom_config_postgrest'
+ const { can: canUpdatePostgrestConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATA_API_CONFIG_WRITE
)
const [isToggling, setIsToggling] = useState(false)
const [rlsConfirmModalOpen, setRlsConfirmModalOpen] = useState(false)
diff --git a/apps/studio/components/interfaces/Integrations/Vault/Secrets/SecretRow.tsx b/apps/studio/components/interfaces/Integrations/Vault/Secrets/SecretRow.tsx
index e2bff1e5793..7a7eed88f2a 100644
--- a/apps/studio/components/interfaces/Integrations/Vault/Secrets/SecretRow.tsx
+++ b/apps/studio/components/interfaces/Integrations/Vault/Secrets/SecretRow.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import dayjs from 'dayjs'
import {
@@ -27,7 +26,7 @@ import { Input } from 'ui-patterns/DataInputs/Input'
import { SecretTableColumn } from './Secrets.types'
import { DropdownMenuItemTooltip } from '@/components/ui/DropdownMenuItemTooltip'
import { useVaultSecretDecryptedValueQuery } from '@/data/vault/vault-secret-decrypted-value-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import type { VaultSecret } from '@/types'
@@ -45,9 +44,8 @@ export const SecretRow = ({ row, col }: SecretRowProps) => {
const [, setSelectedSecretToEdit] = useQueryState('edit', parseAsString)
const [, setSelectedSecretToDelete] = useQueryState('delete', parseAsString)
- const { can: canManageSecrets } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'tables'
+ const { can: canManageSecrets } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const { data: revealedValue, isFetching } = useVaultSecretDecryptedValueQuery(
diff --git a/apps/studio/components/interfaces/Integrations/Vault/Secrets/SecretsManagement.tsx b/apps/studio/components/interfaces/Integrations/Vault/Secrets/SecretsManagement.tsx
index 68f3b9cde9b..15ab1d10192 100644
--- a/apps/studio/components/interfaces/Integrations/Vault/Secrets/SecretsManagement.tsx
+++ b/apps/studio/components/interfaces/Integrations/Vault/Secrets/SecretsManagement.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { sortBy } from 'lodash'
import { RefreshCwIcon, SearchIcon, XIcon } from 'lucide-react'
@@ -28,7 +27,7 @@ import { AlertError } from '@/components/ui/AlertError'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { DocsButton } from '@/components/ui/DocsButton'
import { useVaultSecretsQuery } from '@/data/vault/vault-secrets-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL } from '@/lib/constants'
import { onSearchInputEscape } from '@/lib/keyboard'
@@ -44,9 +43,8 @@ export const SecretsManagement = () => {
const [, setShowAddSecretModal] = useQueryState('new', parseAsBoolean.withDefault(false))
const [selectedSort, setSelectedSort] = useState<'updated_at' | 'name'>('updated_at')
- const { can: canManageSecrets } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'tables'
+ const { can: canManageSecrets } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const {
diff --git a/apps/studio/components/interfaces/Integrations/Webhooks/ListTab.tsx b/apps/studio/components/interfaces/Integrations/Webhooks/ListTab.tsx
index caeda4cbf87..c40fdc482da 100644
--- a/apps/studio/components/interfaces/Integrations/Webhooks/ListTab.tsx
+++ b/apps/studio/components/interfaces/Integrations/Webhooks/ListTab.tsx
@@ -1,16 +1,13 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
-
import { DeleteHookModal } from '@/components/interfaces/Database/Hooks/DeleteHookModal'
import { EditHookPanel } from '@/components/interfaces/Database/Hooks/EditHookPanel'
import { HooksList } from '@/components/interfaces/Database/Hooks/HooksList/HooksList'
import { ConstrainedIntegrationTabScaffold } from '@/components/interfaces/Integrations/ConstrainedIntegrationTabScaffold'
import { NoPermission } from '@/components/ui/NoPermission'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
export const WebhooksListTab = () => {
- const { can: canReadWebhooks, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_READ,
- 'triggers'
+ const { can: canReadWebhooks, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WEBHOOKS_CONFIG_READ
)
if (isPermissionsLoaded && !canReadWebhooks) {
diff --git a/apps/studio/components/interfaces/Integrations/Webhooks/OverviewTab.tsx b/apps/studio/components/interfaces/Integrations/Webhooks/OverviewTab.tsx
index 180aa4630dc..e5b3583efb9 100644
--- a/apps/studio/components/interfaces/Integrations/Webhooks/OverviewTab.tsx
+++ b/apps/studio/components/interfaces/Integrations/Webhooks/OverviewTab.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { toast } from 'sonner'
import { Admonition } from 'ui-patterns/Admonition'
@@ -11,7 +10,7 @@ import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { NoPermission } from '@/components/ui/NoPermission'
import { useHooksEnableMutation } from '@/data/database/hooks-enable-mutation'
import { useSchemasQuery } from '@/data/database/schemas-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
const WebhooksContent = () => {
@@ -28,9 +27,8 @@ const WebhooksContent = () => {
})
const isHooksEnabled = schemas?.some((schema) => schema.name === 'supabase_functions')
- const { can: canReadWebhooks, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_READ,
- 'triggers'
+ const { can: canReadWebhooks, isLoading: isLoadingPermissions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WEBHOOKS_CONFIG_READ
)
const { mutate: enableHooks, isPending: isEnablingHooks } = useHooksEnableMutation({
diff --git a/apps/studio/components/interfaces/Integrations/Wrappers/AddWrapperButton.tsx b/apps/studio/components/interfaces/Integrations/Wrappers/AddWrapperButton.tsx
index ae3bc1428dc..e7aee292a01 100644
--- a/apps/studio/components/interfaces/Integrations/Wrappers/AddWrapperButton.tsx
+++ b/apps/studio/components/interfaces/Integrations/Wrappers/AddWrapperButton.tsx
@@ -1,11 +1,10 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import Link from 'next/link'
import { useMemo } from 'react'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { useDatabaseExtensionsQuery } from '@/data/database-extensions/database-extensions-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
const WRAPPER_REQUIRED_EXTENSION_NAMES = ['wrappers', 'supabase_vault']
@@ -16,10 +15,8 @@ interface AddWrapperButtonProps {
export const AddWrapperButton = ({ variant = 'default' }: AddWrapperButtonProps) => {
const { ref, id } = useParams()
-
- const { can: canCreateWrapper } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'wrappers'
+ const { can: canCreateWrapper } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const { data: project } = useSelectedProjectQuery()
diff --git a/apps/studio/components/interfaces/Integrations/Wrappers/WrapperRow.tsx b/apps/studio/components/interfaces/Integrations/Wrappers/WrapperRow.tsx
index 22e4631fb3f..f03b86d339f 100644
--- a/apps/studio/components/interfaces/Integrations/Wrappers/WrapperRow.tsx
+++ b/apps/studio/components/interfaces/Integrations/Wrappers/WrapperRow.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { partition } from 'lodash'
import { ChevronRightIcon, EditIcon, ExternalLinkIcon, Table2Icon, TrashIcon } from 'lucide-react'
@@ -10,7 +9,7 @@ import { INTEGRATIONS } from '../Landing/Integrations.constants'
import { convertKVStringArrayToJson, formatWrapperTables } from './Wrappers.utils'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import type { FDW } from '@/data/fdw/fdws-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
interface WrapperRowProps {
wrapper: FDW
@@ -18,9 +17,8 @@ interface WrapperRowProps {
export const WrapperRow = ({ wrapper }: WrapperRowProps) => {
const { ref, id } = useParams()
- const { can: canManageWrappers } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'wrappers'
+ const { can: canManageWrappers } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const [, setSelectedWrapperToEdit] = useQueryState('edit', parseAsString)
diff --git a/apps/studio/components/interfaces/Integrations/Wrappers/WrappersTab.tsx b/apps/studio/components/interfaces/Integrations/Wrappers/WrappersTab.tsx
index 80d3a945ab6..c4b06009d13 100644
--- a/apps/studio/components/interfaces/Integrations/Wrappers/WrappersTab.tsx
+++ b/apps/studio/components/interfaces/Integrations/Wrappers/WrappersTab.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { parseAsBoolean, useQueryState } from 'nuqs'
import { useCallback, useState } from 'react'
@@ -14,7 +13,7 @@ import { useIsMarketplaceEnabled } from '@/components/interfaces/App/FeaturePrev
import { DiscardChangesConfirmationDialog } from '@/components/ui-patterns/Dialogs/DiscardChangesConfirmationDialog'
import { DocsButton } from '@/components/ui/DocsButton'
import { useFDWsQuery } from '@/data/fdw/fdws-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useConfirmOnClose } from '@/hooks/ui/useConfirmOnClose'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
@@ -30,9 +29,8 @@ export const WrappersTab = () => {
parseAsBoolean.withDefault(false).withOptions({ clearOnDefault: true })
)
- const { can: canCreateWrapper } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'wrappers'
+ const { can: canCreateWrapper } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
useShortcut(SHORTCUT_IDS.LIST_PAGE_NEW_ITEM, () => setIsCreating(true), {
diff --git a/apps/studio/components/interfaces/Integrations/templates/StripeSyncEngine/IntegrationActions.tsx b/apps/studio/components/interfaces/Integrations/templates/StripeSyncEngine/IntegrationActions.tsx
index c0d4381bb5e..0dd34cca34b 100644
--- a/apps/studio/components/interfaces/Integrations/templates/StripeSyncEngine/IntegrationActions.tsx
+++ b/apps/studio/components/interfaces/Integrations/templates/StripeSyncEngine/IntegrationActions.tsx
@@ -1,10 +1,9 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { Button, cn } from 'ui'
import { hasInstallError, hasUninstallError } from './stripe-sync-status'
import { useStripeSyncStatus } from '@/components/interfaces/Integrations/templates/StripeSyncEngine/useStripeSyncStatus'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
export const IntegrationInstalledActions = ({
className,
@@ -24,9 +23,8 @@ export const IntegrationInstalledActions = ({
setShowUninstallModal: (value: boolean) => void
setShouldShowInstallSheet: (value: boolean) => void
}) => {
- const { can: canManageSecrets } = useAsyncCheckPermissions(
- PermissionAction.FUNCTIONS_SECRET_WRITE,
- '*'
+ const { can: canManageSecrets } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.EDGE_FUNCTIONS_SECRETS_WRITE
)
const {
@@ -90,9 +88,8 @@ export const IntegrationNotInstalledActions = ({
handleUninstall: () => void
setShouldShowInstallSheet: (value: boolean) => void
}) => {
- const { can: canManageSecrets } = useAsyncCheckPermissions(
- PermissionAction.FUNCTIONS_SECRET_WRITE,
- '*'
+ const { can: canManageSecrets } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.EDGE_FUNCTIONS_SECRETS_WRITE
)
const {
diff --git a/apps/studio/components/interfaces/Integrations/templates/StripeSyncEngine/OverviewTab.tsx b/apps/studio/components/interfaces/Integrations/templates/StripeSyncEngine/OverviewTab.tsx
index d652dce906a..b1cfe963c4a 100644
--- a/apps/studio/components/interfaces/Integrations/templates/StripeSyncEngine/OverviewTab.tsx
+++ b/apps/studio/components/interfaces/Integrations/templates/StripeSyncEngine/OverviewTab.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { ExternalLinkIcon } from 'lucide-react'
import Link from 'next/link'
import { useCallback, useEffect, useRef, useState } from 'react'
@@ -43,7 +42,7 @@ import { useStripeSyncStatus } from '@/components/interfaces/Integrations/templa
import { useStripeSyncInstallMutation } from '@/data/database-integrations/stripe/stripe-sync-install-mutation'
import { useStripeSyncUninstallMutation } from '@/data/database-integrations/stripe/stripe-sync-uninstall-mutation'
import { useSchemasQuery } from '@/data/database/schemas-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useTrack } from '@/lib/telemetry/track'
@@ -77,9 +76,8 @@ const StripeSyncContent = ({ hideInstallCTA = false }: { hideInstallCTA?: boolea
} = useStripeSyncStatus()
// Check permissions for managing function secrets
- const { can: canManageSecrets } = useAsyncCheckPermissions(
- PermissionAction.FUNCTIONS_SECRET_WRITE,
- '*'
+ const { can: canManageSecrets } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.EDGE_FUNCTIONS_SECRETS_WRITE
)
const installed = isInstalled(installationStatus)
diff --git a/apps/studio/components/interfaces/JwtSecrets/jwt-secret-keys-table/index.tsx b/apps/studio/components/interfaces/JwtSecrets/jwt-secret-keys-table/index.tsx
index 5ab9d88d428..34a745da6d8 100644
--- a/apps/studio/components/interfaces/JwtSecrets/jwt-secret-keys-table/index.tsx
+++ b/apps/studio/components/interfaces/JwtSecrets/jwt-secret-keys-table/index.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { IS_PLATFORM, useFlag, useParams } from 'common'
import { AlertCircleIcon, RotateCwIcon, TimerIcon } from 'lucide-react'
import { AnimatePresence } from 'motion/react'
@@ -50,7 +49,7 @@ import {
} from '@/data/jwt-signing-keys/jwt-signing-keys-query'
import { useLegacyJWTSigningKeyCreateMutation } from '@/data/jwt-signing-keys/legacy-jwt-signing-key-create-mutation'
import { useLegacyJWTSigningKeyQuery } from '@/data/jwt-signing-keys/legacy-jwt-signing-key-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
@@ -90,9 +89,8 @@ export const JWTSecretKeysTable = () => {
const [shownDialog, setShownDialog] = useState<DialogType>()
const showApiKeysLastUsed = useFlag('showApiKeysLastUsed')
- const { can: canReadAPIKeys, isLoading: isLoadingCanReadAPIKeys } = useAsyncCheckPermissions(
- PermissionAction.SECRETS_READ,
- '*'
+ const { can: canReadAPIKeys, isLoading: isLoadingCanReadAPIKeys } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_SIGNING_KEYS_READ
)
const now = useRef(new Date()).current
const {
diff --git a/apps/studio/components/interfaces/JwtSecrets/jwt-settings.tsx b/apps/studio/components/interfaces/JwtSecrets/jwt-settings.tsx
index f4f8e0edfde..678405726ab 100644
--- a/apps/studio/components/interfaces/JwtSecrets/jwt-settings.tsx
+++ b/apps/studio/components/interfaces/JwtSecrets/jwt-settings.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import {
JwtSecretUpdateError,
JwtSecretUpdateProgress,
@@ -65,7 +64,7 @@ import { useJwtSecretUpdateMutation } from '@/data/config/jwt-secret-update-muta
import { useJwtSecretUpdatingStatusQuery } from '@/data/config/jwt-secret-updating-status-query'
import { useProjectPostgrestConfigQuery } from '@/data/config/project-postgrest-config-query'
import { useLegacyJWTSigningKeyQuery } from '@/data/jwt-signing-keys/legacy-jwt-signing-key-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { DOCS_URL } from '@/lib/constants'
import { uuidv4 } from '@/lib/helpers'
@@ -86,13 +85,11 @@ export const JWTSettings = () => {
const [isCreatingKey, setIsCreatingKey] = useState<boolean>(false)
const [isRegeneratingKey, setIsGeneratingKey] = useState<boolean>(false)
- const { can: canReadJWTSecret } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'field.jwt_secret'
+ const { can: canReadJWTSecret } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_SIGNING_KEYS_READ
)
- const { can: canGenerateNewJWTSecret } = useAsyncCheckPermissions(
- PermissionAction.INFRA_EXECUTE,
- 'queue_job.projects.update_jwt'
+ const { can: canGenerateNewJWTSecret } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.ADMIN_WRITE
)
const { data } = useJwtSecretUpdatingStatusQuery({ projectRef }, { enabled: IS_PLATFORM })
@@ -100,7 +97,9 @@ export const JWTSettings = () => {
const { mutateAsync: updateJwt, isPending: isSubmittingJwtSecretUpdateRequest } =
useJwtSecretUpdateMutation()
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_SIGNING_KEYS_READ
+ )
const { data: legacyKey, isPending } = useLegacyJWTSigningKeyQuery(
{ projectRef },
{ enabled: IS_PLATFORM && canReadAPIKeys, retry: false }
diff --git a/apps/studio/components/interfaces/LogDrains/OrgAuditLogDrains.tsx b/apps/studio/components/interfaces/LogDrains/OrgAuditLogDrains.tsx
index f8f36633691..419470f2809 100644
--- a/apps/studio/components/interfaces/LogDrains/OrgAuditLogDrains.tsx
+++ b/apps/studio/components/interfaces/LogDrains/OrgAuditLogDrains.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { IS_PLATFORM, useParams } from 'common'
import { ChevronDownIcon } from 'lucide-react'
import { cloneElement, useState } from 'react'
@@ -31,7 +30,7 @@ import { LogDrainData } from '@/data/log-drains/log-drains-query'
import { useTestAuditLogDrainMutation } from '@/data/log-drains/test-audit-log-drain-mutation'
import { useUpdateAuditLogDrainMutation } from '@/data/log-drains/update-audit-log-drain-mutation'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useTrack } from '@/lib/telemetry/track'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
@@ -39,9 +38,8 @@ export function OrgAuditLogDrains() {
const { slug } = useParams() as { slug: string }
const track = useTrack()
- const { can: canManageLogDrains, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(
- PermissionAction.ANALYTICS_ADMIN_WRITE,
- 'logflare'
+ const { can: canManageLogDrains, isLoading: isLoadingPermissions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.ANALYTICS_CONFIG_WRITE
)
const { hasAccess: hasAccessToLogDrains, isLoading: isLoadingEntitlement } = useCheckEntitlements(
diff --git a/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsx b/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsx
index 6b2d3c21020..24a0f46a82d 100644
--- a/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsx
+++ b/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { keepPreviousData } from '@tanstack/react-query'
import {
getCoreRowModel,
@@ -57,7 +56,7 @@ import {
import { useOrganizationMembersQuery } from '@/data/organizations/organization-members-query'
import { useOrgProjectsInfiniteQuery } from '@/data/projects/org-projects-infinite-query'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
import { useShortcut } from '@/state/shortcuts/useShortcut'
@@ -98,9 +97,8 @@ export const AuditLogs = () => {
if (range) setDateRange({ from: range[0].toISOString(), to: range[1].toISOString() })
}
- const { can: canReadAuditLogs, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'notifications'
+ const { can: canReadAuditLogs, isLoading: isLoadingPermissions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.AUDIT_LOGS_READ
)
const { hasAccess: hasAccessToAuditLogs, isLoading: isLoadingEntitlements } =
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/BillingBreakdown/BillingBreakdown.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/BillingBreakdown/BillingBreakdown.tsx
index 30e14740e44..ab84343880c 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/BillingBreakdown/BillingBreakdown.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/BillingBreakdown/BillingBreakdown.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import dayjs from 'dayjs'
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
@@ -14,7 +13,7 @@ import { InlineLink } from '@/components/ui/InlineLink'
import { NoPermission } from '@/components/ui/NoPermission'
import { SparkBar } from '@/components/ui/SparkBar'
import { useOrgSubscriptionQuery } from '@/data/subscriptions/org-subscription-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { MANAGED_BY } from '@/lib/constants/infrastructure'
@@ -24,9 +23,8 @@ const BillingBreakdown = () => {
const { data: selectedOrganization } = useSelectedOrganizationQuery()
- const { isSuccess: isPermissionsLoaded, can: canReadSubscriptions } = useAsyncCheckPermissions(
- PermissionAction.BILLING_READ,
- 'stripe.subscriptions'
+ const { isSuccess: isPermissionsLoaded, can: canReadSubscriptions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_READ
)
const {
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerData.test.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerData.test.tsx
index 6fd15885344..c373a487706 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerData.test.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerData.test.tsx
@@ -43,8 +43,9 @@ vi.mock('@/hooks/misc/useSelectedOrganization', () => ({
useSelectedOrganizationQuery: () => ({ data: mockSelectedOrganization() }),
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: () => ({ can: true, isSuccess: true }),
+vi.mock('@/hooks/misc/useCheckPermissionsV2', async (importOriginal) => ({
+ ...(await importOriginal<typeof import('@/hooks/misc/useCheckPermissionsV2')>()),
+ useAsyncCheckPermissionsV2: () => ({ can: true, isSuccess: true }),
}))
vi.mock('@/data/organizations/organization-customer-profile-query', () => ({
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerData.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerData.tsx
index 1a864b02555..6f99e4c4320 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerData.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerData.tsx
@@ -1,6 +1,5 @@
import { Elements } from '@stripe/react-stripe-js'
import { loadStripe, StripeAddressElement, StripeElementsOptions } from '@stripe/stripe-js'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQueryClient } from '@tanstack/react-query'
import { useParams } from 'common'
import { useTheme } from 'next-themes'
@@ -29,7 +28,7 @@ import { isPartnerBillingOrganization } from '@/data/organizations/managed-by-ut
import { useOrganizationCustomerProfileQuery } from '@/data/organizations/organization-customer-profile-query'
import { useOrganizationCustomerProfileUpdateMutation } from '@/data/organizations/organization-customer-profile-update-mutation'
import { useOrganizationTaxIdQuery } from '@/data/organizations/organization-tax-id-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { STRIPE_PUBLIC_KEY } from '@/lib/constants'
@@ -42,10 +41,9 @@ export const BillingCustomerData = () => {
const { data: selectedOrganization } = useSelectedOrganizationQuery()
const { can: canReadBillingCustomerData, isSuccess: isPermissionsLoaded } =
- useAsyncCheckPermissions(PermissionAction.BILLING_READ, 'stripe.customer')
- const { can: canUpdateBillingCustomerData } = useAsyncCheckPermissions(
- PermissionAction.BILLING_WRITE,
- 'stripe.customer'
+ useAsyncCheckPermissionsV2(FGA_PERMISSIONS.ORGANIZATION.BILLING_READ)
+ const { can: canUpdateBillingCustomerData } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_WRITE
)
const { ref, inView } = useInView({ triggerOnce: true })
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/BillingEmail.test.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/BillingEmail.test.tsx
index ab2dbe19443..cdd43999302 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/BillingEmail.test.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/BillingEmail.test.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { QueryClient } from '@tanstack/react-query'
import { fireEvent, screen, waitFor } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
@@ -9,6 +8,7 @@ import { beforeEach, describe, expect, test, vi } from 'vitest'
import BillingEmail from './BillingEmail'
import { organizationKeys } from '@/data/organizations/keys'
+import { FGA_PERMISSIONS } from '@/hooks/misc/useCheckPermissionsV2'
import { customRender } from '@/tests/lib/custom-render'
import { addAPIMock } from '@/tests/lib/msw'
@@ -31,8 +31,9 @@ vi.mock('common', async (importOriginal) => {
}
})
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: (action: string) => mockCheckPermissions(action),
+vi.mock('@/hooks/misc/useCheckPermissionsV2', async (importOriginal) => ({
+ ...(await importOriginal<typeof import('@/hooks/misc/useCheckPermissionsV2')>()),
+ useAsyncCheckPermissionsV2: (permission: string) => mockCheckPermissions(permission),
}))
vi.mock('react-intersection-observer', () => ({
@@ -110,8 +111,8 @@ describe('BillingEmail', () => {
})
test('shows a permission notice when the user cannot read billing data', async () => {
- mockCheckPermissions.mockImplementation((action: string) => ({
- can: action !== PermissionAction.BILLING_READ,
+ mockCheckPermissions.mockImplementation((permission) => ({
+ can: permission !== FGA_PERMISSIONS.ORGANIZATION.BILLING_READ,
isSuccess: true,
}))
@@ -122,8 +123,8 @@ describe('BillingEmail', () => {
})
test('disables the email controls when the user cannot update billing data', async () => {
- mockCheckPermissions.mockImplementation((action: string) => ({
- can: action !== PermissionAction.BILLING_WRITE,
+ mockCheckPermissions.mockImplementation((permission) => ({
+ can: permission !== FGA_PERMISSIONS.ORGANIZATION.BILLING_WRITE,
isSuccess: true,
}))
mockCustomerProfile({ email: '[email protected]', additional_emails: [] })
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/BillingEmail.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/BillingEmail.tsx
index f8248859abf..84a3177dacb 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/BillingEmail.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/BillingEmail.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { useEffect } from 'react'
import { useForm, useWatch } from 'react-hook-form'
@@ -27,7 +26,7 @@ import { FormSection, FormSectionContent } from '@/components/ui/Forms/FormSecti
import { NoPermission } from '@/components/ui/NoPermission'
import { useOrganizationCustomerProfileQuery } from '@/data/organizations/organization-customer-profile-query'
import { useOrganizationCustomerProfileUpdateMutation } from '@/data/organizations/organization-customer-profile-update-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
const FORM_ID = 'org-billing-email'
const formSchema = z.object({
@@ -38,13 +37,11 @@ const formSchema = z.object({
const BillingEmail = () => {
const { slug } = useParams()
- const { can: canReadBillingEmail, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.BILLING_READ,
- 'stripe.customer'
+ const { can: canReadBillingEmail, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_READ
)
- const { can: canUpdateBillingData } = useAsyncCheckPermissions(
- PermissionAction.BILLING_WRITE,
- 'stripe.customer'
+ const { can: canUpdateBillingData } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_WRITE
)
const { ref, inView } = useInView({ triggerOnce: true })
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/CostControl.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/CostControl.tsx
index d46a7926eee..1b40a52d0ff 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/CostControl.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/CostControl.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useFlag, useParams } from 'common'
import { ExternalLinkIcon } from 'lucide-react'
import { useTheme } from 'next-themes'
@@ -21,7 +20,7 @@ import { NoPermission } from '@/components/ui/NoPermission'
import PartnerIcon from '@/components/ui/PartnerIcon'
import { PARTNER_TO_NAME } from '@/components/ui/PartnerManagedResource'
import { useOrgSubscriptionQuery } from '@/data/subscriptions/org-subscription-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { BASE_PATH, DOCS_URL } from '@/lib/constants'
import { MANAGED_BY } from '@/lib/constants/infrastructure'
@@ -35,9 +34,8 @@ export const CostControl = () => {
const projectUpdateDisabled = useFlag('disableProjectCreationAndUpdate')
- const { isSuccess: isPermissionsLoaded, can: canReadSubscriptions } = useAsyncCheckPermissions(
- PermissionAction.BILLING_READ,
- 'stripe.subscriptions'
+ const { isSuccess: isPermissionsLoaded, can: canReadSubscriptions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_READ
)
const {
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/SpendCapSidePanel.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/SpendCapSidePanel.tsx
index 91eff0cd4ab..833ac8ab7d4 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/SpendCapSidePanel.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/SpendCapSidePanel.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { ChevronRightIcon, ExternalLinkIcon } from 'lucide-react'
import { useTheme } from 'next-themes'
@@ -34,7 +33,7 @@ import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { useOrgProjectsInfiniteQuery } from '@/data/projects/org-projects-infinite-query'
import { useOrgSubscriptionQuery } from '@/data/subscriptions/org-subscription-query'
import { useOrgSubscriptionUpdateMutation } from '@/data/subscriptions/org-subscription-update-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { BASE_PATH, DOCS_URL, PRICING_TIER_PRODUCT_IDS } from '@/lib/constants'
import { PROJECT_STATUS } from '@/lib/constants/infrastructure'
import { useOrgSettingsPageStateSnapshot } from '@/state/organization-settings'
@@ -74,9 +73,8 @@ export const SpendCapSidePanel = () => {
const [showUsageCosts, setShowUsageCosts] = useState(false)
const [selectedOption, setSelectedOption] = useState<'on' | 'off'>()
- const { can: canUpdateSpendCap } = useAsyncCheckPermissions(
- PermissionAction.BILLING_WRITE,
- 'stripe.subscriptions'
+ const { can: canUpdateSpendCap } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_WRITE
)
const snap = useOrgSettingsPageStateSnapshot()
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/CreditBalance.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/CreditBalance.tsx
index 051c7930173..6adf166669e 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/CreditBalance.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/CreditBalance.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { useInView } from 'react-intersection-observer'
@@ -14,14 +13,13 @@ import { FormPanel } from '@/components/ui/Forms/FormPanel'
import { FormSection, FormSectionContent } from '@/components/ui/Forms/FormSection'
import { NoPermission } from '@/components/ui/NoPermission'
import { useOrgBalanceQuery } from '@/data/subscriptions/org-balance-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
const CreditBalance = () => {
const { slug } = useParams()
- const { isSuccess: isPermissionsLoaded, can: canReadSubscriptions } = useAsyncCheckPermissions(
- PermissionAction.BILLING_READ,
- 'stripe.subscriptions'
+ const { isSuccess: isPermissionsLoaded, can: canReadSubscriptions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_READ
)
const { ref, inView } = useInView({ triggerOnce: true })
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/CreditCodeRedemption.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/CreditCodeRedemption.tsx
index 34c732e8f6c..e768252d407 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/CreditCodeRedemption.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/CreditCodeRedemption.tsx
@@ -1,6 +1,5 @@
import HCaptcha from '@hcaptcha/react-hcaptcha'
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { CalendarIcon, InfoIcon, PartyPopperIcon } from 'lucide-react'
import Link from 'next/link'
import { useRouter } from 'next/router'
@@ -33,7 +32,7 @@ import { UpgradePlanButton } from '@/components/ui/UpgradePlanButton'
import { useOrganizationCreditCodeRedemptionMutation } from '@/data/organizations/organization-credit-code-redemption-mutation'
import { useOrganizationQuery } from '@/data/organizations/organization-query'
import { useOrgBalanceQuery } from '@/data/subscriptions/org-balance-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useLatest } from '@/hooks/misc/useLatest'
const FORM_ID = 'credit-code-redemption'
@@ -65,10 +64,8 @@ export const CreditCodeRedemption = ({
)
const combinedCreditBalanceCents = orgBalance?.total_balance_cents
- const { can: canRedeemCode, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.BILLING_WRITE,
- 'stripe.subscriptions',
- undefined,
+ const { can: canRedeemCode, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_WRITE,
{ organizationSlug: slug }
)
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/CreditTopUp.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/CreditTopUp.tsx
index 11e399864f1..257fcccdab1 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/CreditTopUp.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/CreditTopUp.tsx
@@ -2,7 +2,7 @@ import HCaptcha from '@hcaptcha/react-hcaptcha'
import { zodResolver } from '@hookform/resolvers/zod'
import { Elements } from '@stripe/react-stripe-js'
import { loadStripe, PaymentIntentResult } from '@stripe/stripe-js'
-import { PermissionAction, SupportCategories } from '@supabase/shared-types/out/constants'
+import { SupportCategories } from '@supabase/shared-types/out/constants'
import { useQueryClient } from '@tanstack/react-query'
import { useDebounce } from '@uidotdev/usehooks'
import { AlertCircleIcon, InfoIcon } from 'lucide-react'
@@ -44,7 +44,7 @@ import { useOrganizationCreditTopUpMutation } from '@/data/organizations/organiz
import { useCreditTopUpPreview } from '@/data/organizations/organization-credit-top-up-preview'
import type { CustomerAddress, CustomerTaxId } from '@/data/organizations/types'
import { subscriptionKeys } from '@/data/subscriptions/keys'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { STRIPE_PUBLIC_KEY } from '@/lib/constants'
import { formatCurrency } from '@/lib/helpers'
@@ -73,9 +73,8 @@ export const CreditTopUp = ({ slug }: { slug: string | undefined }) => {
validateBillingProfile: () => Promise<boolean>
}>(null)
- const { can: canTopUpCredits, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.BILLING_WRITE,
- 'stripe.subscriptions'
+ const { can: canTopUpCredits, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_WRITE
)
const {
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/CancellationFlow.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/CancellationFlow.tsx
index c1b4288de28..dff310ef067 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/CancellationFlow.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/CancellationFlow.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { ComponentProps, useEffect, useMemo, useState } from 'react'
@@ -9,7 +8,7 @@ import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { useFreeProjectLimitCheckQuery } from '@/data/organizations/free-project-limit-check-query'
import { useOrgProjectsInfiniteQuery } from '@/data/projects/org-projects-infinite-query'
import { useOrgSubscriptionQuery } from '@/data/subscriptions/org-subscription-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { MANAGED_BY } from '@/lib/constants'
import { useTrack } from '@/lib/telemetry/track'
@@ -123,9 +122,8 @@ export const InitiateCancellationFlowButton = (props: InitiateCancellationFlowBu
const { data: selectedOrganization } = useSelectedOrganizationQuery()
const isAwsManaged = selectedOrganization?.managed_by === MANAGED_BY.AWS_MARKETPLACE
- const { can: canUpdateSubscription } = useAsyncCheckPermissions(
- PermissionAction.BILLING_WRITE,
- 'stripe.subscriptions'
+ const { can: canUpdateSubscription } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_WRITE
)
const { data: subscription } = useOrgSubscriptionQuery({
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.test.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.test.tsx
index 045095cbc12..aa2390e0301 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.test.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.test.tsx
@@ -58,8 +58,9 @@ vi.mock('@/lib/telemetry/track', () => ({
useTrack: () => vi.fn(),
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: () => ({ can: true }),
+vi.mock('@/hooks/misc/useCheckPermissionsV2', async (importOriginal) => ({
+ ...(await importOriginal<typeof import('@/hooks/misc/useCheckPermissionsV2')>()),
+ useAsyncCheckPermissionsV2: () => ({ can: true }),
}))
vi.mock('@/state/organization-settings', () => ({
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.tsx
index 5b6db4b8590..9456051afeb 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useDebounce } from '@uidotdev/usehooks'
import { useParams } from 'common'
import { StudioPricingSidePanelOpenedEvent } from 'common/telemetry-constants'
@@ -21,7 +20,7 @@ import { useOrgProjectsInfiniteQuery } from '@/data/projects/org-projects-infini
import { useOrgPlansQuery } from '@/data/subscriptions/org-plans-query'
import { useOrgSubscriptionQuery } from '@/data/subscriptions/org-subscription-query'
import type { OrgPlan } from '@/data/subscriptions/types'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { MANAGED_BY } from '@/lib/constants/infrastructure'
import { useTrack } from '@/lib/telemetry/track'
@@ -131,9 +130,8 @@ export const PlanUpdateSidePanel = () => {
[]
)
- const { can: canUpdateSubscription } = useAsyncCheckPermissions(
- PermissionAction.BILLING_WRITE,
- 'stripe.subscriptions'
+ const { can: canUpdateSubscription } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_WRITE
)
const snap = useOrgSettingsPageStateSnapshot()
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/Subscription.test.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/Subscription.test.tsx
index 34978b2375a..6be678c24f9 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/Subscription.test.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/Subscription.test.tsx
@@ -23,8 +23,9 @@ vi.mock('@/data/subscriptions/org-subscription-query', () => ({
useOrgSubscriptionQuery: () => mockSubscription(),
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: () => ({ can: true, isSuccess: true }),
+vi.mock('@/hooks/misc/useCheckPermissionsV2', async (importOriginal) => ({
+ ...(await importOriginal<typeof import('@/hooks/misc/useCheckPermissionsV2')>()),
+ useAsyncCheckPermissionsV2: () => ({ can: true, isSuccess: true }),
}))
vi.mock('@/state/organization-settings', () => ({
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/Subscription.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/Subscription.tsx
index 449fe7d5c9a..f4c51fa5718 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/Subscription.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/Subscription.tsx
@@ -1,4 +1,4 @@
-import { PermissionAction, SupportCategories } from '@supabase/shared-types/out/constants'
+import { SupportCategories } from '@supabase/shared-types/out/constants'
import { useFlag, useParams } from 'common'
import Link from 'next/link'
import { Button } from 'ui'
@@ -17,7 +17,7 @@ import {
import { AlertError } from '@/components/ui/AlertError'
import { NoPermission } from '@/components/ui/NoPermission'
import { useOrgSubscriptionQuery } from '@/data/subscriptions/org-subscription-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useOrgSettingsPageStateSnapshot } from '@/state/organization-settings'
const Subscription = () => {
@@ -25,9 +25,8 @@ const Subscription = () => {
const snap = useOrgSettingsPageStateSnapshot()
const projectUpdateDisabled = useFlag('disableProjectCreationAndUpdate')
- const { isSuccess: isPermissionsLoaded, can: canReadSubscriptions } = useAsyncCheckPermissions(
- PermissionAction.BILLING_READ,
- 'stripe.subscriptions'
+ const { isSuccess: isPermissionsLoaded, can: canReadSubscriptions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_READ
)
const {
diff --git a/apps/studio/components/interfaces/Organization/Documents/ISO27001.tsx b/apps/studio/components/interfaces/Organization/Documents/ISO27001.tsx
index 0140ea82db5..abe745f334d 100644
--- a/apps/studio/components/interfaces/Organization/Documents/ISO27001.tsx
+++ b/apps/studio/components/interfaces/Organization/Documents/ISO27001.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { DownloadIcon } from 'lucide-react'
import { useState } from 'react'
import { toast } from 'sonner'
@@ -15,7 +14,7 @@ import { NoPermission } from '@/components/ui/NoPermission'
import { UpgradePlanButton } from '@/components/ui/UpgradePlanButton'
import { getDocument } from '@/data/documents/document-query'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useTrack } from '@/lib/telemetry/track'
@@ -24,9 +23,8 @@ export const ISO27001 = () => {
const slug = organization?.slug
const track = useTrack()
- const { can: canReadSubscriptions, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(
- PermissionAction.BILLING_READ,
- 'stripe.subscriptions'
+ const { can: canReadSubscriptions, isLoading: isLoadingPermissions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_READ
)
const { hasAccess: hasAccessToISO27001, isLoading: isLoadingEntitlement } = useCheckEntitlements(
'security.iso27001_certificate'
diff --git a/apps/studio/components/interfaces/Organization/Documents/SOC2.tsx b/apps/studio/components/interfaces/Organization/Documents/SOC2.tsx
index ed6468b4518..18b150130f9 100644
--- a/apps/studio/components/interfaces/Organization/Documents/SOC2.tsx
+++ b/apps/studio/components/interfaces/Organization/Documents/SOC2.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { DownloadIcon } from 'lucide-react'
import { useState } from 'react'
import { toast } from 'sonner'
@@ -15,7 +14,7 @@ import { NoPermission } from '@/components/ui/NoPermission'
import { UpgradePlanButton } from '@/components/ui/UpgradePlanButton'
import { getDocument } from '@/data/documents/document-query'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useTrack } from '@/lib/telemetry/track'
@@ -24,9 +23,8 @@ export const SOC2 = () => {
const slug = organization?.slug
const track = useTrack()
- const { can: canReadSubscriptions, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(
- PermissionAction.BILLING_READ,
- 'stripe.subscriptions'
+ const { can: canReadSubscriptions, isLoading: isLoadingPermissions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_READ
)
const { hasAccess: hasAccessToSoc2Report, isLoading: isLoadingEntitlement } =
useCheckEntitlements('security.soc2_report')
diff --git a/apps/studio/components/interfaces/Organization/Documents/SecurityQuestionnaire.tsx b/apps/studio/components/interfaces/Organization/Documents/SecurityQuestionnaire.tsx
index 205ec5b558c..782bd404168 100644
--- a/apps/studio/components/interfaces/Organization/Documents/SecurityQuestionnaire.tsx
+++ b/apps/studio/components/interfaces/Organization/Documents/SecurityQuestionnaire.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { DownloadIcon } from 'lucide-react'
import Link from 'next/link'
import { toast } from 'sonner'
@@ -13,7 +12,7 @@ import {
import { NoPermission } from '@/components/ui/NoPermission'
import { getDocument } from '@/data/documents/document-query'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useTrack } from '@/lib/telemetry/track'
@@ -22,9 +21,8 @@ export const SecurityQuestionnaire = () => {
const slug = organization?.slug
const track = useTrack()
- const { can: canReadSubscriptions, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(
- PermissionAction.BILLING_READ,
- 'stripe.subscriptions'
+ const { can: canReadSubscriptions, isLoading: isLoadingPermissions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_READ
)
const { hasAccess: hasAccessToQuestionnaire, isLoading: isLoadingEntitlement } =
useCheckEntitlements('security.questionnaire')
diff --git a/apps/studio/components/interfaces/Organization/GeneralSettings/DataPrivacyForm.tsx b/apps/studio/components/interfaces/Organization/GeneralSettings/DataPrivacyForm.tsx
index 38d191a19b3..16af374bba7 100644
--- a/apps/studio/components/interfaces/Organization/GeneralSettings/DataPrivacyForm.tsx
+++ b/apps/studio/components/interfaces/Organization/GeneralSettings/DataPrivacyForm.tsx
@@ -1,17 +1,15 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useEffect } from 'react'
import { Card, CardContent, CardFooter, Form } from 'ui'
import { AIOptInLevelSelector } from './AIOptInLevelSelector'
import { FormActions } from '@/components/ui/Forms/FormActions'
import { useAIOptInForm } from '@/hooks/forms/useAIOptInForm'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
export const DataPrivacyForm = () => {
const { form, onSubmit, isUpdating, currentOptInLevel } = useAIOptInForm()
- const { can: canUpdateOrganization } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'organizations'
+ const { can: canUpdateOrganization } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.ADMIN_WRITE
)
const permissionsHelperText = !canUpdateOrganization
diff --git a/apps/studio/components/interfaces/Organization/GeneralSettings/DeleteOrganizationButton.tsx b/apps/studio/components/interfaces/Organization/GeneralSettings/DeleteOrganizationButton.tsx
index 193d8df34c8..d14baaf1ab7 100644
--- a/apps/studio/components/interfaces/Organization/GeneralSettings/DeleteOrganizationButton.tsx
+++ b/apps/studio/components/interfaces/Organization/GeneralSettings/DeleteOrganizationButton.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useRouter } from 'next/router'
import { useEffect, useState } from 'react'
import { toast } from 'sonner'
@@ -9,7 +8,7 @@ import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { TextConfirmModal } from '@/components/ui/TextConfirmModalWrapper'
import { useOrganizationDeleteMutation } from '@/data/organizations/organization-delete-mutation'
import { useOrgProjectsInfiniteQuery } from '@/data/projects/org-projects-infinite-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useLastVisitedOrganization } from '@/hooks/misc/useLastVisitedOrganization'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
@@ -88,9 +87,8 @@ export const DeleteOrganizationButton = () => {
const { setLastVisitedOrganization } = useLastVisitedOrganization()
- const { can: canDeleteOrganization } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'organizations'
+ const { can: canDeleteOrganization } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.ADMIN_WRITE
)
const { mutate: deleteOrganization, isPending: isDeleting } = useOrganizationDeleteMutation({
diff --git a/apps/studio/components/interfaces/Organization/GeneralSettings/OrganizationDetailsForm.tsx b/apps/studio/components/interfaces/Organization/GeneralSettings/OrganizationDetailsForm.tsx
index 7c821a4f86e..b91b1abae2f 100644
--- a/apps/studio/components/interfaces/Organization/GeneralSettings/OrganizationDetailsForm.tsx
+++ b/apps/studio/components/interfaces/Organization/GeneralSettings/OrganizationDetailsForm.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQueryClient } from '@tanstack/react-query'
import { useParams } from 'common'
import { useEffect } from 'react'
@@ -13,7 +12,7 @@ import * as z from 'zod'
import { FormActions } from '@/components/ui/Forms/FormActions'
import { useOrganizationUpdateMutation } from '@/data/organizations/organization-update-mutation'
import { invalidateOrganizationsQuery } from '@/data/organizations/organizations-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import type { ResponseError } from '@/types'
@@ -26,9 +25,8 @@ export const OrganizationDetailsForm = () => {
const queryClient = useQueryClient()
const { data: selectedOrganization } = useSelectedOrganizationQuery()
- const { can: canUpdateOrganization } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'organizations'
+ const { can: canUpdateOrganization } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.ADMIN_WRITE
)
const { mutate: updateOrganization, isPending: isUpdatingDetails } =
diff --git a/apps/studio/components/interfaces/Organization/InvoicesSettings/InvoicesSection.tsx b/apps/studio/components/interfaces/Organization/InvoicesSettings/InvoicesSection.tsx
index 4bbc2d7c48c..7e5cd7d2476 100644
--- a/apps/studio/components/interfaces/Organization/InvoicesSettings/InvoicesSection.tsx
+++ b/apps/studio/components/interfaces/Organization/InvoicesSettings/InvoicesSection.tsx
@@ -1,5 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
-
import { InvoicesSettings } from './InvoicesSettings'
import {
ScaffoldSection,
@@ -7,12 +5,11 @@ import {
ScaffoldSectionDetail,
} from '@/components/layouts/Scaffold'
import { NoPermission } from '@/components/ui/NoPermission'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
export const InvoicesSection = () => {
- const { isSuccess: isPermissionsLoaded, can: canReadInvoices } = useAsyncCheckPermissions(
- PermissionAction.BILLING_READ,
- 'stripe.subscriptions'
+ const { isSuccess: isPermissionsLoaded, can: canReadInvoices } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_READ
)
return (
diff --git a/apps/studio/components/interfaces/Organization/OAuthApps/AuthorizedApps.tsx b/apps/studio/components/interfaces/Organization/OAuthApps/AuthorizedApps.tsx
index aba9b2651ce..bdce0d6ed4a 100644
--- a/apps/studio/components/interfaces/Organization/OAuthApps/AuthorizedApps.tsx
+++ b/apps/studio/components/interfaces/Organization/OAuthApps/AuthorizedApps.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { useMemo, useState } from 'react'
import {
@@ -28,7 +27,7 @@ import { RevokeAppModal } from './RevokeAppModal'
import { AlertError } from '@/components/ui/AlertError'
import { NoPermission } from '@/components/ui/NoPermission'
import { AuthorizedApp, useAuthorizedAppsQuery } from '@/data/oauth/authorized-apps-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
type AuthorizedAppsSort = 'authorized:asc' | 'authorized:desc'
type AuthorizedAppsSortColumn = 'authorized'
@@ -39,9 +38,8 @@ export const AuthorizedApps = () => {
const [selectedAppToRevoke, setSelectedAppToRevoke] = useState<AuthorizedApp>()
const [authorizedAppsSort, setAuthorizedAppsSort] = useState<AuthorizedAppsSort>('authorized:asc')
- const { can: canReadOAuthApps, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'approved_oauth_apps'
+ const { can: canReadOAuthApps, isLoading: isLoadingPermissions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.CONFIG_READ
)
const {
diff --git a/apps/studio/components/interfaces/Organization/OAuthApps/OAuthAppRow.tsx b/apps/studio/components/interfaces/Organization/OAuthApps/OAuthAppRow.tsx
index 29ba31c79ca..14a0f58f442 100644
--- a/apps/studio/components/interfaces/Organization/OAuthApps/OAuthAppRow.tsx
+++ b/apps/studio/components/interfaces/Organization/OAuthApps/OAuthAppRow.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { EditIcon, MoreVerticalIcon, TrashIcon } from 'lucide-react'
import {
Button,
@@ -17,7 +16,7 @@ import { TimestampInfo } from 'ui-patterns/TimestampInfo'
import CopyButton from '@/components/ui/CopyButton'
import type { OAuthApp } from '@/data/oauth/oauth-apps-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
export interface OAuthAppRowProps {
app: OAuthApp
@@ -26,13 +25,11 @@ export interface OAuthAppRowProps {
}
export const OAuthAppRow = ({ app, onSelectEdit, onSelectDelete }: OAuthAppRowProps) => {
- const { can: canUpdateOAuthApps } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'approved_oauth_apps'
+ const { can: canUpdateOAuthApps } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.CONFIG_WRITE
)
- const { can: canDeleteOAuthApps } = useAsyncCheckPermissions(
- PermissionAction.DELETE,
- 'approved_oauth_apps'
+ const { can: canDeleteOAuthApps } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.CONFIG_WRITE
)
return (
diff --git a/apps/studio/components/interfaces/Organization/OAuthApps/OAuthSecrets/OAuthSecrets.tsx b/apps/studio/components/interfaces/Organization/OAuthApps/OAuthSecrets/OAuthSecrets.tsx
index 1dc8720ef4f..cc72e028e82 100644
--- a/apps/studio/components/interfaces/Organization/OAuthApps/OAuthSecrets/OAuthSecrets.tsx
+++ b/apps/studio/components/interfaces/Organization/OAuthApps/OAuthSecrets/OAuthSecrets.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { useState } from 'react'
import { Alert, AlertTitle, InfoIcon } from 'ui'
@@ -9,7 +8,7 @@ import { InlineLink } from '@/components/ui/InlineLink'
import { useClientSecretCreateMutation } from '@/data/oauth-secrets/client-secret-create-mutation'
import { CreatedSecret, useClientSecretsQuery } from '@/data/oauth-secrets/client-secrets-query'
import { OAuthApp } from '@/data/oauth/oauth-apps-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { DOCS_URL } from '@/lib/constants'
interface Props {
@@ -19,7 +18,9 @@ interface Props {
export const OAuthSecrets = ({ selectedApp }: Props) => {
const { slug } = useParams()
const [createdSecret, setCreatedSecret] = useState<CreatedSecret>()
- const { can: canManageSecrets } = useAsyncCheckPermissions(PermissionAction.UPDATE, 'oauth_apps')
+ const { can: canManageSecrets } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.CONFIG_WRITE
+ )
const { id: appId } = selectedApp ?? {}
diff --git a/apps/studio/components/interfaces/Organization/OAuthApps/OAuthSecrets/SecretRow.tsx b/apps/studio/components/interfaces/Organization/OAuthApps/OAuthSecrets/SecretRow.tsx
index cb5f16c54bd..465b6504148 100644
--- a/apps/studio/components/interfaces/Organization/OAuthApps/OAuthSecrets/SecretRow.tsx
+++ b/apps/studio/components/interfaces/Organization/OAuthApps/OAuthSecrets/SecretRow.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import dayjs from 'dayjs'
import { CheckIcon, KeyIcon, TrashIcon } from 'lucide-react'
@@ -12,7 +11,7 @@ import CopyButton from '@/components/ui/CopyButton'
import { useClientSecretDeleteMutation } from '@/data/oauth-secrets/client-secret-delete-mutation'
import { Secret, useClientSecretsQuery } from '@/data/oauth-secrets/client-secrets-query'
import { useOrganizationMembersQuery } from '@/data/organizations/organization-members-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
export interface SecretRowProps {
secret: Secret
@@ -22,7 +21,9 @@ export interface SecretRowProps {
export const SecretRow = ({ secret, appId }: SecretRowProps) => {
const { slug } = useParams()
const [showDeleteModal, setShowDeleteModal] = useState(false)
- const { can: canManageSecrets } = useAsyncCheckPermissions(PermissionAction.UPDATE, 'oauth_apps')
+ const { can: canManageSecrets } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.CONFIG_WRITE
+ )
const { data } = useClientSecretsQuery({ slug, appId })
const secrets = data?.client_secrets ?? []
diff --git a/apps/studio/components/interfaces/Organization/OAuthApps/PublishableApps.tsx b/apps/studio/components/interfaces/Organization/OAuthApps/PublishableApps.tsx
index 09da6d3cea6..074f5e9bceb 100644
--- a/apps/studio/components/interfaces/Organization/OAuthApps/PublishableApps.tsx
+++ b/apps/studio/components/interfaces/Organization/OAuthApps/PublishableApps.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { CheckIcon, XIcon } from 'lucide-react'
import { useMemo, useState } from 'react'
@@ -36,7 +35,7 @@ import { NoPermission } from '@/components/ui/NoPermission'
import { Shortcut } from '@/components/ui/Shortcut'
import { OAuthAppCreateResponse } from '@/data/oauth/oauth-app-create-mutation'
import { OAuthApp, useOAuthAppsQuery } from '@/data/oauth/oauth-apps-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
type PublishedAppsSort = 'created:asc' | 'created:desc'
@@ -50,13 +49,11 @@ export const PublishableApps = () => {
const [selectedAppToUpdate, setSelectedAppToUpdate] = useState<OAuthApp>()
const [selectedAppToDelete, setSelectedAppToDelete] = useState<OAuthApp>()
- const { can: canReadOAuthApps, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'approved_oauth_apps'
+ const { can: canReadOAuthApps, isLoading: isLoadingPermissions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.CONFIG_READ
)
- const { can: canCreateOAuthApps } = useAsyncCheckPermissions(
- PermissionAction.CREATE,
- 'approved_oauth_apps'
+ const { can: canCreateOAuthApps } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.CONFIG_WRITE
)
const {
diff --git a/apps/studio/components/interfaces/Organization/SecuritySettings.tsx b/apps/studio/components/interfaces/Organization/SecuritySettings.tsx
index da3afc08612..4332b2e2aa2 100644
--- a/apps/studio/components/interfaces/Organization/SecuritySettings.tsx
+++ b/apps/studio/components/interfaces/Organization/SecuritySettings.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import Link from 'next/link'
import { useEffect } from 'react'
@@ -19,7 +18,7 @@ import { useOrganizationMembersQuery } from '@/data/organizations/organization-m
import { useOrganizationMfaToggleMutation } from '@/data/organizations/organization-mfa-mutation'
import { useOrganizationMfaQuery } from '@/data/organizations/organization-mfa-query'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useProfile } from '@/lib/profile'
import { useTrack } from '@/lib/telemetry/track'
@@ -38,13 +37,11 @@ export const SecuritySettings = () => {
isSuccess: isSuccessMembers,
} = useOrganizationMembersQuery({ slug })
- const { can: canReadMfaConfig, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'organizations'
+ const { can: canReadMfaConfig, isLoading: isLoadingPermissions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.CONFIG_READ
)
- const { can: canUpdateMfaConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'organizations'
+ const { can: canUpdateMfaConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.CONFIG_WRITE
)
const track = useTrack()
diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/InviteMemberButton.tsx b/apps/studio/components/interfaces/Organization/TeamSettings/InviteMemberButton.tsx
index 2c1d1d6af48..430d5dcf7d1 100644
--- a/apps/studio/components/interfaces/Organization/TeamSettings/InviteMemberButton.tsx
+++ b/apps/studio/components/interfaces/Organization/TeamSettings/InviteMemberButton.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { UserPlusIcon } from 'lucide-react'
import { useEffect, useState } from 'react'
@@ -44,7 +43,7 @@ import {
parseEmails,
} from './InviteMemberButton.utils'
import { ROLE_DESCRIPTIONS } from './Roles.constants'
-import { useGetRolesManagementPermissions } from './TeamSettings.utils'
+import { getAssignableRoleIds, getOrgRole } from './TeamSettings.utils'
import { DiscardChangesConfirmationDialog } from '@/components/ui-patterns/Dialogs/DiscardChangesConfirmationDialog'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { DocsButton } from '@/components/ui/DocsButton'
@@ -55,10 +54,10 @@ import { UpgradePlanButton } from '@/components/ui/UpgradePlanButton'
import { useOrganizationCreateInvitationMutation } from '@/data/organization-members/organization-invitation-create-mutation'
import { useOrganizationRolesV2Query } from '@/data/organization-members/organization-roles-query'
import { useOrganizationMembersQuery } from '@/data/organizations/organization-members-query'
+import { usePermissionsQueryV2 } from '@/data/permissions/permissions-query-v2'
import { useOrgSSOConfigQuery } from '@/data/sso/sso-config-query'
import { useHasAccessToProjectLevelPermissions } from '@/data/subscriptions/org-subscription-query'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { doPermissionsCheck, useGetPermissions } from '@/hooks/misc/useCheckPermissions'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useConfirmOnClose } from '@/hooks/ui/useConfirmOnClose'
@@ -71,7 +70,7 @@ export const InviteMemberButton = () => {
const { slug } = useParams()
const { profile } = useProfile()
const { data: organization } = useSelectedOrganizationQuery()
- const { permissions: permissions } = useGetPermissions()
+ const { data: permissionsV2 } = usePermissionsQueryV2()
const { organizationMembersCreate: organizationMembersCreationEnabled } = useIsFeatureEnabled([
'organization_members:create',
@@ -105,24 +104,10 @@ export const InviteMemberButton = () => {
const isStripeProjectsOrg = organization?.managed_by === MANAGED_BY.STRIPE_PROJECTS
- const { rolesAddable } = useGetRolesManagementPermissions(
- organization?.slug,
- orgScopedRoles,
- permissions ?? []
- )
+ const orgRole = getOrgRole(permissionsV2, organization?.slug)
+ const rolesAddable = getAssignableRoleIds(orgRole, orgScopedRoles)
- const canInviteMembers =
- hasOrgRole &&
- rolesAddable.length > 0 &&
- orgScopedRoles.some(({ id: role_id }) =>
- doPermissionsCheck(
- permissions,
- PermissionAction.CREATE,
- 'user_invites',
- { resource: { role_id } },
- organization?.slug
- )
- )
+ const canInviteMembers = hasOrgRole && rolesAddable.length > 0
const inviteDisabledReason = !organizationMembersCreationEnabled
? 'Inviting members is currently disabled'
diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/MemberActions.tsx b/apps/studio/components/interfaces/Organization/TeamSettings/MemberActions.tsx
index cc2a2c61636..388cb1bd9c4 100644
--- a/apps/studio/components/interfaces/Organization/TeamSettings/MemberActions.tsx
+++ b/apps/studio/components/interfaces/Organization/TeamSettings/MemberActions.tsx
@@ -1,7 +1,6 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useIsLoggedIn, useParams } from 'common'
import { MoreVerticalIcon, Redo2Icon, TrashIcon } from 'lucide-react'
-import { useMemo, useState } from 'react'
+import { useState } from 'react'
import { toast } from 'sonner'
import {
Button,
@@ -13,7 +12,7 @@ import {
import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
import { LeaveTeamButton } from './LeaveTeamButton'
-import { useGetRolesManagementPermissions } from './TeamSettings.utils'
+import { canManageRole, getOrgRole } from './TeamSettings.utils'
import { useTeamSettingsData } from './TeamSettingsDataContext'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { DropdownMenuItemTooltip } from '@/components/ui/DropdownMenuItemTooltip'
@@ -21,7 +20,6 @@ import { useOrganizationCreateInvitationMutation } from '@/data/organization-mem
import { useOrganizationDeleteInvitationMutation } from '@/data/organization-members/organization-invitation-delete-mutation'
import { useOrganizationMemberDeleteMutation } from '@/data/organizations/organization-member-delete-mutation'
import type { OrganizationMember } from '@/data/organizations/organization-members-query'
-import { doPermissionsCheck } from '@/hooks/misc/useCheckPermissions'
import { IS_PLATFORM } from '@/lib/constants'
import { useProfile } from '@/lib/profile'
@@ -37,10 +35,10 @@ export const MemberActions = ({ member }: MemberActionsProps) => {
const {
members,
roles: allRoles,
- permissions,
selectedOrganization,
organizationMembersDeletionEnabled,
onManageAccess,
+ permissionsV2,
} = useTeamSettingsData()
const memberIsUser = member.gotrue_id == profile?.gotrue_id
@@ -53,42 +51,30 @@ export const MemberActions = ({ member }: MemberActionsProps) => {
(userMemberData?.role_ids ?? []).length === 1 &&
orgScopedRoles.some((r) => r.id === userMemberData?.role_ids[0])
- const { rolesRemovable } = useGetRolesManagementPermissions(
- selectedOrganization?.slug,
- orgScopedRoles.concat(projectScopedRoles),
- permissions ?? []
- )
+ // Member management requires an org-level role: project-scoped users have a null
+ // org role in the v2 response and fail every canManageRole check below.
+ const orgRole = getOrgRole(permissionsV2, selectedOrganization?.slug)
+
+ // Name of the role a target member holds; project-scoped roles resolve via their base role.
+ const roleNameFor = (id: number): string | undefined => {
+ const orgScopedRole = orgScopedRoles.find((r) => r.id === id)
+ if (orgScopedRole) return orgScopedRole.name
+ const projectScopedRole = projectScopedRoles.find((r) => r.id === id)
+ return projectScopedRole
+ ? orgScopedRoles.find((r) => r.id === projectScopedRole.base_role_id)?.name
+ : undefined
+ }
const roleId = member.role_ids?.[0] ?? -1
- const canRemoveMember = member.role_ids.every((id) => rolesRemovable.includes(id))
+ const canRemoveMember = (member.role_ids ?? []).every((id) =>
+ canManageRole(orgRole, roleNameFor(id))
+ )
- const canCreateUserInvites = useMemo(() => {
- if (!IS_PLATFORM) return true
- if (!isLoggedIn) return false
- if (!permissions) return false
- return doPermissionsCheck(
- permissions,
- PermissionAction.CREATE,
- 'user_invites',
- { resource: { role_id: roleId } },
- selectedOrganization?.slug
- )
- }, [isLoggedIn, permissions, roleId, selectedOrganization?.slug])
- const canResendInvite = canCreateUserInvites && hasOrgRole
+ const canManageTargetRole =
+ !IS_PLATFORM || (isLoggedIn && !!permissionsV2 && canManageRole(orgRole, roleNameFor(roleId)))
- const canDeleteUserInvites = useMemo(() => {
- if (!IS_PLATFORM) return true
- if (!isLoggedIn) return false
- if (!permissions) return false
- return doPermissionsCheck(
- permissions,
- PermissionAction.DELETE,
- 'user_invites',
- { resource: { role_id: roleId } },
- selectedOrganization?.slug
- )
- }, [isLoggedIn, permissions, roleId, selectedOrganization?.slug])
- const canRevokeInvite = canDeleteUserInvites && hasOrgRole
+ const canResendInvite = canManageTargetRole && hasOrgRole
+ const canRevokeInvite = canManageTargetRole && hasOrgRole
const { mutate: deleteOrganizationMember, isPending: isDeletingMember } =
useOrganizationMemberDeleteMutation({
diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/MembersView.tsx b/apps/studio/components/interfaces/Organization/TeamSettings/MembersView.tsx
index 3911e3fc333..73c056b2db8 100644
--- a/apps/studio/components/interfaces/Organization/TeamSettings/MembersView.tsx
+++ b/apps/studio/components/interfaces/Organization/TeamSettings/MembersView.tsx
@@ -23,6 +23,7 @@ import {
type OrganizationMember,
} from '@/data/organizations/organization-members-query'
import { usePermissionsQuery } from '@/data/permissions/permissions-query'
+import { usePermissionsQueryV2 } from '@/data/permissions/permissions-query-v2'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useProfile } from '@/lib/profile'
@@ -51,6 +52,7 @@ export const MembersView = ({
const { data: selectedOrganization } = useSelectedOrganizationQuery()
const { data: permissions } = usePermissionsQuery()
+ const { data: permissionsV2 } = usePermissionsQueryV2()
const organizationMembersDeletionEnabled = useIsFeatureEnabled('organization_members:delete')
const [memberForRoleUpdate, setMemberForRoleUpdate] = useState<OrganizationMember>()
@@ -146,6 +148,7 @@ export const MembersView = ({
roles={roles}
isLoadingRoles={isLoadingRoles}
permissions={permissions}
+ permissionsV2={permissionsV2}
totalNumOrgProjects={totalNumOrgProjects}
selectedOrganization={selectedOrganization}
organizationMembersDeletionEnabled={organizationMembersDeletionEnabled}
diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettings.utils.ts b/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettings.utils.ts
index 085aa0076b3..0796394edd6 100644
--- a/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettings.utils.ts
+++ b/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettings.utils.ts
@@ -1,49 +1,11 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
-
import {
MEMBER_ROLE_LINE_HEIGHT,
MEMBER_ROW_MIN_HEIGHT,
type MfaFilter,
} from './MembersList.constants'
import type { OrganizationMember } from '@/data/organizations/organization-members-query'
-import { doPermissionsCheck } from '@/hooks/misc/useCheckPermissions'
-import type { Permission, Role } from '@/types'
-
-export const useGetRolesManagementPermissions = (
- orgSlug?: string,
- roles?: Role[],
- permissions?: Permission[]
-): { rolesAddable: Number[]; rolesRemovable: Number[] } => {
- const rolesAddable: Number[] = []
- const rolesRemovable: Number[] = []
- if (!roles || !orgSlug) return { rolesAddable, rolesRemovable }
-
- roles.forEach((role: Role) => {
- const canAdd = doPermissionsCheck(
- permissions,
- PermissionAction.CREATE,
- 'auth.subject_roles',
- {
- resource: { role_id: role.id },
- },
- orgSlug
- )
- if (canAdd) rolesAddable.push(role.id)
-
- const canRemove = doPermissionsCheck(
- permissions,
- PermissionAction.DELETE,
- 'auth.subject_roles',
- {
- resource: { role_id: role.id },
- },
- orgSlug
- )
- if (canRemove) rolesRemovable.push(role.id)
- })
-
- return { rolesAddable, rolesRemovable }
-}
+import { PermissionsV2Data } from '@/data/permissions/permissions-query-v2'
+import type { Role } from '@/types'
export const hasMultipleOwners = (members: OrganizationMember[] = [], roles: Role[] = []) => {
const membersWhoAreOwners = members.filter((member) => {
@@ -54,6 +16,43 @@ export const hasMultipleOwners = (members: OrganizationMember[] = [], roles: Rol
return membersWhoAreOwners.length > 1
}
+export function getOrgRole(
+ data: PermissionsV2Data | undefined,
+ slug?: string
+): PermissionsV2Data['organizations'][number]['role'] | null {
+ if (!data || !slug) return null
+ return data.organizations.find((org) => org.slug === slug)?.role ?? null
+}
+
+/**
+ * Only administrators and owners can assign/update roles;
+ * the Owner role can only be assigned by another owner.
+ */
+export function getAssignableRoleIds(
+ orgRole: PermissionsV2Data['organizations'][number]['role'] | null,
+ orgScopedRoles: { id: number; name: string }[]
+): number[] {
+ if (orgRole !== 'administrator' && orgRole !== 'owner') return []
+ return orgScopedRoles
+ .filter((role) => role.name !== 'Owner' || orgRole === 'owner')
+ .map((role) => role.id)
+}
+
+/**
+ * Whether the current user's org role can manage (invite/remove/reassign) a member
+ * holding `targetRoleName`.
+ * Same rule as assignment: administrators and owners can manage members,
+ * but Owner role members can only be managed by another owner.
+ */
+export function canManageRole(
+ orgRole: PermissionsV2Data['organizations'][number]['role'] | null,
+ targetRoleName?: string
+): boolean {
+ if (orgRole !== 'administrator' && orgRole !== 'owner') return false
+ if (!targetRoleName) return false
+ return targetRoleName !== 'Owner' || orgRole === 'owner'
+}
+
/** Each role renders on its own line, so members with several roles need taller rows */
export const getMemberRowHeight = (member: Pick<OrganizationMember, 'role_ids'>) =>
Math.max(MEMBER_ROW_MIN_HEIGHT, (member.role_ids?.length ?? 0) * MEMBER_ROLE_LINE_HEIGHT)
diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettingsDataContext.tsx b/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettingsDataContext.tsx
index fec6685d059..df63f59abd2 100644
--- a/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettingsDataContext.tsx
+++ b/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettingsDataContext.tsx
@@ -4,6 +4,7 @@ import { createContext, useContext, useMemo } from 'react'
import type { OrganizationRolesResponse } from '@/data/organization-members/organization-roles-query'
import type { OrganizationMember } from '@/data/organizations/organization-members-query'
import type { OrganizationBase } from '@/data/organizations/organizations-query'
+import { PermissionsV2Data } from '@/data/permissions/permissions-query-v2'
import type { Permission } from '@/types'
type TeamSettingsDataContextValue = {
@@ -11,6 +12,7 @@ type TeamSettingsDataContextValue = {
roles: OrganizationRolesResponse | undefined
isLoadingRoles: boolean
permissions: Permission[] | undefined
+ permissionsV2: PermissionsV2Data | undefined
totalNumOrgProjects: number
selectedOrganization: OrganizationBase | undefined
organizationMembersDeletionEnabled: boolean
@@ -33,6 +35,7 @@ export const TeamSettingsDataProvider = ({
roles,
isLoadingRoles,
permissions,
+ permissionsV2,
totalNumOrgProjects,
selectedOrganization,
organizationMembersDeletionEnabled,
@@ -44,6 +47,7 @@ export const TeamSettingsDataProvider = ({
roles,
isLoadingRoles,
permissions,
+ permissionsV2,
totalNumOrgProjects,
selectedOrganization,
organizationMembersDeletionEnabled,
@@ -54,6 +58,7 @@ export const TeamSettingsDataProvider = ({
roles,
isLoadingRoles,
permissions,
+ permissionsV2,
totalNumOrgProjects,
selectedOrganization,
organizationMembersDeletionEnabled,
diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsx b/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsx
index 833de3e64bf..a284a0a543d 100644
--- a/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsx
+++ b/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsx
@@ -27,7 +27,7 @@ import {
import { Admonition } from 'ui-patterns/Admonition'
import { ROLE_DESCRIPTIONS } from '../Roles.constants'
-import { useGetRolesManagementPermissions } from '../TeamSettings.utils'
+import { canManageRole, getAssignableRoleIds, getOrgRole } from '../TeamSettings.utils'
import { UpdateRolesConfirmationModal } from './UpdateRolesConfirmationModal'
import {
formatMemberRoleToProjectRoleConfiguration,
@@ -39,7 +39,7 @@ import { DocsButton } from '@/components/ui/DocsButton'
import { OrganizationProjectsMultiSelect } from '@/components/ui/OrganizationProjectsMultiSelect'
import { useOrganizationRolesV2Query } from '@/data/organization-members/organization-roles-query'
import { OrganizationMember } from '@/data/organizations/organization-members-query'
-import { usePermissionsQuery } from '@/data/permissions/permissions-query'
+import { usePermissionsQueryV2 } from '@/data/permissions/permissions-query-v2'
import { useOrgProjectsInfiniteQuery } from '@/data/projects/org-projects-infinite-query'
import { useHasAccessToProjectLevelPermissions } from '@/data/subscriptions/org-subscription-query'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
@@ -57,7 +57,7 @@ export const UpdateRolesPanel = ({ visible, member, onClose }: UpdateRolesPanelP
const { data: organization } = useSelectedOrganizationQuery()
const isOptedIntoProjectLevelPermissions = useHasAccessToProjectLevelPermissions(slug as string)
- const { data: permissions } = usePermissionsQuery()
+ const { data: permissionsV2 } = usePermissionsQueryV2()
const { data: allRoles, isSuccess: isSuccessRoles } = useOrganizationRolesV2Query({ slug })
const { data: projectsData } = useOrgProjectsInfiniteQuery({ slug })
@@ -65,14 +65,12 @@ export const UpdateRolesPanel = ({ visible, member, onClose }: UpdateRolesPanelP
// [Joshen] We use the org scoped roles as the source for available roles
const orgScopedRoles = allRoles?.org_scoped_roles ?? []
- const projectScopedRoles = allRoles?.project_scoped_roles ?? []
- const { rolesAddable, rolesRemovable } = useGetRolesManagementPermissions(
- organization?.slug,
- orgScopedRoles.concat(projectScopedRoles),
- permissions ?? []
- )
- const cannotAddAnyRoles = orgScopedRoles.every((r) => !rolesAddable.includes(r.id))
+ // Role management requires an org-level role; the Owner role is only
+ // assignable/removable by another owner. Server enforces the same rule.
+ const orgRole = getOrgRole(permissionsV2, organization?.slug)
+ const rolesAddable = getAssignableRoleIds(orgRole, orgScopedRoles)
+ const cannotAddAnyRoles = rolesAddable.length === 0
const isStripeProjectsOrg = organization?.managed_by === MANAGED_BY.STRIPE_PROJECTS
const [showConfirmation, setShowConfirmation] = useState(false)
@@ -111,7 +109,7 @@ export const UpdateRolesPanel = ({ visible, member, onClose }: UpdateRolesPanelP
const selectedRefs = projectsWithRef.map((p) => p.ref)
const knownProjects = projectsWithRef.map((p) => ({ ref: p.ref, name: p.name ?? p.ref }))
const disabledRefs = projectsWithRef
- .filter((p) => !rolesRemovable.includes(getRoleForProject(p)?.id ?? 0))
+ .filter((p) => !canManageRole(orgRole, getRoleForProject(p)?.name))
.map((p) => p.ref)
const onRemoveProject = (ref?: string) => {
@@ -244,7 +242,7 @@ export const UpdateRolesPanel = ({ visible, member, onClose }: UpdateRolesPanelP
{projectsRoleConfiguration.map((project) => {
const name = project.ref === undefined ? 'All projects' : project.name
const role = getRoleForProject(project)
- const canRemoveRole = rolesRemovable.includes(role?.id ?? 0)
+ const canRemoveRole = canManageRole(orgRole, role?.name)
return (
<div
diff --git a/apps/studio/components/interfaces/Organization/Usage/Usage.branches.test.tsx b/apps/studio/components/interfaces/Organization/Usage/Usage.branches.test.tsx
index 0eda96350f7..6dc139186c3 100644
--- a/apps/studio/components/interfaces/Organization/Usage/Usage.branches.test.tsx
+++ b/apps/studio/components/interfaces/Organization/Usage/Usage.branches.test.tsx
@@ -7,6 +7,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
import { Usage } from './Usage'
import type { Branch } from '@/data/branches/branches-query'
+import { FGA_PERMISSIONS } from '@/hooks/misc/useCheckPermissionsV2'
import { createMockOrganizationResponse, createMockProject } from '@/tests/helpers'
import { createTestBranch } from '@/tests/lib/branch-test-utils'
import { customRender } from '@/tests/lib/custom-render'
@@ -142,20 +143,18 @@ describe('Usage branch URLs', () => {
})
addAPIMock({
method: 'get',
- path: '/platform/profile/permissions',
+ path: '/platform/profile/permissions/v2',
response: () =>
- HttpResponse.json<components['schemas']['AccessControlPermission'][]>([
- {
- actions: ['%'],
- resources: ['%'],
- organization_id: 1,
- organization_slug: 'test-org',
- project_ids: [],
- project_refs: [],
- condition: null,
- restrictive: false,
- },
- ]),
+ HttpResponse.json<components['schemas']['UserPermissionsResponse_Output']>({
+ organizations: [
+ {
+ slug: 'test-org',
+ role: 'owner',
+ permissions: [FGA_PERMISSIONS.ORGANIZATION.BILLING_READ],
+ projects: [],
+ },
+ ],
+ }),
})
addAPIMock({
method: 'get',
@@ -193,8 +192,11 @@ describe('Usage branch URLs', () => {
})
addAPIMock({
method: 'get',
- path: '/platform/profile/permissions',
- response: () => HttpResponse.json<components['schemas']['AccessControlPermission'][]>([]),
+ path: '/platform/profile/permissions/v2',
+ response: () =>
+ HttpResponse.json<components['schemas']['UserPermissionsResponse_Output']>({
+ organizations: [{ slug: 'test-org', role: 'readonly', permissions: [], projects: [] }],
+ }),
})
const subscriptionRequested = vi.fn()
addAPIMock({
diff --git a/apps/studio/components/interfaces/Organization/Usage/Usage.test.tsx b/apps/studio/components/interfaces/Organization/Usage/Usage.test.tsx
index a13728da302..739e8e07bb7 100644
--- a/apps/studio/components/interfaces/Organization/Usage/Usage.test.tsx
+++ b/apps/studio/components/interfaces/Organization/Usage/Usage.test.tsx
@@ -21,8 +21,9 @@ vi.mock('common', async (importOriginal) => ({
useParams: () => ({ slug: 'test-org' }),
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: mockUseAsyncCheckPermissions,
+vi.mock('@/hooks/misc/useCheckPermissionsV2', async (importOriginal) => ({
+ ...(await importOriginal<typeof import('@/hooks/misc/useCheckPermissionsV2')>()),
+ useAsyncCheckPermissionsV2: mockUseAsyncCheckPermissions,
}))
vi.mock('@/data/analytics/org-daily-stats-query', async (importOriginal) => ({
diff --git a/apps/studio/components/interfaces/Organization/Usage/Usage.tsx b/apps/studio/components/interfaces/Organization/Usage/Usage.tsx
index 6028f1000f4..5319169b780 100644
--- a/apps/studio/components/interfaces/Organization/Usage/Usage.tsx
+++ b/apps/studio/components/interfaces/Organization/Usage/Usage.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import dayjs from 'dayjs'
import { ChartAreaIcon, CheckIcon, ChevronDownIcon } from 'lucide-react'
@@ -35,7 +34,7 @@ import { useOrgDailyStatsQuery } from '@/data/analytics/org-daily-stats-query'
import { useBranchesQuery } from '@/data/branches/branches-query'
import { useProjectDetailQuery } from '@/data/projects/project-detail-query'
import { useOrgSubscriptionQuery } from '@/data/subscriptions/org-subscription-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { resolveHighAvailability } from '@/hooks/misc/useHighAvailability'
import { TIME_PERIODS_BILLING, TIME_PERIODS_REPORTS } from '@/lib/constants/metrics'
@@ -113,9 +112,8 @@ export const Usage = () => {
!isProjectLookupBlocked
const canLoadUsage = canLoadProjectUsage && canShowUsage
- const { can: canReadSubscriptions, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(
- PermissionAction.BILLING_READ,
- 'stripe.subscriptions'
+ const { can: canReadSubscriptions, isLoading: isLoadingPermissions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_READ
)
const {
diff --git a/apps/studio/components/interfaces/Project/APIKeys.tsx b/apps/studio/components/interfaces/Project/APIKeys.tsx
index ad712208bef..5c8ada1b442 100644
--- a/apps/studio/components/interfaces/Project/APIKeys.tsx
+++ b/apps/studio/components/interfaces/Project/APIKeys.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { JwtSecretUpdateStatus } from '@supabase/shared-types/out/events'
import { useParams } from 'common'
import { LoaderIcon } from 'lucide-react'
@@ -16,11 +15,13 @@ import { useAPIKeys } from '@/data/api-keys/api-keys-query'
import { useLegacyAPIKeysStatusQuery } from '@/data/api-keys/legacy-api-keys-status-query'
import { useJwtSecretUpdatingStatusQuery } from '@/data/config/jwt-secret-updating-status-query'
import { useProjectSettingsV2Query } from '@/data/config/project-settings-v2-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
export const APIKeys = () => {
const { ref: projectRef } = useParams()
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ
+ )
const {
data: settings,
diff --git a/apps/studio/components/interfaces/Project/ResumeProjectButton.tsx b/apps/studio/components/interfaces/Project/ResumeProjectButton.tsx
index 9dd094eff49..f926ce878b1 100644
--- a/apps/studio/components/interfaces/Project/ResumeProjectButton.tsx
+++ b/apps/studio/components/interfaces/Project/ResumeProjectButton.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useFlag, useParams } from 'common'
import Link from 'next/link'
import { useRouter } from 'next/router'
@@ -29,7 +28,7 @@ import { useFreeProjectLimitCheckQuery } from '@/data/organizations/free-project
import { useSetProjectStatus } from '@/data/projects/project-detail-query'
import { useProjectPauseStatusQuery } from '@/data/projects/project-pause-status-query'
import { useProjectRestoreMutation } from '@/data/projects/project-restore-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { PROJECT_STATUS } from '@/lib/constants'
@@ -81,10 +80,7 @@ export const ResumeProjectButton = ({
const [showFreeProjectLimitWarning, setShowFreeProjectLimitWarning] = useState(false)
const [billingBlockReason, setBillingBlockReason] = useState<string>()
- const { can: canResumeProject } = useAsyncCheckPermissions(
- PermissionAction.INFRA_EXECUTE,
- 'queue_jobs.projects.initialize_or_resume'
- )
+ const { can: canResumeProject } = useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.ADMIN_WRITE)
const { mutate: restoreProject, isPending: isRestoring } = useProjectRestoreMutation({
onSuccess: async (_, variables) => {
diff --git a/apps/studio/components/interfaces/ProjectAPIDocs/Content/Introduction.tsx b/apps/studio/components/interfaces/ProjectAPIDocs/Content/Introduction.tsx
index 69b8f93e1b6..15f9ee48633 100644
--- a/apps/studio/components/interfaces/ProjectAPIDocs/Content/Introduction.tsx
+++ b/apps/studio/components/interfaces/ProjectAPIDocs/Content/Introduction.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { CopyIcon } from 'lucide-react'
import { useEffect, useState } from 'react'
@@ -11,12 +10,14 @@ import { DOCS_CONTENT } from '../ProjectAPIDocs.constants'
import type { ContentProps } from './Content.types'
import { useAPIKeys } from '@/data/api-keys/api-keys-query'
import { useProjectSettingsV2Query } from '@/data/config/project-settings-v2-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useTrack } from '@/lib/telemetry/track'
export const Introduction = ({ showKeys, language, apikey, endpoint }: ContentProps) => {
const { ref } = useParams()
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ
+ )
const { data: apiKeysData } = useAPIKeys({ projectRef: ref }, { enabled: canReadAPIKeys })
useProjectSettingsV2Query({ projectRef: ref })
const { anonKey, serviceKey } = apiKeysData ?? {}
diff --git a/apps/studio/components/interfaces/ProjectAPIDocs/ProjectAPIDocs.tsx b/apps/studio/components/interfaces/ProjectAPIDocs/ProjectAPIDocs.tsx
index 421fc73ecd8..10575c7912f 100644
--- a/apps/studio/components/interfaces/ProjectAPIDocs/ProjectAPIDocs.tsx
+++ b/apps/studio/components/interfaces/ProjectAPIDocs/ProjectAPIDocs.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { useState } from 'react'
import { Button, SidePanel } from 'ui'
@@ -19,7 +18,7 @@ import LanguageSelector from './LanguageSelector'
import { SecondLevelNav } from './SecondLevelNav'
import { useAPIKeys } from '@/data/api-keys/api-keys-query'
import { useProjectApiUrl } from '@/data/config/project-endpoint-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useAppStateSnapshot } from '@/state/app-state'
/**
@@ -44,7 +43,9 @@ export const ProjectAPIDocs = () => {
const [showKeys, setShowKeys] = useState(false)
const language = snap.docsLanguage
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ
+ )
const { data: apiKeysData } = useAPIKeys(
{ projectRef: ref },
{ enabled: snap.showProjectApiDocs && canReadAPIKeys }
diff --git a/apps/studio/components/interfaces/ProjectCreation/OrganizationSelector.tsx b/apps/studio/components/interfaces/ProjectCreation/OrganizationSelector.tsx
index 5d127d30892..4fb7ced1f92 100644
--- a/apps/studio/components/interfaces/ProjectCreation/OrganizationSelector.tsx
+++ b/apps/studio/components/interfaces/ProjectCreation/OrganizationSelector.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQueryClient } from '@tanstack/react-query'
import { useParams } from 'common'
import { useRouter } from 'next/router'
@@ -23,7 +22,7 @@ import { NoPermission } from '@/components/ui/NoPermission'
import Panel from '@/components/ui/Panel'
import { useOrganizationsQuery } from '@/data/organizations/organizations-query'
import { permissionKeys } from '@/data/permissions/keys'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
interface OrganizationSelectorProps {
@@ -39,7 +38,7 @@ export const OrganizationSelector = ({
const { slug } = useParams()
const queryClient = useQueryClient()
const { data: currentOrg } = useSelectedOrganizationQuery()
- const { can: isAdmin } = useAsyncCheckPermissions(PermissionAction.CREATE, 'projects')
+ const { can: isAdmin } = useAsyncCheckPermissionsV2(FGA_PERMISSIONS.ORGANIZATION.PROJECTS_CREATE)
// Permissions may be stale for newly created accounts due to replication lag between
// org setup and the permissions endpoint. Invalidate in the background on mount so the
diff --git a/apps/studio/components/interfaces/ProjectCreation/ProjectCreationForm.tsx b/apps/studio/components/interfaces/ProjectCreation/ProjectCreationForm.tsx
index 1453a7a3c01..4d04f00b608 100644
--- a/apps/studio/components/interfaces/ProjectCreation/ProjectCreationForm.tsx
+++ b/apps/studio/components/interfaces/ProjectCreation/ProjectCreationForm.tsx
@@ -1,6 +1,5 @@
import { zodResolver } from '@hookform/resolvers/zod'
import { acceptUntrustedSql, joinSqlFragments, untrustedSql } from '@supabase/pg-meta'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useFeatureFlags, useFlag, useParams } from 'common'
import Link from 'next/link'
import { useRouter } from 'next/router'
@@ -69,7 +68,7 @@ import {
} from '@/data/projects/project-create-mutation'
import { useCustomContent } from '@/hooks/custom-content/useCustomContent'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import {
isInDataApiRevokeTreatment,
useDataApiRevokeOnCreateDefaultEnabled,
@@ -139,10 +138,9 @@ export const ProjectCreationForm = ({
const canChooseInstanceSize = !isFreePlan
const { lastVisitedOrganization } = useLastVisitedOrganization()
- const { can: isAdmin } = useAsyncCheckPermissions(PermissionAction.CREATE, 'projects')
- const { can: canCreateGitHubConnection } = useAsyncCheckPermissions(
- PermissionAction.CREATE,
- 'integrations.github_connections'
+ const { can: isAdmin } = useAsyncCheckPermissionsV2(FGA_PERMISSIONS.ORGANIZATION.PROJECTS_CREATE)
+ const { can: canCreateGitHubConnection } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.CONFIG_WRITE
)
const showAdvancedConfig = useIsFeatureEnabled('project_creation:show_advanced_config')
const { hasAccess: hasAccessToGitHubIntegration } = useCheckEntitlements(
diff --git a/apps/studio/components/interfaces/ProjectHome/CustomReportSection.tsx b/apps/studio/components/interfaces/ProjectHome/CustomReportSection.tsx
index 427ab7144e3..9c4db7c0b35 100644
--- a/apps/studio/components/interfaces/ProjectHome/CustomReportSection.tsx
+++ b/apps/studio/components/interfaces/ProjectHome/CustomReportSection.tsx
@@ -7,7 +7,6 @@ import {
useSensors,
} from '@dnd-kit/core'
import { arrayMove, rectSortingStrategy, SortableContext, useSortable } from '@dnd-kit/sortable'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { keepPreviousData } from '@tanstack/react-query'
import { useParams } from 'common'
import dayjs from 'dayjs'
@@ -34,7 +33,10 @@ import {
UpsertContentPayload,
useContentUpsertMutation,
} from '@/data/content/content-upsert-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import {
+ FGA_PERMISSIONS,
+ useAsyncCheckUserContentPermissions,
+} from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { uuidv4 } from '@/lib/helpers'
import { useProfile } from '@/lib/profile'
@@ -70,23 +72,22 @@ export function CustomReportSection() {
)
const [isDraggingOver, setIsDraggingOver] = useState(false)
- const { can: canCreateReport } = useAsyncCheckPermissions(
- PermissionAction.CREATE,
- 'user_content',
- { resource: { type: 'report', owner_id: profile?.id }, subject: { id: profile?.id } }
+ const { can: canCreateReport } = useAsyncCheckUserContentPermissions(
+ FGA_PERMISSIONS.PROJECT.SNIPPETS_WRITE,
+ { mode: 'create', type: 'report' }
)
- const { can: canUpdateReport } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'user_content',
- {
- resource: {
- type: 'report',
- visibility: homeReport?.visibility,
- owner_id: homeReport?.owner_id,
- },
- subject: { id: profile?.id },
- }
+ const { can: canUpdateReport } = useAsyncCheckUserContentPermissions(
+ FGA_PERMISSIONS.PROJECT.SNIPPETS_WRITE,
+ homeReport
+ ? {
+ mode: 'existing',
+ type: 'report',
+ visibility: homeReport.visibility,
+ ownerId: homeReport.owner_id,
+ subjectId: profile?.id,
+ }
+ : undefined
)
const { mutate: upsertContent } = useContentUpsertMutation()
diff --git a/apps/studio/components/interfaces/ProjectHome/ProjectConnectionPopover.tsx b/apps/studio/components/interfaces/ProjectHome/ProjectConnectionPopover.tsx
index d851c917707..018d8701b82 100644
--- a/apps/studio/components/interfaces/ProjectHome/ProjectConnectionPopover.tsx
+++ b/apps/studio/components/interfaces/ProjectHome/ProjectConnectionPopover.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import {
CheckIcon,
ChevronDownIcon,
@@ -27,7 +26,7 @@ import { appendHighAvailabilitySslParams } from '@/components/interfaces/Connect
import { useAPIKeys } from '@/data/api-keys/api-keys-query'
import { useProjectApiUrl } from '@/data/config/project-endpoint-query'
import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useIsHighAvailability } from '@/hooks/misc/useSelectedProject'
import { IS_PLATFORM } from '@/lib/constants'
import { pluckObjectFields } from '@/lib/helpers'
@@ -49,9 +48,8 @@ export const ProjectConnectionPopover = ({ projectRef }: ProjectConnectionPopove
const [copiedItem, setCopiedItem] = useState<string | null>(null)
const [, setShowConnect] = useQueryState('showConnect', parseAsBoolean.withDefault(false))
- const { isLoading: isLoadingPermissions, can: canReadAPIKeys } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'service_api_keys'
+ const { isLoading: isLoadingPermissions, can: canReadAPIKeys } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ
)
const { data: projectUrl, isPending: isLoadingApiUrl } = useProjectApiUrl({ projectRef })
diff --git a/apps/studio/components/interfaces/Realtime/Inspector/Header.tsx b/apps/studio/components/interfaces/Realtime/Inspector/Header.tsx
index 728b3bffce7..1a9be59d461 100644
--- a/apps/studio/components/interfaces/Realtime/Inspector/Header.tsx
+++ b/apps/studio/components/interfaces/Realtime/Inspector/Header.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { IS_PLATFORM } from 'common'
import { PlayCircleIcon, StopCircleIcon } from 'lucide-react'
import { Dispatch, SetStateAction, useCallback } from 'react'
@@ -11,7 +10,7 @@ import { RealtimeConfig } from './useRealtimeMessages'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { ShortcutTooltip } from '@/components/ui/ShortcutTooltip'
import { getTemporaryAPIKey } from '@/data/api-keys/temp-api-keys-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useTrack } from '@/lib/telemetry/track'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
import { useShortcut } from '@/state/shortcuts/useShortcut'
@@ -35,9 +34,8 @@ export const Header = ({
}: HeaderProps) => {
const track = useTrack()
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'service_api_keys'
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ
)
const canToggleListening = canReadAPIKeys && config.channelName.length > 0
diff --git a/apps/studio/components/interfaces/Realtime/Inspector/MessagesTable.tsx b/apps/studio/components/interfaces/Realtime/Inspector/MessagesTable.tsx
index bfab35273ea..46bbb1d1d91 100644
--- a/apps/studio/components/interfaces/Realtime/Inspector/MessagesTable.tsx
+++ b/apps/studio/components/interfaces/Realtime/Inspector/MessagesTable.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { isEqual } from 'lodash'
import { ExternalLinkIcon, Loader2Icon, MegaphoneIcon } from 'lucide-react'
@@ -16,7 +15,7 @@ import { DocsButton } from '@/components/ui/DocsButton'
import { NoPermission } from '@/components/ui/NoPermission'
import ShimmerLine from '@/components/ui/ShimmerLine'
import { ShortcutTooltip } from '@/components/ui/ShortcutTooltip'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { DOCS_URL } from '@/lib/constants'
import { useTrack } from '@/lib/telemetry/track'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
@@ -36,9 +35,8 @@ const NoResultAlert = ({
}) => {
const { ref } = useParams()
- const { can: canReadAPIKeys, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'service_api_keys'
+ const { can: canReadAPIKeys, isLoading: isLoadingPermissions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ
)
const broadcastButton = <Button onClick={showSendMessage}>Broadcast a message</Button>
diff --git a/apps/studio/components/interfaces/Realtime/Inspector/RealtimeTokensPopover.tsx b/apps/studio/components/interfaces/Realtime/Inspector/RealtimeTokensPopover.tsx
index f8d5e327f44..7572192e5de 100644
--- a/apps/studio/components/interfaces/Realtime/Inspector/RealtimeTokensPopover.tsx
+++ b/apps/studio/components/interfaces/Realtime/Inspector/RealtimeTokensPopover.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { Dispatch, SetStateAction, useEffect, useEffectEvent, useRef } from 'react'
import { toast } from 'sonner'
@@ -7,7 +6,7 @@ import { RoleImpersonationPopover } from '@/components/interfaces/RoleImpersonat
import { useAPIKeys } from '@/data/api-keys/api-keys-query'
import { getTemporaryAPIKey } from '@/data/api-keys/temp-api-keys-query'
import { useProjectPostgrestConfigQuery } from '@/data/config/project-postgrest-config-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { IS_PLATFORM } from '@/lib/constants'
import { getRoleImpersonationJWT } from '@/lib/role-impersonation'
import { useTrack } from '@/lib/telemetry/track'
@@ -21,7 +20,9 @@ interface RealtimeTokensPopoverProps {
export const RealtimeTokensPopover = ({ config, onChangeConfig }: RealtimeTokensPopoverProps) => {
const snap = useRoleImpersonationStateSnapshot()
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ
+ )
const { data: apiKeysData } = useAPIKeys(
{
projectRef: config.projectRef,
diff --git a/apps/studio/components/interfaces/Realtime/RealtimeSettings.test.tsx b/apps/studio/components/interfaces/Realtime/RealtimeSettings.test.tsx
index 9d686bfcd63..fafa9e01a31 100644
--- a/apps/studio/components/interfaces/Realtime/RealtimeSettings.test.tsx
+++ b/apps/studio/components/interfaces/Realtime/RealtimeSettings.test.tsx
@@ -28,8 +28,9 @@ const {
mockUseDatabasePoliciesQuery: vi.fn(),
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: mockUseAsyncCheckPermissions,
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: mockUseAsyncCheckPermissions,
+ FGA_PERMISSIONS: { PROJECT: { REALTIME_CONFIG_WRITE: 'realtime_config_write' } },
}))
vi.mock('@/hooks/misc/useSelectedProject', () => ({
diff --git a/apps/studio/components/interfaces/Realtime/RealtimeSettings.tsx b/apps/studio/components/interfaces/Realtime/RealtimeSettings.tsx
index 1409f32d548..91db81f5e3b 100644
--- a/apps/studio/components/interfaces/Realtime/RealtimeSettings.tsx
+++ b/apps/studio/components/interfaces/Realtime/RealtimeSettings.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import Link from 'next/link'
import { useState } from 'react'
@@ -38,7 +37,7 @@ import {
useRealtimeConfigurationQuery,
} from '@/data/realtime/realtime-config-query'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
@@ -57,9 +56,8 @@ export const RealtimeSettings = () => {
const { ref: projectRef } = useParams()
const { data: project } = useSelectedProjectQuery()
const { data: organization, isSuccess: isSuccessOrganization } = useSelectedOrganizationQuery()
- const { can: canUpdateConfig, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.REALTIME_ADMIN_READ,
- '*'
+ const { can: canUpdateConfig, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.REALTIME_CONFIG_WRITE
)
const [isConfirmNextModalOpen, setIsConfirmNextModalOpen] = useState(false)
diff --git a/apps/studio/components/interfaces/Reports/Reports.tsx b/apps/studio/components/interfaces/Reports/Reports.tsx
index cf1551cbc99..d8603708cdb 100644
--- a/apps/studio/components/interfaces/Reports/Reports.tsx
+++ b/apps/studio/components/interfaces/Reports/Reports.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQueryClient } from '@tanstack/react-query'
import { useParams } from 'common'
import { groupBy, isEqual, isNull } from 'lodash'
@@ -27,7 +26,10 @@ import {
UpsertContentPayload,
useContentUpsertMutation,
} from '@/data/content/content-upsert-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import {
+ FGA_PERMISSIONS,
+ useAsyncCheckUserContentPermissions,
+} from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { usePreventNavigationOnUnsavedChanges } from '@/hooks/ui/usePreventNavigationOnUnsavedChanges'
import { Metric, TIME_PERIODS_REPORTS } from '@/lib/constants/metrics'
@@ -78,29 +80,30 @@ const Reports = () => {
)
const currentReportContent = currentReport?.content as Dashboards.Content
- const { can: canReadReport, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'user_content',
- {
- resource: {
- type: 'report',
- visibility: currentReport?.visibility,
- owner_id: currentReport?.owner_id,
- },
- subject: { id: profile?.id },
- }
- )
- const { can: canUpdateReport } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'user_content',
- {
- resource: {
- type: 'report',
- visibility: currentReport?.visibility,
- owner_id: currentReport?.owner_id,
- },
- subject: { id: profile?.id },
- }
+ const { can: canReadReport, isLoading: isLoadingPermissions } =
+ useAsyncCheckUserContentPermissions(
+ FGA_PERMISSIONS.PROJECT.SNIPPETS_READ,
+ currentReport
+ ? {
+ mode: 'existing',
+ type: 'report',
+ visibility: currentReport.visibility,
+ ownerId: currentReport.owner_id,
+ subjectId: profile?.id,
+ }
+ : undefined
+ )
+ const { can: canUpdateReport } = useAsyncCheckUserContentPermissions(
+ FGA_PERMISSIONS.PROJECT.SNIPPETS_WRITE,
+ currentReport
+ ? {
+ mode: 'existing',
+ type: 'report',
+ visibility: currentReport.visibility,
+ ownerId: currentReport.owner_id,
+ subjectId: profile?.id,
+ }
+ : undefined
)
function handleDateRangePicker({ period_start, period_end }: any) {
diff --git a/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLExamples.tsx b/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLExamples.tsx
index d95a2b75539..d42b232950a 100644
--- a/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLExamples.tsx
+++ b/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLExamples.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { partition } from 'lodash'
import { useRouter } from 'next/router'
@@ -8,7 +7,10 @@ import { cn, SQL_ICON } from 'ui'
import { createSqlSnippetSkeletonV2 } from '../SQLEditor.utils'
import { SQL_TEMPLATES } from '@/components/interfaces/SQLEditor/SQLEditor.queries'
import { ActionCard } from '@/components/layouts/Tabs/ActionCard'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import {
+ FGA_PERMISSIONS,
+ useAsyncCheckUserContentPermissions,
+} from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useProfile } from '@/lib/profile'
import { useTrack } from '@/lib/telemetry/track'
@@ -24,13 +26,9 @@ const SQLExamples = () => {
const snapV2 = useSqlEditorV2StateSnapshot()
const track = useTrack()
- const { can: canCreateSQLSnippet } = useAsyncCheckPermissions(
- PermissionAction.CREATE,
- 'user_content',
- {
- resource: { type: 'sql', owner_id: profile?.id },
- subject: { id: profile?.id },
- }
+ const { can: canCreateSQLSnippet } = useAsyncCheckUserContentPermissions(
+ FGA_PERMISSIONS.PROJECT.SNIPPETS_WRITE,
+ { mode: 'create', type: 'sql' }
)
const handleNewQuery = async (sql: string, name: string) => {
diff --git a/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLTemplates.tsx b/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLTemplates.tsx
index 0b855813393..5f65d0594f8 100644
--- a/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLTemplates.tsx
+++ b/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLTemplates.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { partition } from 'lodash'
import { useRouter } from 'next/router'
@@ -8,7 +7,10 @@ import { cn, SQL_ICON } from 'ui'
import { createSqlSnippetSkeletonV2 } from '../SQLEditor.utils'
import { SQL_TEMPLATES } from '@/components/interfaces/SQLEditor/SQLEditor.queries'
import { ActionCard } from '@/components/layouts/Tabs/ActionCard'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import {
+ FGA_PERMISSIONS,
+ useAsyncCheckUserContentPermissions,
+} from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useProfile } from '@/lib/profile'
import { useTrack } from '@/lib/telemetry/track'
@@ -24,13 +26,9 @@ const SQLTemplates = () => {
const snapV2 = useSqlEditorV2StateSnapshot()
const track = useTrack()
- const { can: canCreateSQLSnippet } = useAsyncCheckPermissions(
- PermissionAction.CREATE,
- 'user_content',
- {
- resource: { type: 'sql', owner_id: profile?.id },
- subject: { id: profile?.id },
- }
+ const { can: canCreateSQLSnippet } = useAsyncCheckUserContentPermissions(
+ FGA_PERMISSIONS.PROJECT.SNIPPETS_WRITE,
+ { mode: 'create', type: 'sql' }
)
const handleNewQuery = async (sql: string, name: string) => {
diff --git a/apps/studio/components/interfaces/SQLEditor/hooks.ts b/apps/studio/components/interfaces/SQLEditor/hooks.ts
index 3f531c4aba4..040106794ed 100644
--- a/apps/studio/components/interfaces/SQLEditor/hooks.ts
+++ b/apps/studio/components/interfaces/SQLEditor/hooks.ts
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { useRouter } from 'next/router'
import { useCallback, useEffect, useMemo, useState } from 'react'
@@ -11,7 +10,10 @@ import {
compareAsNewSnippet,
createSqlSnippetSkeletonV2,
} from './SQLEditor.utils'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import {
+ FGA_PERMISSIONS,
+ useAsyncCheckUserContentPermissions,
+} from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useProfile } from '@/lib/profile'
import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state'
@@ -23,13 +25,9 @@ export const useNewQuery = () => {
const { data: project } = useSelectedProjectQuery()
const snapV2 = useSqlEditorV2StateSnapshot()
- const { can: canCreateSQLSnippet } = useAsyncCheckPermissions(
- PermissionAction.CREATE,
- 'user_content',
- {
- resource: { type: 'sql', owner_id: profile?.id },
- subject: { id: profile?.id },
- }
+ const { can: canCreateSQLSnippet } = useAsyncCheckUserContentPermissions(
+ FGA_PERMISSIONS.PROJECT.SNIPPETS_WRITE,
+ { mode: 'create', type: 'sql' }
)
const newQuery = async (sql: string, name: string, shouldRedirect: boolean = true) => {
diff --git a/apps/studio/components/interfaces/Settings/API/DataApiEnableSwitch.tsx b/apps/studio/components/interfaces/Settings/API/DataApiEnableSwitch.tsx
index 6a3e262ae2f..9226b006291 100644
--- a/apps/studio/components/interfaces/Settings/API/DataApiEnableSwitch.tsx
+++ b/apps/studio/components/interfaces/Settings/API/DataApiEnableSwitch.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { useCallback, useEffect, useEffectEvent, useReducer } from 'react'
import { useForm } from 'react-hook-form'
@@ -17,7 +16,7 @@ import { DataApiEnableSwitchError, DataApiEnableSwitchLoading } from './DataApiE
import { UnsafeEntitiesConfirmModal } from './UnsafeEntitiesConfirmModal'
import { useProjectPostgrestConfigQuery } from '@/data/config/project-postgrest-config-query'
import { useProjectPostgrestConfigUpdateMutation } from '@/data/config/project-postgrest-config-update-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useIsDataApiEnabled } from '@/hooks/misc/useIsDataApiEnabled'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
@@ -25,7 +24,7 @@ export const DataApiEnableSwitch = () => {
const { ref: projectRef } = useParams()
const { data: project } = useSelectedProjectQuery()
const { can: canUpdatePostgrestConfig, isSuccess: isPermissionsLoaded } =
- useAsyncCheckPermissions(PermissionAction.UPDATE, 'custom_config_postgrest')
+ useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.DATA_API_CONFIG_WRITE)
const {
data: config,
diff --git a/apps/studio/components/interfaces/Settings/API/PostgrestConfig.tsx b/apps/studio/components/interfaces/Settings/API/PostgrestConfig.tsx
index 81f05cc9387..c996b4dd153 100644
--- a/apps/studio/components/interfaces/Settings/API/PostgrestConfig.tsx
+++ b/apps/studio/components/interfaces/Settings/API/PostgrestConfig.tsx
@@ -1,6 +1,5 @@
import { zodResolver } from '@hookform/resolvers/zod'
import { safeSql } from '@supabase/pg-meta'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { useParams } from 'common'
import { LockIcon } from 'lucide-react'
@@ -53,7 +52,7 @@ import { privilegeKeys } from '@/data/privileges/keys'
import { useUpdateDefaultPrivilegesMutation } from '@/data/privileges/update-default-privileges-mutation'
import { useUpdateExposedEntitiesMutation } from '@/data/privileges/update-exposed-entities-mutation'
import { useExecuteSqlMutation } from '@/data/sql/execute-sql-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useLatest } from '@/hooks/misc/useLatest'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { IS_PLATFORM } from '@/lib/constants'
@@ -164,7 +163,7 @@ export const PostgrestConfig = () => {
const formId = 'project-postgres-config'
const { can: canUpdatePostgrestConfigPermission, isSuccess: isPermissionsLoaded } =
- useAsyncCheckPermissions(PermissionAction.UPDATE, 'custom_config_postgrest')
+ useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.DATA_API_CONFIG_WRITE)
// PostgREST config (exposed schemas, extra search path, max rows, pool size) is persisted via
// the platform API, which isn't available self-hosted (the values come from env vars there).
const canUpdatePostgrestConfig = IS_PLATFORM && canUpdatePostgrestConfigPermission
diff --git a/apps/studio/components/interfaces/Settings/Addons/CustomDomainSidePanel.tsx b/apps/studio/components/interfaces/Settings/Addons/CustomDomainSidePanel.tsx
index 09179e9c736..3baad8f1d01 100644
--- a/apps/studio/components/interfaces/Settings/Addons/CustomDomainSidePanel.tsx
+++ b/apps/studio/components/interfaces/Settings/Addons/CustomDomainSidePanel.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useFlag, useParams } from 'common'
import { AlertCircleIcon } from 'lucide-react'
import { useEffect, useState } from 'react'
@@ -22,7 +21,7 @@ import { useProjectAddonUpdateMutation } from '@/data/subscriptions/project-addo
import { useProjectAddonsQuery } from '@/data/subscriptions/project-addons-query'
import type { AddonVariantId } from '@/data/subscriptions/types'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { DOCS_URL } from '@/lib/constants'
import { formatCurrency } from '@/lib/helpers'
import { useAddonsPagePanel } from '@/state/addons-page'
@@ -33,9 +32,8 @@ const CustomDomainSidePanel = () => {
const [selectedOption, setSelectedOption] = useState<string>('cd_none')
- const { can: canUpdateCustomDomain } = useAsyncCheckPermissions(
- PermissionAction.BILLING_WRITE,
- 'stripe.subscriptions'
+ const { can: canUpdateCustomDomain } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.INFRA_ADDONS_WRITE
)
const { panel, closePanel } = useAddonsPagePanel()
diff --git a/apps/studio/components/interfaces/Settings/Addons/IPv4SidePanel.tsx b/apps/studio/components/interfaces/Settings/Addons/IPv4SidePanel.tsx
index e2800d7d2fd..7abd4fe25c9 100644
--- a/apps/studio/components/interfaces/Settings/Addons/IPv4SidePanel.tsx
+++ b/apps/studio/components/interfaces/Settings/Addons/IPv4SidePanel.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { useEffect, useState } from 'react'
import { toast } from 'sonner'
@@ -14,7 +13,7 @@ import { useProjectAddonUpdateMutation } from '@/data/subscriptions/project-addo
import { useProjectAddonsQuery } from '@/data/subscriptions/project-addons-query'
import type { AddonVariantId } from '@/data/subscriptions/types'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useIsAwsCloudProvider } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL } from '@/lib/constants'
import { formatCurrency } from '@/lib/helpers'
@@ -26,9 +25,8 @@ const IPv4SidePanel = () => {
const [selectedOption, setSelectedOption] = useState<string>('ipv4_none')
- const { can: canUpdateIPv4 } = useAsyncCheckPermissions(
- PermissionAction.BILLING_WRITE,
- 'stripe.subscriptions'
+ const { can: canUpdateIPv4 } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.INFRA_ADDONS_WRITE
)
const { panel, closePanel } = useAddonsPagePanel()
diff --git a/apps/studio/components/interfaces/Settings/Addons/PITRSidePanel.tsx b/apps/studio/components/interfaces/Settings/Addons/PITRSidePanel.tsx
index 867f1688a22..be6de161062 100644
--- a/apps/studio/components/interfaces/Settings/Addons/PITRSidePanel.tsx
+++ b/apps/studio/components/interfaces/Settings/Addons/PITRSidePanel.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { useTheme } from 'next-themes'
import { useEffect, useState } from 'react'
@@ -27,7 +26,7 @@ import { useProjectAddonUpdateMutation } from '@/data/subscriptions/project-addo
import { useProjectAddonsQuery } from '@/data/subscriptions/project-addons-query'
import type { AddonVariantId } from '@/data/subscriptions/types'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { BASE_PATH, DOCS_URL } from '@/lib/constants'
@@ -64,9 +63,8 @@ const PITRSidePanel = () => {
const [selectedCategory, setSelectedCategory] = useState<'on' | 'off'>('off')
const [selectedOption, setSelectedOption] = useState<string>('pitr_0')
- const { can: canUpdatePitr } = useAsyncCheckPermissions(
- PermissionAction.BILLING_WRITE,
- 'stripe.subscriptions'
+ const { can: canUpdatePitr } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.INFRA_ADDONS_WRITE
)
const isBranchingEnabled =
project?.is_branch_enabled === true || project?.parent_project_ref !== undefined
diff --git a/apps/studio/components/interfaces/Settings/Database/BannedIPs.test.tsx b/apps/studio/components/interfaces/Settings/Database/BannedIPs.test.tsx
index 71a7a3b7507..b50edd0a677 100644
--- a/apps/studio/components/interfaces/Settings/Database/BannedIPs.test.tsx
+++ b/apps/studio/components/interfaces/Settings/Database/BannedIPs.test.tsx
@@ -29,8 +29,9 @@ vi.mock('@/lib/constants', async (importOriginal) => ({
IS_PLATFORM: true,
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: () => ({ can: true }),
+vi.mock('@/hooks/misc/useCheckPermissionsV2', async (importOriginal) => ({
+ ...(await importOriginal<typeof import('@/hooks/misc/useCheckPermissionsV2')>()),
+ useAsyncCheckPermissionsV2: () => ({ can: true }),
}))
vi.mock('@/lib/telemetry/track', () => ({ useTrack: () => vi.fn() }))
diff --git a/apps/studio/components/interfaces/Settings/Database/BannedIPs.tsx b/apps/studio/components/interfaces/Settings/Database/BannedIPs.tsx
index 05c7eaa92f2..c4e70faa75b 100644
--- a/apps/studio/components/interfaces/Settings/Database/BannedIPs.tsx
+++ b/apps/studio/components/interfaces/Settings/Database/BannedIPs.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { GlobeIcon } from 'lucide-react'
import { useMemo, useState } from 'react'
@@ -22,7 +21,7 @@ import { HighAvailabilityDisabledSectionNotice } from '@/components/ui/HighAvail
import { useBannedIPsDeleteMutation } from '@/data/banned-ips/banned-ips-delete-mutations'
import { useBannedIPsQuery } from '@/data/banned-ips/banned-ips-query'
import { useUserIPAddressQuery } from '@/data/misc/user-ip-address-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useHighAvailability } from '@/hooks/misc/useHighAvailability'
import { useIsAwsK8sCloudProvider, useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL } from '@/lib/constants'
@@ -52,11 +51,9 @@ export const BannedIPs = () => {
const hasProjectError = !project && !!projectError
const ipListLoading = isLoadingIPList || isFetchingIPList
- const { can: canUnbanNetworks } = useAsyncCheckPermissions(PermissionAction.UPDATE, 'projects', {
- resource: {
- project_id: project?.id,
- },
- })
+ const { can: canUnbanNetworks } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_NETWORK_BANS_WRITE
+ )
const isSectionDisabled = isHighAvailability || isAwsK8s || !canUnbanNetworks
diff --git a/apps/studio/components/interfaces/Settings/Database/ConnectionLogging.tsx b/apps/studio/components/interfaces/Settings/Database/ConnectionLogging.tsx
index 3c77206ea2d..702b775cb67 100644
--- a/apps/studio/components/interfaces/Settings/Database/ConnectionLogging.tsx
+++ b/apps/studio/components/interfaces/Settings/Database/ConnectionLogging.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQuery } from '@tanstack/react-query'
import { useParams } from 'common'
import { useEffect, useMemo } from 'react'
@@ -22,7 +21,7 @@ import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { DocsButton } from '@/components/ui/DocsButton'
import { usePostgresConfigurationUpdateMutation } from '@/data/config/postgres-config-mutation'
import { postgresConfigurationQueryOptions } from '@/data/config/postgres-config-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL } from '@/lib/constants'
@@ -34,10 +33,9 @@ const FormSchema = z.object({
export const ConnectionLogging = () => {
const { ref: projectRef } = useParams()
const { data: project } = useSelectedProjectQuery()
- const { can: canUpdatePostgresConfiguration } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'projects',
- { resource: { project_id: project?.id } }
+ const { can: canUpdatePostgresConfiguration } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_CONFIG_WRITE,
+ { projectRef: project?.parentRef }
)
const {
diff --git a/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.test.tsx b/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.test.tsx
index ed09061b26e..3cd0d8511fb 100644
--- a/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.test.tsx
+++ b/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.test.tsx
@@ -31,8 +31,9 @@ vi.mock('common', async (importOriginal) => ({
useParams: () => ({ ref: 'ha-project' }),
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: mockUseAsyncCheckPermissions,
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: mockUseAsyncCheckPermissions,
+ FGA_PERMISSIONS: { PROJECT: { DATABASE_POOLING_CONFIG_WRITE: 'database_pooling_config_write' } },
}))
vi.mock('@/hooks/misc/useCheckEntitlements', () => ({
diff --git a/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsx b/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsx
index 09f815555a9..2d8cc99f234 100644
--- a/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsx
+++ b/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { capitalize } from 'lodash'
import Link from 'next/link'
@@ -46,7 +45,7 @@ import { usePgbouncerConfigQuery } from '@/data/database/pgbouncer-config-query'
import { usePgbouncerConfigurationUpdateMutation } from '@/data/database/pgbouncer-config-update-mutation'
import { useProjectAddonsQuery } from '@/data/subscriptions/project-addons-query'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useHighAvailability } from '@/hooks/misc/useHighAvailability'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { useIsAwsCloudProvider, useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
@@ -73,16 +72,14 @@ export const ConnectionPooling = () => {
const { isHighAvailability, isPending: isHighAvailabilityPending } = useHighAvailability()
const canLoadPoolingConfig = !isHighAvailability && !isHighAvailabilityPending
+ const { can: canUpdateConnectionPoolingConfiguration } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_POOLING_CONFIG_WRITE
+ )
+
const { projectAddonsDedicatedIpv4Address } = useIsFeatureEnabled([
'project_addons:dedicated_ipv4_address',
])
- const { can: canUpdateConnectionPoolingConfiguration } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'projects',
- { resource: { project_id: project?.id } }
- )
-
const {
data: pgbouncerConfig,
error: pgbouncerConfigError,
diff --git a/apps/studio/components/interfaces/Settings/Database/DatabaseSettings/ResetDbPasswordDialog.tsx b/apps/studio/components/interfaces/Settings/Database/DatabaseSettings/ResetDbPasswordDialog.tsx
index 9e64e5a1107..4dc31efb44e 100644
--- a/apps/studio/components/interfaces/Settings/Database/DatabaseSettings/ResetDbPasswordDialog.tsx
+++ b/apps/studio/components/interfaces/Settings/Database/DatabaseSettings/ResetDbPasswordDialog.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import type { ChangeEvent, ComponentProps, ReactNode } from 'react'
import { useEffect, useRef, useState } from 'react'
@@ -21,8 +20,8 @@ import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { PasswordStrengthBar } from '@/components/ui/PasswordStrengthBar'
import { useDatabasePasswordResetMutation } from '@/data/database/database-password-reset-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
-import { useIsProjectActive, useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
+import { useIsProjectActive } from '@/hooks/misc/useSelectedProject'
import { DEFAULT_MINIMUM_PASSWORD_STRENGTH } from '@/lib/constants'
import { passwordStrength, PasswordStrengthScore } from '@/lib/password-strength'
import { generateStrongPassword } from '@/lib/project'
@@ -46,16 +45,9 @@ export const ResetDbPasswordDialog = ({
}: ResetDbPasswordDialogProps) => {
const { ref } = useParams()
const isProjectActive = useIsProjectActive()
- const { data: project } = useSelectedProjectQuery()
-
- const { can: canResetDbPassword } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'projects',
- {
- resource: {
- project_id: project?.id,
- },
- }
+
+ const { can: canResetDbPassword } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_CONFIG_WRITE
)
const [showResetDbPass, setShowResetDbPass] = useState<boolean>(false)
diff --git a/apps/studio/components/interfaces/Settings/Database/DiskSizeConfiguration.tsx b/apps/studio/components/interfaces/Settings/Database/DiskSizeConfiguration.tsx
index c392f3b2685..1f2aac45502 100644
--- a/apps/studio/components/interfaces/Settings/Database/DiskSizeConfiguration.tsx
+++ b/apps/studio/components/interfaces/Settings/Database/DiskSizeConfiguration.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { ExternalLinkIcon, InfoIcon } from 'lucide-react'
import Link from 'next/link'
@@ -21,7 +20,7 @@ import Panel from '@/components/ui/Panel'
import { useProjectDiskResizeMutation } from '@/data/config/project-disk-resize-mutation'
import { useDatabaseSizeQuery } from '@/data/database/database-size-query'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import {
@@ -50,14 +49,8 @@ export const DiskSizeConfiguration = ({ disabled = false }: DiskSizeConfiguratio
parseAsBoolean.withDefault(false)
)
- const { can: canUpdateDiskSizeConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'projects',
- {
- resource: {
- project_id: project?.id,
- },
- }
+ const { can: canUpdateDiskSizeConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.INFRA_DISK_CONFIG_WRITE
)
const { isPending: isUpdatingDiskSize } = useProjectDiskResizeMutation({
diff --git a/apps/studio/components/interfaces/Settings/Database/JitDatabaseAccess/JitDbAccessConfiguration.tsx b/apps/studio/components/interfaces/Settings/Database/JitDatabaseAccess/JitDbAccessConfiguration.tsx
index 1580985b5e0..b232bd2cc10 100644
--- a/apps/studio/components/interfaces/Settings/Database/JitDatabaseAccess/JitDbAccessConfiguration.tsx
+++ b/apps/studio/components/interfaces/Settings/Database/JitDatabaseAccess/JitDbAccessConfiguration.tsx
@@ -1,4 +1,4 @@
-import { PermissionAction, SupportCategories } from '@supabase/shared-types/out/constants'
+import { SupportCategories } from '@supabase/shared-types/out/constants'
import { LOCAL_STORAGE_KEYS, useParams } from 'common'
import { Loader2Icon } from 'lucide-react'
import Link from 'next/link'
@@ -57,7 +57,7 @@ import { useJitDbAccessUpdateMutation } from '@/data/jit-db-access/jit-db-access
import { useOrganizationMembersQuery } from '@/data/organizations/organization-members-query'
import { useProjectMembersQuery } from '@/data/projects/project-members-query'
import { useSSLEnforcementUpdateMutation } from '@/data/ssl-enforcement/ssl-enforcement-update-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL } from '@/lib/constants'
@@ -104,10 +104,8 @@ export const JitDbAccessConfiguration = () => {
connectionString: project?.connectionString,
})
- const { can: canUpdateJitDbAccess } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'projects',
- { resource: { project_id: project?.id } }
+ const { can: canUpdateJitDbAccess } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.ADMIN_WRITE
)
const { mutateAsync: updateJitDbAccess, isPending: isUpdatingJitDbAccess } =
diff --git a/apps/studio/components/interfaces/Settings/Database/NetworkRestrictions/NetworkRestrictions.tsx b/apps/studio/components/interfaces/Settings/Database/NetworkRestrictions/NetworkRestrictions.tsx
index 0907bcbe781..31b7f1b7f99 100644
--- a/apps/studio/components/interfaces/Settings/Database/NetworkRestrictions/NetworkRestrictions.tsx
+++ b/apps/studio/components/interfaces/Settings/Database/NetworkRestrictions/NetworkRestrictions.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { AlertCircleIcon, ChevronDownIcon, GlobeIcon, LockIcon } from 'lucide-react'
import { useState } from 'react'
@@ -33,7 +32,7 @@ import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { DocsButton } from '@/components/ui/DocsButton'
import { HighAvailabilityDisabledSectionNotice } from '@/components/ui/HighAvailability/HighAvailabilityDisabledSectionNotice'
import { useNetworkRestrictionsQuery } from '@/data/network-restrictions/network-restrictions-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useHighAvailability } from '@/hooks/misc/useHighAvailability'
import { useIsAwsK8sCloudProvider, useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL } from '@/lib/constants'
@@ -96,14 +95,8 @@ export const NetworkRestrictions = () => {
{ projectRef: ref },
{ enabled: Boolean(project) }
)
- const { can: canUpdateNetworkRestrictions } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'projects',
- {
- resource: {
- project_id: project?.id,
- },
- }
+ const { can: canUpdateNetworkRestrictions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_NETWORK_RESTRICTIONS_WRITE
)
const isSectionDisabled = isHighAvailability || isAwsK8s || !canUpdateNetworkRestrictions
diff --git a/apps/studio/components/interfaces/Settings/Database/SSLConfiguration.test.tsx b/apps/studio/components/interfaces/Settings/Database/SSLConfiguration.test.tsx
index c13f810e32e..be5e65de7d9 100644
--- a/apps/studio/components/interfaces/Settings/Database/SSLConfiguration.test.tsx
+++ b/apps/studio/components/interfaces/Settings/Database/SSLConfiguration.test.tsx
@@ -20,8 +20,9 @@ const { mockUseAsyncCheckPermissions, mockUseHighAvailability, mockUseSelectedPr
mockUseSelectedProjectQuery: vi.fn(),
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: mockUseAsyncCheckPermissions,
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: mockUseAsyncCheckPermissions,
+ FGA_PERMISSIONS: { PROJECT: { DATABASE_SSL_CONFIG_WRITE: 'database_ssl_config_write' } },
}))
vi.mock('@/hooks/misc/useHighAvailability', () => ({
diff --git a/apps/studio/components/interfaces/Settings/Database/SSLConfiguration.tsx b/apps/studio/components/interfaces/Settings/Database/SSLConfiguration.tsx
index f3754ce74f1..33e87eff0b7 100644
--- a/apps/studio/components/interfaces/Settings/Database/SSLConfiguration.tsx
+++ b/apps/studio/components/interfaces/Settings/Database/SSLConfiguration.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { template } from 'lodash'
import { DownloadIcon, Loader2Icon } from 'lucide-react'
@@ -25,14 +24,12 @@ import { useJitDbAccessQuery } from '@/data/jit-db-access/jit-db-access-query'
import { useSSLEnforcementQuery } from '@/data/ssl-enforcement/ssl-enforcement-query'
import { useSSLEnforcementUpdateMutation } from '@/data/ssl-enforcement/ssl-enforcement-update-mutation'
import { useCustomContent } from '@/hooks/custom-content/useCustomContent'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useHighAvailability } from '@/hooks/misc/useHighAvailability'
-import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL } from '@/lib/constants'
export const SSLConfiguration = () => {
const { ref } = useParams()
- const { data: project } = useSelectedProjectQuery()
const [isConfirmDialogOpen, setIsConfirmDialogOpen] = useState(false)
const { data: settings } = useProjectSettingsV2Query({ projectRef: ref })
@@ -61,14 +58,8 @@ export const SSLConfiguration = () => {
},
})
- const { can: canUpdateSSLEnforcement } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'projects',
- {
- resource: {
- project_id: project?.id,
- },
- }
+ const { can: canUpdateSSLEnforcement } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_SSL_CONFIG_WRITE
)
// Derived directly from the query so a refetch triggered elsewhere (e.g.
diff --git a/apps/studio/components/interfaces/Settings/General/ComplianceConfig/ProjectComplianceMode.tsx b/apps/studio/components/interfaces/Settings/General/ComplianceConfig/ProjectComplianceMode.tsx
index c2059613525..fc7c8281e1a 100644
--- a/apps/studio/components/interfaces/Settings/General/ComplianceConfig/ProjectComplianceMode.tsx
+++ b/apps/studio/components/interfaces/Settings/General/ComplianceConfig/ProjectComplianceMode.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { Loader2Icon } from 'lucide-react'
import { useEffect, useState } from 'react'
@@ -18,21 +17,15 @@ import { DocsButton } from '@/components/ui/DocsButton'
import { InlineLink } from '@/components/ui/InlineLink'
import { useComplianceConfigUpdateMutation } from '@/data/config/project-compliance-config-mutation'
import { useProjectSettingsV2Query } from '@/data/config/project-settings-v2-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
-import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { DOCS_URL } from '@/lib/constants'
export const ComplianceConfig = () => {
const { ref } = useParams()
- const { data: project } = useSelectedProjectQuery()
const [isSensitive, setIsSensitive] = useState(false)
- const { can: canUpdateComplianceConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'projects',
- {
- resource: { project_id: project?.id },
- }
+ const { can: canUpdateComplianceConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.ADMIN_WRITE
)
const {
diff --git a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainsConfigureHostname.tsx b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainsConfigureHostname.tsx
index 4023f63a96b..9eea55be802 100644
--- a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainsConfigureHostname.tsx
+++ b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainsConfigureHostname.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { useForm, useWatch } from 'react-hook-form'
import {
@@ -22,8 +21,7 @@ import { DocsButton } from '@/components/ui/DocsButton'
import { useProjectSettingsV2Query } from '@/data/config/project-settings-v2-query'
import { useCheckCNAMERecordMutation } from '@/data/custom-domains/check-cname-mutation'
import { useCustomDomainCreateMutation } from '@/data/custom-domains/custom-domains-create-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
-import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { DOCS_URL } from '@/lib/constants'
const schema = z.object({
@@ -32,21 +30,14 @@ const schema = z.object({
export const CustomDomainsConfigureHostname = () => {
const { ref } = useParams()
- const { data: project } = useSelectedProjectQuery()
const { mutate: checkCNAMERecord, isPending: isCheckingRecord } = useCheckCNAMERecordMutation()
const { mutate: createCustomDomain, isPending: isCreating } = useCustomDomainCreateMutation()
const { data: settings } = useProjectSettingsV2Query({ projectRef: ref })
const endpoint = settings?.app_config?.endpoint
- const { can: canConfigureCustomDomain } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'projects',
- {
- resource: {
- project_id: project?.id,
- },
- }
+ const { can: canConfigureCustomDomain } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.CUSTOM_DOMAIN_WRITE
)
const form = useForm<z.infer<typeof schema>>({
diff --git a/apps/studio/components/interfaces/Settings/General/DeleteBranchPanel.tsx b/apps/studio/components/interfaces/Settings/General/DeleteBranchPanel.tsx
index 7521c5556a4..d200a77b713 100644
--- a/apps/studio/components/interfaces/Settings/General/DeleteBranchPanel.tsx
+++ b/apps/studio/components/interfaces/Settings/General/DeleteBranchPanel.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useRouter } from 'next/router'
import { useState } from 'react'
import { Alert, AlertDescription, AlertTitle, CriticalIcon } from 'ui'
@@ -15,7 +14,7 @@ import { DeleteBranchModal } from '../../BranchManagement/DeleteBranchModal'
import { SwitchToPreviewModal } from '../../BranchManagement/SwitchToPreviewModal'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { useBranchesQuery } from '@/data/branches/branches-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useTrack } from '@/lib/telemetry/track'
@@ -30,9 +29,8 @@ export const DeleteBranchPanel = () => {
const [showDeleteModal, setShowDeleteModal] = useState(false)
const [showSwitchToPreviewModal, setShowSwitchToPreviewModal] = useState(false)
- const { can: canDeleteBranches } = useAsyncCheckPermissions(
- PermissionAction.DELETE,
- 'preview_branches'
+ const { can: canDeleteBranches } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.BRANCHING_DEVELOPMENT_DELETE
)
const { data: branches } = useBranchesQuery({ projectRef })
diff --git a/apps/studio/components/interfaces/Settings/General/DeleteProjectPanel/DeleteProjectButton.tsx b/apps/studio/components/interfaces/Settings/General/DeleteProjectPanel/DeleteProjectButton.tsx
index e0a3f990864..11a70a0170b 100644
--- a/apps/studio/components/interfaces/Settings/General/DeleteProjectPanel/DeleteProjectButton.tsx
+++ b/apps/studio/components/interfaces/Settings/General/DeleteProjectPanel/DeleteProjectButton.tsx
@@ -1,22 +1,17 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useState } from 'react'
import { DeleteProjectModal } from './DeleteProjectModal'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
-import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
export interface DeleteProjectButtonProps {
variant?: 'danger' | 'default'
}
export const DeleteProjectButton = ({ variant = 'danger' }: DeleteProjectButtonProps) => {
- const { data: project } = useSelectedProjectQuery()
const [isOpen, setIsOpen] = useState(false)
- const { can: canDeleteProject } = useAsyncCheckPermissions(PermissionAction.UPDATE, 'projects', {
- resource: { project_id: project?.id },
- })
+ const { can: canDeleteProject } = useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.ADMIN_WRITE)
return (
<>
diff --git a/apps/studio/components/interfaces/Settings/General/General.test.tsx b/apps/studio/components/interfaces/Settings/General/General.test.tsx
index f62e3eb3be6..4bf9c1c274d 100644
--- a/apps/studio/components/interfaces/Settings/General/General.test.tsx
+++ b/apps/studio/components/interfaces/Settings/General/General.test.tsx
@@ -28,8 +28,9 @@ vi.mock('common', async () => {
}
})
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: mockUseAsyncCheckPermissions,
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: mockUseAsyncCheckPermissions,
+ FGA_PERMISSIONS: { PROJECT: { ADMIN_WRITE: 'project_admin_write' } },
}))
vi.mock('@/hooks/misc/useSelectedProject', () => ({
diff --git a/apps/studio/components/interfaces/Settings/General/General.tsx b/apps/studio/components/interfaces/Settings/General/General.tsx
index 695b27d8f89..2db179d9e17 100644
--- a/apps/studio/components/interfaces/Settings/General/General.tsx
+++ b/apps/studio/components/interfaces/Settings/General/General.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { IS_PLATFORM, useParams } from 'common'
import { useForm } from 'react-hook-form'
import { toast } from 'sonner'
@@ -23,7 +22,7 @@ import { DocsButton } from '@/components/ui/DocsButton'
import { InlineLink } from '@/components/ui/InlineLink'
import { useBranchesQuery } from '@/data/branches/branches-query'
import { useProjectUpdateMutation } from '@/data/projects/project-update-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useDeploymentMode } from '@/hooks/misc/useDeploymentMode'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL } from '@/lib/constants'
@@ -41,11 +40,7 @@ export const General = () => {
const branch = branches?.find((x) => x.project_ref === ref)
const projectName = isBranch ? branch?.name : project?.name
- const { can: canUpdateProject } = useAsyncCheckPermissions(PermissionAction.UPDATE, 'projects', {
- resource: {
- project_id: project?.id,
- },
- })
+ const { can: canUpdateProject } = useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.ADMIN_WRITE)
const { mutate: updateProject, isPending: isUpdating } = useProjectUpdateMutation()
diff --git a/apps/studio/components/interfaces/Settings/General/Infrastructure/PauseProjectButton.test.tsx b/apps/studio/components/interfaces/Settings/General/Infrastructure/PauseProjectButton.test.tsx
index 9b6dc5a51f3..dd09866a8aa 100644
--- a/apps/studio/components/interfaces/Settings/General/Infrastructure/PauseProjectButton.test.tsx
+++ b/apps/studio/components/interfaces/Settings/General/Infrastructure/PauseProjectButton.test.tsx
@@ -22,8 +22,9 @@ vi.mock('@/hooks/misc/useCheckEntitlements', () => ({
useCheckEntitlements: mockUseCheckEntitlements,
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: mockUseAsyncCheckPermissions,
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: mockUseAsyncCheckPermissions,
+ FGA_PERMISSIONS: { PROJECT: { ADMIN_WRITE: 'project_admin_write' } },
}))
vi.mock('@/hooks/misc/useSelectedOrganization', () => ({
diff --git a/apps/studio/components/interfaces/Settings/General/Infrastructure/PauseProjectButton.tsx b/apps/studio/components/interfaces/Settings/General/Infrastructure/PauseProjectButton.tsx
index bc679bdf96e..7960413efce 100644
--- a/apps/studio/components/interfaces/Settings/General/Infrastructure/PauseProjectButton.tsx
+++ b/apps/studio/components/interfaces/Settings/General/Infrastructure/PauseProjectButton.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { CirclePauseIcon } from 'lucide-react'
import { useRouter } from 'next/router'
import { useState } from 'react'
@@ -18,7 +17,7 @@ import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { useSetProjectStatus } from '@/data/projects/project-detail-query'
import { useProjectPauseMutation } from '@/data/projects/project-pause-mutation'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import {
useIsHighAvailability,
@@ -40,10 +39,7 @@ export const PauseProjectButton = () => {
const projectRef = project?.ref ?? ''
const isPaused = project?.status === PROJECT_STATUS.INACTIVE
- const { can: canPauseProject } = useAsyncCheckPermissions(
- PermissionAction.INFRA_EXECUTE,
- 'queue_jobs.projects.pause'
- )
+ const { can: canPauseProject } = useAsyncCheckPermissionsV2([FGA_PERMISSIONS.PROJECT.ADMIN_WRITE])
const isFreePlan = organization?.plan.id === 'free'
const isBranch = Boolean(project?.parent_project_ref)
diff --git a/apps/studio/components/interfaces/Settings/General/Infrastructure/RestartServerButton.test.tsx b/apps/studio/components/interfaces/Settings/General/Infrastructure/RestartServerButton.test.tsx
index 9f73d09524b..829e2cb0f5b 100644
--- a/apps/studio/components/interfaces/Settings/General/Infrastructure/RestartServerButton.test.tsx
+++ b/apps/studio/components/interfaces/Settings/General/Infrastructure/RestartServerButton.test.tsx
@@ -26,8 +26,9 @@ vi.mock('next/router', () => ({
useRouter: () => ({ push: vi.fn() }),
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: mockUseAsyncCheckPermissions,
+vi.mock('@/hooks/misc/useCheckPermissionsV2', async (importOriginal) => ({
+ ...(await importOriginal<typeof import('@/hooks/misc/useCheckPermissionsV2')>()),
+ useAsyncCheckPermissionsV2: mockUseAsyncCheckPermissions,
}))
vi.mock('@/hooks/misc/useIsFeatureEnabled', () => ({
diff --git a/apps/studio/components/interfaces/Settings/General/Infrastructure/RestartServerButton.tsx b/apps/studio/components/interfaces/Settings/General/Infrastructure/RestartServerButton.tsx
index b356f7c7116..e97758fd737 100644
--- a/apps/studio/components/interfaces/Settings/General/Infrastructure/RestartServerButton.tsx
+++ b/apps/studio/components/interfaces/Settings/General/Infrastructure/RestartServerButton.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useFlag } from 'common'
import { ChevronDownIcon, RefreshCwIcon } from 'lucide-react'
import { useRouter } from 'next/router'
@@ -18,7 +17,7 @@ import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { useSetProjectStatus } from '@/data/projects/project-detail-query'
import { useProjectRestartMutation } from '@/data/projects/project-restart-mutation'
import { useProjectRestartServicesMutation } from '@/data/projects/project-restart-services-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { useIsProjectActive, useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { PROJECT_STATUS } from '@/lib/constants'
@@ -45,9 +44,8 @@ export const RestartServerButton = () => {
const projectRegion = project?.region ?? ''
const projectRestartDisabled = useFlag('disableProjectRestarts')
- const { can: canRestartProject } = useAsyncCheckPermissions(
- PermissionAction.INFRA_EXECUTE,
- 'reboot'
+ const { can: canRestartProject } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.OPERATIONS_WRITE
)
const { mutate: restartProject, isPending: isRestartingProject } = useProjectRestartMutation({
diff --git a/apps/studio/components/interfaces/Settings/General/TransferProjectPanel/TransferProjectButton.tsx b/apps/studio/components/interfaces/Settings/General/TransferProjectPanel/TransferProjectButton.tsx
index cdf9002019f..4db523cd4c8 100644
--- a/apps/studio/components/interfaces/Settings/General/TransferProjectPanel/TransferProjectButton.tsx
+++ b/apps/studio/components/interfaces/Settings/General/TransferProjectPanel/TransferProjectButton.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQueryClient } from '@tanstack/react-query'
import { useFlag } from 'common'
import { LoaderIcon, ShieldIcon, WrenchIcon } from 'lucide-react'
@@ -32,7 +31,7 @@ import { useOrganizationsQuery } from '@/data/organizations/organizations-query'
import { projectKeys } from '@/data/projects/keys'
import { useProjectTransferMutation } from '@/data/projects/project-transfer-mutation'
import { useProjectTransferPreviewQuery } from '@/data/projects/project-transfer-preview-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL } from '@/lib/constants'
@@ -83,10 +82,10 @@ export const TransferProjectButton = () => {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [isOpen])
- const { can: canTransferProject } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'organizations'
- )
+ const { can: canTransferProject } = useAsyncCheckPermissionsV2([
+ FGA_PERMISSIONS.PROJECT.ADMIN_WRITE,
+ FGA_PERMISSIONS.ORGANIZATION.ADMIN_WRITE,
+ ])
async function handleTransferProject() {
if (project === undefined) return
diff --git a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx
index 8918bf92a4e..fb71d347c97 100644
--- a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx
+++ b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { Loader2Icon } from 'lucide-react'
import { AnimatePresence, motion } from 'motion/react'
import { useState } from 'react'
@@ -39,7 +38,7 @@ import { useGitHubConnectionDeleteMutation } from '@/data/integrations/github-co
import { useGitHubConnectionUpdateMutation } from '@/data/integrations/github-connection-update-mutation'
import type { GitHubConnection } from '@/data/integrations/integrations.types'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL } from '@/lib/constants'
@@ -62,13 +61,11 @@ export const GitHubIntegrationConnectionForm = ({
const { hasAccess: hasAccessToBranching } = useCheckEntitlements('branching_limit')
- const { can: canUpdateGitHubConnection } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'integrations.github_connections'
+ const { can: canUpdateGitHubConnection } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.CONFIG_WRITE
)
- const { can: canCreateGitHubConnection } = useAsyncCheckPermissions(
- PermissionAction.CREATE,
- 'integrations.github_connections'
+ const { can: canCreateGitHubConnection } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.CONFIG_WRITE
)
const canManageGitHubConnection = canCreateGitHubConnection && canUpdateGitHubConnection
diff --git a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GithubSection.tsx b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GithubSection.tsx
index 4e053db0028..34d6b65979b 100644
--- a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GithubSection.tsx
+++ b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GithubSection.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { PlusIcon } from 'lucide-react'
import { useRouter } from 'next/router'
@@ -30,7 +29,7 @@ import {
type GitHubConnection,
} from '@/data/integrations/github-connections-query'
import type { IntegrationProjectConnection } from '@/data/integrations/integrations.types'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import {
GITHUB_INTEGRATION_INSTALLATION_URL,
@@ -64,14 +63,12 @@ export const GitHubSection = ({ isProjectScoped = false }: { isProjectScoped?: b
const { data: org } = useSelectedOrganizationQuery()
const { can: canReadGitHubConnection, isLoading: isLoadingPermissions } =
- useAsyncCheckPermissions(PermissionAction.READ, 'integrations.github_connections')
- const { can: canCreateGitHubConnection } = useAsyncCheckPermissions(
- PermissionAction.CREATE,
- 'integrations.github_connections'
+ useAsyncCheckPermissionsV2(FGA_PERMISSIONS.ORGANIZATION.CONFIG_READ)
+ const { can: canCreateGitHubConnection } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.CONFIG_WRITE
)
- const { can: canUpdateGitHubConnection } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'integrations.github_connections'
+ const { can: canUpdateGitHubConnection } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.CONFIG_WRITE
)
const { data: gitHubAuthorization } = useGitHubAuthorizationQuery({
diff --git a/apps/studio/components/interfaces/Settings/Integrations/VercelIntegration/VercelSection.tsx b/apps/studio/components/interfaces/Settings/Integrations/VercelIntegration/VercelSection.tsx
index c029e879c49..488fd918b06 100644
--- a/apps/studio/components/interfaces/Settings/Integrations/VercelIntegration/VercelSection.tsx
+++ b/apps/studio/components/interfaces/Settings/Integrations/VercelIntegration/VercelSection.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { ChevronDownIcon, ExternalLinkIcon } from 'lucide-react'
import { useCallback, useMemo } from 'react'
import { toast } from 'sonner'
@@ -31,7 +30,7 @@ import type {
IntegrationName,
IntegrationProjectConnection,
} from '@/data/integrations/integrations.types'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { pluralize } from '@/lib/helpers'
@@ -46,14 +45,12 @@ export const VercelSection = ({ isProjectScoped = false }: { isProjectScoped?: b
const isBranch = project?.parent_project_ref !== undefined
const { can: canReadVercelConnection, isLoading: isLoadingPermissions } =
- useAsyncCheckPermissions(PermissionAction.READ, 'integrations.vercel_connections')
- const { can: canCreateVercelConnection } = useAsyncCheckPermissions(
- PermissionAction.CREATE,
- 'integrations.vercel_connections'
+ useAsyncCheckPermissionsV2(FGA_PERMISSIONS.ORGANIZATION.CONFIG_READ)
+ const { can: canCreateVercelConnection } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.CONFIG_WRITE
)
- const { can: canUpdateVercelConnection } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'integrations.vercel_connections'
+ const { can: canUpdateVercelConnection } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.CONFIG_WRITE
)
const { mutate: deleteVercelConnection } = useIntegrationsVercelInstalledConnectionDeleteMutation(
diff --git a/apps/studio/components/interfaces/Settings/Logs/LogTable.tsx b/apps/studio/components/interfaces/Settings/Logs/LogTable.tsx
index 3e7096be687..8709df49a8e 100644
--- a/apps/studio/components/interfaces/Settings/Logs/LogTable.tsx
+++ b/apps/studio/components/interfaces/Settings/Logs/LogTable.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { IS_PLATFORM, useParams } from 'common'
import { CopyIcon, EyeIcon, EyeOffIcon, PlayIcon } from 'lucide-react'
import { Key, ReactNode, useCallback, useEffect, useMemo, useRef, useState } from 'react'
@@ -47,8 +46,10 @@ import { MultiSelectActionBar, type LogCopyFormat } from './MultiSelectActionBar
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { DownloadResultsButton } from '@/components/ui/DownloadResultsButton'
import { useSelectedLog } from '@/hooks/analytics/useSelectedLog'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
-import { useProfile } from '@/lib/profile'
+import {
+ FGA_PERMISSIONS,
+ useAsyncCheckUserContentPermissions,
+} from '@/hooks/misc/useCheckPermissionsV2'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
import { useShortcut } from '@/state/shortcuts/useShortcut'
import type { ResponseError } from '@/types'
@@ -148,7 +149,6 @@ export const LogTable = ({
columnRenderers,
}: Props) => {
const { ref } = useParams()
- const { profile } = useProfile()
const [selectedLogId] = useSelectedLog()
const [selectedRow, setSelectedRow] = useState<LogData | null>(null)
const [selectedRows, setSelectedRows] = useState<Set<string>>(new Set())
@@ -175,13 +175,9 @@ export const LogTable = ({
)
}, [])
- const { can: canCreateLogQuery } = useAsyncCheckPermissions(
- PermissionAction.CREATE,
- 'user_content',
- {
- resource: { type: 'log_sql', owner_id: profile?.id },
- subject: { id: profile?.id },
- }
+ const { can: canCreateLogQuery } = useAsyncCheckUserContentPermissions(
+ FGA_PERMISSIONS.PROJECT.SNIPPETS_WRITE,
+ { mode: 'create', type: 'log_sql' }
)
const firstRow = data[0]
diff --git a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/SimpleConfigurationDetails.tsx b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/SimpleConfigurationDetails.tsx
index 357ed760bcd..88b962c7159 100644
--- a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/SimpleConfigurationDetails.tsx
+++ b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/SimpleConfigurationDetails.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { Card } from 'ui'
import { Admonition } from 'ui-patterns/Admonition'
@@ -19,13 +18,16 @@ import {
import { InlineLink } from '@/components/ui/InlineLink'
import { useAPIKeys } from '@/data/api-keys/api-keys-query'
import { useVaultSecretDecryptedValueQuery } from '@/data/vault/vault-secret-decrypted-value-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL } from '@/lib/constants'
export const SimpleConfigurationDetails = ({ bucketName }: { bucketName?: string }) => {
const { data: project } = useSelectedProjectQuery()
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2([
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ,
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_SECRET_READ,
+ ])
const integration = INTEGRATIONS.find((i) => i.id === 'iceberg_wrapper' && i.type === 'wrapper')
const wrapperMeta = (integration?.type === 'wrapper' && integration.meta) as WrapperMeta
diff --git a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/UpdateCatalogTokenDialog.tsx b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/UpdateCatalogTokenDialog.tsx
index 10d93546846..24aacb89e6e 100644
--- a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/UpdateCatalogTokenDialog.tsx
+++ b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/UpdateCatalogTokenDialog.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQueryClient } from '@tanstack/react-query'
import { useParams } from 'common'
import { useEffect, useState } from 'react'
@@ -29,14 +28,17 @@ import { useAPIKeys } from '@/data/api-keys/api-keys-query'
import { fdwKeys } from '@/data/fdw/keys'
import { vaultSecretsKeys } from '@/data/vault/keys'
import { useVaultSecretUpdateMutation } from '@/data/vault/vault-secret-update-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
export const UpdateCatalogTokenDialog = ({ vaultTokenId }: { vaultTokenId?: string }) => {
const { ref } = useParams()
const queryClient = useQueryClient()
const { data: project } = useSelectedProjectQuery()
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2([
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ,
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_SECRET_READ,
+ ])
const [open, setOpen] = useState(false)
const [selectedKey, setSelectedKey] = useState<string>()
diff --git a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/useAnalyticsBucketAssociatedEntities.tsx b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/useAnalyticsBucketAssociatedEntities.tsx
index bcf9737d16b..b268f856368 100644
--- a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/useAnalyticsBucketAssociatedEntities.tsx
+++ b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/useAnalyticsBucketAssociatedEntities.tsx
@@ -1,5 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
-
import {
getAnalyticsBucketPublicationName,
getAnalyticsBucketS3KeyName,
@@ -15,7 +13,7 @@ import { useReplicationPublicationQuery } from '@/data/replication/publication-q
import { useReplicationSourcesQuery } from '@/data/replication/sources-query'
import { useS3AccessKeyDeleteMutation } from '@/data/storage/s3-access-key-delete-mutation'
import { useStorageCredentialsQuery } from '@/data/storage/s3-access-key-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
/**
@@ -26,9 +24,8 @@ export const useAnalyticsBucketAssociatedEntities = (
{ projectRef, bucketId }: { projectRef?: string; bucketId?: string },
options: { enabled: boolean } = { enabled: true }
) => {
- const { can: canReadS3Credentials } = useAsyncCheckPermissions(
- PermissionAction.STORAGE_ADMIN_READ,
- '*'
+ const { can: canReadS3Credentials } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.STORAGE_CONFIG_READ
)
const {
diff --git a/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerColumn.tsx b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerColumn.tsx
index d487f11d70b..5317c98fe8f 100644
--- a/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerColumn.tsx
+++ b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerColumn.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useInfiniteQuery, useQueryClient } from '@tanstack/react-query'
import { useDebounce } from '@uidotdev/usehooks'
import { useParams } from 'common'
@@ -27,7 +26,7 @@ import { InfiniteListDefault, LoaderForIconMenuItems } from '@/components/ui/Inf
import { useProjectApiUrl } from '@/data/config/project-endpoint-query'
import { bucketObjectsInfiniteQueryOptions } from '@/data/storage/bucket-objects-infinite-query'
import { storageKeys } from '@/data/storage/keys'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { formatBytes } from '@/lib/helpers'
import { noop } from '@/lib/void'
@@ -109,7 +108,9 @@ export const BucketFilePickerColumn = ({
const columnRef = useRef<HTMLDivElement | null>(null)
const { hostEndpoint } = useProjectApiUrl({ projectRef: projectRef! })
- const { can: canUpdateStorage } = useAsyncCheckPermissions(PermissionAction.STORAGE_WRITE, '*')
+ const { can: canUpdateStorage } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.STORAGE_WRITE
+ )
const {
columns,
diff --git a/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerHeader.tsx b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerHeader.tsx
index 2180cbaaf03..d03ac83d870 100644
--- a/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerHeader.tsx
+++ b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerHeader.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQueryClient } from '@tanstack/react-query'
import { useParams } from 'common'
import {
@@ -33,7 +32,7 @@ import { useBucketFilePickerStateSnapshot } from './BucketFilePickerState'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { useProjectApiUrl } from '@/data/config/project-endpoint-query'
import { storageKeys } from '@/data/storage/keys'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
const VIEW_OPTIONS = [
{ key: STORAGE_VIEWS.COLUMNS, name: 'As columns' },
@@ -137,7 +136,9 @@ export const BucketFilePickerHeader = () => {
setSelectedFilePreview,
} = useBucketFilePickerStateSnapshot()
- const { can: canUpdateStorage } = useAsyncCheckPermissions(PermissionAction.STORAGE_WRITE, '*')
+ const { can: canUpdateStorage } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.STORAGE_WRITE
+ )
const breadcrumbs = columns
const backDisabled = columns.length < 1
diff --git a/apps/studio/components/interfaces/Storage/FilesBuckets/CreateBucketModal.test.tsx b/apps/studio/components/interfaces/Storage/FilesBuckets/CreateBucketModal.test.tsx
index c0130dffed9..5cb0b5600c6 100644
--- a/apps/studio/components/interfaces/Storage/FilesBuckets/CreateBucketModal.test.tsx
+++ b/apps/studio/components/interfaces/Storage/FilesBuckets/CreateBucketModal.test.tsx
@@ -8,9 +8,13 @@ import { customRender } from '@/tests/lib/custom-render'
import { addAPIMock } from '@/tests/lib/msw'
import { routerMock } from '@/tests/lib/route-mock'
-vi.mock(`hooks/misc/useCheckPermissions`, () => ({
- useCheckPermissions: vi.fn(),
- useAsyncCheckPermissions: vi.fn().mockImplementation(() => ({ can: true })),
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: () => ({ can: true }),
+ FGA_PERMISSIONS: {
+ PROJECT: {
+ STORAGE_WRITE: 'storage_write',
+ },
+ },
}))
const { versioningEnabled } = vi.hoisted(() => ({ versioningEnabled: { current: false } }))
diff --git a/apps/studio/components/interfaces/Storage/FilesBuckets/useFilesBucketsShortcuts.ts b/apps/studio/components/interfaces/Storage/FilesBuckets/useFilesBucketsShortcuts.ts
index 76373d915f3..acd44b86e52 100644
--- a/apps/studio/components/interfaces/Storage/FilesBuckets/useFilesBucketsShortcuts.ts
+++ b/apps/studio/components/interfaces/Storage/FilesBuckets/useFilesBucketsShortcuts.ts
@@ -1,8 +1,7 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { Dispatch, RefObject, SetStateAction } from 'react'
import { STORAGE_BUCKET_SORT } from '../Storage.constants'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
import { useShortcut } from '@/state/shortcuts/useShortcut'
@@ -23,7 +22,9 @@ export function useFilesBucketsShortcuts({
setCreateVisible,
onRefresh,
}: UseFilesBucketsShortcutsParams) {
- const { can: canCreateBuckets } = useAsyncCheckPermissions(PermissionAction.STORAGE_WRITE, '*')
+ const { can: canCreateBuckets } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.STORAGE_WRITE
+ )
useShortcut(
SHORTCUT_IDS.LIST_PAGE_FOCUS_SEARCH,
diff --git a/apps/studio/components/interfaces/Storage/NewBucketButton.tsx b/apps/studio/components/interfaces/Storage/NewBucketButton.tsx
index 3361ffd4690..03f6cf4b7b0 100644
--- a/apps/studio/components/interfaces/Storage/NewBucketButton.tsx
+++ b/apps/studio/components/interfaces/Storage/NewBucketButton.tsx
@@ -1,16 +1,17 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { PlusIcon } from 'lucide-react'
import { MouseEventHandler } from 'react'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
export const CreateBucketButton = ({
onClick,
}: {
onClick: MouseEventHandler<HTMLButtonElement>
}) => {
- const { can: canCreateBuckets } = useAsyncCheckPermissions(PermissionAction.STORAGE_WRITE, '*')
+ const { can: canCreateBuckets } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.STORAGE_WRITE
+ )
return (
<ButtonTooltip
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerColumn.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerColumn.tsx
index 912e2f065b7..399980c7bca 100644
--- a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerColumn.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerColumn.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { get, noop, sum, uniqBy } from 'lodash'
import {
ChevronsDownIcon,
@@ -37,7 +36,7 @@ import { FileExplorerRow } from './FileExplorerRow'
import { FileExplorerRowContextMenuProvider } from './FileExplorerRowContextMenu'
import { useStoragePreference } from './useStoragePreference'
import { InfiniteListDefault, LoaderForIconMenuItems } from '@/components/ui/InfiniteList'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { BASE_PATH } from '@/lib/constants'
import { formatBytes } from '@/lib/helpers'
import { useStorageExplorerStateSnapshot } from '@/state/storage-explorer'
@@ -105,7 +104,9 @@ export const FileExplorerColumn = ({
const snap = useStorageExplorerStateSnapshot()
const { view, setSortByOrder, setSortBy, setView } = useStoragePreference(snap.projectRef)
- const { can: canUpdateStorage } = useAsyncCheckPermissions(PermissionAction.STORAGE_WRITE, '*')
+ const { can: canUpdateStorage } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.STORAGE_WRITE
+ )
useEffect(() => {
if (fileExplorerColumnRef) {
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeader.test.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeader.test.tsx
index f4e0fac0aa5..2a4c7fef1b3 100644
--- a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeader.test.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeader.test.tsx
@@ -26,8 +26,13 @@ vi.mock('@/lib/telemetry/track', () => ({ useTrack: () => mockTrack }))
vi.mock('@/state/storage-explorer', () => ({
useStorageExplorerStateSnapshot: () => mockUseStorageExplorerStateSnapshot(),
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: () => mockUseAsyncCheckPermissions(),
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: () => mockUseAsyncCheckPermissions(),
+ FGA_PERMISSIONS: {
+ PROJECT: {
+ STORAGE_WRITE: 'storage_write',
+ },
+ },
}))
vi.mock('./StorageExplorerNavigation', () => ({
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeader.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeader.tsx
index 73e53c0fa53..b9e3b6d6b3e 100644
--- a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeader.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeader.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { compact, isEqual, noop } from 'lodash'
import {
ArrowLeftIcon,
@@ -51,7 +50,7 @@ import { useStoragePreference } from './useStoragePreference'
import { useIsStorageVersioningEnabled } from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { ShortcutTooltip } from '@/components/ui/ShortcutTooltip'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useTrack } from '@/lib/telemetry/track'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
import { useStorageExplorerStateSnapshot } from '@/state/storage-explorer'
@@ -184,7 +183,9 @@ export const FileExplorerHeader = ({
const searchPlaceholder = isBucketRoot
? 'Search in root directory...'
: `Search in ${currentFolderName}...`
- const { can: canUpdateStorage } = useAsyncCheckPermissions(PermissionAction.STORAGE_WRITE, '*')
+ const { can: canUpdateStorage } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.STORAGE_WRITE
+ )
useFileExplorerHeaderShortcuts({
uploadButtonRef,
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeaderSelection.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeaderSelection.tsx
index a1ea00a9474..19ff4ce2032 100644
--- a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeaderSelection.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeaderSelection.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { ArchiveIcon, DownloadIcon, MoveIcon, Trash2Icon, XIcon } from 'lucide-react'
import { Button } from 'ui'
@@ -7,12 +6,12 @@ import { bulkActionBarClassName } from './storageExplorerChrome'
import { useIsStorageVersioningEnabled } from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { ShortcutTooltip } from '@/components/ui/ShortcutTooltip'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
import { useStorageExplorerStateSnapshot } from '@/state/storage-explorer'
export const FileExplorerHeaderSelection = () => {
- const { can: canUpdateFiles } = useAsyncCheckPermissions(PermissionAction.STORAGE_WRITE, '*')
+ const { can: canUpdateFiles } = useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.STORAGE_WRITE)
const {
selectedBucket,
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRow.test.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRow.test.tsx
index a47b806a11d..9dca4f2ad00 100644
--- a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRow.test.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRow.test.tsx
@@ -54,8 +54,13 @@ vi.mock('@/components/interfaces/Storage/StorageExplorer/StorageExplorerNavigati
clearPreviewedFile: vi.fn(),
}),
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: () => ({ can: true }),
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: () => ({ can: true }),
+ FGA_PERMISSIONS: {
+ PROJECT: {
+ STORAGE_WRITE: 'storage_write',
+ },
+ },
}))
vi.mock('@/components/interfaces/Storage/StorageExplorer/useCopyUrl', () => ({
useCopyUrl: () => ({ onCopyUrl: vi.fn() }),
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRow.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRow.tsx
index 1c362d84079..93ca9860ccc 100644
--- a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRow.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRow.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { find, isEmpty, isEqual } from 'lodash'
import {
AlertCircleIcon,
@@ -56,7 +55,7 @@ import { useStorageExplorerNavigation } from './StorageExplorerNavigation'
import { useCopyUrl } from './useCopyUrl'
import { useIsStorageVersioningEnabled } from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'
import { useArchivedObjectRestoreMutation } from '@/data/storage/versioning/archived-object-restore-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { formatBytes } from '@/lib/helpers'
import { useStorageExplorerStateSnapshot } from '@/state/storage-explorer'
@@ -198,7 +197,7 @@ export const FileExplorerRow = ({
const isPreviewed =
(!isEmpty(selectedFilePreview) && isEqual(selectedFilePreview?.id, item.id)) ||
(isArchivedFile && selectedArchivedObject?.id === archivedObjectId)
- const { can: canUpdateFiles } = useAsyncCheckPermissions(PermissionAction.STORAGE_WRITE, '*')
+ const { can: canUpdateFiles } = useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.STORAGE_WRITE)
const isStorageVersioningEnabled = useIsStorageVersioningEnabled()
// Names the action being taken, not the retention behind it: a suspended bucket reads
// "Replace file" and "Delete" even for a file that still has one retained version coming.
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewPane.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewPane.tsx
index 08bf39fcf72..07423c8f9c7 100644
--- a/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewPane.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewPane.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQuery } from '@tanstack/react-query'
import {
AlertCircleIcon,
@@ -48,7 +47,7 @@ import {
type LifecyclePolicy,
type ObjectVersion,
} from '@/data/storage/versioning/object-versions-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { formatBytes } from '@/lib/helpers'
import { useStorageExplorerStateSnapshot } from '@/state/storage-explorer'
@@ -267,7 +266,7 @@ export const PreviewPane = () => {
const { clearPreviewedFile } = useStorageExplorerNavigation()
const { onCopyUrl } = useCopyUrl()
- const { can: canUpdateFiles } = useAsyncCheckPermissions(PermissionAction.STORAGE_WRITE, '*')
+ const { can: canUpdateFiles } = useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.STORAGE_WRITE)
const isStorageVersioningEnabled = useIsStorageVersioningEnabled()
const [, setShowEditBucketModal] = useQueryState(
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/useStorageExplorerShortcuts.ts b/apps/studio/components/interfaces/Storage/StorageExplorer/useStorageExplorerShortcuts.ts
index 156f8f533ad..add6d1c7621 100644
--- a/apps/studio/components/interfaces/Storage/StorageExplorer/useStorageExplorerShortcuts.ts
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/useStorageExplorerShortcuts.ts
@@ -1,7 +1,5 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
-
import { useStorageExplorerNavigation } from './StorageExplorerNavigation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
import { useShortcut } from '@/state/shortcuts/useShortcut'
import { useStorageExplorerStateSnapshot } from '@/state/storage-explorer'
@@ -32,7 +30,7 @@ export function useStorageExplorerShortcuts({ onClearSearch }: UseStorageExplore
const { clearPreviewedFile } = useStorageExplorerNavigation()
- const { can: canUpdateFiles } = useAsyncCheckPermissions(PermissionAction.STORAGE_WRITE, '*')
+ const { can: canUpdateFiles } = useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.STORAGE_WRITE)
useShortcut(SHORTCUT_IDS.STORAGE_EXPLORER_REFRESH, () => {
refreshAll()
diff --git a/apps/studio/components/interfaces/Storage/StorageSettings/CreateCredentialModal.tsx b/apps/studio/components/interfaces/Storage/StorageSettings/CreateCredentialModal.tsx
index ee7f8d9ad59..4c137a8e2d1 100644
--- a/apps/studio/components/interfaces/Storage/StorageSettings/CreateCredentialModal.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageSettings/CreateCredentialModal.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { PlusIcon } from 'lucide-react'
import { useState } from 'react'
@@ -28,7 +27,7 @@ import { z } from 'zod'
import { useProjectStorageConfigQuery } from '@/data/config/project-storage-config-query'
import { useS3AccessKeyCreateMutation } from '@/data/storage/s3-access-key-create-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useIsProjectActive } from '@/hooks/misc/useSelectedProject'
interface CreateCredentialModalProps {
@@ -41,9 +40,8 @@ export const CreateCredentialModal = ({ visible, onOpenChange }: CreateCredentia
const isProjectActive = useIsProjectActive()
const [showSuccess, setShowSuccess] = useState(false)
- const { can: canCreateCredentials } = useAsyncCheckPermissions(
- PermissionAction.STORAGE_ADMIN_WRITE,
- '*'
+ const { can: canCreateCredentials } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.STORAGE_CONFIG_WRITE
)
const { data: config } = useProjectStorageConfigQuery({ projectRef })
diff --git a/apps/studio/components/interfaces/Storage/StorageSettings/S3Connection.tsx b/apps/studio/components/interfaces/Storage/StorageSettings/S3Connection.tsx
index f7714886e92..47c941cad28 100644
--- a/apps/studio/components/interfaces/Storage/StorageSettings/S3Connection.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageSettings/S3Connection.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import Link from 'next/link'
import { useEffect, useState } from 'react'
@@ -51,7 +50,7 @@ import { useProjectSettingsV2Query } from '@/data/config/project-settings-v2-que
import { useProjectStorageConfigQuery } from '@/data/config/project-storage-config-query'
import { useProjectStorageConfigUpdateUpdateMutation } from '@/data/config/project-storage-config-update-mutation'
import { useStorageCredentialsQuery } from '@/data/storage/s3-access-key-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useIsProjectActive, useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL } from '@/lib/constants'
@@ -64,13 +63,11 @@ export const S3Connection = () => {
const [openDeleteDialog, setOpenDeleteDialog] = useState(false)
const [deleteCred, setDeleteCred] = useState<{ id: string; description: string }>()
- const { can: canReadS3Credentials, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(
- PermissionAction.STORAGE_ADMIN_READ,
- '*'
+ const { can: canReadS3Credentials, isLoading: isLoadingPermissions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.STORAGE_CONFIG_READ
)
- const { can: canUpdateStorageSettings } = useAsyncCheckPermissions(
- PermissionAction.STORAGE_ADMIN_WRITE,
- '*'
+ const { can: canUpdateStorageSettings } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.STORAGE_CONFIG_WRITE
)
const { data: settings } = useProjectSettingsV2Query({ projectRef })
diff --git a/apps/studio/components/interfaces/Storage/StorageSettings/StorageCredItem.tsx b/apps/studio/components/interfaces/Storage/StorageSettings/StorageCredItem.tsx
index 1102a64e64b..4a9903bc009 100644
--- a/apps/studio/components/interfaces/Storage/StorageSettings/StorageCredItem.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageSettings/StorageCredItem.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { differenceInDays } from 'date-fns'
import { MoreVerticalIcon, TrashIcon } from 'lucide-react'
import {
@@ -12,7 +11,7 @@ import {
} from 'ui'
import { Input } from 'ui-patterns/DataInputs/Input'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
export const StorageCredItem = ({
description,
@@ -27,9 +26,8 @@ export const StorageCredItem = ({
access_key: string
onDeleteClick: (id: string) => void
}) => {
- const { can: canRemoveAccessKey } = useAsyncCheckPermissions(
- PermissionAction.STORAGE_ADMIN_WRITE,
- '*'
+ const { can: canRemoveAccessKey } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.STORAGE_CONFIG_WRITE
)
function daysSince(date: string) {
diff --git a/apps/studio/components/interfaces/Storage/StorageSettings/StorageSettings.tsx b/apps/studio/components/interfaces/Storage/StorageSettings/StorageSettings.tsx
index 4f361ba954e..a171f6beb4a 100644
--- a/apps/studio/components/interfaces/Storage/StorageSettings/StorageSettings.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageSettings/StorageSettings.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { IS_PLATFORM, useParams } from 'common'
import { useEffect, useMemo, useState } from 'react'
import { SubmitHandler, useForm } from 'react-hook-form'
@@ -48,7 +47,7 @@ import { useProjectStorageConfigQuery } from '@/data/config/project-storage-conf
import { useProjectStorageConfigUpdateUpdateMutation } from '@/data/config/project-storage-config-update-mutation'
import { useLargestBucketSizeLimitsCheck } from '@/data/storage/buckets-max-size-limit-query'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL } from '@/lib/constants'
@@ -60,13 +59,10 @@ export const StorageSettings = () => {
const { ref: projectRef } = useParams()
const { data: project } = useSelectedProjectQuery()
- const { can: canReadStorageSettings, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(
- PermissionAction.STORAGE_ADMIN_READ,
- '*'
- )
- const { can: canUpdateStorageSettings } = useAsyncCheckPermissions(
- PermissionAction.STORAGE_ADMIN_WRITE,
- '*'
+ const { can: canReadStorageSettings, isLoading: isLoadingPermissions } =
+ useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.STORAGE_CONFIG_READ)
+ const { can: canUpdateStorageSettings } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.STORAGE_CONFIG_WRITE
)
const {
diff --git a/apps/studio/components/interfaces/Storage/VectorBuckets/CreateVectorTableSheet.tsx b/apps/studio/components/interfaces/Storage/VectorBuckets/CreateVectorTableSheet.tsx
index 88b29473b6d..df4815ebcf0 100644
--- a/apps/studio/components/interfaces/Storage/VectorBuckets/CreateVectorTableSheet.tsx
+++ b/apps/studio/components/interfaces/Storage/VectorBuckets/CreateVectorTableSheet.tsx
@@ -1,6 +1,5 @@
import { zodResolver } from '@hookform/resolvers/zod'
import { literal, safeSql } from '@supabase/pg-meta'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { PlusIcon, Trash2Icon } from 'lucide-react'
import { parseAsBoolean, useQueryState } from 'nuqs'
import { useEffect } from 'react'
@@ -33,7 +32,7 @@ import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { DocsButton } from '@/components/ui/DocsButton'
import { useFDWImportForeignSchemaMutation } from '@/data/fdw/fdw-import-foreign-schema-mutation'
import { useVectorBucketIndexCreateMutation } from '@/data/storage/vector-bucket-index-create-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useDeploymentMode } from '@/hooks/misc/useDeploymentMode'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL } from '@/lib/constants'
@@ -111,7 +110,9 @@ export const CreateVectorTableSheet = ({ bucketName }: CreateVectorTableSheetPro
'newTable',
parseAsBoolean.withDefault(false).withOptions({ history: 'push', clearOnDefault: true })
)
- const { can: canCreateBuckets } = useAsyncCheckPermissions(PermissionAction.STORAGE_WRITE, '*')
+ const { can: canCreateBuckets } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.STORAGE_WRITE
+ )
const { data: wrapperInstance } = useS3VectorsWrapperInstance({ bucketId: bucketName })
const schema = (wrapperInstance?.server_options ?? [])
diff --git a/apps/studio/components/interfaces/Storage/VectorBuckets/VectorBucketDetails/VectorBucketTableExamplesSheet.tsx b/apps/studio/components/interfaces/Storage/VectorBuckets/VectorBucketDetails/VectorBucketTableExamplesSheet.tsx
index 945eb77f7d1..3698969d922 100644
--- a/apps/studio/components/interfaces/Storage/VectorBuckets/VectorBucketDetails/VectorBucketTableExamplesSheet.tsx
+++ b/apps/studio/components/interfaces/Storage/VectorBuckets/VectorBucketDetails/VectorBucketTableExamplesSheet.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { SqlEditor } from 'icons'
import { ChevronDownIcon, ListPlusIcon } from 'lucide-react'
@@ -30,7 +29,7 @@ import { useS3VectorsWrapperInstance } from '../useS3VectorsWrapperInstance'
import { DocsButton } from '@/components/ui/DocsButton'
import { useAPIKeys } from '@/data/api-keys/api-keys-query'
import { VectorBucketIndex } from '@/data/storage/vector-buckets-indexes-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { DOCS_URL } from '@/lib/constants'
import { isGreaterThanOrEqual } from '@/lib/semver'
@@ -139,9 +138,8 @@ function VectorBucketIndexExamples({
}: VectorBucketIndexExamplesProps) {
const { ref: projectRef, bucketId } = useParams()
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'service_api_keys'
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ
)
const { data: apiKeysData } = useAPIKeys({ projectRef }, { enabled: canReadAPIKeys })
const { secretKey } = apiKeysData ?? {}
diff --git a/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx b/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx
index eddb86b4e83..34c272c35c1 100644
--- a/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { Realtime } from 'icons'
import {
@@ -55,7 +54,7 @@ import {
isView as isTableLikeView,
} from '@/data/table-editor/table-editor-types'
import { useTableUpdateMutation } from '@/data/tables/table-update-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useIsProtectedSchema } from '@/hooks/useProtectedSchemas'
@@ -125,13 +124,11 @@ export const GridHeaderActions = ({ table, isRefetching }: GridHeaderActionsProp
(policy) => policy.schema === table.schema && policy.table === table.name
)
- const { can: canSqlWriteTables, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'tables'
+ const { can: canSqlWriteTables, isLoading: isLoadingPermissions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
- const { can: canSqlWriteColumns } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'columns'
+ const { can: canSqlWriteColumns } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const isReadOnly = !isLoadingPermissions && !canSqlWriteTables && !canSqlWriteColumns
// This will change when we allow autogenerated API docs for schemas other than `public`
diff --git a/apps/studio/components/interfaces/TableGridEditor/InsertButton.tsx b/apps/studio/components/interfaces/TableGridEditor/InsertButton.tsx
index 4ff032fc17d..9432bef8631 100644
--- a/apps/studio/components/interfaces/TableGridEditor/InsertButton.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/InsertButton.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { ArrowUpIcon, ChevronDownIcon, FileTextIcon } from 'lucide-react'
import {
Button,
@@ -10,7 +9,7 @@ import {
} from 'ui'
import { ShortcutBadge } from '@/components/ui/ShortcutBadge'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useTrack } from '@/lib/telemetry/track'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
import { useShortcut } from '@/state/shortcuts/useShortcut'
@@ -22,9 +21,8 @@ export const InsertButton = () => {
const snap = useTableEditorTableStateSnapshot()
const tableEditorSnap = useTableEditorStateSnapshot()
- const { can: canCreateColumns } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'columns'
+ const { can: canCreateColumns } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const onAddRow =
diff --git a/apps/studio/components/interfaces/TableGridEditor/TableGridEditor.tsx b/apps/studio/components/interfaces/TableGridEditor/TableGridEditor.tsx
index cbda689496a..0b1025e1151 100644
--- a/apps/studio/components/interfaces/TableGridEditor/TableGridEditor.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/TableGridEditor.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import Link from 'next/link'
import { useRouter } from 'next/router'
@@ -21,7 +20,7 @@ import {
isView,
TableLike,
} from '@/data/table-editor/table-editor-types'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useDashboardHistory } from '@/hooks/misc/useDashboardHistory'
import { useQuerySchemaState } from '@/hooks/misc/useSchemaQueryState'
import { useIsProtectedSchema } from '@/hooks/useProtectedSchemas'
@@ -51,14 +50,8 @@ export const TableGridEditor = ({
const [selectedView] = useQueryState('view', parseAsString.withDefault('data'))
- const { can: canEditTables } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'tables'
- )
- const { can: canEditColumns } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'columns'
- )
+ const { can: canEditTables } = useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.DATABASE_WRITE)
+ const { can: canEditColumns } = useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.DATABASE_WRITE)
const isReadOnly = !canEditTables && !canEditColumns
const tabId = !!id ? tabs.openTabs.find((x) => x.endsWith(id)) : undefined
const openTabs = tabs.openTabs.filter((x) => !x.startsWith('sql'))
diff --git a/apps/studio/components/layouts/AppLayout/EnableBranchingButton/BranchingPITRNotice.tsx b/apps/studio/components/layouts/AppLayout/EnableBranchingButton/BranchingPITRNotice.tsx
index 7c37d7e93c4..fdb97893e29 100644
--- a/apps/studio/components/layouts/AppLayout/EnableBranchingButton/BranchingPITRNotice.tsx
+++ b/apps/studio/components/layouts/AppLayout/EnableBranchingButton/BranchingPITRNotice.tsx
@@ -1,20 +1,18 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { ClockIcon } from 'lucide-react'
import Link from 'next/link'
import { Button } from 'ui'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useAppStateSnapshot } from '@/state/app-state'
export const BranchingPITRNotice = () => {
const { ref } = useParams()
const snap = useAppStateSnapshot()
- const { can: canUpdateSubscription } = useAsyncCheckPermissions(
- PermissionAction.BILLING_WRITE,
- 'stripe.subscriptions'
+ const { can: canUpdateSubscription } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_WRITE
)
return (
diff --git a/apps/studio/components/layouts/ComputeLayout/ComputeLayout.tsx b/apps/studio/components/layouts/ComputeLayout/ComputeLayout.tsx
index 85e4e76883f..73f8cd62049 100644
--- a/apps/studio/components/layouts/ComputeLayout/ComputeLayout.tsx
+++ b/apps/studio/components/layouts/ComputeLayout/ComputeLayout.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { FeatureFlagContext, useFlag, useParams } from 'common'
import { useRouter } from 'next/router'
import { useContext, useEffect, useMemo, type PropsWithChildren } from 'react'
@@ -8,7 +7,7 @@ import { ProjectLayout } from '../ProjectLayout'
import { NoPermission } from '@/components/ui/NoPermission'
import { ProductMenu } from '@/components/ui/ProductMenu'
import type { ProductMenuGroup } from '@/components/ui/ProductMenu/ProductMenu.types'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { withAuth } from '@/hooks/misc/withAuth'
import { PRODUCT_NAME } from '@/lib/constants/compute'
@@ -57,9 +56,8 @@ const ComputeLayoutContent = ({ children, title }: PropsWithChildren<ComputeLayo
const computeEnabled = useFlag('compute')
// The v2 compute routes require the FGA workers_read permission, which shared-types does not
// expose yet; they reuse the Edge Functions OAuth scope, so gate on the same product here.
- const { isLoading: isLoadingPermissions, can: canReadCompute } = useAsyncCheckPermissions(
- PermissionAction.FUNCTIONS_READ,
- '*'
+ const { isLoading: isLoadingPermissions, can: canReadCompute } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.WORKERS_READ
)
useEffect(() => {
diff --git a/apps/studio/components/layouts/DatabaseLayout/DatabaseTriggersLayout.tsx b/apps/studio/components/layouts/DatabaseLayout/DatabaseTriggersLayout.tsx
index 29e0c14cd36..c6b40c8766b 100644
--- a/apps/studio/components/layouts/DatabaseLayout/DatabaseTriggersLayout.tsx
+++ b/apps/studio/components/layouts/DatabaseLayout/DatabaseTriggersLayout.tsx
@@ -1,19 +1,17 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { PropsWithChildren } from 'react'
import { DatabaseLayout } from './DatabaseLayout'
import { PageLayout } from '@/components/layouts/PageLayout/PageLayout'
import { NoPermission } from '@/components/ui/NoPermission'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
type DatabaseTriggersLayoutProps = PropsWithChildren
export const DatabaseTriggersLayout = ({ children }: DatabaseTriggersLayoutProps) => {
const { ref } = useParams()
- const { can: canReadTriggers, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_READ,
- 'triggers'
+ const { can: canReadTriggers, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_READ
)
const navigationItems = [
diff --git a/apps/studio/components/layouts/EdgeFunctionsLayout/EdgeFunctionDetailsLayout.tsx b/apps/studio/components/layouts/EdgeFunctionsLayout/EdgeFunctionDetailsLayout.tsx
index 49b61f24fac..a0c8ca91868 100644
--- a/apps/studio/components/layouts/EdgeFunctionsLayout/EdgeFunctionDetailsLayout.tsx
+++ b/apps/studio/components/layouts/EdgeFunctionsLayout/EdgeFunctionDetailsLayout.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { BlobReader, BlobWriter, ZipWriter } from '@zip.js/zip.js'
import { IS_PLATFORM, useParams } from 'common'
import dayjs from 'dayjs'
@@ -48,7 +47,7 @@ import { ShortcutTooltip } from '@/components/ui/ShortcutTooltip'
import { useProjectApiUrl } from '@/data/config/project-endpoint-query'
import { useEdgeFunctionBodyQuery } from '@/data/edge-functions/edge-function-body-query'
import { useEdgeFunctionQuery } from '@/data/edge-functions/edge-function-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { withAuth } from '@/hooks/misc/withAuth'
import { DOCS_URL } from '@/lib/constants'
import { useTrack } from '@/lib/telemetry/track'
@@ -68,9 +67,8 @@ const EdgeFunctionDetailsLayout = ({
const track = useTrack()
const { functionSlug, ref } = useParams()
- const { isLoading, can: canReadFunctions } = useAsyncCheckPermissions(
- PermissionAction.FUNCTIONS_READ,
- '*'
+ const { isLoading, can: canReadFunctions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.EDGE_FUNCTIONS_READ
)
const [isOpen, setIsOpen] = useState(false)
diff --git a/apps/studio/components/layouts/LogsLayout/LogsLayout.tsx b/apps/studio/components/layouts/LogsLayout/LogsLayout.tsx
index 993dda2f7db..779fb8ecddd 100644
--- a/apps/studio/components/layouts/LogsLayout/LogsLayout.tsx
+++ b/apps/studio/components/layouts/LogsLayout/LogsLayout.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { PropsWithChildren } from 'react'
@@ -6,7 +5,7 @@ import { ProjectLayout } from '../ProjectLayout'
import { LogsSidebarMenuV2 } from './LogsSidebarMenuV2'
import { NoPermission } from '@/components/ui/NoPermission'
import { UnknownInterface } from '@/components/ui/UnknownInterface'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { withAuth } from '@/hooks/misc/withAuth'
@@ -18,9 +17,8 @@ const LogsLayout = ({ title, children }: PropsWithChildren<LogsLayoutProps>) =>
const { ref } = useParams()
const logsEnabled = useIsFeatureEnabled('logs:all')
- const { isLoading, can: canUseLogsExplorer } = useAsyncCheckPermissions(
- PermissionAction.ANALYTICS_READ,
- 'logflare'
+ const { isLoading, can: canUseLogsExplorer } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.ANALYTICS_LOGS_READ
)
if (!logsEnabled) {
diff --git a/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenu.tsx b/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenu.tsx
index 07872ef958c..d8cb527d32f 100644
--- a/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenu.tsx
+++ b/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenu.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { PlusIcon } from 'lucide-react'
import { useRouter } from 'next/router'
@@ -22,28 +21,25 @@ import { ProductMenu } from '@/components/ui/ProductMenu'
import { ProductMenuShortcuts } from '@/components/ui/ProductMenu/ProductMenuShortcuts'
import { useContentDeleteMutation } from '@/data/content/content-delete-mutation'
import { ContentOfType } from '@/data/content/content-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import {
+ FGA_PERMISSIONS,
+ useAsyncCheckUserContentPermissions,
+} from '@/hooks/misc/useCheckPermissionsV2'
import { IS_PLATFORM } from '@/lib/constants'
-import { useProfile } from '@/lib/profile'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
import { useShortcut } from '@/state/shortcuts/useShortcut'
export const ObservabilityMenu = () => {
const router = useRouter()
- const { profile } = useProfile()
const { ref, id } = useParams()
const pageKey = (id || router.pathname.split('/')[4] || 'observability') as string
const menuItems = useGenerateObservabilityMenu()
const { data: customReportItems, isLoading } = useGenerateCustomReportsMenu()
- const { can: canCreateCustomReport } = useAsyncCheckPermissions(
- PermissionAction.CREATE,
- 'user_content',
- {
- resource: { type: 'report', owner_id: profile?.id },
- subject: { id: profile?.id },
- }
+ const { can: canCreateCustomReport } = useAsyncCheckUserContentPermissions(
+ FGA_PERMISSIONS.PROJECT.SNIPPETS_WRITE,
+ { mode: 'create', type: 'report' }
)
const { mutateAsync: deleteReport } = useContentDeleteMutation({
diff --git a/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenuItem.tsx b/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenuItem.tsx
index 46cc88f3e5d..f565142e9bc 100644
--- a/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenuItem.tsx
+++ b/apps/studio/components/layouts/ObservabilityLayout/ObservabilityMenuItem.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { Edit2Icon, MoreVerticalIcon, TrashIcon } from 'lucide-react'
import Link from 'next/link'
import {
@@ -12,7 +11,10 @@ import {
} from 'ui'
import { ContentBase } from '@/data/content/content-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import {
+ FGA_PERMISSIONS,
+ useAsyncCheckUserContentPermissions,
+} from '@/hooks/misc/useCheckPermissionsV2'
import { useProfile } from '@/lib/profile'
import type { Dashboards } from '@/types'
@@ -41,16 +43,14 @@ export const ObservabilityMenuItem = ({
onSelectDelete,
}: ReportMenuItemProps) => {
const { profile } = useProfile()
- const { can: canUpdateCustomReport } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'user_content',
+ const { can: canUpdateCustomReport } = useAsyncCheckUserContentPermissions(
+ FGA_PERMISSIONS.PROJECT.SNIPPETS_WRITE,
{
- resource: {
- type: 'report',
- visibility: item.report.visibility,
- owner_id: item.report.owner_id,
- },
- subject: { id: profile?.id },
+ mode: 'existing',
+ type: 'report',
+ visibility: item.report.visibility,
+ ownerId: item.report.owner_id,
+ subjectId: profile?.id,
}
)
diff --git a/apps/studio/components/layouts/ProjectLayout/LogicalBackupCliInstructions.tsx b/apps/studio/components/layouts/ProjectLayout/LogicalBackupCliInstructions.tsx
index 459b6dbcf1c..05753662859 100644
--- a/apps/studio/components/layouts/ProjectLayout/LogicalBackupCliInstructions.tsx
+++ b/apps/studio/components/layouts/ProjectLayout/LogicalBackupCliInstructions.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { useRouter } from 'next/router'
import { cn } from 'ui'
@@ -14,8 +13,7 @@ import {
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { InlineLink } from '@/components/ui/InlineLink'
import { useProjectSettingsV2Query } from '@/data/config/project-settings-v2-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
-import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { DOCS_URL } from '@/lib/constants'
export type LogicalBackupCliInstructionsProps = {
@@ -33,15 +31,8 @@ export const LogicalBackupCliInstructions = ({
}: LogicalBackupCliInstructionsProps) => {
const router = useRouter()
const { ref } = useParams()
- const { data: project } = useSelectedProjectQuery()
- const { can: canResetDbPassword } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'projects',
- {
- resource: {
- project_id: project?.id,
- },
- }
+ const { can: canResetDbPassword } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_CONFIG_WRITE
)
const {
diff --git a/apps/studio/components/layouts/ProjectLayout/PauseFailedState.tsx b/apps/studio/components/layouts/ProjectLayout/PauseFailedState.tsx
index 846151da1cc..65adb9f02d0 100644
--- a/apps/studio/components/layouts/ProjectLayout/PauseFailedState.tsx
+++ b/apps/studio/components/layouts/ProjectLayout/PauseFailedState.tsx
@@ -1,4 +1,4 @@
-import { PermissionAction, SupportCategories } from '@supabase/shared-types/out/constants'
+import { SupportCategories } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { DownloadIcon, MoreVerticalIcon, TrashIcon } from 'lucide-react'
import { useState } from 'react'
@@ -24,7 +24,7 @@ import { DropdownMenuItemTooltip } from '@/components/ui/DropdownMenuItemTooltip
import { InlineLink } from '@/components/ui/InlineLink'
import { useBackupDownloadMutation } from '@/data/database/backup-download-mutation'
import { useDownloadableBackupQuery } from '@/data/database/backup-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
export const PauseFailedState = () => {
@@ -33,9 +33,7 @@ export const PauseFailedState = () => {
const [visible, setVisible] = useState(false)
const [showCliBackup, setShowCliBackup] = useState(false)
- const { can: canDeleteProject } = useAsyncCheckPermissions(PermissionAction.UPDATE, 'projects', {
- resource: { project_id: project?.id },
- })
+ const { can: canDeleteProject } = useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.ADMIN_WRITE)
const { data, isPending: isLoadingBackups } = useDownloadableBackupQuery({ projectRef: ref })
const backups = data?.backups ?? []
diff --git a/apps/studio/components/layouts/ProjectLayout/RestoreFailedState.tsx b/apps/studio/components/layouts/ProjectLayout/RestoreFailedState.tsx
index a5446fc36ae..6eb6f1e99a1 100644
--- a/apps/studio/components/layouts/ProjectLayout/RestoreFailedState.tsx
+++ b/apps/studio/components/layouts/ProjectLayout/RestoreFailedState.tsx
@@ -1,4 +1,4 @@
-import { PermissionAction, SupportCategories } from '@supabase/shared-types/out/constants'
+import { SupportCategories } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { DownloadIcon, MoreVerticalIcon, TrashIcon } from 'lucide-react'
import { useState } from 'react'
@@ -24,7 +24,7 @@ import { DropdownMenuItemTooltip } from '@/components/ui/DropdownMenuItemTooltip
import { InlineLink } from '@/components/ui/InlineLink'
import { useBackupDownloadMutation } from '@/data/database/backup-download-mutation'
import { useDownloadableBackupQuery } from '@/data/database/backup-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
export const RestoreFailedState = () => {
@@ -33,9 +33,7 @@ export const RestoreFailedState = () => {
const [visible, setVisible] = useState(false)
const [showCliBackup, setShowCliBackup] = useState(false)
- const { can: canDeleteProject } = useAsyncCheckPermissions(PermissionAction.UPDATE, 'projects', {
- resource: { project_id: project?.id },
- })
+ const { can: canDeleteProject } = useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.ADMIN_WRITE)
const { data, isPending: isLoadingBackups } = useDownloadableBackupQuery({ projectRef: ref })
const backups = data?.backups ?? []
diff --git a/apps/studio/components/layouts/ProjectLayout/UnhealthyState.tsx b/apps/studio/components/layouts/ProjectLayout/UnhealthyState.tsx
index 97ede758b6a..0fd3b223acd 100644
--- a/apps/studio/components/layouts/ProjectLayout/UnhealthyState.tsx
+++ b/apps/studio/components/layouts/ProjectLayout/UnhealthyState.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { AlertTriangleIcon } from 'lucide-react'
import { useRouter } from 'next/router'
@@ -9,7 +8,7 @@ import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
import { useProjectDetailQuery, useSetProjectStatus } from '@/data/projects/project-detail-query'
import { useProjectRestartMutation } from '@/data/projects/project-restart-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { PROJECT_STATUS } from '@/lib/constants'
@@ -20,9 +19,8 @@ export const UnhealthyState = () => {
const { setProjectStatus } = useSetProjectStatus()
const [showConfirm, setShowConfirm] = useState(false)
- const { can: canRestartProject } = useAsyncCheckPermissions(
- PermissionAction.INFRA_EXECUTE,
- 'reboot'
+ const { can: canRestartProject } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.OPERATIONS_WRITE
)
useProjectDetailQuery(
diff --git a/apps/studio/components/layouts/SQLEditorLayout/SQLEditorMenu.tsx b/apps/studio/components/layouts/SQLEditorLayout/SQLEditorMenu.tsx
index 4f0ed55c613..26af78d5246 100644
--- a/apps/studio/components/layouts/SQLEditorLayout/SQLEditorMenu.tsx
+++ b/apps/studio/components/layouts/SQLEditorLayout/SQLEditorMenu.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useDebounce } from '@uidotdev/usehooks'
import { LOCAL_STORAGE_KEYS, useFlag, useParams } from 'common'
import { FilePlusIcon, FolderPlusIcon, PlusIcon, ScrollTextIcon, XIcon } from 'lucide-react'
@@ -26,7 +25,10 @@ import {
import { SearchList } from './SQLEditorNavV2/SearchList'
import { SQLEditorNav } from './SQLEditorNavV2/SQLEditorNav'
import { type SqlSnippetSource } from '@/components/interfaces/SQLEditor/querySource'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import {
+ FGA_PERMISSIONS,
+ useAsyncCheckUserContentPermissions,
+} from '@/hooks/misc/useCheckPermissionsV2'
import { useLocalStorage } from '@/hooks/misc/useLocalStorage'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { getErrorMessage } from '@/lib/get-error-message'
@@ -53,12 +55,11 @@ export const SQLEditorMenu = () => {
const debouncedSearch = useDebounce(search, 500)
- const { can: canCreateSQLSnippet } = useAsyncCheckPermissions(
- PermissionAction.CREATE,
- 'user_content',
+ const { can: canCreateSQLSnippet } = useAsyncCheckUserContentPermissions(
+ FGA_PERMISSIONS.PROJECT.SNIPPETS_WRITE,
{
- resource: { type: 'sql', owner_id: profile?.id },
- subject: { id: profile?.id },
+ mode: 'create',
+ type: 'sql',
}
)
diff --git a/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/SQLEditorTreeViewItem.tsx b/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/SQLEditorTreeViewItem.tsx
index 88cb82e4963..563f47bc0bc 100644
--- a/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/SQLEditorTreeViewItem.tsx
+++ b/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/SQLEditorTreeViewItem.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { keepPreviousData } from '@tanstack/react-query'
import { IS_PLATFORM } from 'common'
import { useParams } from 'common/hooks/useParams'
@@ -34,7 +33,10 @@ import { LogsSnippetIcon } from '@/components/ui/EntityTypeIcon'
import { getContentById, getSqlSnippetById } from '@/data/content/content-id-query'
import { useSQLSnippetFolderContentsQuery } from '@/data/content/sql-folder-contents-query'
import { Snippet } from '@/data/content/sql-folders-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import {
+ FGA_PERMISSIONS,
+ useAsyncCheckUserContentPermissions,
+} from '@/hooks/misc/useCheckPermissionsV2'
import { useLatest } from '@/hooks/misc/useLatest'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useProfile } from '@/lib/profile'
@@ -119,12 +121,11 @@ export const SQLEditorTreeViewItem = ({
const isEditing = isFolderEditing(status)
const isSaving = isFolderSaving(status)
- const { can: canCreateSQLSnippet } = useAsyncCheckPermissions(
- PermissionAction.CREATE,
- 'user_content',
+ const { can: canCreateSQLSnippet } = useAsyncCheckUserContentPermissions(
+ FGA_PERMISSIONS.PROJECT.SNIPPETS_WRITE,
{
- resource: { type: 'sql', owner_id: profile?.id },
- subject: { id: profile?.id },
+ mode: 'create',
+ type: 'sql',
}
)
diff --git a/apps/studio/components/layouts/SQLEditorLayout/SqlEditor.Commands.tsx b/apps/studio/components/layouts/SQLEditorLayout/SqlEditor.Commands.tsx
index 1ecb1aba76e..f60eb95810b 100644
--- a/apps/studio/components/layouts/SQLEditorLayout/SqlEditor.Commands.tsx
+++ b/apps/studio/components/layouts/SQLEditorLayout/SqlEditor.Commands.tsx
@@ -1,5 +1,4 @@
import type { PGColumn } from '@supabase/pg-meta'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useDebounce, useIntersectionObserver } from '@uidotdev/usehooks'
import { useParams } from 'common'
import { AlertTriangleIcon, CodeIcon, Loader2Icon, Table2Icon } from 'lucide-react'
@@ -33,9 +32,11 @@ import {
usePrefetchTables,
type TablesData,
} from '@/data/tables/tables-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import {
+ FGA_PERMISSIONS,
+ useAsyncCheckUserContentPermissions,
+} from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
-import { useProfile } from '@/lib/profile'
export function useSqlEditorGotoCommands(options?: CommandOptions) {
let { ref } = useParams()
@@ -101,13 +102,11 @@ function RunSnippetPage() {
const snippets = snippetPages?.pages.flatMap((page) => page.contents)
- const { profile } = useProfile()
- const { can: canCreateSQLSnippet } = useAsyncCheckPermissions(
- PermissionAction.CREATE,
- 'user_content',
+ const { can: canCreateSQLSnippet } = useAsyncCheckUserContentPermissions(
+ FGA_PERMISSIONS.PROJECT.SNIPPETS_WRITE,
{
- resource: { type: 'sql', owner_id: profile?.id },
- subject: { id: profile?.id },
+ mode: 'create',
+ type: 'sql',
}
)
diff --git a/apps/studio/components/layouts/TableEditorLayout/TableEditorLayout.tsx b/apps/studio/components/layouts/TableEditorLayout/TableEditorLayout.tsx
index f9b7fb32cef..4278453710b 100644
--- a/apps/studio/components/layouts/TableEditorLayout/TableEditorLayout.tsx
+++ b/apps/studio/components/layouts/TableEditorLayout/TableEditorLayout.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { LOCAL_STORAGE_KEYS, useParams } from 'common'
import { PropsWithChildren, useEffect } from 'react'
@@ -8,7 +7,7 @@ import { useIsQueueOperationsEnabled } from '@/components/interfaces/Account/Pre
import { BannerTableEditorQueueOperations } from '@/components/ui/BannerStack/Banners/BannerTableEditorQueueOperations'
import { useBannerStack } from '@/components/ui/BannerStack/BannerStackProvider'
import { NoPermission } from '@/components/ui/NoPermission'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'
export const TableEditorLayout = ({ children }: PropsWithChildren<{}>) => {
@@ -21,15 +20,11 @@ export const TableEditorLayout = ({ children }: PropsWithChildren<{}>) => {
false
)
- const { can: canReadTables, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_READ,
- 'tables'
+ const { can: canReadTables, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_READ
)
- const { can: canWriteTables } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'tables'
- )
+ const { can: canWriteTables } = useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.DATABASE_WRITE)
useEffect(() => {
if (!isPermissionsLoaded) return
diff --git a/apps/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx b/apps/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx
index 367cf784c86..989f79d9c36 100644
--- a/apps/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx
+++ b/apps/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { keepPreviousData } from '@tanstack/react-query'
import { useParams } from 'common'
import { FilterIcon, PlusIcon } from 'lucide-react'
@@ -31,7 +30,7 @@ import { ENTITY_TYPE } from '@/data/entity-types/entity-type-constants'
import { useEntityTypesQuery } from '@/data/entity-types/entity-types-infinite-query'
import { useTableApiAccessQuery } from '@/data/privileges/table-api-access-query'
import { getTableEditor, useTableEditorQuery } from '@/data/table-editor/table-editor-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useLocalStorage } from '@/hooks/misc/useLocalStorage'
import { useQuerySchemaState } from '@/hooks/misc/useSchemaQueryState'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
@@ -95,9 +94,8 @@ export const TableEditorMenu = () => {
{ enabled: Boolean(selectedSchema && entityNames.length > 0) }
)
- const { can: canCreateTables } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'tables'
+ const { can: canCreateTables } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const { isSchemaLocked } = useIsProtectedSchema({ schema: selectedSchema })
diff --git a/apps/studio/components/ui/AIAssistantPanel/AIOptInModal.tsx b/apps/studio/components/ui/AIAssistantPanel/AIOptInModal.tsx
index 5aba4b048d7..3c8fc334cd5 100644
--- a/apps/studio/components/ui/AIAssistantPanel/AIOptInModal.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/AIOptInModal.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useEffect } from 'react'
import {
Button,
@@ -16,7 +15,7 @@ import { Admonition } from 'ui-patterns/Admonition'
import { AIOptInLevelSelector } from '@/components/interfaces/Organization/GeneralSettings/AIOptInLevelSelector'
import { useAIOptInForm } from '@/hooks/forms/useAIOptInForm'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import type { AiOptInLevel } from '@/hooks/misc/useOrgOptedIntoAi'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { isOptInLevelAtLeast } from '@/lib/ai/opt-in-level'
@@ -36,9 +35,8 @@ export const AIOptInModal = ({ visible, onCancel, requiredLevel, onSaved }: AIOp
onSaved?.(level)
onCancel()
})
- const { can: canUpdateOrganization } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'organizations'
+ const { can: canUpdateOrganization } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.ADMIN_WRITE
)
const onOpenChange = (open: boolean) => {
diff --git a/apps/studio/components/ui/AutoEnableRLSNotice.tsx b/apps/studio/components/ui/AutoEnableRLSNotice.tsx
index 633760da79d..0da6f1c2d51 100644
--- a/apps/studio/components/ui/AutoEnableRLSNotice.tsx
+++ b/apps/studio/components/ui/AutoEnableRLSNotice.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { LOCAL_STORAGE_KEYS, useParams } from 'common'
import { ShieldCheckIcon, XIcon } from 'lucide-react'
import { useMemo, useState } from 'react'
@@ -22,7 +21,7 @@ import { AUTO_ENABLE_RLS_EVENT_TRIGGER_SQL } from '@/components/interfaces/Datab
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { useDatabaseEventTriggerCreateMutation } from '@/data/database-event-triggers/database-event-trigger-create-mutation'
import { useDatabaseEventTriggersQuery } from '@/data/database-event-triggers/database-event-triggers-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useTrack } from '@/lib/telemetry/track'
@@ -87,9 +86,8 @@ const CreateEnsureRLSTriggerDialog = ({ iconOnly }: { iconOnly?: boolean }) => {
const [open, setOpen] = useState(false)
- const { can: canCreateTriggers } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'triggers'
+ const { can: canCreateTriggers } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const { mutate: createEventTrigger, isPending: isCreating } =
diff --git a/apps/studio/components/ui/ProjectSettings/DisplayApiSettings.tsx b/apps/studio/components/ui/ProjectSettings/DisplayApiSettings.tsx
index 4f53b6b37e3..902fc54cbf5 100644
--- a/apps/studio/components/ui/ProjectSettings/DisplayApiSettings.tsx
+++ b/apps/studio/components/ui/ProjectSettings/DisplayApiSettings.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { JwtSecretUpdateStatus } from '@supabase/shared-types/out/events'
import { IS_PLATFORM, useFlag, useParams } from 'common'
import { AlertCircleIcon, Loader2Icon } from 'lucide-react'
@@ -13,7 +12,7 @@ import Panel from '@/components/ui/Panel'
import { useApiKeysLastUsedQuery } from '@/data/analytics/api-keys-last-used-query'
import { useJwtSecretUpdatingStatusQuery } from '@/data/config/jwt-secret-updating-status-query'
import { useProjectSettingsV2Query } from '@/data/config/project-settings-v2-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
export const DisplayApiSettings = ({
showTitle = true,
@@ -38,9 +37,8 @@ export const DisplayApiSettings = ({
} = useJwtSecretUpdatingStatusQuery({ projectRef })
const jwtSecretUpdateStatus = data?.jwtSecretUpdateStatus
- const { isLoading: isLoadingPermissions, can: canReadAPIKeys } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'service_api_keys'
+ const { isLoading: isLoadingPermissions, can: canReadAPIKeys } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ
)
const isLoading = isProjectSettingsLoading || isLoadingPermissions
diff --git a/apps/studio/components/ui/ProjectSettings/ToggleLegacyApiKeys.tsx b/apps/studio/components/ui/ProjectSettings/ToggleLegacyApiKeys.tsx
index c17890c255b..485a532ddb3 100644
--- a/apps/studio/components/ui/ProjectSettings/ToggleLegacyApiKeys.tsx
+++ b/apps/studio/components/ui/ProjectSettings/ToggleLegacyApiKeys.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { useState } from 'react'
import { toast } from 'sonner'
@@ -20,7 +19,7 @@ import { useToggleLegacyAPIKeysMutation } from '@/data/api-keys/legacy-api-key-t
import { useLegacyAPIKeysStatusQuery } from '@/data/api-keys/legacy-api-keys-status-query'
import { useLegacyJWTSigningKeyQuery } from '@/data/jwt-signing-keys/legacy-jwt-signing-key-query'
import { useAuthorizedAppsQuery } from '@/data/oauth/authorized-apps-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
export const ToggleLegacyApiKeysPanel = () => {
@@ -30,10 +29,11 @@ export const ToggleLegacyApiKeysPanel = () => {
const [isConfirmOpen, setIsConfirmOpen] = useState(false)
const [isAppsWarningOpen, setIsAppsWarningOpen] = useState(false)
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')
- const { can: canUpdateAPIKeys, isSuccess: isPermissionsSuccess } = useAsyncCheckPermissions(
- PermissionAction.SECRETS_WRITE,
- '*'
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_SIGNING_KEYS_READ
+ )
+ const { can: canUpdateAPIKeys, isSuccess: isPermissionsSuccess } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_SIGNING_KEYS_WRITE
)
const { data: legacyAPIKeysStatusData, isSuccess: isLegacyAPIKeysStatusSuccess } =
diff --git a/apps/studio/components/ui/SchemaSelector.tsx b/apps/studio/components/ui/SchemaSelector.tsx
index 1396ed08101..67e9ce7bd02 100644
--- a/apps/studio/components/ui/SchemaSelector.tsx
+++ b/apps/studio/components/ui/SchemaSelector.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { CheckIcon, PlusIcon } from 'lucide-react'
import { ComponentPropsWithoutRef, forwardRef, useMemo, useState } from 'react'
import {
@@ -23,7 +22,7 @@ import {
import { RestartProjectDialog } from '@/components/interfaces/ErrorHandling/RestartProjectDialog'
import { useSchemasQuery } from '@/data/database/schemas-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSchemasFilteredForHighAvailability } from '@/hooks/misc/useHighAvailability'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
@@ -72,9 +71,8 @@ export const SchemaSelector = forwardRef<HTMLDivElement, SchemaSelectorProps>(
if (!isControlled) setInternalOpen(next)
onOpenChange?.(next)
}
- const { can: canCreateSchemas } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'schemas'
+ const { can: canCreateSchemas } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
const { data: project } = useSelectedProjectQuery()
diff --git a/apps/studio/components/ui/UpgradePlanButton.tsx b/apps/studio/components/ui/UpgradePlanButton.tsx
index 2fe24002eff..9493324557d 100644
--- a/apps/studio/components/ui/UpgradePlanButton.tsx
+++ b/apps/studio/components/ui/UpgradePlanButton.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useFlag, useParams } from 'common'
import Link from 'next/link'
import { PropsWithChildren } from 'react'
@@ -8,7 +7,7 @@ import { ButtonTooltip } from './ButtonTooltip'
import { RequestUpgradeToBillingOwners } from './RequestUpgradeToBillingOwners'
import { getInfrastructurePath } from '@/components/interfaces/Settings/Infrastructure/Infrastructure.utils'
import { SupportLink } from '@/components/interfaces/Support/SupportLink'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
@@ -54,11 +53,11 @@ export const UpgradePlanButton = ({
const projectUpdateDisabled = useFlag('disableProjectCreationAndUpdate')
const { billingAll } = useIsFeatureEnabled(['billing:all'])
- const { can: canUpdateSubscription } = useAsyncCheckPermissions(
- PermissionAction.BILLING_WRITE,
- 'stripe.subscriptions',
- undefined,
- { organizationSlug: slug }
+ const { can: canUpdateSubscription } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_WRITE,
+ {
+ organizationSlug: slug,
+ }
)
const subject = `Enquiry to upgrade ${!!plan ? `to ${plan} ` : ''}plan for organization`
diff --git a/apps/studio/data/config/project-settings-v2-query.ts b/apps/studio/data/config/project-settings-v2-query.ts
index 2172cad83ce..fb3ddbc4384 100644
--- a/apps/studio/data/config/project-settings-v2-query.ts
+++ b/apps/studio/data/config/project-settings-v2-query.ts
@@ -1,10 +1,9 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQuery } from '@tanstack/react-query'
import { configKeys } from './keys'
import type { components } from '@/data/api'
import { get, handleError } from '@/data/fetchers'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import type { ResponseError, UseCustomQueryOptions } from '@/types'
export type ProjectSettingsVariables = { projectRef?: string }
@@ -46,9 +45,8 @@ export const useProjectSettingsV2Query = <TData = ProjectSettingsData>(
) => {
// [Joshen] Sync with API perms checking here - shouldReturnApiKeys
// https://github.com/supabase/platform/blob/develop/api/src/routes/platform/projects/ref/settings.controller.ts#L92
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- '*'
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ
)
return useQuery<ProjectSettingsData, ProjectSettingsError, TData>({
diff --git a/apps/studio/data/organizations/organization-customer-profile-query.ts b/apps/studio/data/organizations/organization-customer-profile-query.ts
index 9966011f9a1..ff91bc79011 100644
--- a/apps/studio/data/organizations/organization-customer-profile-query.ts
+++ b/apps/studio/data/organizations/organization-customer-profile-query.ts
@@ -1,10 +1,9 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQuery } from '@tanstack/react-query'
import { IS_PLATFORM } from 'common'
import { organizationKeys } from './keys'
import { get, handleError } from '@/data/fetchers'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import type { ResponseError, UseCustomQueryOptions } from '@/types'
export type OrganizationCustomerProfileVariables = {
@@ -48,11 +47,11 @@ export const useOrganizationCustomerProfileQuery = <TData = OrganizationCustomer
) => {
// [Joshen] Thinking it makes sense to add this check at the RQ level - prevent
// unnecessary requests, although this behaviour still needs handling on the UI
- const { can: canReadCustomerProfile } = useAsyncCheckPermissions(
- PermissionAction.BILLING_READ,
- 'stripe.customer',
- undefined,
- { organizationSlug: slug }
+ const { can: canReadCustomerProfile } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_READ,
+ {
+ organizationSlug: slug,
+ }
)
return useQuery<OrganizationCustomerProfileData, OrganizationCustomerProfileError, TData>({
diff --git a/apps/studio/data/organizations/organization-payment-methods-query.ts b/apps/studio/data/organizations/organization-payment-methods-query.ts
index 420f361f948..a86f2c398a0 100644
--- a/apps/studio/data/organizations/organization-payment-methods-query.ts
+++ b/apps/studio/data/organizations/organization-payment-methods-query.ts
@@ -1,10 +1,9 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQuery } from '@tanstack/react-query'
import { components } from 'api-types'
import { organizationKeys } from './keys'
import { get, handleError } from '@/data/fetchers'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import type { ResponseError, UseCustomQueryOptions } from '@/types'
export type OrganizationPaymentMethodsVariables = { slug?: string }
@@ -48,9 +47,8 @@ export const useOrganizationPaymentMethodsQuery = <TData = OrganizationPaymentMe
TData
> = {}
) => {
- const { can: canReadSubscriptions } = useAsyncCheckPermissions(
- PermissionAction.BILLING_READ,
- 'stripe.payment_methods'
+ const { can: canReadSubscriptions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_READ
)
return useQuery<OrganizationPaymentMethodsData, OrganizationPaymentMethodsError, TData>({
queryKey: organizationKeys.paymentMethods(slug),
diff --git a/apps/studio/data/organizations/organization-tax-id-query.ts b/apps/studio/data/organizations/organization-tax-id-query.ts
index 21d3c9a1080..6fb153fac92 100644
--- a/apps/studio/data/organizations/organization-tax-id-query.ts
+++ b/apps/studio/data/organizations/organization-tax-id-query.ts
@@ -1,10 +1,9 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQuery } from '@tanstack/react-query'
import { components } from 'api-types'
import { organizationKeys } from './keys'
import { get, handleError } from '@/data/fetchers'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import type { ResponseError, UseCustomQueryOptions } from '@/types'
export type OrganizationTaxIdVariables = {
@@ -36,9 +35,8 @@ export const useOrganizationTaxIdQuery = <TData = OrganizationTaxIdData>(
...options
}: UseCustomQueryOptions<OrganizationTaxIdData, OrganizationTaxIdError, TData> = {}
) => {
- const { can: canReadSubscriptions } = useAsyncCheckPermissions(
- PermissionAction.BILLING_READ,
- 'stripe.tax_ids'
+ const { can: canReadSubscriptions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_READ
)
return useQuery<OrganizationTaxIdData, OrganizationTaxIdError, TData>({
diff --git a/apps/studio/data/permissions/keys.ts b/apps/studio/data/permissions/keys.ts
index f90354c2b84..88546961e64 100644
--- a/apps/studio/data/permissions/keys.ts
+++ b/apps/studio/data/permissions/keys.ts
@@ -1,3 +1,4 @@
export const permissionKeys = {
list: () => ['permissions'] as const,
+ listV2: () => ['permissions', 'v2'] as const,
}
diff --git a/apps/studio/data/permissions/permissions-query-v2.ts b/apps/studio/data/permissions/permissions-query-v2.ts
new file mode 100644
index 00000000000..e423bfa2322
--- /dev/null
+++ b/apps/studio/data/permissions/permissions-query-v2.ts
@@ -0,0 +1,46 @@
+import { useQuery, type QueryClient } from '@tanstack/react-query'
+import { useIsLoggedIn } from 'common'
+
+import { permissionKeys } from './keys'
+import { get, handleError } from '@/data/fetchers'
+import { IS_PLATFORM } from '@/lib/constants'
+import type { ResponseError, UseCustomQueryOptions } from '@/types'
+
+export async function getPermissionsV2(signal?: AbortSignal) {
+ const { data, error } = await get('/platform/profile/permissions/v2', { signal })
+ if (error) {
+ handleError(error, {
+ sentryContext: {
+ tags: {
+ permissionsQuery: true,
+ },
+ contexts: {
+ rawError: error,
+ },
+ },
+ })
+ }
+ return data
+}
+
+export type PermissionsV2Data = Awaited<ReturnType<typeof getPermissionsV2>>
+export type PermissionsV2Error = ResponseError
+
+export const usePermissionsQueryV2 = <TData = PermissionsV2Data>({
+ enabled = true,
+ ...options
+}: UseCustomQueryOptions<PermissionsV2Data, PermissionsV2Error, TData> = {}) => {
+ const isLoggedIn = useIsLoggedIn()
+
+ return useQuery<PermissionsV2Data, PermissionsV2Error, TData>({
+ queryKey: permissionKeys.listV2(),
+ queryFn: ({ signal }) => getPermissionsV2(signal),
+ ...options,
+ enabled: IS_PLATFORM && enabled && isLoggedIn,
+ staleTime: 5 * 60 * 1000,
+ })
+}
+
+export function invalidatePermissionsQueryV2(client: QueryClient) {
+ return client.invalidateQueries({ queryKey: permissionKeys.listV2() })
+}
diff --git a/apps/studio/data/storage/iceberg-wrapper-create-mutation.ts b/apps/studio/data/storage/iceberg-wrapper-create-mutation.ts
index 19288899452..fe2801e1a8f 100644
--- a/apps/studio/data/storage/iceberg-wrapper-create-mutation.ts
+++ b/apps/studio/data/storage/iceberg-wrapper-create-mutation.ts
@@ -1,5 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
-
import { useS3AccessKeyCreateMutation } from './s3-access-key-create-mutation'
import { WRAPPERS } from '@/components/interfaces/Integrations/Wrappers/Wrappers.constants'
import {
@@ -13,13 +11,15 @@ import {
import { useAPIKeys } from '@/data/api-keys/api-keys-query'
import { useProjectSettingsV2Query } from '@/data/config/project-settings-v2-query'
import { FDWCreateVariables, useFDWCreateMutation } from '@/data/fdw/fdw-create-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
export const useIcebergWrapperCreateMutation = () => {
const { data: project } = useSelectedProjectQuery()
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_SECRET_READ
+ )
const { data: apiKeysData } = useAPIKeys(
{ projectRef: project?.ref, reveal: true },
{ enabled: canReadAPIKeys }
@@ -33,9 +33,8 @@ export const useIcebergWrapperCreateMutation = () => {
const wrapperMeta = WRAPPERS.find((wrapper) => wrapper.name === 'iceberg_wrapper')
- const { can: canCreateCredentials } = useAsyncCheckPermissions(
- PermissionAction.STORAGE_ADMIN_WRITE,
- '*'
+ const { can: canCreateCredentials } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.STORAGE_CONFIG_WRITE
)
const { mutateAsync: createS3AccessKey, isPending: isCreatingS3AccessKey } =
diff --git a/apps/studio/data/storage/s3-vectors-wrapper-create-mutation.ts b/apps/studio/data/storage/s3-vectors-wrapper-create-mutation.ts
index 2cd0385dbb6..3e402188094 100644
--- a/apps/studio/data/storage/s3-vectors-wrapper-create-mutation.ts
+++ b/apps/studio/data/storage/s3-vectors-wrapper-create-mutation.ts
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { IS_PLATFORM } from 'common'
import { useLocalS3KeysQuery } from '../misc/local-s3-keys-query'
@@ -11,7 +10,7 @@ import {
} from '@/components/interfaces/Storage/VectorBuckets/VectorBuckets.utils'
import { useProjectSettingsV2Query } from '@/data/config/project-settings-v2-query'
import { FDWCreateVariables, useFDWCreateMutation } from '@/data/fdw/fdw-create-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useDeploymentMode } from '@/hooks/misc/useDeploymentMode'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
@@ -38,9 +37,8 @@ export const useS3VectorsWrapperCreateMutation = () => {
const wrapperMeta = WRAPPERS.find((wrapper) => wrapper.name === 's3_vectors_wrapper')
- const { can: canCreateCredentials } = useAsyncCheckPermissions(
- PermissionAction.STORAGE_ADMIN_WRITE,
- '*'
+ const { can: canCreateCredentials } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.STORAGE_CONFIG_WRITE
)
const { mutateAsync: createS3AccessKey, isPending: isCreatingS3AccessKey } =
diff --git a/apps/studio/data/subscriptions/org-balance-query.ts b/apps/studio/data/subscriptions/org-balance-query.ts
index af00ac0f39d..f3091ac5847 100644
--- a/apps/studio/data/subscriptions/org-balance-query.ts
+++ b/apps/studio/data/subscriptions/org-balance-query.ts
@@ -1,9 +1,8 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQuery } from '@tanstack/react-query'
import { subscriptionKeys } from './keys'
import { get, handleError } from '@/data/fetchers'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import type { ResponseError, UseCustomQueryOptions } from '@/types'
export type OrgBalanceVariables = {
@@ -36,9 +35,8 @@ export const useOrgBalanceQuery = <TData = OrgBalanceData>(
) => {
// [Joshen] Thinking it makes sense to add this check at the RQ level - prevent
// unnecessary requests, although this behaviour still needs handling on the UI
- const { can: canReadBalance } = useAsyncCheckPermissions(
- PermissionAction.BILLING_READ,
- 'stripe.subscriptions'
+ const { can: canReadBalance } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_READ
)
return useQuery<OrgBalanceData, OrgBalanceError, TData>({
diff --git a/apps/studio/data/subscriptions/org-plans-query.ts b/apps/studio/data/subscriptions/org-plans-query.ts
index 2c35509d2df..bc46a81b56e 100644
--- a/apps/studio/data/subscriptions/org-plans-query.ts
+++ b/apps/studio/data/subscriptions/org-plans-query.ts
@@ -1,9 +1,8 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQuery } from '@tanstack/react-query'
import { subscriptionKeys } from './keys'
import { get, handleError } from '@/data/fetchers'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { UseCustomQueryOptions } from '@/types'
export type OrgPlansVariables = {
@@ -28,9 +27,8 @@ export const useOrgPlansQuery = <TData = OrgPlansData>(
{ orgSlug }: OrgPlansVariables,
{ enabled = true, ...options }: UseCustomQueryOptions<OrgPlansData, OrgPlansError, TData> = {}
) => {
- const { can: canReadSubscriptions } = useAsyncCheckPermissions(
- PermissionAction.BILLING_READ,
- 'stripe.subscriptions'
+ const { can: canReadSubscriptions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_READ
)
return useQuery<OrgPlansData, OrgPlansError, TData>({
diff --git a/apps/studio/data/subscriptions/org-subscription-query.ts b/apps/studio/data/subscriptions/org-subscription-query.ts
index 8e3cfc47439..a11dfa178c3 100644
--- a/apps/studio/data/subscriptions/org-subscription-query.ts
+++ b/apps/studio/data/subscriptions/org-subscription-query.ts
@@ -1,10 +1,9 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQuery } from '@tanstack/react-query'
import { subscriptionKeys } from './keys'
import { get, handleError } from '@/data/fetchers'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import type { ResponseError, UseCustomQueryOptions } from '@/types'
export type OrgSubscriptionVariables = {
@@ -40,9 +39,8 @@ export const useOrgSubscriptionQuery = <TData = OrgSubscriptionData>(
) => {
// [Joshen] Thinking it makes sense to add this check at the RQ level - prevent
// unnecessary requests, although this behaviour still needs handling on the UI
- const { can: canReadSubscriptions } = useAsyncCheckPermissions(
- PermissionAction.BILLING_READ,
- 'stripe.subscriptions'
+ const { can: canReadSubscriptions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.BILLING_READ
)
return useQuery<OrgSubscriptionData, OrgSubscriptionError, TData>({
diff --git a/apps/studio/data/table-rows/table-rows-count-query.ts b/apps/studio/data/table-rows/table-rows-count-query.ts
index fa961af0ddb..77eb62c1c43 100644
--- a/apps/studio/data/table-rows/table-rows-count-query.ts
+++ b/apps/studio/data/table-rows/table-rows-count-query.ts
@@ -1,6 +1,5 @@
import { getTableRowsCountSql } from '@supabase/pg-meta'
import { formatPatternMatchFilterValue } from '@supabase/pg-meta/src/query/table-row-query'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { QueryClient, useQuery, useQueryClient } from '@tanstack/react-query'
import { IS_PLATFORM } from 'common'
@@ -10,7 +9,7 @@ import type { Filter, SupaTable } from '@/components/grid/types'
import { useConnectionStringForReadOps } from '@/data/read-replicas/replicas-query'
import { executeSql } from '@/data/sql/execute-sql-mutation'
import { prefetchTableEditor } from '@/data/table-editor/table-editor-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { RoleImpersonationState, wrapWithRoleImpersonation } from '@/lib/role-impersonation'
import { isRoleImpersonationEnabled } from '@/state/role-impersonation-state'
import { ResponseError, UseCustomQueryOptions } from '@/types'
@@ -108,9 +107,8 @@ export const useTableRowsCountQuery = <TData = TableRowsCountData>(
identifier: readReplicaIdentifier,
type,
} = useConnectionStringForReadOps()
- const { can: canSQLAdminWrite, isLoading: isPermissionsLoading } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_WRITE,
- 'tables'
+ const { can: canSQLAdminWrite, isLoading: isPermissionsLoading } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_WRITE
)
return useQuery<TableRowsCountData, TableRowsCountError, TData>({
diff --git a/apps/studio/hooks/forms/useAIOptInForm.ts b/apps/studio/hooks/forms/useAIOptInForm.ts
index bd3f03c1870..4d6e086f6ca 100644
--- a/apps/studio/hooks/forms/useAIOptInForm.ts
+++ b/apps/studio/hooks/forms/useAIOptInForm.ts
@@ -1,14 +1,13 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQueryClient } from '@tanstack/react-query'
import { LOCAL_STORAGE_KEYS } from 'common'
import { useForm } from 'react-hook-form'
import { toast } from 'sonner'
import * as z from 'zod'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '../misc/useCheckPermissionsV2'
import { useOrganizationUpdateMutation } from '@/data/organizations/organization-update-mutation'
import { invalidateOrganizationsQuery } from '@/data/organizations/organizations-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'
import { getAiOptInLevel, type AiOptInLevel } from '@/hooks/misc/useOrgOptedIntoAi'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
@@ -31,9 +30,8 @@ export type AIOptInFormValues = z.infer<typeof AIOptInSchema>
export const useAIOptInForm = (onSuccessCallback?: (level: AiOptInLevel) => void) => {
const queryClient = useQueryClient()
const { data: selectedOrganization } = useSelectedOrganizationQuery()
- const { can: canUpdateOrganization } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'organizations'
+ const { can: canUpdateOrganization } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.ORGANIZATION.ADMIN_WRITE
)
const [, setUpdatedOptInSinceMCP] = useLocalStorageQuery(
diff --git a/apps/studio/hooks/misc/useCheckPermissionsV2.test.ts b/apps/studio/hooks/misc/useCheckPermissionsV2.test.ts
new file mode 100644
index 00000000000..33538311540
--- /dev/null
+++ b/apps/studio/hooks/misc/useCheckPermissionsV2.test.ts
@@ -0,0 +1,58 @@
+import { describe, expect, it } from 'vitest'
+
+import { doPermissionsCheckV2 } from './useCheckPermissionsV2'
+import { PermissionsV2Data } from '@/data/permissions/permissions-query-v2'
+
+function permissions(
+ overrides?: Partial<PermissionsV2Data['organizations'][number]>
+): PermissionsV2Data {
+ return {
+ organizations: [
+ {
+ slug: 'org-slug',
+ role: 'developer',
+ permissions: ['storage_read', 'storage_write'],
+ projects: [],
+ ...overrides,
+ },
+ ],
+ }
+}
+
+describe('doPermissionsCheckV2', () => {
+ it('returns false when data is missing', () => {
+ expect(doPermissionsCheckV2(undefined, 'storage_read', 'org-slug')).toBe(false)
+ })
+
+ it('returns false for an unknown organization', () => {
+ expect(doPermissionsCheckV2(permissions(), 'storage_read', 'other-org')).toBe(false)
+ })
+
+ it('grants from org level permissions', () => {
+ expect(doPermissionsCheckV2(permissions(), 'storage_read', 'org-slug')).toBe(true)
+ expect(doPermissionsCheckV2(permissions(), 'custom_domain_write', 'org-slug')).toBe(false)
+ })
+
+ it('org level permissions apply when a projectRef is given but has no explicit entry', () => {
+ expect(doPermissionsCheckV2(permissions(), 'storage_read', 'org-slug', 'some-project')).toBe(
+ true
+ )
+ })
+
+ it('grants from a project scoped role entry', () => {
+ const data = permissions({
+ role: 'member',
+ permissions: ['storage_read'],
+ projects: [{ ref: 'project-ref', role: 'developer', permissions: ['storage_write'] }],
+ })
+ expect(doPermissionsCheckV2(data, 'storage_write', 'org-slug', 'project-ref')).toBe(true)
+ // project-scoped role does not leak to other projects in the org
+ expect(doPermissionsCheckV2(data, 'storage_write', 'org-slug', 'other-project')).toBe(false)
+ // ...or to org-level checks
+ expect(doPermissionsCheckV2(data, 'storage_write', 'org-slug')).toBe(false)
+ })
+
+ it('returns false when organizationSlug is undefined', () => {
+ expect(doPermissionsCheckV2(permissions(), 'storage_read', undefined)).toBe(false)
+ })
+})
diff --git a/apps/studio/hooks/misc/useCheckPermissionsV2.ts b/apps/studio/hooks/misc/useCheckPermissionsV2.ts
new file mode 100644
index 00000000000..5346ac99124
--- /dev/null
+++ b/apps/studio/hooks/misc/useCheckPermissionsV2.ts
@@ -0,0 +1,213 @@
+import { permissions } from '@supabase/shared-types'
+import { useIsLoggedIn, useParams } from 'common'
+import { useMemo } from 'react'
+
+import { useSelectedOrganizationQuery } from './useSelectedOrganization'
+import { useSelectedProjectQuery } from './useSelectedProject'
+import { PermissionsV2Data, usePermissionsQueryV2 } from '@/data/permissions/permissions-query-v2'
+import { IS_PLATFORM } from '@/lib/constants'
+
+type ExtractIds<T> = {
+ [K in keyof T]: {
+ [P in keyof T[K]]: T[K][P] extends { id: infer I } ? I : never
+ }
+}
+
+export const FGA_PERMISSIONS = Object.fromEntries(
+ Object.entries(permissions.FgaPermissions).map(([group, permissions]) => [
+ group,
+ Object.fromEntries(Object.entries(permissions).map(([key, { id }]) => [key, id])),
+ ])
+) as ExtractIds<typeof permissions.FgaPermissions>
+
+type DeepValue<T> = T extends object ? DeepValue<T[keyof T]> : T
+export type FgaPermissions = DeepValue<typeof FGA_PERMISSIONS>
+
+/**
+ * Checks an FGA permission against the v2 permissions response.
+ * Resolution order:
+ * 1. explicit project scoped role entry for projectRef (if provided)
+ * 2. org level permissions (org role applies to all projects in the org)
+ */
+export function doPermissionsCheckV2(
+ data: PermissionsV2Data | undefined,
+ permission: FgaPermissions | FgaPermissions[],
+ organizationSlug?: string,
+ projectRef?: string | null
+): boolean {
+ if (!data) return false
+
+ const org = data.organizations.find((o) => o.slug === organizationSlug)
+ if (!org) return false
+
+ const required = Array.isArray(permission) ? permission : [permission]
+ if (required.length === 0) return false // nothing requested: fail closed
+
+ const project = projectRef ? org.projects.find((p) => p.ref === projectRef) : undefined
+
+ return required.every(
+ (p) => (project?.permissions.includes(p) ?? false) || org.permissions.includes(p)
+ )
+}
+
+function useGetProjectPermissionsV2(
+ permissionsOverride?: PermissionsV2Data,
+ organizationSlugOverride?: string,
+ projectRefOverride?: string | null,
+ enabled = true
+) {
+ const {
+ data,
+ isPending: isLoadingPermissions,
+ isSuccess: isSuccessPermissions,
+ } = usePermissionsQueryV2({
+ enabled: permissionsOverride === undefined && enabled,
+ })
+ const permissions = permissionsOverride === undefined ? data : permissionsOverride
+
+ const getOrganizationDataFromParamsSlug = organizationSlugOverride === undefined && enabled
+ const {
+ data: organizationData,
+ isPending: isLoadingOrganization,
+ isSuccess: isSuccessOrganization,
+ } = useSelectedOrganizationQuery({
+ enabled: getOrganizationDataFromParamsSlug,
+ })
+ const organization =
+ organizationSlugOverride === undefined ? organizationData : { slug: organizationSlugOverride }
+ const organizationSlug = organization?.slug
+
+ const { ref: urlProjectRef } = useParams()
+ const getProjectDataFromParamsRef = !!urlProjectRef && projectRefOverride === undefined && enabled
+ const {
+ data: projectData,
+ isPending: isLoadingProject,
+ isSuccess: isSuccessProject,
+ } = useSelectedProjectQuery({
+ enabled: getProjectDataFromParamsRef,
+ })
+ const project =
+ projectRefOverride === undefined
+ ? projectData
+ : { ref: projectRefOverride, parent_project_ref: undefined }
+
+ // branch projects resolve to their base project ref, since FGA tuples
+ // are written against the base project only
+ const projectRef =
+ projectRefOverride === null
+ ? null
+ : project?.parent_project_ref
+ ? project.parent_project_ref
+ : project?.ref
+
+ const isLoading =
+ isLoadingPermissions ||
+ (getOrganizationDataFromParamsSlug && isLoadingOrganization) ||
+ (getProjectDataFromParamsRef && isLoadingProject)
+ const isSuccess =
+ isSuccessPermissions &&
+ (!getOrganizationDataFromParamsSlug || isSuccessOrganization) &&
+ (!getProjectDataFromParamsRef || isSuccessProject)
+
+ return {
+ permissions,
+ organizationSlug,
+ projectRef,
+ isLoading,
+ isSuccess,
+ }
+}
+
+export function useAsyncCheckPermissionsV2(
+ permission: FgaPermissions | FgaPermissions[],
+ overrides?: {
+ organizationSlug?: string
+ projectRef?: string | null
+ permissions?: PermissionsV2Data
+ }
+) {
+ const isLoggedIn = useIsLoggedIn()
+ const { organizationSlug, projectRef, permissions } = overrides ?? {}
+
+ const {
+ permissions: allPermissions,
+ organizationSlug: _organizationSlug,
+ projectRef: _projectRef,
+ isLoading: isPermissionsLoading,
+ isSuccess: isPermissionsSuccess,
+ } = useGetProjectPermissionsV2(permissions, organizationSlug, projectRef, isLoggedIn)
+
+ const can = useMemo(() => {
+ if (!IS_PLATFORM) return true
+ if (!isLoggedIn) return false
+ if (!isPermissionsSuccess || !allPermissions) return false
+
+ return doPermissionsCheckV2(allPermissions, permission, _organizationSlug, _projectRef)
+ }, [isLoggedIn, isPermissionsSuccess, allPermissions, permission, _organizationSlug, _projectRef])
+
+ // project scoped role wins over org role
+ const role = useMemo<PermissionsV2Data['organizations'][number]['role'] | undefined>(() => {
+ if (!allPermissions || !_organizationSlug) return undefined
+ const org = allPermissions.organizations.find((o) => o.slug === _organizationSlug)
+ if (!org) return undefined
+ const project = _projectRef ? org.projects.find((p) => p.ref === _projectRef) : undefined
+ return project?.role ?? org.role
+ }, [allPermissions, _organizationSlug, _projectRef])
+
+ const isLoading = !IS_PLATFORM ? false : !isLoggedIn ? true : isPermissionsLoading
+ const isSuccess = !IS_PLATFORM ? true : !isLoggedIn ? false : isPermissionsSuccess
+
+ return { isLoading, isSuccess, can, role }
+}
+
+export function useAsyncCheckUserContentPermissions(
+ permission: 'project_snippets_read' | 'project_snippets_write',
+ content:
+ | {
+ mode: 'create'
+ type: 'report' | 'sql' | 'log_sql' | 'notebook'
+ }
+ | {
+ mode: 'existing'
+ type: 'report' | 'sql' | 'log_sql' | 'notebook'
+ visibility: 'project' | 'user' | 'public' | 'org'
+ ownerId: number
+ subjectId?: number
+ }
+ | undefined,
+ overrides?: {
+ organizationSlug?: string
+ projectRef?: string | null
+ permissions?: PermissionsV2Data
+ }
+) {
+ const { isLoading, isSuccess, can, role } = useAsyncCheckPermissionsV2(permission, overrides)
+ const isResolved =
+ content !== undefined && (content.mode === 'create' || content.subjectId !== undefined)
+ const isAtLeastDeveloper =
+ role !== undefined && ['developer', 'administrator', 'owner'].includes(role)
+ const isRestrictedWrite = permission === 'project_snippets_write' && !isAtLeastDeveloper
+ const isWritableBelowDeveloper = content !== undefined && ['sql'].includes(content.type)
+
+ let passesContextCheck = false
+ if (content === undefined) {
+ // content not loaded yet
+ passesContextCheck = false
+ } else if (content.mode === 'create') {
+ passesContextCheck = !isRestrictedWrite || isWritableBelowDeveloper
+ } else {
+ const isOwner = content.ownerId === content.subjectId
+ const isUserVisibility = content.visibility === 'user'
+ if (isRestrictedWrite) {
+ passesContextCheck = isWritableBelowDeveloper && isOwner
+ } else {
+ passesContextCheck = !isUserVisibility || isOwner
+ }
+ }
+
+ return {
+ isLoading: isLoading || !isResolved,
+ isSuccess: isSuccess && isResolved,
+ can: can && passesContextCheck,
+ }
+}
diff --git a/apps/studio/package.json b/apps/studio/package.json
index 7f953ac7f09..bd5a8b3c166 100644
--- a/apps/studio/package.json
+++ b/apps/studio/package.json
@@ -79,7 +79,7 @@
"@supabase/mcp-server-supabase": "^0.12.0",
"@supabase/pg-meta": "workspace:*",
"@supabase/realtime-js": "catalog:",
- "@supabase/shared-types": "0.1.96",
+ "@supabase/shared-types": "0.1.98",
"@supabase/supabase-js": "catalog:",
"@tanstack/react-devtools": "^0.10.3",
"@tanstack/react-hotkeys": "^0.10.0",
diff --git a/apps/studio/pages/project/[ref]/auth/audit-logs.tsx b/apps/studio/pages/project/[ref]/auth/audit-logs.tsx
index 723c8047e81..580689cc7ab 100644
--- a/apps/studio/pages/project/[ref]/auth/audit-logs.tsx
+++ b/apps/studio/pages/project/[ref]/auth/audit-logs.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { PageContainer } from 'ui-patterns/PageContainer'
import {
PageHeader,
@@ -16,14 +15,13 @@ import AuthLayout from '@/components/layouts/AuthLayout/AuthLayout'
import { DefaultLayout } from '@/components/layouts/DefaultLayout'
import { DocsButton } from '@/components/ui/DocsButton'
import { NoPermission } from '@/components/ui/NoPermission'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { DOCS_URL } from '@/lib/constants'
import type { NextPageWithLayout } from '@/types'
const AuditLogsPage: NextPageWithLayout = () => {
- const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'custom_config_gotrue'
+ const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_READ
)
if (isPermissionsLoaded && !canReadAuthSettings) {
diff --git a/apps/studio/pages/project/[ref]/auth/hooks.tsx b/apps/studio/pages/project/[ref]/auth/hooks.tsx
index c941e734e0d..2283d772693 100644
--- a/apps/studio/pages/project/[ref]/auth/hooks.tsx
+++ b/apps/studio/pages/project/[ref]/auth/hooks.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { PageContainer } from 'ui-patterns/PageContainer'
import {
PageHeader,
@@ -16,14 +15,13 @@ import AuthLayout from '@/components/layouts/AuthLayout/AuthLayout'
import { DefaultLayout } from '@/components/layouts/DefaultLayout'
import { DocsButton } from '@/components/ui/DocsButton'
import { NoPermission } from '@/components/ui/NoPermission'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { DOCS_URL } from '@/lib/constants'
import type { NextPageWithLayout } from '@/types'
const Hooks: NextPageWithLayout = () => {
- const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'custom_config_gotrue'
+ const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_READ
)
if (isPermissionsLoaded && !canReadAuthSettings) {
diff --git a/apps/studio/pages/project/[ref]/auth/mfa.tsx b/apps/studio/pages/project/[ref]/auth/mfa.tsx
index 4cd007eaf79..77a2e7e3cee 100644
--- a/apps/studio/pages/project/[ref]/auth/mfa.tsx
+++ b/apps/studio/pages/project/[ref]/auth/mfa.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { PageContainer } from 'ui-patterns/PageContainer'
import {
@@ -16,7 +15,7 @@ import AuthLayout from '@/components/layouts/AuthLayout/AuthLayout'
import { DefaultLayout } from '@/components/layouts/DefaultLayout'
import { NoPermission } from '@/components/ui/NoPermission'
import { UnknownInterface } from '@/components/ui/UnknownInterface'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import type { NextPageWithLayout } from '@/types'
@@ -24,9 +23,8 @@ const MfaPage: NextPageWithLayout = () => {
const { ref } = useParams()
const showMFA = useIsFeatureEnabled('authentication:multi_factor')
- const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'custom_config_gotrue'
+ const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_READ
)
if (!showMFA) {
diff --git a/apps/studio/pages/project/[ref]/auth/performance.tsx b/apps/studio/pages/project/[ref]/auth/performance.tsx
index ffd935d7c03..5d2a461c7a0 100644
--- a/apps/studio/pages/project/[ref]/auth/performance.tsx
+++ b/apps/studio/pages/project/[ref]/auth/performance.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { PageContainer } from 'ui-patterns/PageContainer'
import {
@@ -16,7 +15,7 @@ import AuthLayout from '@/components/layouts/AuthLayout/AuthLayout'
import { DefaultLayout } from '@/components/layouts/DefaultLayout'
import { NoPermission } from '@/components/ui/NoPermission'
import { UnknownInterface } from '@/components/ui/UnknownInterface'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import type { NextPageWithLayout } from '@/types'
@@ -24,9 +23,8 @@ const PerformancePage: NextPageWithLayout = () => {
const { ref } = useParams()
const showPerformance = useIsFeatureEnabled('authentication:performance')
- const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'custom_config_gotrue'
+ const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_READ
)
if (!showPerformance) {
diff --git a/apps/studio/pages/project/[ref]/auth/protection.tsx b/apps/studio/pages/project/[ref]/auth/protection.tsx
index 02cdfd2ce47..ed9dcc61ee9 100644
--- a/apps/studio/pages/project/[ref]/auth/protection.tsx
+++ b/apps/studio/pages/project/[ref]/auth/protection.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { PageContainer } from 'ui-patterns/PageContainer'
import {
@@ -16,7 +15,7 @@ import AuthLayout from '@/components/layouts/AuthLayout/AuthLayout'
import { DefaultLayout } from '@/components/layouts/DefaultLayout'
import { NoPermission } from '@/components/ui/NoPermission'
import { UnknownInterface } from '@/components/ui/UnknownInterface'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import type { NextPageWithLayout } from '@/types'
@@ -24,9 +23,8 @@ const ProtectionPage: NextPageWithLayout = () => {
const { ref } = useParams()
const showAttackProtection = useIsFeatureEnabled('authentication:attack_protection')
- const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'custom_config_gotrue'
+ const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_READ
)
if (!showAttackProtection) {
diff --git a/apps/studio/pages/project/[ref]/auth/rate-limits.tsx b/apps/studio/pages/project/[ref]/auth/rate-limits.tsx
index f09a72daccb..dbcb7709657 100644
--- a/apps/studio/pages/project/[ref]/auth/rate-limits.tsx
+++ b/apps/studio/pages/project/[ref]/auth/rate-limits.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { PageContainer } from 'ui-patterns/PageContainer'
import {
@@ -18,7 +17,7 @@ import { DefaultLayout } from '@/components/layouts/DefaultLayout'
import { DocsButton } from '@/components/ui/DocsButton'
import { NoPermission } from '@/components/ui/NoPermission'
import { UnknownInterface } from '@/components/ui/UnknownInterface'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { DOCS_URL } from '@/lib/constants'
import type { NextPageWithLayout } from '@/types'
@@ -27,9 +26,8 @@ const RateLimitsPage: NextPageWithLayout = () => {
const { ref } = useParams()
const showRateLimits = useIsFeatureEnabled('authentication:rate_limits')
- const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'custom_config_gotrue'
+ const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_READ
)
if (!showRateLimits) {
diff --git a/apps/studio/pages/project/[ref]/auth/sessions.tsx b/apps/studio/pages/project/[ref]/auth/sessions.tsx
index 0fe62065225..4228209836a 100644
--- a/apps/studio/pages/project/[ref]/auth/sessions.tsx
+++ b/apps/studio/pages/project/[ref]/auth/sessions.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { PageContainer } from 'ui-patterns/PageContainer'
import {
PageHeader,
@@ -14,13 +13,12 @@ import { SessionsAuthSettingsForm } from '@/components/interfaces/Auth/SessionsA
import AuthLayout from '@/components/layouts/AuthLayout/AuthLayout'
import { DefaultLayout } from '@/components/layouts/DefaultLayout'
import { NoPermission } from '@/components/ui/NoPermission'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import type { NextPageWithLayout } from '@/types'
const SessionsPage: NextPageWithLayout = () => {
- const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'custom_config_gotrue'
+ const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_READ
)
if (isPermissionsLoaded && !canReadAuthSettings) {
diff --git a/apps/studio/pages/project/[ref]/auth/smtp.tsx b/apps/studio/pages/project/[ref]/auth/smtp.tsx
index e6856e5a38e..44a8c827563 100644
--- a/apps/studio/pages/project/[ref]/auth/smtp.tsx
+++ b/apps/studio/pages/project/[ref]/auth/smtp.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { PageContainer } from 'ui-patterns/PageContainer'
import { PageSection, PageSectionContent } from 'ui-patterns/PageSection'
import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
@@ -7,13 +6,12 @@ import { SmtpForm } from '@/components/interfaces/Auth/SmtpForm/SmtpForm'
import { AuthEmailsLayout } from '@/components/layouts/AuthLayout/AuthEmailsLayout'
import { DefaultLayout } from '@/components/layouts/DefaultLayout'
import { NoPermission } from '@/components/ui/NoPermission'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import type { NextPageWithLayout } from '@/types'
const SmtpPage: NextPageWithLayout = () => {
- const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'custom_config_gotrue'
+ const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_READ
)
if (isPermissionsLoaded && !canReadAuthSettings) {
diff --git a/apps/studio/pages/project/[ref]/auth/templates/[templateId].tsx b/apps/studio/pages/project/[ref]/auth/templates/[templateId].tsx
index d8195556aa9..ab5daa8be34 100644
--- a/apps/studio/pages/project/[ref]/auth/templates/[templateId].tsx
+++ b/apps/studio/pages/project/[ref]/auth/templates/[templateId].tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import Link from 'next/link'
import { useRouter } from 'next/router'
@@ -59,7 +58,7 @@ import { DocsButton } from '@/components/ui/DocsButton'
import { NoPermission } from '@/components/ui/NoPermission'
import { useAuthConfigQuery } from '@/data/auth/auth-config-query'
import { useAuthConfigUpdateMutation } from '@/data/auth/auth-config-update-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL } from '@/lib/constants'
@@ -74,14 +73,12 @@ const RedirectToTemplates = () => {
const { templateId, ref } = router.query
const { ref: projectRef } = useParams()
- const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'custom_config_gotrue'
+ const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_READ
)
- const { can: canUpdateConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'custom_config_gotrue'
+ const { can: canUpdateConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_WRITE
)
const { data: authConfig, isPending: isLoadingConfig } = useAuthConfigQuery({ projectRef })
diff --git a/apps/studio/pages/project/[ref]/auth/templates/index.tsx b/apps/studio/pages/project/[ref]/auth/templates/index.tsx
index f02769b959f..2805873acea 100644
--- a/apps/studio/pages/project/[ref]/auth/templates/index.tsx
+++ b/apps/studio/pages/project/[ref]/auth/templates/index.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { PageContainer } from 'ui-patterns/PageContainer'
import { PageSection, PageSectionContent } from 'ui-patterns/PageSection'
import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
@@ -7,13 +6,12 @@ import { EmailTemplates } from '@/components/interfaces/Auth/EmailTemplates/Emai
import { AuthEmailsLayout } from '@/components/layouts/AuthLayout/AuthEmailsLayout'
import { DefaultLayout } from '@/components/layouts/DefaultLayout'
import { NoPermission } from '@/components/ui/NoPermission'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import type { NextPageWithLayout } from '@/types'
const TemplatesPage: NextPageWithLayout = () => {
- const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'custom_config_gotrue'
+ const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_READ
)
if (isPermissionsLoaded && !canReadAuthSettings) {
diff --git a/apps/studio/pages/project/[ref]/auth/third-party.tsx b/apps/studio/pages/project/[ref]/auth/third-party.tsx
index 188bdd3abd4..a359ab937f5 100644
--- a/apps/studio/pages/project/[ref]/auth/third-party.tsx
+++ b/apps/studio/pages/project/[ref]/auth/third-party.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { PageContainer } from 'ui-patterns/PageContainer'
@@ -8,15 +7,14 @@ import { AuthProvidersLayout } from '@/components/layouts/AuthLayout/AuthProvide
import { DefaultLayout } from '@/components/layouts/DefaultLayout'
import { NoPermission } from '@/components/ui/NoPermission'
import { UnknownInterface } from '@/components/ui/UnknownInterface'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import type { NextPageWithLayout } from '@/types'
const ThirdPartyPage: NextPageWithLayout = () => {
const { ref } = useParams()
- const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'custom_config_gotrue'
+ const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_READ
)
const showThirdPartyAuth = useIsFeatureEnabled('authentication:third_party_auth')
diff --git a/apps/studio/pages/project/[ref]/auth/url-configuration.tsx b/apps/studio/pages/project/[ref]/auth/url-configuration.tsx
index 81f42779c0c..0334a2af9ca 100644
--- a/apps/studio/pages/project/[ref]/auth/url-configuration.tsx
+++ b/apps/studio/pages/project/[ref]/auth/url-configuration.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { PageContainer } from 'ui-patterns/PageContainer'
import {
PageHeader,
@@ -15,13 +14,12 @@ import SiteUrl from '@/components/interfaces/Auth/SiteUrl/SiteUrl'
import AuthLayout from '@/components/layouts/AuthLayout/AuthLayout'
import { DefaultLayout } from '@/components/layouts/DefaultLayout'
import { NoPermission } from '@/components/ui/NoPermission'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import type { NextPageWithLayout } from '@/types'
const URLConfiguration: NextPageWithLayout = () => {
- const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'custom_config_gotrue'
+ const { can: canReadAuthSettings, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_CONFIG_READ
)
if (isPermissionsLoaded && !canReadAuthSettings) {
diff --git a/apps/studio/pages/project/[ref]/branches/index.tsx b/apps/studio/pages/project/[ref]/branches/index.tsx
index 8333cb7ac14..ddd792ec838 100644
--- a/apps/studio/pages/project/[ref]/branches/index.tsx
+++ b/apps/studio/pages/project/[ref]/branches/index.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { partition } from 'lodash'
import { useRouter } from 'next/router'
@@ -16,7 +15,7 @@ import { DocsButton } from '@/components/ui/DocsButton'
import { NoPermission } from '@/components/ui/NoPermission'
import { Branch, useBranchesQuery } from '@/data/branches/branches-query'
import { useGitHubConnectionsQuery } from '@/data/integrations/github-connections-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL } from '@/lib/constants'
@@ -39,9 +38,8 @@ const BranchesPage: NextPageWithLayout = () => {
const projectRef =
project !== undefined ? (isBranch ? project.parent_project_ref : ref) : undefined
- const { can: canReadBranches, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'preview_branches'
+ const { can: canReadBranches, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.BRANCHING_DEVELOPMENT_READ
)
const {
diff --git a/apps/studio/pages/project/[ref]/branches/merge-requests.tsx b/apps/studio/pages/project/[ref]/branches/merge-requests.tsx
index d5358942409..6829c6e97c0 100644
--- a/apps/studio/pages/project/[ref]/branches/merge-requests.tsx
+++ b/apps/studio/pages/project/[ref]/branches/merge-requests.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { partition } from 'lodash'
import { ArrowRightIcon, GitMergeIcon, MoreVerticalIcon, ShieldIcon, XIcon } from 'lucide-react'
@@ -33,7 +32,7 @@ import { NoPermission } from '@/components/ui/NoPermission'
import { useBranchUpdateMutation } from '@/data/branches/branch-update-mutation'
import { Branch, useBranchesQuery } from '@/data/branches/branches-query'
import { useGitHubConnectionsQuery } from '@/data/integrations/github-connections-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { DOCS_URL } from '@/lib/constants'
@@ -50,9 +49,8 @@ const MergeRequestsPage: NextPageWithLayout = () => {
const projectRef =
project !== undefined ? (isBranch ? project.parent_project_ref : ref) : undefined
- const { can: canReadBranches, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'preview_branches'
+ const { can: canReadBranches, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.BRANCHING_DEVELOPMENT_READ
)
const {
diff --git a/apps/studio/pages/project/[ref]/database/backups/pitr.tsx b/apps/studio/pages/project/[ref]/database/backups/pitr.tsx
index 748f13ce6fa..45448ddded0 100644
--- a/apps/studio/pages/project/[ref]/database/backups/pitr.tsx
+++ b/apps/studio/pages/project/[ref]/database/backups/pitr.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { AlertCircleIcon, DatabaseBackupIcon } from 'lucide-react'
import { Alert, AlertDescription, AlertTitle } from 'ui'
@@ -26,7 +25,7 @@ import { NoPermission } from '@/components/ui/NoPermission'
import { UpgradeToPro } from '@/components/ui/UpgradeToPro'
import { useBackupsQuery } from '@/data/database/backups-query'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useHighAvailability } from '@/hooks/misc/useHighAvailability'
import {
useIsOrioleDbInAws,
@@ -88,10 +87,8 @@ const PITR = () => {
const isEnabled = backups?.pitr_enabled
const isActiveHealthy = project?.status === PROJECT_STATUS.ACTIVE_HEALTHY
- const { can: canReadPhysicalBackups, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'physical_backups'
- )
+ const { can: canReadPhysicalBackups, isSuccess: isPermissionsLoaded } =
+ useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.BACKUPS_READ)
if (isPermissionsLoaded && !canReadPhysicalBackups) {
return <NoPermission resourceText="view PITR backups" />
diff --git a/apps/studio/pages/project/[ref]/database/backups/scheduled.tsx b/apps/studio/pages/project/[ref]/database/backups/scheduled.tsx
index 14f19d1f552..a9a02962861 100644
--- a/apps/studio/pages/project/[ref]/database/backups/scheduled.tsx
+++ b/apps/studio/pages/project/[ref]/database/backups/scheduled.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { DatabaseBackupIcon, InfoIcon } from 'lucide-react'
import { Admonition } from 'ui-patterns/Admonition'
@@ -23,7 +22,7 @@ import { HighAvailabilityDisabledEmptyState } from '@/components/ui/HighAvailabi
import InformationBox from '@/components/ui/InformationBox'
import { NoPermission } from '@/components/ui/NoPermission'
import { useBackupsQuery } from '@/data/database/backups-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import {
useIsHighAvailability,
useIsOrioleDbInAws,
@@ -72,10 +71,8 @@ const ScheduledBackups = () => {
const orioleDbReleaseStage = useOrioleDbReleaseStage()
const isPitrEnabled = backups?.pitr_enabled
- const { can: canReadScheduledBackups, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'back_ups'
- )
+ const { can: canReadScheduledBackups, isSuccess: isPermissionsLoaded } =
+ useAsyncCheckPermissionsV2(FGA_PERMISSIONS.PROJECT.BACKUPS_READ)
if (isOrioleDbInAws && orioleDbReleaseStage === 'alpha') {
return (
diff --git a/apps/studio/pages/project/[ref]/database/extensions.tsx b/apps/studio/pages/project/[ref]/database/extensions.tsx
index 36e4c673362..30bb762d314 100644
--- a/apps/studio/pages/project/[ref]/database/extensions.tsx
+++ b/apps/studio/pages/project/[ref]/database/extensions.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { PageContainer } from 'ui-patterns/PageContainer'
import {
PageHeader,
@@ -15,14 +14,13 @@ import { DatabaseLayout } from '@/components/layouts/DatabaseLayout/DatabaseLayo
import { DefaultLayout } from '@/components/layouts/DefaultLayout'
import { DocsButton } from '@/components/ui/DocsButton'
import { NoPermission } from '@/components/ui/NoPermission'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { DOCS_URL } from '@/lib/constants'
import type { NextPageWithLayout } from '@/types'
const DatabaseExtensions: NextPageWithLayout = () => {
- const { can: canReadExtensions, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_READ,
- 'extensions'
+ const { can: canReadExtensions, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_READ
)
if (isPermissionsLoaded && !canReadExtensions) {
diff --git a/apps/studio/pages/project/[ref]/database/functions.tsx b/apps/studio/pages/project/[ref]/database/functions.tsx
index dc08e5e688c..efbc3401d60 100644
--- a/apps/studio/pages/project/[ref]/database/functions.tsx
+++ b/apps/studio/pages/project/[ref]/database/functions.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { PageContainer } from 'ui-patterns/PageContainer'
import {
PageHeader,
@@ -14,14 +13,13 @@ import { DatabaseLayout } from '@/components/layouts/DatabaseLayout/DatabaseLayo
import { DefaultLayout } from '@/components/layouts/DefaultLayout'
import { DocsButton } from '@/components/ui/DocsButton'
import { NoPermission } from '@/components/ui/NoPermission'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { DOCS_URL } from '@/lib/constants'
import type { NextPageWithLayout } from '@/types'
const DatabaseFunctionsPage: NextPageWithLayout = () => {
- const { can: canReadFunctions, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_READ,
- 'functions'
+ const { can: canReadFunctions, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_READ
)
if (isPermissionsLoaded && !canReadFunctions) {
diff --git a/apps/studio/pages/project/[ref]/database/policies.tsx b/apps/studio/pages/project/[ref]/database/policies.tsx
index aa0b329d835..1b9241cd0f6 100644
--- a/apps/studio/pages/project/[ref]/database/policies.tsx
+++ b/apps/studio/pages/project/[ref]/database/policies.tsx
@@ -1,6 +1,5 @@
import type { PGTable } from '@supabase/pg-meta'
import { ident, safeSql } from '@supabase/pg-meta'
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { LOCAL_STORAGE_KEYS, useParams } from 'common'
import { SearchIcon, XIcon } from 'lucide-react'
import { parseAsBoolean, parseAsString, useQueryState } from 'nuqs'
@@ -42,7 +41,7 @@ import { Shortcut } from '@/components/ui/Shortcut'
import { useProjectPostgrestConfigQuery } from '@/data/config/project-postgrest-config-query'
import { useDatabasePoliciesQuery } from '@/data/database-policies/database-policies-query'
import { useTablesQuery } from '@/data/tables/tables-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useIsProtectedSchema } from '@/hooks/useProtectedSchemas'
@@ -182,9 +181,8 @@ const DatabasePoliciesPage: NextPageWithLayout = () => {
)
const exposedSchemas = getExposedSchemas(dbSchema)
- const { can: canReadPolicies, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_READ,
- 'policies'
+ const { can: canReadPolicies, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_READ
)
const handleSelectCreatePolicy = useCallback(
diff --git a/apps/studio/pages/project/[ref]/database/publications/[id].tsx b/apps/studio/pages/project/[ref]/database/publications/[id].tsx
index 079ef296979..aaaddfd3e1b 100644
--- a/apps/studio/pages/project/[ref]/database/publications/[id].tsx
+++ b/apps/studio/pages/project/[ref]/database/publications/[id].tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { PageContainer } from 'ui-patterns/PageContainer'
import { PageSection, PageSectionContent } from 'ui-patterns/PageSection'
@@ -11,16 +10,15 @@ import { DefaultLayout } from '@/components/layouts/DefaultLayout'
import { PageLayout } from '@/components/layouts/PageLayout/PageLayout'
import { NoPermission } from '@/components/ui/NoPermission'
import { useDatabasePublicationsQuery } from '@/data/database-publications/database-publications-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import type { NextPageWithLayout } from '@/types'
const DatabasePublicationsContent = () => {
const { ref, id } = useParams()
const { data: project } = useSelectedProjectQuery()
- const { can: canViewPublications, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_READ,
- 'publications'
+ const { can: canViewPublications, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_READ
)
const { data: publications = [], isPending } = useDatabasePublicationsQuery({
diff --git a/apps/studio/pages/project/[ref]/database/publications/index.tsx b/apps/studio/pages/project/[ref]/database/publications/index.tsx
index 7ef15f0471b..ab255a38094 100644
--- a/apps/studio/pages/project/[ref]/database/publications/index.tsx
+++ b/apps/studio/pages/project/[ref]/database/publications/index.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { PageContainer } from 'ui-patterns/PageContainer'
import { PageSection } from 'ui-patterns/PageSection'
@@ -8,13 +7,12 @@ import { DatabaseLayout } from '@/components/layouts/DatabaseLayout/DatabaseLayo
import { DefaultLayout } from '@/components/layouts/DefaultLayout'
import { PageLayout } from '@/components/layouts/PageLayout/PageLayout'
import { NoPermission } from '@/components/ui/NoPermission'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import type { NextPageWithLayout } from '@/types'
const DatabasePublicationsContent = () => {
- const { can: canViewPublications, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_READ,
- 'publications'
+ const { can: canViewPublications, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_READ
)
if (isPermissionsLoaded && !canViewPublications) {
diff --git a/apps/studio/pages/project/[ref]/functions/[functionSlug]/code.tsx b/apps/studio/pages/project/[ref]/functions/[functionSlug]/code.tsx
index a2707468a50..5800899aa1f 100644
--- a/apps/studio/pages/project/[ref]/functions/[functionSlug]/code.tsx
+++ b/apps/studio/pages/project/[ref]/functions/[functionSlug]/code.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { IS_PLATFORM, useParams } from 'common'
import { isEqual } from 'lodash'
import { AlertCircleIcon, CornerDownLeftIcon, Loader2Icon } from 'lucide-react'
@@ -21,7 +20,7 @@ import { InlineLink } from '@/components/ui/InlineLink'
import { useEdgeFunctionBodyQuery } from '@/data/edge-functions/edge-function-body-query'
import { useEdgeFunctionQuery } from '@/data/edge-functions/edge-function-query'
import { useEdgeFunctionDeployMutation } from '@/data/edge-functions/edge-functions-deploy-mutation'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { usePreventNavigationOnUnsavedChanges } from '@/hooks/ui/usePreventNavigationOnUnsavedChanges'
@@ -36,7 +35,9 @@ const CodePage = () => {
const track = useTrack()
const [showDeployWarning, setShowDeployWarning] = useState(false)
- const { can: canDeployFunction } = useAsyncCheckPermissions(PermissionAction.FUNCTIONS_WRITE, '*')
+ const { can: canDeployFunction } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.EDGE_FUNCTIONS_WRITE
+ )
const { data: selectedFunction } = useEdgeFunctionQuery({
projectRef: ref,
diff --git a/apps/studio/pages/project/[ref]/functions/[functionSlug]/index.tsx b/apps/studio/pages/project/[ref]/functions/[functionSlug]/index.tsx
index 6af3b79b1ad..84b0f64aa48 100644
--- a/apps/studio/pages/project/[ref]/functions/[functionSlug]/index.tsx
+++ b/apps/studio/pages/project/[ref]/functions/[functionSlug]/index.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { IS_PLATFORM, useFeatureFlags, useFlag, useParams } from 'common'
import dayjs, { Dayjs } from 'dayjs'
import maxBy from 'lodash/maxBy'
@@ -24,7 +23,7 @@ import {
} from '@/data/analytics/functions-combined-stats-query'
import { useEdgeFunctionQuery } from '@/data/edge-functions/edge-function-query'
import { useFillTimeseriesSorted } from '@/hooks/analytics/useFillTimeseriesSorted'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import type { ChartIntervals, NextPageWithLayout } from '@/types'
const CHART_INTERVALS: ChartIntervals[] = [
@@ -121,9 +120,8 @@ const LegacyEdgeFunctionOverview = () => {
endDate: endDate.toISOString(),
})
- const { isLoading: permissionsLoading, can: canReadFunction } = useAsyncCheckPermissions(
- PermissionAction.FUNCTIONS_READ,
- functionSlug as string
+ const { isLoading: permissionsLoading, can: canReadFunction } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.EDGE_FUNCTIONS_READ
)
if (!canReadFunction && !permissionsLoading) {
return <NoPermission isFullPage resourceText="access this edge function" />
diff --git a/apps/studio/pages/project/[ref]/logs/auth-logs.tsx b/apps/studio/pages/project/[ref]/logs/auth-logs.tsx
index 1720f34c65c..53eb00063d4 100644
--- a/apps/studio/pages/project/[ref]/logs/auth-logs.tsx
+++ b/apps/studio/pages/project/[ref]/logs/auth-logs.tsx
@@ -1,18 +1,15 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
-
import { LogsPreviewer } from '@/components/interfaces/Settings/Logs/LogsPreviewer'
import { DefaultLayout } from '@/components/layouts/DefaultLayout'
import LogsLayout from '@/components/layouts/LogsLayout/LogsLayout'
import { NoPermission } from '@/components/ui/NoPermission'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import type { NextPageWithLayout } from '@/types'
const LogsPage: NextPageWithLayout = () => {
const { data: project } = useSelectedProjectQuery()
- const { can: canReadAuthLogs } = useAsyncCheckPermissions(
- PermissionAction.ANALYTICS_READ,
- 'logflare'
+ const { can: canReadAuthLogs } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.ANALYTICS_LOGS_READ
)
return !canReadAuthLogs ? (
diff --git a/apps/studio/pages/project/[ref]/observability/database.tsx b/apps/studio/pages/project/[ref]/observability/database.tsx
index 9aa0bd4df89..b0756b0cbad 100644
--- a/apps/studio/pages/project/[ref]/observability/database.tsx
+++ b/apps/studio/pages/project/[ref]/observability/database.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQueryClient } from '@tanstack/react-query'
import { useFlag, useParams } from 'common'
import dayjs from 'dayjs'
@@ -40,7 +39,7 @@ import { getReportAttributesV2 } from '@/data/reports/database-charts'
import { useDatabaseReport } from '@/data/reports/database-report-query'
import { useProjectAddonsQuery } from '@/data/subscriptions/project-addons-query'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useRefreshHandler, useReportDateRange } from '@/hooks/misc/useReportDateRange'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useIsHighAvailability, useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
@@ -200,14 +199,8 @@ const DatabaseUsage = () => {
]
const defaultMaxClientConn = poolingOptimizations.maxClientConn ?? 200
- const { can: canUpdateDiskSizeConfig } = useAsyncCheckPermissions(
- PermissionAction.UPDATE,
- 'projects',
- {
- resource: {
- project_id: project?.id,
- },
- }
+ const { can: canUpdateDiskSizeConfig } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.INFRA_DISK_CONFIG_WRITE
)
const { getEntitlementSetValues, isLoading: isEntitlementLoading } = useCheckEntitlements(
@@ -432,7 +425,7 @@ const DatabaseUsage = () => {
</div>
<div className="ml-auto">
- {/*
+ {/*
[Joshen] TODO: Check if this check is still relevant
The DiskSizeConfigurationModal is old and might be obsolete
*/}
diff --git a/apps/studio/pages/project/[ref]/observability/index.tsx b/apps/studio/pages/project/[ref]/observability/index.tsx
index 38fc4039644..4839a912d00 100644
--- a/apps/studio/pages/project/[ref]/observability/index.tsx
+++ b/apps/studio/pages/project/[ref]/observability/index.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useFeatureFlags, useFlag, useParams } from 'common'
import { useRouter } from 'next/router'
import { parseAsBoolean, useQueryState } from 'nuqs'
@@ -11,15 +10,16 @@ import { DefaultLayout } from '@/components/layouts/DefaultLayout'
import ObservabilityLayout from '@/components/layouts/ObservabilityLayout/ObservabilityLayout'
import ProductEmptyState from '@/components/to-be-cleaned/ProductEmptyState'
import { useContentQuery } from '@/data/content/content-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
-import { useProfile } from '@/lib/profile'
+import {
+ FGA_PERMISSIONS,
+ useAsyncCheckUserContentPermissions,
+} from '@/hooks/misc/useCheckPermissionsV2'
import type { NextPageWithLayout } from '@/types'
export const UserReportPage: NextPageWithLayout = () => {
const router = useRouter()
const { ref } = useParams()
- const { profile } = useProfile()
const { hasLoaded: flagsLoaded } = useFeatureFlags()
const showOverview = useFlag('observabilityOverview')
const [showCreateReportModal, setShowCreateReportModal] = useQueryState(
@@ -48,12 +48,11 @@ export const UserReportPage: NextPageWithLayout = () => {
if (reports.length === 0) router.replace(`/project/${ref}/observability/api-overview`)
}, [isSuccess, data, router, ref, showOverview, flagsLoaded])
- const { can: canCreateReport } = useAsyncCheckPermissions(
- PermissionAction.CREATE,
- 'user_content',
+ const { can: canCreateReport } = useAsyncCheckUserContentPermissions(
+ FGA_PERMISSIONS.PROJECT.SNIPPETS_WRITE,
{
- resource: { type: 'report', owner_id: profile?.id },
- subject: { id: profile?.id },
+ mode: 'create',
+ type: 'report',
}
)
diff --git a/apps/studio/pages/project/[ref]/settings/api-keys/index.tsx b/apps/studio/pages/project/[ref]/settings/api-keys/index.tsx
index 6e9cd5389c7..7e88f53ccca 100644
--- a/apps/studio/pages/project/[ref]/settings/api-keys/index.tsx
+++ b/apps/studio/pages/project/[ref]/settings/api-keys/index.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { IS_PLATFORM, useParams } from 'common'
import { useMemo } from 'react'
import { Separator } from 'ui'
@@ -16,7 +15,7 @@ import SettingsLayout from '@/components/layouts/ProjectSettingsLayout/SettingsL
import { DisableInteraction } from '@/components/ui/DisableInteraction'
import { DocsButton } from '@/components/ui/DocsButton'
import { useAPIKeysQuery } from '@/data/api-keys/api-keys-query'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useDeploymentMode } from '@/hooks/misc/useDeploymentMode'
import { DOCS_URL } from '@/lib/constants'
import type { NextPageWithLayout } from '@/types'
@@ -24,7 +23,9 @@ import type { NextPageWithLayout } from '@/types'
const ApiKeysNewPage: NextPageWithLayout = () => {
const { ref: projectRef } = useParams()
const { isCli, isSelfHosted } = useDeploymentMode()
- const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')
+ const { can: canReadAPIKeys } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.API_GATEWAY_KEYS_READ
+ )
const { data: apiKeysData = [] } = useAPIKeysQuery(
{
projectRef,
diff --git a/apps/studio/pages/project/[ref]/settings/jwt/index.tsx b/apps/studio/pages/project/[ref]/settings/jwt/index.tsx
index 010c6880259..302a98a6e0a 100644
--- a/apps/studio/pages/project/[ref]/settings/jwt/index.tsx
+++ b/apps/studio/pages/project/[ref]/settings/jwt/index.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { IS_PLATFORM } from 'common'
import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
@@ -8,16 +7,15 @@ import JWTKeysLayout from '@/components/layouts/JWTKeys/JWTKeysLayout'
import SettingsLayout from '@/components/layouts/ProjectSettingsLayout/SettingsLayout'
import { LocalSetupGuide } from '@/components/ui/LocalSetupGuide'
import { NoPermission } from '@/components/ui/NoPermission'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { useDeploymentMode } from '@/hooks/misc/useDeploymentMode'
import { DOCS_URL } from '@/lib/constants'
import type { NextPageWithLayout } from '@/types'
const JWTSigningKeysPage: NextPageWithLayout = () => {
const { isCli, isSelfHosted } = useDeploymentMode()
- const { can: canReadAPIKeys, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'auth_signing_keys'
+ const { can: canReadAPIKeys, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.AUTH_SIGNING_KEYS_READ
)
if (!IS_PLATFORM) {
diff --git a/apps/studio/pages/project/[ref]/settings/log-drains.tsx b/apps/studio/pages/project/[ref]/settings/log-drains.tsx
index 954aa7c5e77..9686a481954 100644
--- a/apps/studio/pages/project/[ref]/settings/log-drains.tsx
+++ b/apps/studio/pages/project/[ref]/settings/log-drains.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { IS_PLATFORM, useParams } from 'common'
import { ChevronDownIcon } from 'lucide-react'
import { cloneElement, useState, type ReactElement } from 'react'
@@ -31,16 +30,15 @@ import {
import { LogDrainData, useLogDrainsQuery } from '@/data/log-drains/log-drains-query'
import { useUpdateLogDrainMutation } from '@/data/log-drains/update-log-drain-mutation'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
import { DOCS_URL } from '@/lib/constants'
import { useTrack } from '@/lib/telemetry/track'
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
import type { NextPageWithLayout } from '@/types'
const LogDrainsSettings: NextPageWithLayout = () => {
- const { can: canManageLogDrains, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(
- PermissionAction.ANALYTICS_ADMIN_WRITE,
- 'logflare'
+ const { can: canManageLogDrains, isLoading: isLoadingPermissions } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.ANALYTICS_CONFIG_WRITE
)
const track = useTrack()
diff --git a/apps/studio/routes/project/$ref/database/triggers.tsx b/apps/studio/routes/project/$ref/database/triggers.tsx
index 6770eaef2f9..b443fcb3fa7 100644
--- a/apps/studio/routes/project/$ref/database/triggers.tsx
+++ b/apps/studio/routes/project/$ref/database/triggers.tsx
@@ -1,9 +1,8 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { createFileRoute, Outlet } from '@tanstack/react-router'
import { PageLayout } from '@/components/layouts/PageLayout/PageLayout'
import { NoPermission } from '@/components/ui/NoPermission'
-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
+import { FGA_PERMISSIONS, useAsyncCheckPermissionsV2 } from '@/hooks/misc/useCheckPermissionsV2'
export const Route = createFileRoute('/project/$ref/database/triggers')({
component: TriggersShell,
@@ -14,9 +13,8 @@ export const Route = createFileRoute('/project/$ref/database/triggers')({
function TriggersShell() {
const { ref } = Route.useParams()
- const { can: canReadTriggers, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
- PermissionAction.TENANT_SQL_ADMIN_READ,
- 'triggers'
+ const { can: canReadTriggers, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissionsV2(
+ FGA_PERMISSIONS.PROJECT.DATABASE_READ
)
if (isPermissionsLoaded && !canReadTriggers) {
diff --git a/apps/studio/tests/components/Organization/TeamSettings/InviteMemberButton.network.test.tsx b/apps/studio/tests/components/Organization/TeamSettings/InviteMemberButton.network.test.tsx
index 01bc398769a..debe2b3aa77 100644
--- a/apps/studio/tests/components/Organization/TeamSettings/InviteMemberButton.network.test.tsx
+++ b/apps/studio/tests/components/Organization/TeamSettings/InviteMemberButton.network.test.tsx
@@ -6,6 +6,7 @@ import { HttpResponse } from 'msw'
import { describe, expect, test, vi } from 'vitest'
import { InviteMemberButton } from '@/components/interfaces/Organization/TeamSettings/InviteMemberButton'
+import { FGA_PERMISSIONS } from '@/hooks/misc/useCheckPermissionsV2'
import type { ProfileContextType } from '@/lib/profile'
import { createMockOrganizationResponse } from '@/tests/helpers'
import { customRender } from '@/tests/lib/custom-render'
@@ -20,7 +21,7 @@ type OrganizationProjectsResponse = components['schemas']['OrganizationProjectsR
type OrgProject = OrganizationProjectsResponse['projects'][number]
type CreateInvitationResponse =
operations['InvitationsController_createInvitation']['responses']['201']['content']['application/json']
-type AccessControlPermission = components['schemas']['AccessControlPermission']
+type PermissionsV2Response = components['schemas']['UserPermissionsResponse_Output']
// The project multi-select's infinite-scroll sentinel uses IntersectionObserver, which jsdom lacks
mockIntersectionObserver()
@@ -84,16 +85,16 @@ const buildMember = (overrides: Partial<Member>): Member => ({
...overrides,
})
-const buildPermission = (resource: string): AccessControlPermission => ({
- actions: ['write:Create', 'write:Delete'],
- condition: null,
- organization_id: 1,
- organization_slug: ORG_SLUG,
- project_ids: [],
- project_refs: [],
- resources: [resource],
- restrictive: false,
-})
+const PERMISSIONS_RESPONSE: PermissionsV2Response = {
+ organizations: [
+ {
+ slug: ORG_SLUG,
+ role: 'owner',
+ permissions: [FGA_PERMISSIONS.ORGANIZATION.MEMBERS_WRITE],
+ projects: [],
+ },
+ ],
+}
const PROJECTS: OrgProject[] = [
{
@@ -137,12 +138,8 @@ function setupMocks(
addAPIMock({
method: 'get',
- path: '/platform/profile/permissions',
- response: () =>
- HttpResponse.json<AccessControlPermission[]>([
- buildPermission('user_invites'),
- buildPermission('auth.subject_roles'),
- ]),
+ path: '/platform/profile/permissions/v2',
+ response: () => HttpResponse.json<PermissionsV2Response>(PERMISSIONS_RESPONSE),
})
addAPIMock({
diff --git a/apps/studio/tests/components/Organization/TeamSettings/InviteMemberButton.test.tsx b/apps/studio/tests/components/Organization/TeamSettings/InviteMemberButton.test.tsx
index 0efc0e0a1d3..85b0c9c61f8 100644
--- a/apps/studio/tests/components/Organization/TeamSettings/InviteMemberButton.test.tsx
+++ b/apps/studio/tests/components/Organization/TeamSettings/InviteMemberButton.test.tsx
@@ -25,10 +25,12 @@ vi.mock('@/hooks/misc/useSelectedOrganization', () => ({
}),
}))
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useGetPermissions: () => ({ permissions: [], organizationSlug: 'test-org' }),
- doPermissionsCheck: () => true,
- useAsyncCheckPermissions: () => ({ can: true, isSuccess: true }),
+vi.mock('@/data/permissions/permissions-query-v2', () => ({
+ usePermissionsQueryV2: () => ({
+ data: {
+ organizations: [{ slug: 'test-org', role: 'owner', permissions: [], projects: [] }],
+ },
+ }),
}))
vi.mock('@/hooks/misc/useIsFeatureEnabled', () => ({
@@ -76,13 +78,14 @@ vi.mock('@/hooks/misc/useCheckEntitlements', () => ({
useCheckEntitlements: () => ({ hasAccess: false }),
}))
-const { mockRolesManagementPermissions, mockIsFeatureEnabled } = vi.hoisted(() => ({
- mockRolesManagementPermissions: vi.fn(),
+const { mockGetAssignableRoleIds, mockIsFeatureEnabled } = vi.hoisted(() => ({
+ mockGetAssignableRoleIds: vi.fn(),
mockIsFeatureEnabled: vi.fn(),
}))
vi.mock('@/components/interfaces/Organization/TeamSettings/TeamSettings.utils', () => ({
- useGetRolesManagementPermissions: mockRolesManagementPermissions,
+ getOrgRole: () => 'owner',
+ getAssignableRoleIds: mockGetAssignableRoleIds,
}))
const mockInvite = vi.fn().mockResolvedValue({ succeeded: [], failed: [] })
@@ -124,10 +127,7 @@ async function submitForm(emailValue: string) {
describe('InviteMemberButton', () => {
beforeEach(() => {
mockInvite.mockResolvedValue({ succeeded: [], failed: [] })
- mockRolesManagementPermissions.mockReturnValue({
- rolesAddable: [1, 2, 3, 4],
- rolesRemovable: [1, 2, 3, 4],
- })
+ mockGetAssignableRoleIds.mockReturnValue([1, 2, 3, 4])
mockIsFeatureEnabled.mockReturnValue({ organizationMembersCreate: true })
})
@@ -148,7 +148,7 @@ describe('InviteMemberButton', () => {
describe('when the user cannot invite members', () => {
beforeEach(() => {
- mockRolesManagementPermissions.mockReturnValue({ rolesAddable: [], rolesRemovable: [] })
+ mockGetAssignableRoleIds.mockReturnValue([])
})
it('shows only the permission warning, not the shortcut tooltip', async () => {
diff --git a/apps/studio/tests/components/Organization/TeamSettings/UpdateRolesPanel.network.test.tsx b/apps/studio/tests/components/Organization/TeamSettings/UpdateRolesPanel.network.test.tsx
index 6e6ddd9276a..66ab5edcd4a 100644
--- a/apps/studio/tests/components/Organization/TeamSettings/UpdateRolesPanel.network.test.tsx
+++ b/apps/studio/tests/components/Organization/TeamSettings/UpdateRolesPanel.network.test.tsx
@@ -7,6 +7,7 @@ import { describe, expect, test, vi } from 'vitest'
import { UpdateRolesPanel } from '@/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel'
import type { OrganizationMember } from '@/data/organizations/organization-members-query'
+import { FGA_PERMISSIONS } from '@/hooks/misc/useCheckPermissionsV2'
import type { ProfileContextType } from '@/lib/profile'
import { createMockOrganizationResponse } from '@/tests/helpers'
import { customRender } from '@/tests/lib/custom-render'
@@ -16,7 +17,7 @@ type OrganizationResponse = components['schemas']['OrganizationResponse_Output']
type OrganizationRoleResponse = components['schemas']['OrganizationRoleResponse_Output']
type OrganizationProjectsResponse = components['schemas']['OrganizationProjectsResponse_Output']
type ListEntitlementsResponse = components['schemas']['ListEntitlementsResponse_Output']
-type AccessControlPermission = components['schemas']['AccessControlPermission']
+type PermissionsV2Response = components['schemas']['UserPermissionsResponse_Output']
const ORG_SLUG = 'test-org'
@@ -70,16 +71,16 @@ const buildRole = (id: number, name: string): OrganizationRoleResponse['org_scop
projects: [],
})
-const buildPermission = (resource: string): AccessControlPermission => ({
- actions: ['write:Create', 'write:Delete'],
- condition: null,
- organization_id: 1,
- organization_slug: ORG_SLUG,
- project_ids: [],
- project_refs: [],
- resources: [resource],
- restrictive: false,
-})
+const PERMISSIONS_RESPONSE: PermissionsV2Response = {
+ organizations: [
+ {
+ slug: ORG_SLUG,
+ role: 'owner',
+ permissions: [FGA_PERMISSIONS.ORGANIZATION.MEMBERS_WRITE],
+ projects: [],
+ },
+ ],
+}
const MEMBER: OrganizationMember = {
gotrue_id: 'gotrue-member',
@@ -104,9 +105,8 @@ function setupMocks() {
addAPIMock({
method: 'get',
- path: '/platform/profile/permissions',
- response: () =>
- HttpResponse.json<AccessControlPermission[]>([buildPermission('auth.subject_roles')]),
+ path: '/platform/profile/permissions/v2',
+ response: () => HttpResponse.json<PermissionsV2Response>(PERMISSIONS_RESPONSE),
})
addAPIMock({
diff --git a/apps/studio/tests/components/interfaces/App/IndirectTaxDeclarationModal.test.tsx b/apps/studio/tests/components/interfaces/App/IndirectTaxDeclarationModal.test.tsx
index 548d4ab3fac..3b221b9719b 100644
--- a/apps/studio/tests/components/interfaces/App/IndirectTaxDeclarationModal.test.tsx
+++ b/apps/studio/tests/components/interfaces/App/IndirectTaxDeclarationModal.test.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { screen, waitFor } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { HttpResponse } from 'msw'
@@ -6,6 +5,7 @@ import { toast } from 'sonner'
import { describe, expect, test, vi } from 'vitest'
import { IndirectTaxDeclarationModal } from '@/components/interfaces/App/IndirectTaxDeclarationModal'
+import { FGA_PERMISSIONS } from '@/hooks/misc/useCheckPermissionsV2'
import { createMockOrganizationResponse } from '@/tests/helpers'
import { customRender } from '@/tests/lib/custom-render'
import { addAPIMock } from '@/tests/lib/msw'
@@ -35,17 +35,6 @@ vi.mock('sonner', () => ({
},
}))
-const billingWritePermission = {
- actions: [PermissionAction.BILLING_WRITE],
- condition: null,
- organization_id: 1,
- organization_slug: ORG_SLUG,
- project_ids: [],
- project_refs: [],
- resources: ['stripe.customer'],
- restrictive: false,
-}
-
function setupMocks({
canUpdateBilling = true,
requiresDeclaration = true,
@@ -67,8 +56,17 @@ function setupMocks({
addAPIMock({
method: 'get',
- path: '/platform/profile/permissions',
- response: canUpdateBilling ? [billingWritePermission] : [],
+ path: '/platform/profile/permissions/v2',
+ response: {
+ organizations: [
+ {
+ slug: ORG_SLUG,
+ role: 'administrator',
+ permissions: canUpdateBilling ? [FGA_PERMISSIONS.ORGANIZATION.BILLING_WRITE] : [],
+ projects: [],
+ },
+ ],
+ },
})
}
diff --git a/apps/studio/tests/pages/new/[slug].test.tsx b/apps/studio/tests/pages/new/[slug].test.tsx
index 07eb11c6cf2..419487919f0 100644
--- a/apps/studio/tests/pages/new/[slug].test.tsx
+++ b/apps/studio/tests/pages/new/[slug].test.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { act, configure, fireEvent, screen, waitFor, within } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { platformComponents as components } from 'api-types'
@@ -9,14 +8,15 @@ import { toast } from 'sonner'
import { beforeEach, describe, expect, test, vi } from 'vitest'
import { AUTO_ENABLE_RLS_EVENT_TRIGGER_SQL } from '@/components/interfaces/Database/Triggers/EventTriggersList/EventTriggers.constants'
+import { FGA_PERMISSIONS } from '@/hooks/misc/useCheckPermissionsV2'
import { createMockOrganizationResponse } from '@/tests/helpers'
import { customRender } from '@/tests/lib/custom-render'
import { addAPIMock, type APIErrorBody } from '@/tests/lib/msw'
import { createMockProfileContext } from '@/tests/lib/profile-helpers'
import { routerMock } from '@/tests/lib/route-mock'
-import type { Permission } from '@/types'
type OrganizationResponse = components['schemas']['OrganizationResponse_Output']
+type PermissionsV2Response = components['schemas']['UserPermissionsResponse_Output']
type CreateProjectBody = components['schemas']['CreateProjectBody']
type CreateProjectResponse = components['schemas']['CreateProjectResponse_Output']
type RegionsInfo = components['schemas']['RegionsInfo_Output']
@@ -76,16 +76,19 @@ vi.mock(import('@/lib/constants'), async (importOriginal) => {
const ORG_SLUG = 'default-org'
-const ADMIN_PERMISSIONS = [
- {
- actions: [PermissionAction.CREATE],
- resources: ['projects', 'integrations.github_connections'],
- condition: null,
- organization_slug: ORG_SLUG,
- project_refs: [],
- restrictive: false,
- },
-] as unknown as Permission[]
+const ADMIN_PERMISSIONS: PermissionsV2Response = {
+ organizations: [
+ {
+ slug: ORG_SLUG,
+ role: 'administrator',
+ permissions: [
+ FGA_PERMISSIONS.ORGANIZATION.PROJECTS_CREATE,
+ FGA_PERMISSIONS.ORGANIZATION.CONFIG_WRITE,
+ ],
+ projects: [],
+ },
+ ],
+}
const DEFAULT_AVAILABLE_REGIONS: RegionsInfo = {
all: {
@@ -171,7 +174,7 @@ const mockOrg = (overrides: Partial<OrganizationResponse> = {}) =>
function mockWizardEndpoints(
overrides: {
organizations?: OrganizationResponse[]
- permissions?: Permission[]
+ permissions?: PermissionsV2Response
freeProjectLimitMembers?: MemberWithFreeProjectLimit[]
overdueInvoices?: OverdueInvoiceCount[]
orgProjects?: OrganizationProjectsResponse
@@ -199,9 +202,9 @@ function mockWizardEndpoints(
})
addAPIMock({
method: 'get',
- path: '/platform/profile/permissions',
- // @ts-expect-error - Permission is bridged from the raw API shape, not the generated type
- response: () => HttpResponse.json<Permission[]>(overrides.permissions ?? ADMIN_PERMISSIONS),
+ path: '/platform/profile/permissions/v2',
+ response: () =>
+ HttpResponse.json<PermissionsV2Response>(overrides.permissions ?? ADMIN_PERMISSIONS),
})
addAPIMock({
method: 'get',
diff --git a/apps/studio/tests/pages/project/[ref]/settings/api-keys/index.test.tsx b/apps/studio/tests/pages/project/[ref]/settings/api-keys/index.test.tsx
index 54cc1449d44..de2a2a4ccb0 100644
--- a/apps/studio/tests/pages/project/[ref]/settings/api-keys/index.test.tsx
+++ b/apps/studio/tests/pages/project/[ref]/settings/api-keys/index.test.tsx
@@ -23,8 +23,9 @@ vi.mock('common', async () => {
}
})
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: mockUseAsyncCheckPermissions,
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: mockUseAsyncCheckPermissions,
+ FGA_PERMISSIONS: { PROJECT: { API_GATEWAY_KEYS_READ: 'api_gateway_keys_read' } },
}))
vi.mock('@/data/api-keys/api-keys-query', () => ({
diff --git a/apps/studio/tests/pages/project/[ref]/settings/infrastructure.test.tsx b/apps/studio/tests/pages/project/[ref]/settings/infrastructure.test.tsx
index 40566c3e34c..637c768d87d 100644
--- a/apps/studio/tests/pages/project/[ref]/settings/infrastructure.test.tsx
+++ b/apps/studio/tests/pages/project/[ref]/settings/infrastructure.test.tsx
@@ -1,4 +1,3 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
import { screen, waitFor, within } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { platformComponents as components } from 'api-types'
@@ -6,6 +5,7 @@ import { HttpResponse } from 'msw'
import type { ReactNode } from 'react'
import { beforeEach, describe, expect, test, vi } from 'vitest'
+import { FGA_PERMISSIONS } from '@/hooks/misc/useCheckPermissionsV2'
import type { ProfileContextType } from '@/lib/profile'
import InfrastructurePage from '@/pages/project/[ref]/settings/infrastructure'
import { createMockOrganizationResponse } from '@/tests/helpers'
@@ -14,7 +14,7 @@ import { addAPIMock } from '@/tests/lib/msw'
type ProjectDetailResponse = components['schemas']['ProjectDetailResponse_Output']
type ProjectAddonsResponse = components['schemas']['ProjectAddonsResponse_Output']
-type PermissionResponse = components['schemas']['AccessControlPermission']
+type PermissionsV2Response = components['schemas']['UserPermissionsResponse_Output']
const PROJECT_REF = 'project-ref'
const ORGANIZATION_SLUG = 'acme'
@@ -180,19 +180,28 @@ function mockInfrastructureEndpoints() {
})
addAPIMock({
method: 'get',
- path: '/platform/profile/permissions',
- response: [
- {
- actions: [PermissionAction.UPDATE],
- condition: null,
- organization_id: 1,
- organization_slug: ORGANIZATION_SLUG,
- project_ids: [PROJECT.id],
- project_refs: [PROJECT_REF],
- resources: ['projects'],
- restrictive: false,
- } satisfies PermissionResponse,
- ],
+ path: '/platform/profile/permissions/v2',
+ response: {
+ organizations: [
+ {
+ slug: ORGANIZATION_SLUG,
+ role: 'administrator',
+ permissions: [],
+ projects: [
+ {
+ ref: PROJECT_REF,
+ role: 'administrator',
+ permissions: [
+ FGA_PERMISSIONS.PROJECT.ADMIN_WRITE,
+ FGA_PERMISSIONS.PROJECT.OPERATIONS_WRITE,
+ FGA_PERMISSIONS.PROJECT.INFRA_ADDONS_WRITE,
+ FGA_PERMISSIONS.PROJECT.INFRA_DISK_CONFIG_WRITE,
+ ],
+ },
+ ],
+ },
+ ],
+ } satisfies PermissionsV2Response,
})
addAPIMock({
method: 'get',
diff --git a/apps/studio/tests/pages/project/[ref]/settings/jwt/index.test.tsx b/apps/studio/tests/pages/project/[ref]/settings/jwt/index.test.tsx
index 8bffb73aab1..e1abf4f5b33 100644
--- a/apps/studio/tests/pages/project/[ref]/settings/jwt/index.test.tsx
+++ b/apps/studio/tests/pages/project/[ref]/settings/jwt/index.test.tsx
@@ -20,8 +20,9 @@ vi.mock('common', async () => {
}
})
-vi.mock('@/hooks/misc/useCheckPermissions', () => ({
- useAsyncCheckPermissions: mockUseAsyncCheckPermissions,
+vi.mock('@/hooks/misc/useCheckPermissionsV2', () => ({
+ useAsyncCheckPermissionsV2: mockUseAsyncCheckPermissions,
+ FGA_PERMISSIONS: { PROJECT: { AUTH_SIGNING_KEYS_READ: 'auth_signing_keys_read' } },
}))
vi.mock('@/hooks/misc/useDeploymentMode', () => ({
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e58cce83427..5dd466fa4fd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1126,8 +1126,8 @@ importers:
specifier: 'catalog:'
version: 2.117.3
'@supabase/shared-types':
- specifier: 0.1.96
- version: 0.1.96
+ specifier: 0.1.98
+ version: 0.1.98
'@supabase/supabase-js':
specifier: 'catalog:'
version: 2.117.3(@opentelemetry/[email protected])
@@ -8601,6 +8601,9 @@ packages:
'@supabase/[email protected]':
resolution: {integrity: sha512-2qB7Cmtu/59VgDpSjFN11hQhmhKK0RXgmGuF8F4fKDFHiTWA5Tu3EhPpcU5/j7jKhEsgUPFLXiZaGxn9hNQk/g==}
+ '@supabase/[email protected]':
+ resolution: {integrity: sha512-TU633VIMRpKDt69Vi9bjiVHTcyC3o1K3A7McIcEN/62Lb1OUK4aQg/zixuuX2qhHSDONfeafvrRmiHGzD7an1A==}
+
'@supabase/[email protected]':
resolution: {integrity: sha512-06KgjeINtc6405XQvfnchBE1azEsU8G2NElfadmvVHKmHa5l2bFzjbtFbpaYgpgTzccHlcDmBaCgedVf2Gyl8Q==}
@@ -25743,6 +25746,8 @@ snapshots:
'@supabase/[email protected]': {}
+ '@supabase/[email protected]': {}
+
dependencies:
'@babel/parser': 7.29.0