Skip to content

fix(clerk-react): Using wrong OrganizationCustomPermission type #2310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
panteliselef merged 1 commit into from
Dec 11, 2023
Merged

fix(clerk-react): Using wrong OrganizationCustomPermission type #2310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .changeset/old-timers-obey.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
4 changes: 2 additions & 2 deletions packages/react/src/contexts/AuthContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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');
4 changes: 2 additions & 2 deletions packages/react/src/utils/deriveState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type {
ActiveSessionResource,
InitialState,
MembershipRole,
OrganizationCustomPermission,
OrganizationCustomPermissionKey,
OrganizationResource,
Resources,
UserResource,
Expand All @@ -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;

Expand Down