Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/loud-foxes-love.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduces a new `isAuthorized()` method in the `Session` class. Returns a promise and checks whether the active user is allowed to perform an action based on the passed (required) permission and the ones attached to the membership.
5 changes: 5 additions & 0 deletions .changeset/proud-dolls-yawn.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Introduces an internal `<Gate/>` component (supporting hook and HOC) which enables us to conditionally render parts of our components based on a users permissions.
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import type {
MembershipRole,
OrganizationMembershipJSON,
OrganizationMembershipResource,
OrganizationPermission,
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
Expand All@@ -17,6 +18,12 @@ export class OrganizationMembership extends BaseResource implements Organization
publicMetadata: OrganizationMembershipPublicMetadata = {};
publicUserData!: PublicUserData;
organization!: Organization;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: adding (string & {}) allows for getting eslint autocomplete but also accepts any string

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we write this in a comment?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good call

permissions: (OrganizationPermission | (string & {}))[] = [];
role!: MembershipRole;
createdAt!: Date;
updatedAt!: Date;
Expand DownExpand Up@@ -106,6 +113,7 @@ export class OrganizationMembership extends BaseResource implements Organization
if (data.public_user_data) {
this.publicUserData = new PublicUserData(data.public_user_data);
}
this.permissions = Array.isArray(data.permissions) ? [...data.permissions] : [];
this.role = data.role;
this.createdAt = unixEpochToDate(data.created_at);
this.updatedAt = unixEpochToDate(data.updated_at);
Expand Down
42 changes: 42 additions & 0 deletions packages/clerk-js/src/core/resources/Session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,4 +56,46 @@ describe('Session', () => {
expect(dispatchSpy.mock.calls[0]).toMatchSnapshot();
});
});

describe('isAuthorized()', () => {
it('user with permission to delete the organization should be able to delete the organization', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({
organization_memberships: [{ name: 'Org1', id: 'org1' }],
}),
last_active_organization_id: 'org1',
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

const isAuthorized = await session.isAuthorized({ permission: 'org:profile:delete' });

expect(isAuthorized).toBe(true);
});

it('user with permission to read memberships should not be deleting the organization', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({
organization_memberships: [{ name: 'Org1', id: 'org1', permissions: ['org:memberships:read'] }],
}),
last_active_organization_id: 'org1',
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

const isAuthorized = await session.isAuthorized({ permission: 'org:profile:delete' });

expect(isAuthorized).toBe(false);
});
});
});
33 changes: 33 additions & 0 deletions packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type {
ActJWTClaim,
GetToken,
GetTokenOptions,
IsAuthorized,
SessionJSON,
SessionResource,
SessionStatus,
Expand DownExpand Up@@ -75,6 +76,38 @@ export class Session extends BaseResource implements SessionResource {
});
};

/**
* @experimental The method is experimental and subject to change in future releases.
*/
isAuthorized: IsAuthorized = async params => {
return new Promise(resolve => {
// if there is no active organization user can not be authorized
if (!this.lastActiveOrganizationId || !this.user) {
return resolve(false);
}

// loop through organizationMemberships from client piggybacking
const orgMemberships = this.user.organizationMemberships || [];
const activeMembership = orgMemberships.find(mem => mem.organization.id === this.lastActiveOrganizationId);

// Based on FAPI this should never happen, but we handle it anyway
if (!activeMembership) {
return resolve(false);
}

const activeOrganizationPermissions = activeMembership.permissions;
const activeOrganizationRole = activeMembership.role;

if (params.permission) {
return resolve(activeOrganizationPermissions.includes(params.permission));
}
if (params.role) {
return resolve(activeOrganizationRole === params.role);
}
return resolve(false);
});
};

#hydrateCache = (token: TokenResource | null) => {
if (token) {
SessionTokenCache.set({
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ OrganizationMembership {
"updatedAt": 1970-01-01T00:01:07.890Z,
},
"pathRoot": "",
"permissions": [],
"publicMetadata": {
"foo": "bar",
},
Expand Down
19 changes: 15 additions & 4 deletions packages/clerk-js/src/core/test/fixtures.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,15 @@ import type {
OAuthProvider,
OrganizationJSON,
OrganizationMembershipJSON,
OrganizationPermission,
PhoneNumberJSON,
UserJSON,
} from '@clerk/types';

export const mockJwt =
'eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ.eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9.n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg';

type OrgParams = Partial<OrganizationJSON> & { role?: MembershipRole };
type OrgParams = Partial<OrganizationJSON> & { role?: MembershipRole; permissions?: OrganizationPermission[] };

type WithUserParams = Omit<
Partial<UserJSON>,
Expand All@@ -26,8 +27,8 @@ type WithUserParams = Omit<

export const getOrganizationId = (orgParams: OrgParams) => orgParams?.id || orgParams?.name || 'test_id';

export const createOrganization = (params: OrgParams): OrganizationMembershipJSON => {
const { role, ...orgParams } = params;
export const createOrganizationMembership = (params: OrgParams): OrganizationMembershipJSON => {
const { role, permissions, ...orgParams } = params;
return {
created_at: new Date().getTime(),
id: getOrganizationId(orgParams),
Expand All@@ -49,6 +50,16 @@ export const createOrganization = (params: OrgParams): OrganizationMembershipJSO
} as OrganizationJSON,
public_metadata: {},
role: role || 'admin',
permissions: permissions || [
'org:domains:delete',
'org:domains:manage',
'org:domains:read',
'org:memberships:delete',
'org:memberships:manage',
'org:memberships:read',
'org:profile:delete',
'org:profile:manage',
],
updated_at: new Date().getTime(),
} as OrganizationMembershipJSON;
};
Expand DownExpand Up@@ -145,7 +156,7 @@ export const createUser = (params: WithUserParams): UserJSON => {
typeof p === 'string' ? createExternalAccount({ provider: p }) : createExternalAccount(p),
),
organization_memberships: (params.organization_memberships || []).map(o =>
typeof o === 'string' ? createOrganization({ name: o }) : createOrganization(o),
typeof o === 'string' ? createOrganizationMembership({ name: o }) : createOrganizationMembership(o),
),
} as any as UserJSON;
res.primary_email_address_id = res.email_addresses[0]?.id;
Expand Down
65 changes: 65 additions & 0 deletions packages/clerk-js/src/ui/common/Gate.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
import type { IsAuthorized } from '@clerk/types';
import type { ComponentType, PropsWithChildren, ReactNode } from 'react';
import React, { useEffect } from 'react';

import { useCoreSession } from '../contexts';
import { useFetch } from '../hooks';
import { useRouter } from '../router';

type GateParams = Parameters<IsAuthorized>[0];
type GateProps = PropsWithChildren<
GateParams & {
fallback?: ReactNode;
redirectTo?: string;
}
>;

export const useGate = (params: GateParams) => {
const { isAuthorized } = useCoreSession();
const { data: isAuthorizedUser } = useFetch(isAuthorized, params);

return {
isAuthorizedUser,
};
};

export const Gate = (gateProps: GateProps) => {
const { children, fallback, redirectTo, ...restAuthorizedParams } = gateProps;

const { isAuthorizedUser } = useGate(restAuthorizedParams);

const { navigate } = useRouter();

useEffect(() => {
// wait for promise to resolve
if (typeof isAuthorizedUser === 'boolean' && !isAuthorizedUser && redirectTo) {
void navigate(redirectTo);
}
}, [isAuthorizedUser, redirectTo]);

// wait for promise to resolve
if (typeof isAuthorizedUser === 'boolean' && !isAuthorizedUser && fallback) {
return <>{fallback}</>;
}

if (isAuthorizedUser) {
return <>{children}</>;
}

return null;
};

export function withGate<P>(Component: ComponentType<P>, gateProps: GateProps): React.ComponentType<P> {
const displayName = Component.displayName || Component.name || 'Component';
const HOC = (props: P) => {
return (
<Gate {...gateProps}>
<Component {...(props as any)} />
</Gate>
);
};

HOC.displayName = `withGate(${displayName})`;

return HOC;
}
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui/common/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ export * from './BlockButtons';
export * from './constants';
export * from './CalloutWithAction';
export * from './forms';
export * from './Gate';
export * from './InfiniteListSpinner';
export * from './redirects';
export * from './verification';
Expand Down
8 changes: 4 additions & 4 deletions packages/clerk-js/src/ui/hooks/useFetch.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,11 +24,11 @@ export const useFetch = <T>(
requestStatus.setLoading();
fetcherRef
.current(params)
.then(domain => {
.then(result => {
requestStatus.setIdle();
if (domain) {
setData({ ...domain });
callbacks?.onSuccess?.({ ...domain });
if (typeof result !== 'undefined') {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note for reviewer: if value is an object then do a shallow copy otherwise use the actual value

setData(typeof result === 'object' ? { ...result } : result);
callbacks?.onSuccess?.(typeof result === 'object' ? { ...result } : result);
}
})
.catch(() => {
Expand Down
8 changes: 7 additions & 1 deletion packages/types/src/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import type { ActJWTClaim } from './jwt';
import type { OAuthProvider } from './oauth';
import type { OrganizationDomainVerificationStatus, OrganizationEnrollmentMode } from './organizationDomain';
import type { OrganizationInvitationStatus } from './organizationInvitation';
import type { MembershipRole } from './organizationMembership';
import type { MembershipRole, OrganizationPermission } from './organizationMembership';
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { OrganizationSuggestionStatus } from './organizationSuggestion';
import type { SamlIdpSlug } from './saml';
Expand DownExpand Up@@ -322,6 +322,12 @@ export interface OrganizationMembershipJSON extends ClerkResourceJSON {
object: 'organization_membership';
id: string;
organization: OrganizationJSON;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permissions: (OrganizationPermission | (string & {}))[];
public_metadata: OrganizationMembershipPublicMetadata;
public_user_data: PublicUserDataJSON;
role: MembershipRole;
Expand Down
16 changes: 16 additions & 0 deletions packages/types/src/organizationMembership.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,12 @@ declare global {
export interface OrganizationMembershipResource extends ClerkResource {
id: string;
organization: OrganizationResource;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permissions: (OrganizationPermission | (string & {}))[];
publicMetadata: OrganizationMembershipPublicMetadata;
publicUserData: PublicUserData;
role: MembershipRole;
Expand All@@ -36,6 +42,16 @@ export interface OrganizationMembershipResource extends ClerkResource {

export type MembershipRole = 'admin' | 'basic_member' | 'guest_member';

export type OrganizationPermission =
| 'org:domains:manage'
| 'org:domains:delete'
| 'org:profile:manage'
| 'org:profile:delete'
| 'org:memberships:read'
| 'org:memberships:manage'
| 'org:memberships:delete'
| 'org:domains:read';

export type UpdateOrganizationMembershipParams = {
role: MembershipRole;
};
16 changes: 16 additions & 0 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
import type { ActJWTClaim } from './jwt';
import type { OrganizationPermission } from './organizationMembership';
import type { ClerkResource } from './resource';
import type { TokenResource } from './token';
import type { UserResource } from './user';

export type IsAuthorized = (isAuthorizedParams: IsAuthorizedParams) => Promise<IsAuthorizedReturnValues>;

interface IsAuthorizedParams {
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permission?: OrganizationPermission | (string & {});
role?: string;
}

type IsAuthorizedReturnValues = boolean;

export interface SessionResource extends ClerkResource {
id: string;
status: SessionStatus;
Expand All@@ -18,6 +30,10 @@ export interface SessionResource extends ClerkResource {
remove: () => Promise<SessionResource>;
touch: () => Promise<SessionResource>;
getToken: GetToken;
/**
* @experimental The method is experimental and subject to change in future releases.
*/
isAuthorized: IsAuthorized;
clearCache: () => void;
createdAt: Date;
updatedAt: Date;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/loud-foxes-love.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduces a new `isAuthorized()` method in the `Session` class. Returns a promise and checks whether the active user is allowed to perform an action based on the passed (required) permission and the ones attached to the membership.
5 changes: 5 additions & 0 deletions .changeset/proud-dolls-yawn.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Introduces an internal `<Gate/>` component (supporting hook and HOC) which enables us to conditionally render parts of our components based on a users permissions.
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import type {
MembershipRole,
OrganizationMembershipJSON,
OrganizationMembershipResource,
OrganizationPermission,
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
Expand All@@ -17,6 +18,12 @@ export class OrganizationMembership extends BaseResource implements Organization
publicMetadata: OrganizationMembershipPublicMetadata = {};
publicUserData!: PublicUserData;
organization!: Organization;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: adding (string & {}) allows for getting eslint autocomplete but also accepts any string

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we write this in a comment?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good call

permissions: (OrganizationPermission | (string & {}))[] = [];
role!: MembershipRole;
createdAt!: Date;
updatedAt!: Date;
Expand DownExpand Up@@ -106,6 +113,7 @@ export class OrganizationMembership extends BaseResource implements Organization
if (data.public_user_data) {
this.publicUserData = new PublicUserData(data.public_user_data);
}
this.permissions = Array.isArray(data.permissions) ? [...data.permissions] : [];
this.role = data.role;
this.createdAt = unixEpochToDate(data.created_at);
this.updatedAt = unixEpochToDate(data.updated_at);
Expand Down
42 changes: 42 additions & 0 deletions packages/clerk-js/src/core/resources/Session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,4 +56,46 @@ describe('Session', () => {
expect(dispatchSpy.mock.calls[0]).toMatchSnapshot();
});
});

describe('isAuthorized()', () => {
it('user with permission to delete the organization should be able to delete the organization', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({
organization_memberships: [{ name: 'Org1', id: 'org1' }],
}),
last_active_organization_id: 'org1',
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

const isAuthorized = await session.isAuthorized({ permission: 'org:profile:delete' });

expect(isAuthorized).toBe(true);
});

it('user with permission to read memberships should not be deleting the organization', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({
organization_memberships: [{ name: 'Org1', id: 'org1', permissions: ['org:memberships:read'] }],
}),
last_active_organization_id: 'org1',
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

const isAuthorized = await session.isAuthorized({ permission: 'org:profile:delete' });

expect(isAuthorized).toBe(false);
});
});
});
33 changes: 33 additions & 0 deletions packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type {
ActJWTClaim,
GetToken,
GetTokenOptions,
IsAuthorized,
SessionJSON,
SessionResource,
SessionStatus,
Expand DownExpand Up@@ -75,6 +76,38 @@ export class Session extends BaseResource implements SessionResource {
});
};

/**
* @experimental The method is experimental and subject to change in future releases.
*/
isAuthorized: IsAuthorized = async params => {
return new Promise(resolve => {
// if there is no active organization user can not be authorized
if (!this.lastActiveOrganizationId || !this.user) {
return resolve(false);
}

// loop through organizationMemberships from client piggybacking
const orgMemberships = this.user.organizationMemberships || [];
const activeMembership = orgMemberships.find(mem => mem.organization.id === this.lastActiveOrganizationId);

// Based on FAPI this should never happen, but we handle it anyway
if (!activeMembership) {
return resolve(false);
}

const activeOrganizationPermissions = activeMembership.permissions;
const activeOrganizationRole = activeMembership.role;

if (params.permission) {
return resolve(activeOrganizationPermissions.includes(params.permission));
}
if (params.role) {
return resolve(activeOrganizationRole === params.role);
}
return resolve(false);
});
};

#hydrateCache = (token: TokenResource | null) => {
if (token) {
SessionTokenCache.set({
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ OrganizationMembership {
"updatedAt": 1970-01-01T00:01:07.890Z,
},
"pathRoot": "",
"permissions": [],
"publicMetadata": {
"foo": "bar",
},
Expand Down
19 changes: 15 additions & 4 deletions packages/clerk-js/src/core/test/fixtures.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,15 @@ import type {
OAuthProvider,
OrganizationJSON,
OrganizationMembershipJSON,
OrganizationPermission,
PhoneNumberJSON,
UserJSON,
} from '@clerk/types';

export const mockJwt =
'eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ.eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9.n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg';

type OrgParams = Partial<OrganizationJSON> & { role?: MembershipRole };
type OrgParams = Partial<OrganizationJSON> & { role?: MembershipRole; permissions?: OrganizationPermission[] };

type WithUserParams = Omit<
Partial<UserJSON>,
Expand All@@ -26,8 +27,8 @@ type WithUserParams = Omit<

export const getOrganizationId = (orgParams: OrgParams) => orgParams?.id || orgParams?.name || 'test_id';

export const createOrganization = (params: OrgParams): OrganizationMembershipJSON => {
const { role, ...orgParams } = params;
export const createOrganizationMembership = (params: OrgParams): OrganizationMembershipJSON => {
const { role, permissions, ...orgParams } = params;
return {
created_at: new Date().getTime(),
id: getOrganizationId(orgParams),
Expand All@@ -49,6 +50,16 @@ export const createOrganization = (params: OrgParams): OrganizationMembershipJSO
} as OrganizationJSON,
public_metadata: {},
role: role || 'admin',
permissions: permissions || [
'org:domains:delete',
'org:domains:manage',
'org:domains:read',
'org:memberships:delete',
'org:memberships:manage',
'org:memberships:read',
'org:profile:delete',
'org:profile:manage',
],
updated_at: new Date().getTime(),
} as OrganizationMembershipJSON;
};
Expand DownExpand Up@@ -145,7 +156,7 @@ export const createUser = (params: WithUserParams): UserJSON => {
typeof p === 'string' ? createExternalAccount({ provider: p }) : createExternalAccount(p),
),
organization_memberships: (params.organization_memberships || []).map(o =>
typeof o === 'string' ? createOrganization({ name: o }) : createOrganization(o),
typeof o === 'string' ? createOrganizationMembership({ name: o }) : createOrganizationMembership(o),
),
} as any as UserJSON;
res.primary_email_address_id = res.email_addresses[0]?.id;
Expand Down
65 changes: 65 additions & 0 deletions packages/clerk-js/src/ui/common/Gate.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
import type { IsAuthorized } from '@clerk/types';
import type { ComponentType, PropsWithChildren, ReactNode } from 'react';
import React, { useEffect } from 'react';

import { useCoreSession } from '../contexts';
import { useFetch } from '../hooks';
import { useRouter } from '../router';

type GateParams = Parameters<IsAuthorized>[0];
type GateProps = PropsWithChildren<
GateParams & {
fallback?: ReactNode;
redirectTo?: string;
}
>;

export const useGate = (params: GateParams) => {
const { isAuthorized } = useCoreSession();
const { data: isAuthorizedUser } = useFetch(isAuthorized, params);

return {
isAuthorizedUser,
};
};

export const Gate = (gateProps: GateProps) => {
const { children, fallback, redirectTo, ...restAuthorizedParams } = gateProps;

const { isAuthorizedUser } = useGate(restAuthorizedParams);

const { navigate } = useRouter();

useEffect(() => {
// wait for promise to resolve
if (typeof isAuthorizedUser === 'boolean' && !isAuthorizedUser && redirectTo) {
void navigate(redirectTo);
}
}, [isAuthorizedUser, redirectTo]);

// wait for promise to resolve
if (typeof isAuthorizedUser === 'boolean' && !isAuthorizedUser && fallback) {
return <>{fallback}</>;
}

if (isAuthorizedUser) {
return <>{children}</>;
}

return null;
};

export function withGate<P>(Component: ComponentType<P>, gateProps: GateProps): React.ComponentType<P> {
const displayName = Component.displayName || Component.name || 'Component';
const HOC = (props: P) => {
return (
<Gate {...gateProps}>
<Component {...(props as any)} />
</Gate>
);
};

HOC.displayName = `withGate(${displayName})`;

return HOC;
}
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui/common/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ export * from './BlockButtons';
export * from './constants';
export * from './CalloutWithAction';
export * from './forms';
export * from './Gate';
export * from './InfiniteListSpinner';
export * from './redirects';
export * from './verification';
Expand Down
8 changes: 4 additions & 4 deletions packages/clerk-js/src/ui/hooks/useFetch.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,11 +24,11 @@ export const useFetch = <T>(
requestStatus.setLoading();
fetcherRef
.current(params)
.then(domain => {
.then(result => {
requestStatus.setIdle();
if (domain) {
setData({ ...domain });
callbacks?.onSuccess?.({ ...domain });
if (typeof result !== 'undefined') {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note for reviewer: if value is an object then do a shallow copy otherwise use the actual value

setData(typeof result === 'object' ? { ...result } : result);
callbacks?.onSuccess?.(typeof result === 'object' ? { ...result } : result);
}
})
.catch(() => {
Expand Down
8 changes: 7 additions & 1 deletion packages/types/src/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import type { ActJWTClaim } from './jwt';
import type { OAuthProvider } from './oauth';
import type { OrganizationDomainVerificationStatus, OrganizationEnrollmentMode } from './organizationDomain';
import type { OrganizationInvitationStatus } from './organizationInvitation';
import type { MembershipRole } from './organizationMembership';
import type { MembershipRole, OrganizationPermission } from './organizationMembership';
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { OrganizationSuggestionStatus } from './organizationSuggestion';
import type { SamlIdpSlug } from './saml';
Expand DownExpand Up@@ -322,6 +322,12 @@ export interface OrganizationMembershipJSON extends ClerkResourceJSON {
object: 'organization_membership';
id: string;
organization: OrganizationJSON;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permissions: (OrganizationPermission | (string & {}))[];
public_metadata: OrganizationMembershipPublicMetadata;
public_user_data: PublicUserDataJSON;
role: MembershipRole;
Expand Down
16 changes: 16 additions & 0 deletions packages/types/src/organizationMembership.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,12 @@ declare global {
export interface OrganizationMembershipResource extends ClerkResource {
id: string;
organization: OrganizationResource;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permissions: (OrganizationPermission | (string & {}))[];
publicMetadata: OrganizationMembershipPublicMetadata;
publicUserData: PublicUserData;
role: MembershipRole;
Expand All@@ -36,6 +42,16 @@ export interface OrganizationMembershipResource extends ClerkResource {

export type MembershipRole = 'admin' | 'basic_member' | 'guest_member';

export type OrganizationPermission =
| 'org:domains:manage'
| 'org:domains:delete'
| 'org:profile:manage'
| 'org:profile:delete'
| 'org:memberships:read'
| 'org:memberships:manage'
| 'org:memberships:delete'
| 'org:domains:read';

export type UpdateOrganizationMembershipParams = {
role: MembershipRole;
};
16 changes: 16 additions & 0 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
import type { ActJWTClaim } from './jwt';
import type { OrganizationPermission } from './organizationMembership';
import type { ClerkResource } from './resource';
import type { TokenResource } from './token';
import type { UserResource } from './user';

export type IsAuthorized = (isAuthorizedParams: IsAuthorizedParams) => Promise<IsAuthorizedReturnValues>;

interface IsAuthorizedParams {
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permission?: OrganizationPermission | (string & {});
role?: string;
}

type IsAuthorizedReturnValues = boolean;

export interface SessionResource extends ClerkResource {
id: string;
status: SessionStatus;
Expand All@@ -18,6 +30,10 @@ export interface SessionResource extends ClerkResource {
remove: () => Promise<SessionResource>;
touch: () => Promise<SessionResource>;
getToken: GetToken;
/**
* @experimental The method is experimental and subject to change in future releases.
*/
isAuthorized: IsAuthorized;
clearCache: () => void;
createdAt: Date;
updatedAt: Date;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/loud-foxes-love.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduces a new `isAuthorized()` method in the `Session` class. Returns a promise and checks whether the active user is allowed to perform an action based on the passed (required) permission and the ones attached to the membership.
5 changes: 5 additions & 0 deletions .changeset/proud-dolls-yawn.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Introduces an internal `<Gate/>` component (supporting hook and HOC) which enables us to conditionally render parts of our components based on a users permissions.
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import type {
MembershipRole,
OrganizationMembershipJSON,
OrganizationMembershipResource,
OrganizationPermission,
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
Expand All@@ -17,6 +18,12 @@ export class OrganizationMembership extends BaseResource implements Organization
publicMetadata: OrganizationMembershipPublicMetadata = {};
publicUserData!: PublicUserData;
organization!: Organization;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: adding (string & {}) allows for getting eslint autocomplete but also accepts any string

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we write this in a comment?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good call

permissions: (OrganizationPermission | (string & {}))[] = [];
role!: MembershipRole;
createdAt!: Date;
updatedAt!: Date;
Expand DownExpand Up@@ -106,6 +113,7 @@ export class OrganizationMembership extends BaseResource implements Organization
if (data.public_user_data) {
this.publicUserData = new PublicUserData(data.public_user_data);
}
this.permissions = Array.isArray(data.permissions) ? [...data.permissions] : [];
this.role = data.role;
this.createdAt = unixEpochToDate(data.created_at);
this.updatedAt = unixEpochToDate(data.updated_at);
Expand Down
42 changes: 42 additions & 0 deletions packages/clerk-js/src/core/resources/Session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,4 +56,46 @@ describe('Session', () => {
expect(dispatchSpy.mock.calls[0]).toMatchSnapshot();
});
});

describe('isAuthorized()', () => {
it('user with permission to delete the organization should be able to delete the organization', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({
organization_memberships: [{ name: 'Org1', id: 'org1' }],
}),
last_active_organization_id: 'org1',
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

const isAuthorized = await session.isAuthorized({ permission: 'org:profile:delete' });

expect(isAuthorized).toBe(true);
});

it('user with permission to read memberships should not be deleting the organization', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({
organization_memberships: [{ name: 'Org1', id: 'org1', permissions: ['org:memberships:read'] }],
}),
last_active_organization_id: 'org1',
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

const isAuthorized = await session.isAuthorized({ permission: 'org:profile:delete' });

expect(isAuthorized).toBe(false);
});
});
});
33 changes: 33 additions & 0 deletions packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type {
ActJWTClaim,
GetToken,
GetTokenOptions,
IsAuthorized,
SessionJSON,
SessionResource,
SessionStatus,
Expand DownExpand Up@@ -75,6 +76,38 @@ export class Session extends BaseResource implements SessionResource {
});
};

/**
* @experimental The method is experimental and subject to change in future releases.
*/
isAuthorized: IsAuthorized = async params => {
return new Promise(resolve => {
// if there is no active organization user can not be authorized
if (!this.lastActiveOrganizationId || !this.user) {
return resolve(false);
}

// loop through organizationMemberships from client piggybacking
const orgMemberships = this.user.organizationMemberships || [];
const activeMembership = orgMemberships.find(mem => mem.organization.id === this.lastActiveOrganizationId);

// Based on FAPI this should never happen, but we handle it anyway
if (!activeMembership) {
return resolve(false);
}

const activeOrganizationPermissions = activeMembership.permissions;
const activeOrganizationRole = activeMembership.role;

if (params.permission) {
return resolve(activeOrganizationPermissions.includes(params.permission));
}
if (params.role) {
return resolve(activeOrganizationRole === params.role);
}
return resolve(false);
});
};

#hydrateCache = (token: TokenResource | null) => {
if (token) {
SessionTokenCache.set({
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ OrganizationMembership {
"updatedAt": 1970-01-01T00:01:07.890Z,
},
"pathRoot": "",
"permissions": [],
"publicMetadata": {
"foo": "bar",
},
Expand Down
19 changes: 15 additions & 4 deletions packages/clerk-js/src/core/test/fixtures.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,15 @@ import type {
OAuthProvider,
OrganizationJSON,
OrganizationMembershipJSON,
OrganizationPermission,
PhoneNumberJSON,
UserJSON,
} from '@clerk/types';

export const mockJwt =
'eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ.eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9.n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg';

type OrgParams = Partial<OrganizationJSON> & { role?: MembershipRole };
type OrgParams = Partial<OrganizationJSON> & { role?: MembershipRole; permissions?: OrganizationPermission[] };

type WithUserParams = Omit<
Partial<UserJSON>,
Expand All@@ -26,8 +27,8 @@ type WithUserParams = Omit<

export const getOrganizationId = (orgParams: OrgParams) => orgParams?.id || orgParams?.name || 'test_id';

export const createOrganization = (params: OrgParams): OrganizationMembershipJSON => {
const { role, ...orgParams } = params;
export const createOrganizationMembership = (params: OrgParams): OrganizationMembershipJSON => {
const { role, permissions, ...orgParams } = params;
return {
created_at: new Date().getTime(),
id: getOrganizationId(orgParams),
Expand All@@ -49,6 +50,16 @@ export const createOrganization = (params: OrgParams): OrganizationMembershipJSO
} as OrganizationJSON,
public_metadata: {},
role: role || 'admin',
permissions: permissions || [
'org:domains:delete',
'org:domains:manage',
'org:domains:read',
'org:memberships:delete',
'org:memberships:manage',
'org:memberships:read',
'org:profile:delete',
'org:profile:manage',
],
updated_at: new Date().getTime(),
} as OrganizationMembershipJSON;
};
Expand DownExpand Up@@ -145,7 +156,7 @@ export const createUser = (params: WithUserParams): UserJSON => {
typeof p === 'string' ? createExternalAccount({ provider: p }) : createExternalAccount(p),
),
organization_memberships: (params.organization_memberships || []).map(o =>
typeof o === 'string' ? createOrganization({ name: o }) : createOrganization(o),
typeof o === 'string' ? createOrganizationMembership({ name: o }) : createOrganizationMembership(o),
),
} as any as UserJSON;
res.primary_email_address_id = res.email_addresses[0]?.id;
Expand Down
65 changes: 65 additions & 0 deletions packages/clerk-js/src/ui/common/Gate.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
import type { IsAuthorized } from '@clerk/types';
import type { ComponentType, PropsWithChildren, ReactNode } from 'react';
import React, { useEffect } from 'react';

import { useCoreSession } from '../contexts';
import { useFetch } from '../hooks';
import { useRouter } from '../router';

type GateParams = Parameters<IsAuthorized>[0];
type GateProps = PropsWithChildren<
GateParams & {
fallback?: ReactNode;
redirectTo?: string;
}
>;

export const useGate = (params: GateParams) => {
const { isAuthorized } = useCoreSession();
const { data: isAuthorizedUser } = useFetch(isAuthorized, params);

return {
isAuthorizedUser,
};
};

export const Gate = (gateProps: GateProps) => {
const { children, fallback, redirectTo, ...restAuthorizedParams } = gateProps;

const { isAuthorizedUser } = useGate(restAuthorizedParams);

const { navigate } = useRouter();

useEffect(() => {
// wait for promise to resolve
if (typeof isAuthorizedUser === 'boolean' && !isAuthorizedUser && redirectTo) {
void navigate(redirectTo);
}
}, [isAuthorizedUser, redirectTo]);

// wait for promise to resolve
if (typeof isAuthorizedUser === 'boolean' && !isAuthorizedUser && fallback) {
return <>{fallback}</>;
}

if (isAuthorizedUser) {
return <>{children}</>;
}

return null;
};

export function withGate<P>(Component: ComponentType<P>, gateProps: GateProps): React.ComponentType<P> {
const displayName = Component.displayName || Component.name || 'Component';
const HOC = (props: P) => {
return (
<Gate {...gateProps}>
<Component {...(props as any)} />
</Gate>
);
};

HOC.displayName = `withGate(${displayName})`;

return HOC;
}
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui/common/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ export * from './BlockButtons';
export * from './constants';
export * from './CalloutWithAction';
export * from './forms';
export * from './Gate';
export * from './InfiniteListSpinner';
export * from './redirects';
export * from './verification';
Expand Down
8 changes: 4 additions & 4 deletions packages/clerk-js/src/ui/hooks/useFetch.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,11 +24,11 @@ export const useFetch = <T>(
requestStatus.setLoading();
fetcherRef
.current(params)
.then(domain => {
.then(result => {
requestStatus.setIdle();
if (domain) {
setData({ ...domain });
callbacks?.onSuccess?.({ ...domain });
if (typeof result !== 'undefined') {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note for reviewer: if value is an object then do a shallow copy otherwise use the actual value

setData(typeof result === 'object' ? { ...result } : result);
callbacks?.onSuccess?.(typeof result === 'object' ? { ...result } : result);
}
})
.catch(() => {
Expand Down
8 changes: 7 additions & 1 deletion packages/types/src/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import type { ActJWTClaim } from './jwt';
import type { OAuthProvider } from './oauth';
import type { OrganizationDomainVerificationStatus, OrganizationEnrollmentMode } from './organizationDomain';
import type { OrganizationInvitationStatus } from './organizationInvitation';
import type { MembershipRole } from './organizationMembership';
import type { MembershipRole, OrganizationPermission } from './organizationMembership';
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { OrganizationSuggestionStatus } from './organizationSuggestion';
import type { SamlIdpSlug } from './saml';
Expand DownExpand Up@@ -322,6 +322,12 @@ export interface OrganizationMembershipJSON extends ClerkResourceJSON {
object: 'organization_membership';
id: string;
organization: OrganizationJSON;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permissions: (OrganizationPermission | (string & {}))[];
public_metadata: OrganizationMembershipPublicMetadata;
public_user_data: PublicUserDataJSON;
role: MembershipRole;
Expand Down
16 changes: 16 additions & 0 deletions packages/types/src/organizationMembership.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,12 @@ declare global {
export interface OrganizationMembershipResource extends ClerkResource {
id: string;
organization: OrganizationResource;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permissions: (OrganizationPermission | (string & {}))[];
publicMetadata: OrganizationMembershipPublicMetadata;
publicUserData: PublicUserData;
role: MembershipRole;
Expand All@@ -36,6 +42,16 @@ export interface OrganizationMembershipResource extends ClerkResource {

export type MembershipRole = 'admin' | 'basic_member' | 'guest_member';

export type OrganizationPermission =
| 'org:domains:manage'
| 'org:domains:delete'
| 'org:profile:manage'
| 'org:profile:delete'
| 'org:memberships:read'
| 'org:memberships:manage'
| 'org:memberships:delete'
| 'org:domains:read';

export type UpdateOrganizationMembershipParams = {
role: MembershipRole;
};
16 changes: 16 additions & 0 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
import type { ActJWTClaim } from './jwt';
import type { OrganizationPermission } from './organizationMembership';
import type { ClerkResource } from './resource';
import type { TokenResource } from './token';
import type { UserResource } from './user';

export type IsAuthorized = (isAuthorizedParams: IsAuthorizedParams) => Promise<IsAuthorizedReturnValues>;

interface IsAuthorizedParams {
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permission?: OrganizationPermission | (string & {});
role?: string;
}

type IsAuthorizedReturnValues = boolean;

export interface SessionResource extends ClerkResource {
id: string;
status: SessionStatus;
Expand All@@ -18,6 +30,10 @@ export interface SessionResource extends ClerkResource {
remove: () => Promise<SessionResource>;
touch: () => Promise<SessionResource>;
getToken: GetToken;
/**
* @experimental The method is experimental and subject to change in future releases.
*/
isAuthorized: IsAuthorized;
clearCache: () => void;
createdAt: Date;
updatedAt: Date;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/loud-foxes-love.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduces a new `isAuthorized()` method in the `Session` class. Returns a promise and checks whether the active user is allowed to perform an action based on the passed (required) permission and the ones attached to the membership.
5 changes: 5 additions & 0 deletions .changeset/proud-dolls-yawn.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Introduces an internal `<Gate/>` component (supporting hook and HOC) which enables us to conditionally render parts of our components based on a users permissions.
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import type {
MembershipRole,
OrganizationMembershipJSON,
OrganizationMembershipResource,
OrganizationPermission,
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
Expand All@@ -17,6 +18,12 @@ export class OrganizationMembership extends BaseResource implements Organization
publicMetadata: OrganizationMembershipPublicMetadata = {};
publicUserData!: PublicUserData;
organization!: Organization;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: adding (string & {}) allows for getting eslint autocomplete but also accepts any string

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we write this in a comment?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good call

permissions: (OrganizationPermission | (string & {}))[] = [];
role!: MembershipRole;
createdAt!: Date;
updatedAt!: Date;
Expand DownExpand Up@@ -106,6 +113,7 @@ export class OrganizationMembership extends BaseResource implements Organization
if (data.public_user_data) {
this.publicUserData = new PublicUserData(data.public_user_data);
}
this.permissions = Array.isArray(data.permissions) ? [...data.permissions] : [];
this.role = data.role;
this.createdAt = unixEpochToDate(data.created_at);
this.updatedAt = unixEpochToDate(data.updated_at);
Expand Down
42 changes: 42 additions & 0 deletions packages/clerk-js/src/core/resources/Session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,4 +56,46 @@ describe('Session', () => {
expect(dispatchSpy.mock.calls[0]).toMatchSnapshot();
});
});

describe('isAuthorized()', () => {
it('user with permission to delete the organization should be able to delete the organization', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({
organization_memberships: [{ name: 'Org1', id: 'org1' }],
}),
last_active_organization_id: 'org1',
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

const isAuthorized = await session.isAuthorized({ permission: 'org:profile:delete' });

expect(isAuthorized).toBe(true);
});

it('user with permission to read memberships should not be deleting the organization', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({
organization_memberships: [{ name: 'Org1', id: 'org1', permissions: ['org:memberships:read'] }],
}),
last_active_organization_id: 'org1',
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

const isAuthorized = await session.isAuthorized({ permission: 'org:profile:delete' });

expect(isAuthorized).toBe(false);
});
});
});
33 changes: 33 additions & 0 deletions packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type {
ActJWTClaim,
GetToken,
GetTokenOptions,
IsAuthorized,
SessionJSON,
SessionResource,
SessionStatus,
Expand DownExpand Up@@ -75,6 +76,38 @@ export class Session extends BaseResource implements SessionResource {
});
};

/**
* @experimental The method is experimental and subject to change in future releases.
*/
isAuthorized: IsAuthorized = async params => {
return new Promise(resolve => {
// if there is no active organization user can not be authorized
if (!this.lastActiveOrganizationId || !this.user) {
return resolve(false);
}

// loop through organizationMemberships from client piggybacking
const orgMemberships = this.user.organizationMemberships || [];
const activeMembership = orgMemberships.find(mem => mem.organization.id === this.lastActiveOrganizationId);

// Based on FAPI this should never happen, but we handle it anyway
if (!activeMembership) {
return resolve(false);
}

const activeOrganizationPermissions = activeMembership.permissions;
const activeOrganizationRole = activeMembership.role;

if (params.permission) {
return resolve(activeOrganizationPermissions.includes(params.permission));
}
if (params.role) {
return resolve(activeOrganizationRole === params.role);
}
return resolve(false);
});
};

#hydrateCache = (token: TokenResource | null) => {
if (token) {
SessionTokenCache.set({
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ OrganizationMembership {
"updatedAt": 1970-01-01T00:01:07.890Z,
},
"pathRoot": "",
"permissions": [],
"publicMetadata": {
"foo": "bar",
},
Expand Down
19 changes: 15 additions & 4 deletions packages/clerk-js/src/core/test/fixtures.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,15 @@ import type {
OAuthProvider,
OrganizationJSON,
OrganizationMembershipJSON,
OrganizationPermission,
PhoneNumberJSON,
UserJSON,
} from '@clerk/types';

export const mockJwt =
'eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ.eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9.n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg';

type OrgParams = Partial<OrganizationJSON> & { role?: MembershipRole };
type OrgParams = Partial<OrganizationJSON> & { role?: MembershipRole; permissions?: OrganizationPermission[] };

type WithUserParams = Omit<
Partial<UserJSON>,
Expand All@@ -26,8 +27,8 @@ type WithUserParams = Omit<

export const getOrganizationId = (orgParams: OrgParams) => orgParams?.id || orgParams?.name || 'test_id';

export const createOrganization = (params: OrgParams): OrganizationMembershipJSON => {
const { role, ...orgParams } = params;
export const createOrganizationMembership = (params: OrgParams): OrganizationMembershipJSON => {
const { role, permissions, ...orgParams } = params;
return {
created_at: new Date().getTime(),
id: getOrganizationId(orgParams),
Expand All@@ -49,6 +50,16 @@ export const createOrganization = (params: OrgParams): OrganizationMembershipJSO
} as OrganizationJSON,
public_metadata: {},
role: role || 'admin',
permissions: permissions || [
'org:domains:delete',
'org:domains:manage',
'org:domains:read',
'org:memberships:delete',
'org:memberships:manage',
'org:memberships:read',
'org:profile:delete',
'org:profile:manage',
],
updated_at: new Date().getTime(),
} as OrganizationMembershipJSON;
};
Expand DownExpand Up@@ -145,7 +156,7 @@ export const createUser = (params: WithUserParams): UserJSON => {
typeof p === 'string' ? createExternalAccount({ provider: p }) : createExternalAccount(p),
),
organization_memberships: (params.organization_memberships || []).map(o =>
typeof o === 'string' ? createOrganization({ name: o }) : createOrganization(o),
typeof o === 'string' ? createOrganizationMembership({ name: o }) : createOrganizationMembership(o),
),
} as any as UserJSON;
res.primary_email_address_id = res.email_addresses[0]?.id;
Expand Down
65 changes: 65 additions & 0 deletions packages/clerk-js/src/ui/common/Gate.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
import type { IsAuthorized } from '@clerk/types';
import type { ComponentType, PropsWithChildren, ReactNode } from 'react';
import React, { useEffect } from 'react';

import { useCoreSession } from '../contexts';
import { useFetch } from '../hooks';
import { useRouter } from '../router';

type GateParams = Parameters<IsAuthorized>[0];
type GateProps = PropsWithChildren<
GateParams & {
fallback?: ReactNode;
redirectTo?: string;
}
>;

export const useGate = (params: GateParams) => {
const { isAuthorized } = useCoreSession();
const { data: isAuthorizedUser } = useFetch(isAuthorized, params);

return {
isAuthorizedUser,
};
};

export const Gate = (gateProps: GateProps) => {
const { children, fallback, redirectTo, ...restAuthorizedParams } = gateProps;

const { isAuthorizedUser } = useGate(restAuthorizedParams);

const { navigate } = useRouter();

useEffect(() => {
// wait for promise to resolve
if (typeof isAuthorizedUser === 'boolean' && !isAuthorizedUser && redirectTo) {
void navigate(redirectTo);
}
}, [isAuthorizedUser, redirectTo]);

// wait for promise to resolve
if (typeof isAuthorizedUser === 'boolean' && !isAuthorizedUser && fallback) {
return <>{fallback}</>;
}

if (isAuthorizedUser) {
return <>{children}</>;
}

return null;
};

export function withGate<P>(Component: ComponentType<P>, gateProps: GateProps): React.ComponentType<P> {
const displayName = Component.displayName || Component.name || 'Component';
const HOC = (props: P) => {
return (
<Gate {...gateProps}>
<Component {...(props as any)} />
</Gate>
);
};

HOC.displayName = `withGate(${displayName})`;

return HOC;
}
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui/common/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ export * from './BlockButtons';
export * from './constants';
export * from './CalloutWithAction';
export * from './forms';
export * from './Gate';
export * from './InfiniteListSpinner';
export * from './redirects';
export * from './verification';
Expand Down
8 changes: 4 additions & 4 deletions packages/clerk-js/src/ui/hooks/useFetch.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,11 +24,11 @@ export const useFetch = <T>(
requestStatus.setLoading();
fetcherRef
.current(params)
.then(domain => {
.then(result => {
requestStatus.setIdle();
if (domain) {
setData({ ...domain });
callbacks?.onSuccess?.({ ...domain });
if (typeof result !== 'undefined') {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note for reviewer: if value is an object then do a shallow copy otherwise use the actual value

setData(typeof result === 'object' ? { ...result } : result);
callbacks?.onSuccess?.(typeof result === 'object' ? { ...result } : result);
}
})
.catch(() => {
Expand Down
8 changes: 7 additions & 1 deletion packages/types/src/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import type { ActJWTClaim } from './jwt';
import type { OAuthProvider } from './oauth';
import type { OrganizationDomainVerificationStatus, OrganizationEnrollmentMode } from './organizationDomain';
import type { OrganizationInvitationStatus } from './organizationInvitation';
import type { MembershipRole } from './organizationMembership';
import type { MembershipRole, OrganizationPermission } from './organizationMembership';
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { OrganizationSuggestionStatus } from './organizationSuggestion';
import type { SamlIdpSlug } from './saml';
Expand DownExpand Up@@ -322,6 +322,12 @@ export interface OrganizationMembershipJSON extends ClerkResourceJSON {
object: 'organization_membership';
id: string;
organization: OrganizationJSON;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permissions: (OrganizationPermission | (string & {}))[];
public_metadata: OrganizationMembershipPublicMetadata;
public_user_data: PublicUserDataJSON;
role: MembershipRole;
Expand Down
16 changes: 16 additions & 0 deletions packages/types/src/organizationMembership.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,12 @@ declare global {
export interface OrganizationMembershipResource extends ClerkResource {
id: string;
organization: OrganizationResource;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permissions: (OrganizationPermission | (string & {}))[];
publicMetadata: OrganizationMembershipPublicMetadata;
publicUserData: PublicUserData;
role: MembershipRole;
Expand All@@ -36,6 +42,16 @@ export interface OrganizationMembershipResource extends ClerkResource {

export type MembershipRole = 'admin' | 'basic_member' | 'guest_member';

export type OrganizationPermission =
| 'org:domains:manage'
| 'org:domains:delete'
| 'org:profile:manage'
| 'org:profile:delete'
| 'org:memberships:read'
| 'org:memberships:manage'
| 'org:memberships:delete'
| 'org:domains:read';

export type UpdateOrganizationMembershipParams = {
role: MembershipRole;
};
16 changes: 16 additions & 0 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
import type { ActJWTClaim } from './jwt';
import type { OrganizationPermission } from './organizationMembership';
import type { ClerkResource } from './resource';
import type { TokenResource } from './token';
import type { UserResource } from './user';

export type IsAuthorized = (isAuthorizedParams: IsAuthorizedParams) => Promise<IsAuthorizedReturnValues>;

interface IsAuthorizedParams {
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permission?: OrganizationPermission | (string & {});
role?: string;
}

type IsAuthorizedReturnValues = boolean;

export interface SessionResource extends ClerkResource {
id: string;
status: SessionStatus;
Expand All@@ -18,6 +30,10 @@ export interface SessionResource extends ClerkResource {
remove: () => Promise<SessionResource>;
touch: () => Promise<SessionResource>;
getToken: GetToken;
/**
* @experimental The method is experimental and subject to change in future releases.
*/
isAuthorized: IsAuthorized;
clearCache: () => void;
createdAt: Date;
updatedAt: Date;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/loud-foxes-love.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduces a new `isAuthorized()` method in the `Session` class. Returns a promise and checks whether the active user is allowed to perform an action based on the passed (required) permission and the ones attached to the membership.
5 changes: 5 additions & 0 deletions .changeset/proud-dolls-yawn.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Introduces an internal `<Gate/>` component (supporting hook and HOC) which enables us to conditionally render parts of our components based on a users permissions.
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import type {
MembershipRole,
OrganizationMembershipJSON,
OrganizationMembershipResource,
OrganizationPermission,
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
Expand All@@ -17,6 +18,12 @@ export class OrganizationMembership extends BaseResource implements Organization
publicMetadata: OrganizationMembershipPublicMetadata = {};
publicUserData!: PublicUserData;
organization!: Organization;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: adding (string & {}) allows for getting eslint autocomplete but also accepts any string

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we write this in a comment?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good call

permissions: (OrganizationPermission | (string & {}))[] = [];
role!: MembershipRole;
createdAt!: Date;
updatedAt!: Date;
Expand DownExpand Up@@ -106,6 +113,7 @@ export class OrganizationMembership extends BaseResource implements Organization
if (data.public_user_data) {
this.publicUserData = new PublicUserData(data.public_user_data);
}
this.permissions = Array.isArray(data.permissions) ? [...data.permissions] : [];
this.role = data.role;
this.createdAt = unixEpochToDate(data.created_at);
this.updatedAt = unixEpochToDate(data.updated_at);
Expand Down
42 changes: 42 additions & 0 deletions packages/clerk-js/src/core/resources/Session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,4 +56,46 @@ describe('Session', () => {
expect(dispatchSpy.mock.calls[0]).toMatchSnapshot();
});
});

describe('isAuthorized()', () => {
it('user with permission to delete the organization should be able to delete the organization', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({
organization_memberships: [{ name: 'Org1', id: 'org1' }],
}),
last_active_organization_id: 'org1',
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

const isAuthorized = await session.isAuthorized({ permission: 'org:profile:delete' });

expect(isAuthorized).toBe(true);
});

it('user with permission to read memberships should not be deleting the organization', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({
organization_memberships: [{ name: 'Org1', id: 'org1', permissions: ['org:memberships:read'] }],
}),
last_active_organization_id: 'org1',
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

const isAuthorized = await session.isAuthorized({ permission: 'org:profile:delete' });

expect(isAuthorized).toBe(false);
});
});
});
33 changes: 33 additions & 0 deletions packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type {
ActJWTClaim,
GetToken,
GetTokenOptions,
IsAuthorized,
SessionJSON,
SessionResource,
SessionStatus,
Expand DownExpand Up@@ -75,6 +76,38 @@ export class Session extends BaseResource implements SessionResource {
});
};

/**
* @experimental The method is experimental and subject to change in future releases.
*/
isAuthorized: IsAuthorized = async params => {
return new Promise(resolve => {
// if there is no active organization user can not be authorized
if (!this.lastActiveOrganizationId || !this.user) {
return resolve(false);
}

// loop through organizationMemberships from client piggybacking
const orgMemberships = this.user.organizationMemberships || [];
const activeMembership = orgMemberships.find(mem => mem.organization.id === this.lastActiveOrganizationId);

// Based on FAPI this should never happen, but we handle it anyway
if (!activeMembership) {
return resolve(false);
}

const activeOrganizationPermissions = activeMembership.permissions;
const activeOrganizationRole = activeMembership.role;

if (params.permission) {
return resolve(activeOrganizationPermissions.includes(params.permission));
}
if (params.role) {
return resolve(activeOrganizationRole === params.role);
}
return resolve(false);
});
};

#hydrateCache = (token: TokenResource | null) => {
if (token) {
SessionTokenCache.set({
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ OrganizationMembership {
"updatedAt": 1970-01-01T00:01:07.890Z,
},
"pathRoot": "",
"permissions": [],
"publicMetadata": {
"foo": "bar",
},
Expand Down
19 changes: 15 additions & 4 deletions packages/clerk-js/src/core/test/fixtures.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,15 @@ import type {
OAuthProvider,
OrganizationJSON,
OrganizationMembershipJSON,
OrganizationPermission,
PhoneNumberJSON,
UserJSON,
} from '@clerk/types';

export const mockJwt =
'eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ.eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9.n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg';

type OrgParams = Partial<OrganizationJSON> & { role?: MembershipRole };
type OrgParams = Partial<OrganizationJSON> & { role?: MembershipRole; permissions?: OrganizationPermission[] };

type WithUserParams = Omit<
Partial<UserJSON>,
Expand All@@ -26,8 +27,8 @@ type WithUserParams = Omit<

export const getOrganizationId = (orgParams: OrgParams) => orgParams?.id || orgParams?.name || 'test_id';

export const createOrganization = (params: OrgParams): OrganizationMembershipJSON => {
const { role, ...orgParams } = params;
export const createOrganizationMembership = (params: OrgParams): OrganizationMembershipJSON => {
const { role, permissions, ...orgParams } = params;
return {
created_at: new Date().getTime(),
id: getOrganizationId(orgParams),
Expand All@@ -49,6 +50,16 @@ export const createOrganization = (params: OrgParams): OrganizationMembershipJSO
} as OrganizationJSON,
public_metadata: {},
role: role || 'admin',
permissions: permissions || [
'org:domains:delete',
'org:domains:manage',
'org:domains:read',
'org:memberships:delete',
'org:memberships:manage',
'org:memberships:read',
'org:profile:delete',
'org:profile:manage',
],
updated_at: new Date().getTime(),
} as OrganizationMembershipJSON;
};
Expand DownExpand Up@@ -145,7 +156,7 @@ export const createUser = (params: WithUserParams): UserJSON => {
typeof p === 'string' ? createExternalAccount({ provider: p }) : createExternalAccount(p),
),
organization_memberships: (params.organization_memberships || []).map(o =>
typeof o === 'string' ? createOrganization({ name: o }) : createOrganization(o),
typeof o === 'string' ? createOrganizationMembership({ name: o }) : createOrganizationMembership(o),
),
} as any as UserJSON;
res.primary_email_address_id = res.email_addresses[0]?.id;
Expand Down
65 changes: 65 additions & 0 deletions packages/clerk-js/src/ui/common/Gate.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
import type { IsAuthorized } from '@clerk/types';
import type { ComponentType, PropsWithChildren, ReactNode } from 'react';
import React, { useEffect } from 'react';

import { useCoreSession } from '../contexts';
import { useFetch } from '../hooks';
import { useRouter } from '../router';

type GateParams = Parameters<IsAuthorized>[0];
type GateProps = PropsWithChildren<
GateParams & {
fallback?: ReactNode;
redirectTo?: string;
}
>;

export const useGate = (params: GateParams) => {
const { isAuthorized } = useCoreSession();
const { data: isAuthorizedUser } = useFetch(isAuthorized, params);

return {
isAuthorizedUser,
};
};

export const Gate = (gateProps: GateProps) => {
const { children, fallback, redirectTo, ...restAuthorizedParams } = gateProps;

const { isAuthorizedUser } = useGate(restAuthorizedParams);

const { navigate } = useRouter();

useEffect(() => {
// wait for promise to resolve
if (typeof isAuthorizedUser === 'boolean' && !isAuthorizedUser && redirectTo) {
void navigate(redirectTo);
}
}, [isAuthorizedUser, redirectTo]);

// wait for promise to resolve
if (typeof isAuthorizedUser === 'boolean' && !isAuthorizedUser && fallback) {
return <>{fallback}</>;
}

if (isAuthorizedUser) {
return <>{children}</>;
}

return null;
};

export function withGate<P>(Component: ComponentType<P>, gateProps: GateProps): React.ComponentType<P> {
const displayName = Component.displayName || Component.name || 'Component';
const HOC = (props: P) => {
return (
<Gate {...gateProps}>
<Component {...(props as any)} />
</Gate>
);
};

HOC.displayName = `withGate(${displayName})`;

return HOC;
}
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui/common/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ export * from './BlockButtons';
export * from './constants';
export * from './CalloutWithAction';
export * from './forms';
export * from './Gate';
export * from './InfiniteListSpinner';
export * from './redirects';
export * from './verification';
Expand Down
8 changes: 4 additions & 4 deletions packages/clerk-js/src/ui/hooks/useFetch.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,11 +24,11 @@ export const useFetch = <T>(
requestStatus.setLoading();
fetcherRef
.current(params)
.then(domain => {
.then(result => {
requestStatus.setIdle();
if (domain) {
setData({ ...domain });
callbacks?.onSuccess?.({ ...domain });
if (typeof result !== 'undefined') {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note for reviewer: if value is an object then do a shallow copy otherwise use the actual value

setData(typeof result === 'object' ? { ...result } : result);
callbacks?.onSuccess?.(typeof result === 'object' ? { ...result } : result);
}
})
.catch(() => {
Expand Down
8 changes: 7 additions & 1 deletion packages/types/src/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import type { ActJWTClaim } from './jwt';
import type { OAuthProvider } from './oauth';
import type { OrganizationDomainVerificationStatus, OrganizationEnrollmentMode } from './organizationDomain';
import type { OrganizationInvitationStatus } from './organizationInvitation';
import type { MembershipRole } from './organizationMembership';
import type { MembershipRole, OrganizationPermission } from './organizationMembership';
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { OrganizationSuggestionStatus } from './organizationSuggestion';
import type { SamlIdpSlug } from './saml';
Expand DownExpand Up@@ -322,6 +322,12 @@ export interface OrganizationMembershipJSON extends ClerkResourceJSON {
object: 'organization_membership';
id: string;
organization: OrganizationJSON;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permissions: (OrganizationPermission | (string & {}))[];
public_metadata: OrganizationMembershipPublicMetadata;
public_user_data: PublicUserDataJSON;
role: MembershipRole;
Expand Down
16 changes: 16 additions & 0 deletions packages/types/src/organizationMembership.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,12 @@ declare global {
export interface OrganizationMembershipResource extends ClerkResource {
id: string;
organization: OrganizationResource;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permissions: (OrganizationPermission | (string & {}))[];
publicMetadata: OrganizationMembershipPublicMetadata;
publicUserData: PublicUserData;
role: MembershipRole;
Expand All@@ -36,6 +42,16 @@ export interface OrganizationMembershipResource extends ClerkResource {

export type MembershipRole = 'admin' | 'basic_member' | 'guest_member';

export type OrganizationPermission =
| 'org:domains:manage'
| 'org:domains:delete'
| 'org:profile:manage'
| 'org:profile:delete'
| 'org:memberships:read'
| 'org:memberships:manage'
| 'org:memberships:delete'
| 'org:domains:read';

export type UpdateOrganizationMembershipParams = {
role: MembershipRole;
};
16 changes: 16 additions & 0 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
import type { ActJWTClaim } from './jwt';
import type { OrganizationPermission } from './organizationMembership';
import type { ClerkResource } from './resource';
import type { TokenResource } from './token';
import type { UserResource } from './user';

export type IsAuthorized = (isAuthorizedParams: IsAuthorizedParams) => Promise<IsAuthorizedReturnValues>;

interface IsAuthorizedParams {
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permission?: OrganizationPermission | (string & {});
role?: string;
}

type IsAuthorizedReturnValues = boolean;

export interface SessionResource extends ClerkResource {
id: string;
status: SessionStatus;
Expand All@@ -18,6 +30,10 @@ export interface SessionResource extends ClerkResource {
remove: () => Promise<SessionResource>;
touch: () => Promise<SessionResource>;
getToken: GetToken;
/**
* @experimental The method is experimental and subject to change in future releases.
*/
isAuthorized: IsAuthorized;
clearCache: () => void;
createdAt: Date;
updatedAt: Date;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/loud-foxes-love.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduces a new `isAuthorized()` method in the `Session` class. Returns a promise and checks whether the active user is allowed to perform an action based on the passed (required) permission and the ones attached to the membership.
5 changes: 5 additions & 0 deletions .changeset/proud-dolls-yawn.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Introduces an internal `<Gate/>` component (supporting hook and HOC) which enables us to conditionally render parts of our components based on a users permissions.
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import type {
MembershipRole,
OrganizationMembershipJSON,
OrganizationMembershipResource,
OrganizationPermission,
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
Expand All@@ -17,6 +18,12 @@ export class OrganizationMembership extends BaseResource implements Organization
publicMetadata: OrganizationMembershipPublicMetadata = {};
publicUserData!: PublicUserData;
organization!: Organization;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: adding (string & {}) allows for getting eslint autocomplete but also accepts any string

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we write this in a comment?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good call

permissions: (OrganizationPermission | (string & {}))[] = [];
role!: MembershipRole;
createdAt!: Date;
updatedAt!: Date;
Expand DownExpand Up@@ -106,6 +113,7 @@ export class OrganizationMembership extends BaseResource implements Organization
if (data.public_user_data) {
this.publicUserData = new PublicUserData(data.public_user_data);
}
this.permissions = Array.isArray(data.permissions) ? [...data.permissions] : [];
this.role = data.role;
this.createdAt = unixEpochToDate(data.created_at);
this.updatedAt = unixEpochToDate(data.updated_at);
Expand Down
42 changes: 42 additions & 0 deletions packages/clerk-js/src/core/resources/Session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,4 +56,46 @@ describe('Session', () => {
expect(dispatchSpy.mock.calls[0]).toMatchSnapshot();
});
});

describe('isAuthorized()', () => {
it('user with permission to delete the organization should be able to delete the organization', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({
organization_memberships: [{ name: 'Org1', id: 'org1' }],
}),
last_active_organization_id: 'org1',
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

const isAuthorized = await session.isAuthorized({ permission: 'org:profile:delete' });

expect(isAuthorized).toBe(true);
});

it('user with permission to read memberships should not be deleting the organization', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({
organization_memberships: [{ name: 'Org1', id: 'org1', permissions: ['org:memberships:read'] }],
}),
last_active_organization_id: 'org1',
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

const isAuthorized = await session.isAuthorized({ permission: 'org:profile:delete' });

expect(isAuthorized).toBe(false);
});
});
});
33 changes: 33 additions & 0 deletions packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type {
ActJWTClaim,
GetToken,
GetTokenOptions,
IsAuthorized,
SessionJSON,
SessionResource,
SessionStatus,
Expand DownExpand Up@@ -75,6 +76,38 @@ export class Session extends BaseResource implements SessionResource {
});
};

/**
* @experimental The method is experimental and subject to change in future releases.
*/
isAuthorized: IsAuthorized = async params => {
return new Promise(resolve => {
// if there is no active organization user can not be authorized
if (!this.lastActiveOrganizationId || !this.user) {
return resolve(false);
}

// loop through organizationMemberships from client piggybacking
const orgMemberships = this.user.organizationMemberships || [];
const activeMembership = orgMemberships.find(mem => mem.organization.id === this.lastActiveOrganizationId);

// Based on FAPI this should never happen, but we handle it anyway
if (!activeMembership) {
return resolve(false);
}

const activeOrganizationPermissions = activeMembership.permissions;
const activeOrganizationRole = activeMembership.role;

if (params.permission) {
return resolve(activeOrganizationPermissions.includes(params.permission));
}
if (params.role) {
return resolve(activeOrganizationRole === params.role);
}
return resolve(false);
});
};

#hydrateCache = (token: TokenResource | null) => {
if (token) {
SessionTokenCache.set({
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ OrganizationMembership {
"updatedAt": 1970-01-01T00:01:07.890Z,
},
"pathRoot": "",
"permissions": [],
"publicMetadata": {
"foo": "bar",
},
Expand Down
19 changes: 15 additions & 4 deletions packages/clerk-js/src/core/test/fixtures.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,15 @@ import type {
OAuthProvider,
OrganizationJSON,
OrganizationMembershipJSON,
OrganizationPermission,
PhoneNumberJSON,
UserJSON,
} from '@clerk/types';

export const mockJwt =
'eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ.eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9.n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg';

type OrgParams = Partial<OrganizationJSON> & { role?: MembershipRole };
type OrgParams = Partial<OrganizationJSON> & { role?: MembershipRole; permissions?: OrganizationPermission[] };

type WithUserParams = Omit<
Partial<UserJSON>,
Expand All@@ -26,8 +27,8 @@ type WithUserParams = Omit<

export const getOrganizationId = (orgParams: OrgParams) => orgParams?.id || orgParams?.name || 'test_id';

export const createOrganization = (params: OrgParams): OrganizationMembershipJSON => {
const { role, ...orgParams } = params;
export const createOrganizationMembership = (params: OrgParams): OrganizationMembershipJSON => {
const { role, permissions, ...orgParams } = params;
return {
created_at: new Date().getTime(),
id: getOrganizationId(orgParams),
Expand All@@ -49,6 +50,16 @@ export const createOrganization = (params: OrgParams): OrganizationMembershipJSO
} as OrganizationJSON,
public_metadata: {},
role: role || 'admin',
permissions: permissions || [
'org:domains:delete',
'org:domains:manage',
'org:domains:read',
'org:memberships:delete',
'org:memberships:manage',
'org:memberships:read',
'org:profile:delete',
'org:profile:manage',
],
updated_at: new Date().getTime(),
} as OrganizationMembershipJSON;
};
Expand DownExpand Up@@ -145,7 +156,7 @@ export const createUser = (params: WithUserParams): UserJSON => {
typeof p === 'string' ? createExternalAccount({ provider: p }) : createExternalAccount(p),
),
organization_memberships: (params.organization_memberships || []).map(o =>
typeof o === 'string' ? createOrganization({ name: o }) : createOrganization(o),
typeof o === 'string' ? createOrganizationMembership({ name: o }) : createOrganizationMembership(o),
),
} as any as UserJSON;
res.primary_email_address_id = res.email_addresses[0]?.id;
Expand Down
65 changes: 65 additions & 0 deletions packages/clerk-js/src/ui/common/Gate.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
import type { IsAuthorized } from '@clerk/types';
import type { ComponentType, PropsWithChildren, ReactNode } from 'react';
import React, { useEffect } from 'react';

import { useCoreSession } from '../contexts';
import { useFetch } from '../hooks';
import { useRouter } from '../router';

type GateParams = Parameters<IsAuthorized>[0];
type GateProps = PropsWithChildren<
GateParams & {
fallback?: ReactNode;
redirectTo?: string;
}
>;

export const useGate = (params: GateParams) => {
const { isAuthorized } = useCoreSession();
const { data: isAuthorizedUser } = useFetch(isAuthorized, params);

return {
isAuthorizedUser,
};
};

export const Gate = (gateProps: GateProps) => {
const { children, fallback, redirectTo, ...restAuthorizedParams } = gateProps;

const { isAuthorizedUser } = useGate(restAuthorizedParams);

const { navigate } = useRouter();

useEffect(() => {
// wait for promise to resolve
if (typeof isAuthorizedUser === 'boolean' && !isAuthorizedUser && redirectTo) {
void navigate(redirectTo);
}
}, [isAuthorizedUser, redirectTo]);

// wait for promise to resolve
if (typeof isAuthorizedUser === 'boolean' && !isAuthorizedUser && fallback) {
return <>{fallback}</>;
}

if (isAuthorizedUser) {
return <>{children}</>;
}

return null;
};

export function withGate<P>(Component: ComponentType<P>, gateProps: GateProps): React.ComponentType<P> {
const displayName = Component.displayName || Component.name || 'Component';
const HOC = (props: P) => {
return (
<Gate {...gateProps}>
<Component {...(props as any)} />
</Gate>
);
};

HOC.displayName = `withGate(${displayName})`;

return HOC;
}
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui/common/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ export * from './BlockButtons';
export * from './constants';
export * from './CalloutWithAction';
export * from './forms';
export * from './Gate';
export * from './InfiniteListSpinner';
export * from './redirects';
export * from './verification';
Expand Down
8 changes: 4 additions & 4 deletions packages/clerk-js/src/ui/hooks/useFetch.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,11 +24,11 @@ export const useFetch = <T>(
requestStatus.setLoading();
fetcherRef
.current(params)
.then(domain => {
.then(result => {
requestStatus.setIdle();
if (domain) {
setData({ ...domain });
callbacks?.onSuccess?.({ ...domain });
if (typeof result !== 'undefined') {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note for reviewer: if value is an object then do a shallow copy otherwise use the actual value

setData(typeof result === 'object' ? { ...result } : result);
callbacks?.onSuccess?.(typeof result === 'object' ? { ...result } : result);
}
})
.catch(() => {
Expand Down
8 changes: 7 additions & 1 deletion packages/types/src/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import type { ActJWTClaim } from './jwt';
import type { OAuthProvider } from './oauth';
import type { OrganizationDomainVerificationStatus, OrganizationEnrollmentMode } from './organizationDomain';
import type { OrganizationInvitationStatus } from './organizationInvitation';
import type { MembershipRole } from './organizationMembership';
import type { MembershipRole, OrganizationPermission } from './organizationMembership';
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { OrganizationSuggestionStatus } from './organizationSuggestion';
import type { SamlIdpSlug } from './saml';
Expand DownExpand Up@@ -322,6 +322,12 @@ export interface OrganizationMembershipJSON extends ClerkResourceJSON {
object: 'organization_membership';
id: string;
organization: OrganizationJSON;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permissions: (OrganizationPermission | (string & {}))[];
public_metadata: OrganizationMembershipPublicMetadata;
public_user_data: PublicUserDataJSON;
role: MembershipRole;
Expand Down
16 changes: 16 additions & 0 deletions packages/types/src/organizationMembership.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,12 @@ declare global {
export interface OrganizationMembershipResource extends ClerkResource {
id: string;
organization: OrganizationResource;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permissions: (OrganizationPermission | (string & {}))[];
publicMetadata: OrganizationMembershipPublicMetadata;
publicUserData: PublicUserData;
role: MembershipRole;
Expand All@@ -36,6 +42,16 @@ export interface OrganizationMembershipResource extends ClerkResource {

export type MembershipRole = 'admin' | 'basic_member' | 'guest_member';

export type OrganizationPermission =
| 'org:domains:manage'
| 'org:domains:delete'
| 'org:profile:manage'
| 'org:profile:delete'
| 'org:memberships:read'
| 'org:memberships:manage'
| 'org:memberships:delete'
| 'org:domains:read';

export type UpdateOrganizationMembershipParams = {
role: MembershipRole;
};
16 changes: 16 additions & 0 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
import type { ActJWTClaim } from './jwt';
import type { OrganizationPermission } from './organizationMembership';
import type { ClerkResource } from './resource';
import type { TokenResource } from './token';
import type { UserResource } from './user';

export type IsAuthorized = (isAuthorizedParams: IsAuthorizedParams) => Promise<IsAuthorizedReturnValues>;

interface IsAuthorizedParams {
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permission?: OrganizationPermission | (string & {});
role?: string;
}

type IsAuthorizedReturnValues = boolean;

export interface SessionResource extends ClerkResource {
id: string;
status: SessionStatus;
Expand All@@ -18,6 +30,10 @@ export interface SessionResource extends ClerkResource {
remove: () => Promise<SessionResource>;
touch: () => Promise<SessionResource>;
getToken: GetToken;
/**
* @experimental The method is experimental and subject to change in future releases.
*/
isAuthorized: IsAuthorized;
clearCache: () => void;
createdAt: Date;
updatedAt: Date;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/loud-foxes-love.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduces a new `isAuthorized()` method in the `Session` class. Returns a promise and checks whether the active user is allowed to perform an action based on the passed (required) permission and the ones attached to the membership.
5 changes: 5 additions & 0 deletions .changeset/proud-dolls-yawn.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Introduces an internal `<Gate/>` component (supporting hook and HOC) which enables us to conditionally render parts of our components based on a users permissions.
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import type {
MembershipRole,
OrganizationMembershipJSON,
OrganizationMembershipResource,
OrganizationPermission,
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
Expand All@@ -17,6 +18,12 @@ export class OrganizationMembership extends BaseResource implements Organization
publicMetadata: OrganizationMembershipPublicMetadata = {};
publicUserData!: PublicUserData;
organization!: Organization;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: adding (string & {}) allows for getting eslint autocomplete but also accepts any string

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we write this in a comment?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good call

permissions: (OrganizationPermission | (string & {}))[] = [];
role!: MembershipRole;
createdAt!: Date;
updatedAt!: Date;
Expand DownExpand Up@@ -106,6 +113,7 @@ export class OrganizationMembership extends BaseResource implements Organization
if (data.public_user_data) {
this.publicUserData = new PublicUserData(data.public_user_data);
}
this.permissions = Array.isArray(data.permissions) ? [...data.permissions] : [];
this.role = data.role;
this.createdAt = unixEpochToDate(data.created_at);
this.updatedAt = unixEpochToDate(data.updated_at);
Expand Down
42 changes: 42 additions & 0 deletions packages/clerk-js/src/core/resources/Session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,4 +56,46 @@ describe('Session', () => {
expect(dispatchSpy.mock.calls[0]).toMatchSnapshot();
});
});

describe('isAuthorized()', () => {
it('user with permission to delete the organization should be able to delete the organization', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({
organization_memberships: [{ name: 'Org1', id: 'org1' }],
}),
last_active_organization_id: 'org1',
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

const isAuthorized = await session.isAuthorized({ permission: 'org:profile:delete' });

expect(isAuthorized).toBe(true);
});

it('user with permission to read memberships should not be deleting the organization', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({
organization_memberships: [{ name: 'Org1', id: 'org1', permissions: ['org:memberships:read'] }],
}),
last_active_organization_id: 'org1',
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

const isAuthorized = await session.isAuthorized({ permission: 'org:profile:delete' });

expect(isAuthorized).toBe(false);
});
});
});
33 changes: 33 additions & 0 deletions packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type {
ActJWTClaim,
GetToken,
GetTokenOptions,
IsAuthorized,
SessionJSON,
SessionResource,
SessionStatus,
Expand DownExpand Up@@ -75,6 +76,38 @@ export class Session extends BaseResource implements SessionResource {
});
};

/**
* @experimental The method is experimental and subject to change in future releases.
*/
isAuthorized: IsAuthorized = async params => {
return new Promise(resolve => {
// if there is no active organization user can not be authorized
if (!this.lastActiveOrganizationId || !this.user) {
return resolve(false);
}

// loop through organizationMemberships from client piggybacking
const orgMemberships = this.user.organizationMemberships || [];
const activeMembership = orgMemberships.find(mem => mem.organization.id === this.lastActiveOrganizationId);

// Based on FAPI this should never happen, but we handle it anyway
if (!activeMembership) {
return resolve(false);
}

const activeOrganizationPermissions = activeMembership.permissions;
const activeOrganizationRole = activeMembership.role;

if (params.permission) {
return resolve(activeOrganizationPermissions.includes(params.permission));
}
if (params.role) {
return resolve(activeOrganizationRole === params.role);
}
return resolve(false);
});
};

#hydrateCache = (token: TokenResource | null) => {
if (token) {
SessionTokenCache.set({
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ OrganizationMembership {
"updatedAt": 1970-01-01T00:01:07.890Z,
},
"pathRoot": "",
"permissions": [],
"publicMetadata": {
"foo": "bar",
},
Expand Down
19 changes: 15 additions & 4 deletions packages/clerk-js/src/core/test/fixtures.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,15 @@ import type {
OAuthProvider,
OrganizationJSON,
OrganizationMembershipJSON,
OrganizationPermission,
PhoneNumberJSON,
UserJSON,
} from '@clerk/types';

export const mockJwt =
'eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ.eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9.n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg';

type OrgParams = Partial<OrganizationJSON> & { role?: MembershipRole };
type OrgParams = Partial<OrganizationJSON> & { role?: MembershipRole; permissions?: OrganizationPermission[] };

type WithUserParams = Omit<
Partial<UserJSON>,
Expand All@@ -26,8 +27,8 @@ type WithUserParams = Omit<

export const getOrganizationId = (orgParams: OrgParams) => orgParams?.id || orgParams?.name || 'test_id';

export const createOrganization = (params: OrgParams): OrganizationMembershipJSON => {
const { role, ...orgParams } = params;
export const createOrganizationMembership = (params: OrgParams): OrganizationMembershipJSON => {
const { role, permissions, ...orgParams } = params;
return {
created_at: new Date().getTime(),
id: getOrganizationId(orgParams),
Expand All@@ -49,6 +50,16 @@ export const createOrganization = (params: OrgParams): OrganizationMembershipJSO
} as OrganizationJSON,
public_metadata: {},
role: role || 'admin',
permissions: permissions || [
'org:domains:delete',
'org:domains:manage',
'org:domains:read',
'org:memberships:delete',
'org:memberships:manage',
'org:memberships:read',
'org:profile:delete',
'org:profile:manage',
],
updated_at: new Date().getTime(),
} as OrganizationMembershipJSON;
};
Expand DownExpand Up@@ -145,7 +156,7 @@ export const createUser = (params: WithUserParams): UserJSON => {
typeof p === 'string' ? createExternalAccount({ provider: p }) : createExternalAccount(p),
),
organization_memberships: (params.organization_memberships || []).map(o =>
typeof o === 'string' ? createOrganization({ name: o }) : createOrganization(o),
typeof o === 'string' ? createOrganizationMembership({ name: o }) : createOrganizationMembership(o),
),
} as any as UserJSON;
res.primary_email_address_id = res.email_addresses[0]?.id;
Expand Down
65 changes: 65 additions & 0 deletions packages/clerk-js/src/ui/common/Gate.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
import type { IsAuthorized } from '@clerk/types';
import type { ComponentType, PropsWithChildren, ReactNode } from 'react';
import React, { useEffect } from 'react';

import { useCoreSession } from '../contexts';
import { useFetch } from '../hooks';
import { useRouter } from '../router';

type GateParams = Parameters<IsAuthorized>[0];
type GateProps = PropsWithChildren<
GateParams & {
fallback?: ReactNode;
redirectTo?: string;
}
>;

export const useGate = (params: GateParams) => {
const { isAuthorized } = useCoreSession();
const { data: isAuthorizedUser } = useFetch(isAuthorized, params);

return {
isAuthorizedUser,
};
};

export const Gate = (gateProps: GateProps) => {
const { children, fallback, redirectTo, ...restAuthorizedParams } = gateProps;

const { isAuthorizedUser } = useGate(restAuthorizedParams);

const { navigate } = useRouter();

useEffect(() => {
// wait for promise to resolve
if (typeof isAuthorizedUser === 'boolean' && !isAuthorizedUser && redirectTo) {
void navigate(redirectTo);
}
}, [isAuthorizedUser, redirectTo]);

// wait for promise to resolve
if (typeof isAuthorizedUser === 'boolean' && !isAuthorizedUser && fallback) {
return <>{fallback}</>;
}

if (isAuthorizedUser) {
return <>{children}</>;
}

return null;
};

export function withGate<P>(Component: ComponentType<P>, gateProps: GateProps): React.ComponentType<P> {
const displayName = Component.displayName || Component.name || 'Component';
const HOC = (props: P) => {
return (
<Gate {...gateProps}>
<Component {...(props as any)} />
</Gate>
);
};

HOC.displayName = `withGate(${displayName})`;

return HOC;
}
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui/common/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ export * from './BlockButtons';
export * from './constants';
export * from './CalloutWithAction';
export * from './forms';
export * from './Gate';
export * from './InfiniteListSpinner';
export * from './redirects';
export * from './verification';
Expand Down
8 changes: 4 additions & 4 deletions packages/clerk-js/src/ui/hooks/useFetch.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,11 +24,11 @@ export const useFetch = <T>(
requestStatus.setLoading();
fetcherRef
.current(params)
.then(domain => {
.then(result => {
requestStatus.setIdle();
if (domain) {
setData({ ...domain });
callbacks?.onSuccess?.({ ...domain });
if (typeof result !== 'undefined') {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note for reviewer: if value is an object then do a shallow copy otherwise use the actual value

setData(typeof result === 'object' ? { ...result } : result);
callbacks?.onSuccess?.(typeof result === 'object' ? { ...result } : result);
}
})
.catch(() => {
Expand Down
8 changes: 7 additions & 1 deletion packages/types/src/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import type { ActJWTClaim } from './jwt';
import type { OAuthProvider } from './oauth';
import type { OrganizationDomainVerificationStatus, OrganizationEnrollmentMode } from './organizationDomain';
import type { OrganizationInvitationStatus } from './organizationInvitation';
import type { MembershipRole } from './organizationMembership';
import type { MembershipRole, OrganizationPermission } from './organizationMembership';
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { OrganizationSuggestionStatus } from './organizationSuggestion';
import type { SamlIdpSlug } from './saml';
Expand DownExpand Up@@ -322,6 +322,12 @@ export interface OrganizationMembershipJSON extends ClerkResourceJSON {
object: 'organization_membership';
id: string;
organization: OrganizationJSON;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permissions: (OrganizationPermission | (string & {}))[];
public_metadata: OrganizationMembershipPublicMetadata;
public_user_data: PublicUserDataJSON;
role: MembershipRole;
Expand Down
16 changes: 16 additions & 0 deletions packages/types/src/organizationMembership.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,12 @@ declare global {
export interface OrganizationMembershipResource extends ClerkResource {
id: string;
organization: OrganizationResource;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permissions: (OrganizationPermission | (string & {}))[];
publicMetadata: OrganizationMembershipPublicMetadata;
publicUserData: PublicUserData;
role: MembershipRole;
Expand All@@ -36,6 +42,16 @@ export interface OrganizationMembershipResource extends ClerkResource {

export type MembershipRole = 'admin' | 'basic_member' | 'guest_member';

export type OrganizationPermission =
| 'org:domains:manage'
| 'org:domains:delete'
| 'org:profile:manage'
| 'org:profile:delete'
| 'org:memberships:read'
| 'org:memberships:manage'
| 'org:memberships:delete'
| 'org:domains:read';

export type UpdateOrganizationMembershipParams = {
role: MembershipRole;
};
16 changes: 16 additions & 0 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
import type { ActJWTClaim } from './jwt';
import type { OrganizationPermission } from './organizationMembership';
import type { ClerkResource } from './resource';
import type { TokenResource } from './token';
import type { UserResource } from './user';

export type IsAuthorized = (isAuthorizedParams: IsAuthorizedParams) => Promise<IsAuthorizedReturnValues>;

interface IsAuthorizedParams {
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permission?: OrganizationPermission | (string & {});
role?: string;
}

type IsAuthorizedReturnValues = boolean;

export interface SessionResource extends ClerkResource {
id: string;
status: SessionStatus;
Expand All@@ -18,6 +30,10 @@ export interface SessionResource extends ClerkResource {
remove: () => Promise<SessionResource>;
touch: () => Promise<SessionResource>;
getToken: GetToken;
/**
* @experimental The method is experimental and subject to change in future releases.
*/
isAuthorized: IsAuthorized;
clearCache: () => void;
createdAt: Date;
updatedAt: Date;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/loud-foxes-love.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduces a new `isAuthorized()` method in the `Session` class. Returns a promise and checks whether the active user is allowed to perform an action based on the passed (required) permission and the ones attached to the membership.
5 changes: 5 additions & 0 deletions .changeset/proud-dolls-yawn.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Introduces an internal `<Gate/>` component (supporting hook and HOC) which enables us to conditionally render parts of our components based on a users permissions.
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import type {
MembershipRole,
OrganizationMembershipJSON,
OrganizationMembershipResource,
OrganizationPermission,
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
Expand All@@ -17,6 +18,12 @@ export class OrganizationMembership extends BaseResource implements Organization
publicMetadata: OrganizationMembershipPublicMetadata = {};
publicUserData!: PublicUserData;
organization!: Organization;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: adding (string & {}) allows for getting eslint autocomplete but also accepts any string

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we write this in a comment?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good call

permissions: (OrganizationPermission | (string & {}))[] = [];
role!: MembershipRole;
createdAt!: Date;
updatedAt!: Date;
Expand DownExpand Up@@ -106,6 +113,7 @@ export class OrganizationMembership extends BaseResource implements Organization
if (data.public_user_data) {
this.publicUserData = new PublicUserData(data.public_user_data);
}
this.permissions = Array.isArray(data.permissions) ? [...data.permissions] : [];
this.role = data.role;
this.createdAt = unixEpochToDate(data.created_at);
this.updatedAt = unixEpochToDate(data.updated_at);
Expand Down
42 changes: 42 additions & 0 deletions packages/clerk-js/src/core/resources/Session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,4 +56,46 @@ describe('Session', () => {
expect(dispatchSpy.mock.calls[0]).toMatchSnapshot();
});
});

describe('isAuthorized()', () => {
it('user with permission to delete the organization should be able to delete the organization', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({
organization_memberships: [{ name: 'Org1', id: 'org1' }],
}),
last_active_organization_id: 'org1',
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

const isAuthorized = await session.isAuthorized({ permission: 'org:profile:delete' });

expect(isAuthorized).toBe(true);
});

it('user with permission to read memberships should not be deleting the organization', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({
organization_memberships: [{ name: 'Org1', id: 'org1', permissions: ['org:memberships:read'] }],
}),
last_active_organization_id: 'org1',
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

const isAuthorized = await session.isAuthorized({ permission: 'org:profile:delete' });

expect(isAuthorized).toBe(false);
});
});
});
33 changes: 33 additions & 0 deletions packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type {
ActJWTClaim,
GetToken,
GetTokenOptions,
IsAuthorized,
SessionJSON,
SessionResource,
SessionStatus,
Expand DownExpand Up@@ -75,6 +76,38 @@ export class Session extends BaseResource implements SessionResource {
});
};

/**
* @experimental The method is experimental and subject to change in future releases.
*/
isAuthorized: IsAuthorized = async params => {
return new Promise(resolve => {
// if there is no active organization user can not be authorized
if (!this.lastActiveOrganizationId || !this.user) {
return resolve(false);
}

// loop through organizationMemberships from client piggybacking
const orgMemberships = this.user.organizationMemberships || [];
const activeMembership = orgMemberships.find(mem => mem.organization.id === this.lastActiveOrganizationId);

// Based on FAPI this should never happen, but we handle it anyway
if (!activeMembership) {
return resolve(false);
}

const activeOrganizationPermissions = activeMembership.permissions;
const activeOrganizationRole = activeMembership.role;

if (params.permission) {
return resolve(activeOrganizationPermissions.includes(params.permission));
}
if (params.role) {
return resolve(activeOrganizationRole === params.role);
}
return resolve(false);
});
};

#hydrateCache = (token: TokenResource | null) => {
if (token) {
SessionTokenCache.set({
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ OrganizationMembership {
"updatedAt": 1970-01-01T00:01:07.890Z,
},
"pathRoot": "",
"permissions": [],
"publicMetadata": {
"foo": "bar",
},
Expand Down
19 changes: 15 additions & 4 deletions packages/clerk-js/src/core/test/fixtures.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,15 @@ import type {
OAuthProvider,
OrganizationJSON,
OrganizationMembershipJSON,
OrganizationPermission,
PhoneNumberJSON,
UserJSON,
} from '@clerk/types';

export const mockJwt =
'eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ.eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9.n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg';

type OrgParams = Partial<OrganizationJSON> & { role?: MembershipRole };
type OrgParams = Partial<OrganizationJSON> & { role?: MembershipRole; permissions?: OrganizationPermission[] };

type WithUserParams = Omit<
Partial<UserJSON>,
Expand All@@ -26,8 +27,8 @@ type WithUserParams = Omit<

export const getOrganizationId = (orgParams: OrgParams) => orgParams?.id || orgParams?.name || 'test_id';

export const createOrganization = (params: OrgParams): OrganizationMembershipJSON => {
const { role, ...orgParams } = params;
export const createOrganizationMembership = (params: OrgParams): OrganizationMembershipJSON => {
const { role, permissions, ...orgParams } = params;
return {
created_at: new Date().getTime(),
id: getOrganizationId(orgParams),
Expand All@@ -49,6 +50,16 @@ export const createOrganization = (params: OrgParams): OrganizationMembershipJSO
} as OrganizationJSON,
public_metadata: {},
role: role || 'admin',
permissions: permissions || [
'org:domains:delete',
'org:domains:manage',
'org:domains:read',
'org:memberships:delete',
'org:memberships:manage',
'org:memberships:read',
'org:profile:delete',
'org:profile:manage',
],
updated_at: new Date().getTime(),
} as OrganizationMembershipJSON;
};
Expand DownExpand Up@@ -145,7 +156,7 @@ export const createUser = (params: WithUserParams): UserJSON => {
typeof p === 'string' ? createExternalAccount({ provider: p }) : createExternalAccount(p),
),
organization_memberships: (params.organization_memberships || []).map(o =>
typeof o === 'string' ? createOrganization({ name: o }) : createOrganization(o),
typeof o === 'string' ? createOrganizationMembership({ name: o }) : createOrganizationMembership(o),
),
} as any as UserJSON;
res.primary_email_address_id = res.email_addresses[0]?.id;
Expand Down
65 changes: 65 additions & 0 deletions packages/clerk-js/src/ui/common/Gate.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
import type { IsAuthorized } from '@clerk/types';
import type { ComponentType, PropsWithChildren, ReactNode } from 'react';
import React, { useEffect } from 'react';

import { useCoreSession } from '../contexts';
import { useFetch } from '../hooks';
import { useRouter } from '../router';

type GateParams = Parameters<IsAuthorized>[0];
type GateProps = PropsWithChildren<
GateParams & {
fallback?: ReactNode;
redirectTo?: string;
}
>;

export const useGate = (params: GateParams) => {
const { isAuthorized } = useCoreSession();
const { data: isAuthorizedUser } = useFetch(isAuthorized, params);

return {
isAuthorizedUser,
};
};

export const Gate = (gateProps: GateProps) => {
const { children, fallback, redirectTo, ...restAuthorizedParams } = gateProps;

const { isAuthorizedUser } = useGate(restAuthorizedParams);

const { navigate } = useRouter();

useEffect(() => {
// wait for promise to resolve
if (typeof isAuthorizedUser === 'boolean' && !isAuthorizedUser && redirectTo) {
void navigate(redirectTo);
}
}, [isAuthorizedUser, redirectTo]);

// wait for promise to resolve
if (typeof isAuthorizedUser === 'boolean' && !isAuthorizedUser && fallback) {
return <>{fallback}</>;
}

if (isAuthorizedUser) {
return <>{children}</>;
}

return null;
};

export function withGate<P>(Component: ComponentType<P>, gateProps: GateProps): React.ComponentType<P> {
const displayName = Component.displayName || Component.name || 'Component';
const HOC = (props: P) => {
return (
<Gate {...gateProps}>
<Component {...(props as any)} />
</Gate>
);
};

HOC.displayName = `withGate(${displayName})`;

return HOC;
}
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui/common/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ export * from './BlockButtons';
export * from './constants';
export * from './CalloutWithAction';
export * from './forms';
export * from './Gate';
export * from './InfiniteListSpinner';
export * from './redirects';
export * from './verification';
Expand Down
8 changes: 4 additions & 4 deletions packages/clerk-js/src/ui/hooks/useFetch.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,11 +24,11 @@ export const useFetch = <T>(
requestStatus.setLoading();
fetcherRef
.current(params)
.then(domain => {
.then(result => {
requestStatus.setIdle();
if (domain) {
setData({ ...domain });
callbacks?.onSuccess?.({ ...domain });
if (typeof result !== 'undefined') {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note for reviewer: if value is an object then do a shallow copy otherwise use the actual value

setData(typeof result === 'object' ? { ...result } : result);
callbacks?.onSuccess?.(typeof result === 'object' ? { ...result } : result);
}
})
.catch(() => {
Expand Down
8 changes: 7 additions & 1 deletion packages/types/src/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import type { ActJWTClaim } from './jwt';
import type { OAuthProvider } from './oauth';
import type { OrganizationDomainVerificationStatus, OrganizationEnrollmentMode } from './organizationDomain';
import type { OrganizationInvitationStatus } from './organizationInvitation';
import type { MembershipRole } from './organizationMembership';
import type { MembershipRole, OrganizationPermission } from './organizationMembership';
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { OrganizationSuggestionStatus } from './organizationSuggestion';
import type { SamlIdpSlug } from './saml';
Expand DownExpand Up@@ -322,6 +322,12 @@ export interface OrganizationMembershipJSON extends ClerkResourceJSON {
object: 'organization_membership';
id: string;
organization: OrganizationJSON;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permissions: (OrganizationPermission | (string & {}))[];
public_metadata: OrganizationMembershipPublicMetadata;
public_user_data: PublicUserDataJSON;
role: MembershipRole;
Expand Down
16 changes: 16 additions & 0 deletions packages/types/src/organizationMembership.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,12 @@ declare global {
export interface OrganizationMembershipResource extends ClerkResource {
id: string;
organization: OrganizationResource;
/**
* @experimental The property is experimental and subject to change in future releases.
*/
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permissions: (OrganizationPermission | (string & {}))[];
publicMetadata: OrganizationMembershipPublicMetadata;
publicUserData: PublicUserData;
role: MembershipRole;
Expand All@@ -36,6 +42,16 @@ export interface OrganizationMembershipResource extends ClerkResource {

export type MembershipRole = 'admin' | 'basic_member' | 'guest_member';

export type OrganizationPermission =
| 'org:domains:manage'
| 'org:domains:delete'
| 'org:profile:manage'
| 'org:profile:delete'
| 'org:memberships:read'
| 'org:memberships:manage'
| 'org:memberships:delete'
| 'org:domains:read';

export type UpdateOrganizationMembershipParams = {
role: MembershipRole;
};
16 changes: 16 additions & 0 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
import type { ActJWTClaim } from './jwt';
import type { OrganizationPermission } from './organizationMembership';
import type { ClerkResource } from './resource';
import type { TokenResource } from './token';
import type { UserResource } from './user';

export type IsAuthorized = (isAuthorizedParams: IsAuthorizedParams) => Promise<IsAuthorizedReturnValues>;

interface IsAuthorizedParams {
// Adding (string & {}) allows for getting eslint autocomplete but also accepts any string
// eslint-disable-next-line
permission?: OrganizationPermission | (string & {});
role?: string;
}

type IsAuthorizedReturnValues = boolean;

export interface SessionResource extends ClerkResource {
id: string;
status: SessionStatus;
Expand All@@ -18,6 +30,10 @@ export interface SessionResource extends ClerkResource {
remove: () => Promise<SessionResource>;
touch: () => Promise<SessionResource>;
getToken: GetToken;
/**
* @experimental The method is experimental and subject to change in future releases.
*/
isAuthorized: IsAuthorized;
clearCache: () => void;
createdAt: Date;
updatedAt: Date;
Expand Down