From bfb1d9a800dfa6e45c16013dd6933c7793904bb2 Mon Sep 17 00:00:00 2001 From: panteliselef Date: Mon, 11 Dec 2023 20:42:44 +0200 Subject: [PATCH] fix(clerk-react): Using wrong `OrganizationCustomPermission` type --- .changeset/old-timers-obey.md | 2 ++ packages/react/src/contexts/AuthContext.ts | 4 ++-- packages/react/src/utils/deriveState.ts | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 .changeset/old-timers-obey.md diff --git a/.changeset/old-timers-obey.md b/.changeset/old-timers-obey.md new file mode 100644 index 00000000000..a845151cc84 --- /dev/null +++ b/.changeset/old-timers-obey.md @@ -0,0 +1,2 @@ +--- +--- diff --git a/packages/react/src/contexts/AuthContext.ts b/packages/react/src/contexts/AuthContext.ts index d829bee2dd3..6be2af1680b 100644 --- a/packages/react/src/contexts/AuthContext.ts +++ b/packages/react/src/contexts/AuthContext.ts @@ -1,5 +1,5 @@ import { createContextAndHook } from '@clerk/shared/react'; -import type { ActJWTClaim, MembershipRole, OrganizationCustomPermission } from '@clerk/types'; +import type { ActJWTClaim, MembershipRole, OrganizationCustomPermissionKey } from '@clerk/types'; export const [AuthContext, useAuthContext] = createContextAndHook<{ userId: string | null | undefined; @@ -8,5 +8,5 @@ export const [AuthContext, useAuthContext] = createContextAndHook<{ orgId: string | null | undefined; orgRole: MembershipRole | null | undefined; orgSlug: string | null | undefined; - orgPermissions: OrganizationCustomPermission[] | null | undefined; + orgPermissions: OrganizationCustomPermissionKey[] | null | undefined; }>('AuthContext'); diff --git a/packages/react/src/utils/deriveState.ts b/packages/react/src/utils/deriveState.ts index db7c31e71c7..cbd024fad4a 100644 --- a/packages/react/src/utils/deriveState.ts +++ b/packages/react/src/utils/deriveState.ts @@ -2,7 +2,7 @@ import type { ActiveSessionResource, InitialState, MembershipRole, - OrganizationCustomPermission, + OrganizationCustomPermissionKey, OrganizationResource, Resources, UserResource, @@ -23,7 +23,7 @@ const deriveFromSsrInitialState = (initialState: InitialState) => { const organization = initialState.organization as OrganizationResource; const orgId = initialState.orgId; const orgRole = initialState.orgRole as MembershipRole; - const orgPermissions = initialState.orgPermissions as OrganizationCustomPermission[]; + const orgPermissions = initialState.orgPermissions as OrganizationCustomPermissionKey[]; const orgSlug = initialState.orgSlug; const actor = initialState.actor;