Closed
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
9 changes: 9 additions & 0 deletions .changeset/curvy-teeth-watch.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/backend': patch
'@clerk/clerk-js': patch
'@clerk/clerk-react': patch
'@clerk/shared': patch
'@clerk/types': patch
---

Add feature param to has
26 changes: 23 additions & 3 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ type SignedInAuthObjectProperties = {
* [fistFactorAge, secondFactorAge]
*/
factorVerificationAge: [firstFactorAge: number, secondFactorAge: number] | null;
__experimental_features?: string | null;
};

/**
Expand DownExpand Up@@ -114,6 +115,7 @@ const generateSignedInAuthObjectProperties = (claims: JwtPayload): SignedInAuthO
orgSlug: claims.org_slug,
orgPermissions,
factorVerificationAge,
__experimental_features: claims.fea,
};
};

Expand All@@ -125,8 +127,18 @@ export function signedInAuthObject(
sessionToken: string,
sessionClaims: JwtPayload,
): SignedInAuthObject {
const { actor, sessionId, sessionStatus, userId, orgId, orgRole, orgSlug, orgPermissions, factorVerificationAge } =
generateSignedInAuthObjectProperties(sessionClaims);
const {
actor,
sessionId,
sessionStatus,
userId,
orgId,
orgRole,
orgSlug,
orgPermissions,
factorVerificationAge,
__experimental_features,
} = generateSignedInAuthObjectProperties(sessionClaims);
const apiClient = createBackendApiClient(authenticateContext);
const getToken = createGetToken({
sessionId,
Expand All@@ -145,8 +157,16 @@ export function signedInAuthObject(
orgSlug,
orgPermissions,
factorVerificationAge,
__experimental_features,
getToken,
has: createCheckAuthorization({ orgId, orgRole, orgPermissions, userId, factorVerificationAge }),
has: createCheckAuthorization({
orgId,
orgRole,
orgPermissions,
userId,
factorVerificationAge,
__experimental_features,
}),
debug: createDebug({ ...authenticateContext, sessionToken }),
};
}
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,8 @@ export class Session extends BaseResource implements SessionResource {
orgId: activeMembership?.id,
orgRole: activeMembership?.role,
orgPermissions: activeMembership?.permissions,
// TODO: retrieve features
__experimental_features: 'testfeature',
})(params);
};

Expand Down
15 changes: 14 additions & 1 deletion packages/react/src/components/controlComponents.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { deprecated } from '@clerk/shared/deprecated';
import type {
CheckAuthorizationWithCustomPermissions,
FeatureKey,
HandleOAuthCallbackParams,
OrganizationCustomPermissionKey,
OrganizationCustomRoleKey,
Expand DownExpand Up@@ -61,21 +62,31 @@ export type ProtectProps = React.PropsWithChildren<
condition?: never;
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
condition?: never;
role?: never;
permission: OrganizationCustomPermissionKey;
__experimental_feature?: never;
}
| {
condition: (has: CheckAuthorizationWithCustomPermissions) => boolean;
role?: never;
permission?: never;
__experimental_feature?: never;
}
| {
condition?: never;
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| {
condition?: never;
role?: never;
permission?: never;
__experimental_feature?: never;
}
) & {
fallback?: React.ReactNode;
Expand All@@ -89,8 +100,10 @@ export type ProtectProps = React.PropsWithChildren<
* ```
* <Protect permission="a_permission_key" />
* <Protect role="a_role_key" />
* <Protect __experimental_feature"a_feature_key" />
* <Protect condition={(has) => has({permission:"a_permission_key"})} />
* <Protect condition={(has) => has({role:"a_role_key"})} />
* <Protect condition={(has) => has({__experimental_feature:"a_feature_key"})} />
* <Protect fallback={<p>Unauthorized</p>} />
* ```
*/
Expand DownExpand Up@@ -127,7 +140,7 @@ export const Protect = ({ children, fallback, treatPendingAsSignedOut, ...restAu
return unauthorized;
}

if (restAuthorizedParams.role || restAuthorizedParams.permission) {
if (restAuthorizedParams.role || restAuthorizedParams.permission || restAuthorizedParams.__experimental_feature) {
if (has(restAuthorizedParams)) {
return authorized;
}
Expand Down
15 changes: 13 additions & 2 deletions packages/react/src/hooks/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,17 @@ export function useDerivedAuth(
authObject: any,
{ treatPendingAsSignedOut = true }: PendingSessionOptions = {},
): UseAuthReturn {
const { userId, orgId, orgRole, has, signOut, getToken, orgPermissions, factorVerificationAge } = authObject ?? {};
const {
userId,
orgId,
orgRole,
has,
signOut,
getToken,
orgPermissions,
factorVerificationAge,
__experimental_features,
} = authObject ?? {};

const derivedHas = useCallback(
(params: Parameters<CheckAuthorizationWithCustomPermissions>[0]) => {
Expand All@@ -157,9 +167,10 @@ export function useDerivedAuth(
orgRole,
orgPermissions,
factorVerificationAge,
__experimental_features,
})(params);
},
[has, userId, orgId, orgRole, orgPermissions, factorVerificationAge],
[has, userId, orgId, orgRole, orgPermissions, factorVerificationAge, __experimental_features],
);

const payload = resolveAuthState({
Expand Down
31 changes: 31 additions & 0 deletions packages/shared/src/authorization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,13 +20,19 @@ type AuthorizationOptions = {
orgRole: string | null | undefined;
orgPermissions: string[] | null | undefined;
factorVerificationAge: [number, number] | null;
__experimental_features?: string | null;
};

type CheckOrgAuthorization = (
params: { role?: OrganizationCustomRoleKey; permission?: OrganizationCustomPermissionKey },
{ orgId, orgRole, orgPermissions }: AuthorizationOptions,
) => boolean | null;

type CheckFeatureAuthorization = (
params: { __experimental_feature?: string },
{ __experimental_features }: AuthorizationOptions,
) => boolean | null;

type CheckReverificationAuthorization = (
params: {
reverification?: ReverificationConfig;
Expand DownExpand Up@@ -85,6 +91,25 @@ const checkOrgAuthorization: CheckOrgAuthorization = (params, options) => {
return null;
};

const checkFeatureAuthorization: CheckFeatureAuthorization = (param, options) => {
const { __experimental_feature: feature } = param;
const { __experimental_features } = options;

if (!feature) {
return null;
}

if (!__experimental_features) {
return null;
}

if (typeof __experimental_features === 'string') {
return __experimental_features.split(',').includes(feature);
}

return null;
};

const validateReverificationConfig = (config: ReverificationConfig | undefined | null) => {
if (!config) {
return false;
Expand DownExpand Up@@ -156,6 +181,11 @@ const createCheckAuthorization = (options: AuthorizationOptions): CheckAuthoriza

const orgAuthorization = checkOrgAuthorization(params, options);
const reverificationAuthorization = checkReverificationAuthorization(params, options);
const featureAuthorization = checkFeatureAuthorization(params, options);

if (featureAuthorization) {
return featureAuthorization;
}

if ([orgAuthorization, reverificationAuthorization].some(a => a === null)) {
return [orgAuthorization, reverificationAuthorization].some(a => a === true);
Expand All@@ -175,6 +205,7 @@ type AuthStateOptions = {
orgRole?: OrganizationCustomRoleKey | null;
orgSlug?: string | null;
orgPermissions?: OrganizationCustomPermissionKey[] | null;
__experimental_features?: string | null;
getToken: GetToken;
signOut: SignOut;
has: (params: Parameters<CheckAuthorizationWithCustomPermissions>[0]) => boolean;
Expand Down
34 changes: 34 additions & 0 deletions packages/types/src/authorization.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
declare global {
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
interface ClerkAuthorization {}
}

interface AuthorizationKeysBase {
role: string;
permission: string;
__experimental_feature: string;
}

interface AuthorizationKeysPlaceholder {
role: unknown;
permission: unknown;
__experimental_feature: unknown;
}

export type RoleKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['role'] extends string
? ClerkAuthorization['role']
: AuthorizationKeysBase['role']
: AuthorizationKeysBase['role'];

export type PermissionKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['permission'] extends string
? ClerkAuthorization['permission']
: AuthorizationKeysBase['permission']
: AuthorizationKeysBase['permission'];

export type FeatureKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['__experimental_feature'] extends string
? ClerkAuthorization['__experimental_feature']
: AuthorizationKeysBase['__experimental_feature']
: AuthorizationKeysBase['__experimental_feature'];
1 change: 1 addition & 0 deletions packages/types/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ export * from './appearance';
export * from './elementIds';
export * from './attributes';
export * from './authConfig';
export * from './authorization';
export * from './backupCode';
export * from './clerk';
export * from './client';
Expand Down
7 changes: 6 additions & 1 deletion packages/types/src/jwtv2.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,14 +119,19 @@ type JWTPayloadBase = {
* Any other JWT Claim Set member.
*/
[propName: string]: unknown;

/**
* Feature claims, you can have multiple features in the same claim. e.g.: "impersonation,emails"
* @experimental
*/
fea?: string | null;

@octoperoctoperApr 3, 2025

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.

I think we will first need to have JWT versioning before proceeding with this addition - reference

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.

I agree, I'll move this one to draft, and we can update it later with the versioning changes.

};

export type VersionedJwtPayload =
| {
ver?: never;

/**
*
* Active organization permissions.
*/
org_permissions?: OrganizationCustomPermissionKey[];
Expand Down
19 changes: 17 additions & 2 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { FeatureKey } from './authorization';
import type {
BackupCodeAttempt,
EmailCodeAttempt,
Expand DownExpand Up@@ -52,12 +53,19 @@ export type CheckAuthorizationParamsWithCustomPermissions = WithReverification<
| {
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
role?: never;
permission: OrganizationCustomPermissionKey;
__experimental_feature?: never;
}
| { role?: never; permission?: never }
| {
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| { role?: never; permission?: never; __experimental_feature?: never }
>;

export type CheckAuthorization = CheckAuthorizationFn<CheckAuthorizationParams>;
Expand DownExpand Up@@ -90,12 +98,19 @@ export type CheckAuthorizationParamsFromSessionClaims<P extends OrganizationCust
| {
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
role?: never;
permission: DisallowSystemPermissions<P>;
__experimental_feature?: never;
}
| {
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| { role?: never; permission?: never }
| { role?: never; permission?: never; __experimental_feature?: never }
>;

/**
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
Closed
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
9 changes: 9 additions & 0 deletions .changeset/curvy-teeth-watch.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/backend': patch
'@clerk/clerk-js': patch
'@clerk/clerk-react': patch
'@clerk/shared': patch
'@clerk/types': patch
---

Add feature param to has
26 changes: 23 additions & 3 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ type SignedInAuthObjectProperties = {
* [fistFactorAge, secondFactorAge]
*/
factorVerificationAge: [firstFactorAge: number, secondFactorAge: number] | null;
__experimental_features?: string | null;
};

/**
Expand DownExpand Up@@ -114,6 +115,7 @@ const generateSignedInAuthObjectProperties = (claims: JwtPayload): SignedInAuthO
orgSlug: claims.org_slug,
orgPermissions,
factorVerificationAge,
__experimental_features: claims.fea,
};
};

Expand All@@ -125,8 +127,18 @@ export function signedInAuthObject(
sessionToken: string,
sessionClaims: JwtPayload,
): SignedInAuthObject {
const { actor, sessionId, sessionStatus, userId, orgId, orgRole, orgSlug, orgPermissions, factorVerificationAge } =
generateSignedInAuthObjectProperties(sessionClaims);
const {
actor,
sessionId,
sessionStatus,
userId,
orgId,
orgRole,
orgSlug,
orgPermissions,
factorVerificationAge,
__experimental_features,
} = generateSignedInAuthObjectProperties(sessionClaims);
const apiClient = createBackendApiClient(authenticateContext);
const getToken = createGetToken({
sessionId,
Expand All@@ -145,8 +157,16 @@ export function signedInAuthObject(
orgSlug,
orgPermissions,
factorVerificationAge,
__experimental_features,
getToken,
has: createCheckAuthorization({ orgId, orgRole, orgPermissions, userId, factorVerificationAge }),
has: createCheckAuthorization({
orgId,
orgRole,
orgPermissions,
userId,
factorVerificationAge,
__experimental_features,
}),
debug: createDebug({ ...authenticateContext, sessionToken }),
};
}
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,8 @@ export class Session extends BaseResource implements SessionResource {
orgId: activeMembership?.id,
orgRole: activeMembership?.role,
orgPermissions: activeMembership?.permissions,
// TODO: retrieve features
__experimental_features: 'testfeature',
})(params);
};

Expand Down
15 changes: 14 additions & 1 deletion packages/react/src/components/controlComponents.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { deprecated } from '@clerk/shared/deprecated';
import type {
CheckAuthorizationWithCustomPermissions,
FeatureKey,
HandleOAuthCallbackParams,
OrganizationCustomPermissionKey,
OrganizationCustomRoleKey,
Expand DownExpand Up@@ -61,21 +62,31 @@ export type ProtectProps = React.PropsWithChildren<
condition?: never;
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
condition?: never;
role?: never;
permission: OrganizationCustomPermissionKey;
__experimental_feature?: never;
}
| {
condition: (has: CheckAuthorizationWithCustomPermissions) => boolean;
role?: never;
permission?: never;
__experimental_feature?: never;
}
| {
condition?: never;
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| {
condition?: never;
role?: never;
permission?: never;
__experimental_feature?: never;
}
) & {
fallback?: React.ReactNode;
Expand All@@ -89,8 +100,10 @@ export type ProtectProps = React.PropsWithChildren<
* ```
* <Protect permission="a_permission_key" />
* <Protect role="a_role_key" />
* <Protect __experimental_feature"a_feature_key" />
* <Protect condition={(has) => has({permission:"a_permission_key"})} />
* <Protect condition={(has) => has({role:"a_role_key"})} />
* <Protect condition={(has) => has({__experimental_feature:"a_feature_key"})} />
* <Protect fallback={<p>Unauthorized</p>} />
* ```
*/
Expand DownExpand Up@@ -127,7 +140,7 @@ export const Protect = ({ children, fallback, treatPendingAsSignedOut, ...restAu
return unauthorized;
}

if (restAuthorizedParams.role || restAuthorizedParams.permission) {
if (restAuthorizedParams.role || restAuthorizedParams.permission || restAuthorizedParams.__experimental_feature) {
if (has(restAuthorizedParams)) {
return authorized;
}
Expand Down
15 changes: 13 additions & 2 deletions packages/react/src/hooks/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,17 @@ export function useDerivedAuth(
authObject: any,
{ treatPendingAsSignedOut = true }: PendingSessionOptions = {},
): UseAuthReturn {
const { userId, orgId, orgRole, has, signOut, getToken, orgPermissions, factorVerificationAge } = authObject ?? {};
const {
userId,
orgId,
orgRole,
has,
signOut,
getToken,
orgPermissions,
factorVerificationAge,
__experimental_features,
} = authObject ?? {};

const derivedHas = useCallback(
(params: Parameters<CheckAuthorizationWithCustomPermissions>[0]) => {
Expand All@@ -157,9 +167,10 @@ export function useDerivedAuth(
orgRole,
orgPermissions,
factorVerificationAge,
__experimental_features,
})(params);
},
[has, userId, orgId, orgRole, orgPermissions, factorVerificationAge],
[has, userId, orgId, orgRole, orgPermissions, factorVerificationAge, __experimental_features],
);

const payload = resolveAuthState({
Expand Down
31 changes: 31 additions & 0 deletions packages/shared/src/authorization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,13 +20,19 @@ type AuthorizationOptions = {
orgRole: string | null | undefined;
orgPermissions: string[] | null | undefined;
factorVerificationAge: [number, number] | null;
__experimental_features?: string | null;
};

type CheckOrgAuthorization = (
params: { role?: OrganizationCustomRoleKey; permission?: OrganizationCustomPermissionKey },
{ orgId, orgRole, orgPermissions }: AuthorizationOptions,
) => boolean | null;

type CheckFeatureAuthorization = (
params: { __experimental_feature?: string },
{ __experimental_features }: AuthorizationOptions,
) => boolean | null;

type CheckReverificationAuthorization = (
params: {
reverification?: ReverificationConfig;
Expand DownExpand Up@@ -85,6 +91,25 @@ const checkOrgAuthorization: CheckOrgAuthorization = (params, options) => {
return null;
};

const checkFeatureAuthorization: CheckFeatureAuthorization = (param, options) => {
const { __experimental_feature: feature } = param;
const { __experimental_features } = options;

if (!feature) {
return null;
}

if (!__experimental_features) {
return null;
}

if (typeof __experimental_features === 'string') {
return __experimental_features.split(',').includes(feature);
}

return null;
};

const validateReverificationConfig = (config: ReverificationConfig | undefined | null) => {
if (!config) {
return false;
Expand DownExpand Up@@ -156,6 +181,11 @@ const createCheckAuthorization = (options: AuthorizationOptions): CheckAuthoriza

const orgAuthorization = checkOrgAuthorization(params, options);
const reverificationAuthorization = checkReverificationAuthorization(params, options);
const featureAuthorization = checkFeatureAuthorization(params, options);

if (featureAuthorization) {
return featureAuthorization;
}

if ([orgAuthorization, reverificationAuthorization].some(a => a === null)) {
return [orgAuthorization, reverificationAuthorization].some(a => a === true);
Expand All@@ -175,6 +205,7 @@ type AuthStateOptions = {
orgRole?: OrganizationCustomRoleKey | null;
orgSlug?: string | null;
orgPermissions?: OrganizationCustomPermissionKey[] | null;
__experimental_features?: string | null;
getToken: GetToken;
signOut: SignOut;
has: (params: Parameters<CheckAuthorizationWithCustomPermissions>[0]) => boolean;
Expand Down
34 changes: 34 additions & 0 deletions packages/types/src/authorization.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
declare global {
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
interface ClerkAuthorization {}
}

interface AuthorizationKeysBase {
role: string;
permission: string;
__experimental_feature: string;
}

interface AuthorizationKeysPlaceholder {
role: unknown;
permission: unknown;
__experimental_feature: unknown;
}

export type RoleKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['role'] extends string
? ClerkAuthorization['role']
: AuthorizationKeysBase['role']
: AuthorizationKeysBase['role'];

export type PermissionKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['permission'] extends string
? ClerkAuthorization['permission']
: AuthorizationKeysBase['permission']
: AuthorizationKeysBase['permission'];

export type FeatureKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['__experimental_feature'] extends string
? ClerkAuthorization['__experimental_feature']
: AuthorizationKeysBase['__experimental_feature']
: AuthorizationKeysBase['__experimental_feature'];
1 change: 1 addition & 0 deletions packages/types/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ export * from './appearance';
export * from './elementIds';
export * from './attributes';
export * from './authConfig';
export * from './authorization';
export * from './backupCode';
export * from './clerk';
export * from './client';
Expand Down
7 changes: 6 additions & 1 deletion packages/types/src/jwtv2.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,14 +119,19 @@ type JWTPayloadBase = {
* Any other JWT Claim Set member.
*/
[propName: string]: unknown;

/**
* Feature claims, you can have multiple features in the same claim. e.g.: "impersonation,emails"
* @experimental
*/
fea?: string | null;

@octoperoctoperApr 3, 2025

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.

I think we will first need to have JWT versioning before proceeding with this addition - reference

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.

I agree, I'll move this one to draft, and we can update it later with the versioning changes.

};

export type VersionedJwtPayload =
| {
ver?: never;

/**
*
* Active organization permissions.
*/
org_permissions?: OrganizationCustomPermissionKey[];
Expand Down
19 changes: 17 additions & 2 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { FeatureKey } from './authorization';
import type {
BackupCodeAttempt,
EmailCodeAttempt,
Expand DownExpand Up@@ -52,12 +53,19 @@ export type CheckAuthorizationParamsWithCustomPermissions = WithReverification<
| {
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
role?: never;
permission: OrganizationCustomPermissionKey;
__experimental_feature?: never;
}
| { role?: never; permission?: never }
| {
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| { role?: never; permission?: never; __experimental_feature?: never }
>;

export type CheckAuthorization = CheckAuthorizationFn<CheckAuthorizationParams>;
Expand DownExpand Up@@ -90,12 +98,19 @@ export type CheckAuthorizationParamsFromSessionClaims<P extends OrganizationCust
| {
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
role?: never;
permission: DisallowSystemPermissions<P>;
__experimental_feature?: never;
}
| {
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| { role?: never; permission?: never }
| { role?: never; permission?: never; __experimental_feature?: never }
>;

/**
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
Closed
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
9 changes: 9 additions & 0 deletions .changeset/curvy-teeth-watch.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/backend': patch
'@clerk/clerk-js': patch
'@clerk/clerk-react': patch
'@clerk/shared': patch
'@clerk/types': patch
---

Add feature param to has
26 changes: 23 additions & 3 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ type SignedInAuthObjectProperties = {
* [fistFactorAge, secondFactorAge]
*/
factorVerificationAge: [firstFactorAge: number, secondFactorAge: number] | null;
__experimental_features?: string | null;
};

/**
Expand DownExpand Up@@ -114,6 +115,7 @@ const generateSignedInAuthObjectProperties = (claims: JwtPayload): SignedInAuthO
orgSlug: claims.org_slug,
orgPermissions,
factorVerificationAge,
__experimental_features: claims.fea,
};
};

Expand All@@ -125,8 +127,18 @@ export function signedInAuthObject(
sessionToken: string,
sessionClaims: JwtPayload,
): SignedInAuthObject {
const { actor, sessionId, sessionStatus, userId, orgId, orgRole, orgSlug, orgPermissions, factorVerificationAge } =
generateSignedInAuthObjectProperties(sessionClaims);
const {
actor,
sessionId,
sessionStatus,
userId,
orgId,
orgRole,
orgSlug,
orgPermissions,
factorVerificationAge,
__experimental_features,
} = generateSignedInAuthObjectProperties(sessionClaims);
const apiClient = createBackendApiClient(authenticateContext);
const getToken = createGetToken({
sessionId,
Expand All@@ -145,8 +157,16 @@ export function signedInAuthObject(
orgSlug,
orgPermissions,
factorVerificationAge,
__experimental_features,
getToken,
has: createCheckAuthorization({ orgId, orgRole, orgPermissions, userId, factorVerificationAge }),
has: createCheckAuthorization({
orgId,
orgRole,
orgPermissions,
userId,
factorVerificationAge,
__experimental_features,
}),
debug: createDebug({ ...authenticateContext, sessionToken }),
};
}
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,8 @@ export class Session extends BaseResource implements SessionResource {
orgId: activeMembership?.id,
orgRole: activeMembership?.role,
orgPermissions: activeMembership?.permissions,
// TODO: retrieve features
__experimental_features: 'testfeature',
})(params);
};

Expand Down
15 changes: 14 additions & 1 deletion packages/react/src/components/controlComponents.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { deprecated } from '@clerk/shared/deprecated';
import type {
CheckAuthorizationWithCustomPermissions,
FeatureKey,
HandleOAuthCallbackParams,
OrganizationCustomPermissionKey,
OrganizationCustomRoleKey,
Expand DownExpand Up@@ -61,21 +62,31 @@ export type ProtectProps = React.PropsWithChildren<
condition?: never;
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
condition?: never;
role?: never;
permission: OrganizationCustomPermissionKey;
__experimental_feature?: never;
}
| {
condition: (has: CheckAuthorizationWithCustomPermissions) => boolean;
role?: never;
permission?: never;
__experimental_feature?: never;
}
| {
condition?: never;
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| {
condition?: never;
role?: never;
permission?: never;
__experimental_feature?: never;
}
) & {
fallback?: React.ReactNode;
Expand All@@ -89,8 +100,10 @@ export type ProtectProps = React.PropsWithChildren<
* ```
* <Protect permission="a_permission_key" />
* <Protect role="a_role_key" />
* <Protect __experimental_feature"a_feature_key" />
* <Protect condition={(has) => has({permission:"a_permission_key"})} />
* <Protect condition={(has) => has({role:"a_role_key"})} />
* <Protect condition={(has) => has({__experimental_feature:"a_feature_key"})} />
* <Protect fallback={<p>Unauthorized</p>} />
* ```
*/
Expand DownExpand Up@@ -127,7 +140,7 @@ export const Protect = ({ children, fallback, treatPendingAsSignedOut, ...restAu
return unauthorized;
}

if (restAuthorizedParams.role || restAuthorizedParams.permission) {
if (restAuthorizedParams.role || restAuthorizedParams.permission || restAuthorizedParams.__experimental_feature) {
if (has(restAuthorizedParams)) {
return authorized;
}
Expand Down
15 changes: 13 additions & 2 deletions packages/react/src/hooks/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,17 @@ export function useDerivedAuth(
authObject: any,
{ treatPendingAsSignedOut = true }: PendingSessionOptions = {},
): UseAuthReturn {
const { userId, orgId, orgRole, has, signOut, getToken, orgPermissions, factorVerificationAge } = authObject ?? {};
const {
userId,
orgId,
orgRole,
has,
signOut,
getToken,
orgPermissions,
factorVerificationAge,
__experimental_features,
} = authObject ?? {};

const derivedHas = useCallback(
(params: Parameters<CheckAuthorizationWithCustomPermissions>[0]) => {
Expand All@@ -157,9 +167,10 @@ export function useDerivedAuth(
orgRole,
orgPermissions,
factorVerificationAge,
__experimental_features,
})(params);
},
[has, userId, orgId, orgRole, orgPermissions, factorVerificationAge],
[has, userId, orgId, orgRole, orgPermissions, factorVerificationAge, __experimental_features],
);

const payload = resolveAuthState({
Expand Down
31 changes: 31 additions & 0 deletions packages/shared/src/authorization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,13 +20,19 @@ type AuthorizationOptions = {
orgRole: string | null | undefined;
orgPermissions: string[] | null | undefined;
factorVerificationAge: [number, number] | null;
__experimental_features?: string | null;
};

type CheckOrgAuthorization = (
params: { role?: OrganizationCustomRoleKey; permission?: OrganizationCustomPermissionKey },
{ orgId, orgRole, orgPermissions }: AuthorizationOptions,
) => boolean | null;

type CheckFeatureAuthorization = (
params: { __experimental_feature?: string },
{ __experimental_features }: AuthorizationOptions,
) => boolean | null;

type CheckReverificationAuthorization = (
params: {
reverification?: ReverificationConfig;
Expand DownExpand Up@@ -85,6 +91,25 @@ const checkOrgAuthorization: CheckOrgAuthorization = (params, options) => {
return null;
};

const checkFeatureAuthorization: CheckFeatureAuthorization = (param, options) => {
const { __experimental_feature: feature } = param;
const { __experimental_features } = options;

if (!feature) {
return null;
}

if (!__experimental_features) {
return null;
}

if (typeof __experimental_features === 'string') {
return __experimental_features.split(',').includes(feature);
}

return null;
};

const validateReverificationConfig = (config: ReverificationConfig | undefined | null) => {
if (!config) {
return false;
Expand DownExpand Up@@ -156,6 +181,11 @@ const createCheckAuthorization = (options: AuthorizationOptions): CheckAuthoriza

const orgAuthorization = checkOrgAuthorization(params, options);
const reverificationAuthorization = checkReverificationAuthorization(params, options);
const featureAuthorization = checkFeatureAuthorization(params, options);

if (featureAuthorization) {
return featureAuthorization;
}

if ([orgAuthorization, reverificationAuthorization].some(a => a === null)) {
return [orgAuthorization, reverificationAuthorization].some(a => a === true);
Expand All@@ -175,6 +205,7 @@ type AuthStateOptions = {
orgRole?: OrganizationCustomRoleKey | null;
orgSlug?: string | null;
orgPermissions?: OrganizationCustomPermissionKey[] | null;
__experimental_features?: string | null;
getToken: GetToken;
signOut: SignOut;
has: (params: Parameters<CheckAuthorizationWithCustomPermissions>[0]) => boolean;
Expand Down
34 changes: 34 additions & 0 deletions packages/types/src/authorization.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
declare global {
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
interface ClerkAuthorization {}
}

interface AuthorizationKeysBase {
role: string;
permission: string;
__experimental_feature: string;
}

interface AuthorizationKeysPlaceholder {
role: unknown;
permission: unknown;
__experimental_feature: unknown;
}

export type RoleKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['role'] extends string
? ClerkAuthorization['role']
: AuthorizationKeysBase['role']
: AuthorizationKeysBase['role'];

export type PermissionKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['permission'] extends string
? ClerkAuthorization['permission']
: AuthorizationKeysBase['permission']
: AuthorizationKeysBase['permission'];

export type FeatureKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['__experimental_feature'] extends string
? ClerkAuthorization['__experimental_feature']
: AuthorizationKeysBase['__experimental_feature']
: AuthorizationKeysBase['__experimental_feature'];
1 change: 1 addition & 0 deletions packages/types/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ export * from './appearance';
export * from './elementIds';
export * from './attributes';
export * from './authConfig';
export * from './authorization';
export * from './backupCode';
export * from './clerk';
export * from './client';
Expand Down
7 changes: 6 additions & 1 deletion packages/types/src/jwtv2.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,14 +119,19 @@ type JWTPayloadBase = {
* Any other JWT Claim Set member.
*/
[propName: string]: unknown;

/**
* Feature claims, you can have multiple features in the same claim. e.g.: "impersonation,emails"
* @experimental
*/
fea?: string | null;

@octoperoctoperApr 3, 2025

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.

I think we will first need to have JWT versioning before proceeding with this addition - reference

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.

I agree, I'll move this one to draft, and we can update it later with the versioning changes.

};

export type VersionedJwtPayload =
| {
ver?: never;

/**
*
* Active organization permissions.
*/
org_permissions?: OrganizationCustomPermissionKey[];
Expand Down
19 changes: 17 additions & 2 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { FeatureKey } from './authorization';
import type {
BackupCodeAttempt,
EmailCodeAttempt,
Expand DownExpand Up@@ -52,12 +53,19 @@ export type CheckAuthorizationParamsWithCustomPermissions = WithReverification<
| {
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
role?: never;
permission: OrganizationCustomPermissionKey;
__experimental_feature?: never;
}
| { role?: never; permission?: never }
| {
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| { role?: never; permission?: never; __experimental_feature?: never }
>;

export type CheckAuthorization = CheckAuthorizationFn<CheckAuthorizationParams>;
Expand DownExpand Up@@ -90,12 +98,19 @@ export type CheckAuthorizationParamsFromSessionClaims<P extends OrganizationCust
| {
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
role?: never;
permission: DisallowSystemPermissions<P>;
__experimental_feature?: never;
}
| {
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| { role?: never; permission?: never }
| { role?: never; permission?: never; __experimental_feature?: never }
>;

/**
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
Closed
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
9 changes: 9 additions & 0 deletions .changeset/curvy-teeth-watch.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/backend': patch
'@clerk/clerk-js': patch
'@clerk/clerk-react': patch
'@clerk/shared': patch
'@clerk/types': patch
---

Add feature param to has
26 changes: 23 additions & 3 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ type SignedInAuthObjectProperties = {
* [fistFactorAge, secondFactorAge]
*/
factorVerificationAge: [firstFactorAge: number, secondFactorAge: number] | null;
__experimental_features?: string | null;
};

/**
Expand DownExpand Up@@ -114,6 +115,7 @@ const generateSignedInAuthObjectProperties = (claims: JwtPayload): SignedInAuthO
orgSlug: claims.org_slug,
orgPermissions,
factorVerificationAge,
__experimental_features: claims.fea,
};
};

Expand All@@ -125,8 +127,18 @@ export function signedInAuthObject(
sessionToken: string,
sessionClaims: JwtPayload,
): SignedInAuthObject {
const { actor, sessionId, sessionStatus, userId, orgId, orgRole, orgSlug, orgPermissions, factorVerificationAge } =
generateSignedInAuthObjectProperties(sessionClaims);
const {
actor,
sessionId,
sessionStatus,
userId,
orgId,
orgRole,
orgSlug,
orgPermissions,
factorVerificationAge,
__experimental_features,
} = generateSignedInAuthObjectProperties(sessionClaims);
const apiClient = createBackendApiClient(authenticateContext);
const getToken = createGetToken({
sessionId,
Expand All@@ -145,8 +157,16 @@ export function signedInAuthObject(
orgSlug,
orgPermissions,
factorVerificationAge,
__experimental_features,
getToken,
has: createCheckAuthorization({ orgId, orgRole, orgPermissions, userId, factorVerificationAge }),
has: createCheckAuthorization({
orgId,
orgRole,
orgPermissions,
userId,
factorVerificationAge,
__experimental_features,
}),
debug: createDebug({ ...authenticateContext, sessionToken }),
};
}
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,8 @@ export class Session extends BaseResource implements SessionResource {
orgId: activeMembership?.id,
orgRole: activeMembership?.role,
orgPermissions: activeMembership?.permissions,
// TODO: retrieve features
__experimental_features: 'testfeature',
})(params);
};

Expand Down
15 changes: 14 additions & 1 deletion packages/react/src/components/controlComponents.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { deprecated } from '@clerk/shared/deprecated';
import type {
CheckAuthorizationWithCustomPermissions,
FeatureKey,
HandleOAuthCallbackParams,
OrganizationCustomPermissionKey,
OrganizationCustomRoleKey,
Expand DownExpand Up@@ -61,21 +62,31 @@ export type ProtectProps = React.PropsWithChildren<
condition?: never;
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
condition?: never;
role?: never;
permission: OrganizationCustomPermissionKey;
__experimental_feature?: never;
}
| {
condition: (has: CheckAuthorizationWithCustomPermissions) => boolean;
role?: never;
permission?: never;
__experimental_feature?: never;
}
| {
condition?: never;
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| {
condition?: never;
role?: never;
permission?: never;
__experimental_feature?: never;
}
) & {
fallback?: React.ReactNode;
Expand All@@ -89,8 +100,10 @@ export type ProtectProps = React.PropsWithChildren<
* ```
* <Protect permission="a_permission_key" />
* <Protect role="a_role_key" />
* <Protect __experimental_feature"a_feature_key" />
* <Protect condition={(has) => has({permission:"a_permission_key"})} />
* <Protect condition={(has) => has({role:"a_role_key"})} />
* <Protect condition={(has) => has({__experimental_feature:"a_feature_key"})} />
* <Protect fallback={<p>Unauthorized</p>} />
* ```
*/
Expand DownExpand Up@@ -127,7 +140,7 @@ export const Protect = ({ children, fallback, treatPendingAsSignedOut, ...restAu
return unauthorized;
}

if (restAuthorizedParams.role || restAuthorizedParams.permission) {
if (restAuthorizedParams.role || restAuthorizedParams.permission || restAuthorizedParams.__experimental_feature) {
if (has(restAuthorizedParams)) {
return authorized;
}
Expand Down
15 changes: 13 additions & 2 deletions packages/react/src/hooks/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,17 @@ export function useDerivedAuth(
authObject: any,
{ treatPendingAsSignedOut = true }: PendingSessionOptions = {},
): UseAuthReturn {
const { userId, orgId, orgRole, has, signOut, getToken, orgPermissions, factorVerificationAge } = authObject ?? {};
const {
userId,
orgId,
orgRole,
has,
signOut,
getToken,
orgPermissions,
factorVerificationAge,
__experimental_features,
} = authObject ?? {};

const derivedHas = useCallback(
(params: Parameters<CheckAuthorizationWithCustomPermissions>[0]) => {
Expand All@@ -157,9 +167,10 @@ export function useDerivedAuth(
orgRole,
orgPermissions,
factorVerificationAge,
__experimental_features,
})(params);
},
[has, userId, orgId, orgRole, orgPermissions, factorVerificationAge],
[has, userId, orgId, orgRole, orgPermissions, factorVerificationAge, __experimental_features],
);

const payload = resolveAuthState({
Expand Down
31 changes: 31 additions & 0 deletions packages/shared/src/authorization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,13 +20,19 @@ type AuthorizationOptions = {
orgRole: string | null | undefined;
orgPermissions: string[] | null | undefined;
factorVerificationAge: [number, number] | null;
__experimental_features?: string | null;
};

type CheckOrgAuthorization = (
params: { role?: OrganizationCustomRoleKey; permission?: OrganizationCustomPermissionKey },
{ orgId, orgRole, orgPermissions }: AuthorizationOptions,
) => boolean | null;

type CheckFeatureAuthorization = (
params: { __experimental_feature?: string },
{ __experimental_features }: AuthorizationOptions,
) => boolean | null;

type CheckReverificationAuthorization = (
params: {
reverification?: ReverificationConfig;
Expand DownExpand Up@@ -85,6 +91,25 @@ const checkOrgAuthorization: CheckOrgAuthorization = (params, options) => {
return null;
};

const checkFeatureAuthorization: CheckFeatureAuthorization = (param, options) => {
const { __experimental_feature: feature } = param;
const { __experimental_features } = options;

if (!feature) {
return null;
}

if (!__experimental_features) {
return null;
}

if (typeof __experimental_features === 'string') {
return __experimental_features.split(',').includes(feature);
}

return null;
};

const validateReverificationConfig = (config: ReverificationConfig | undefined | null) => {
if (!config) {
return false;
Expand DownExpand Up@@ -156,6 +181,11 @@ const createCheckAuthorization = (options: AuthorizationOptions): CheckAuthoriza

const orgAuthorization = checkOrgAuthorization(params, options);
const reverificationAuthorization = checkReverificationAuthorization(params, options);
const featureAuthorization = checkFeatureAuthorization(params, options);

if (featureAuthorization) {
return featureAuthorization;
}

if ([orgAuthorization, reverificationAuthorization].some(a => a === null)) {
return [orgAuthorization, reverificationAuthorization].some(a => a === true);
Expand All@@ -175,6 +205,7 @@ type AuthStateOptions = {
orgRole?: OrganizationCustomRoleKey | null;
orgSlug?: string | null;
orgPermissions?: OrganizationCustomPermissionKey[] | null;
__experimental_features?: string | null;
getToken: GetToken;
signOut: SignOut;
has: (params: Parameters<CheckAuthorizationWithCustomPermissions>[0]) => boolean;
Expand Down
34 changes: 34 additions & 0 deletions packages/types/src/authorization.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
declare global {
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
interface ClerkAuthorization {}
}

interface AuthorizationKeysBase {
role: string;
permission: string;
__experimental_feature: string;
}

interface AuthorizationKeysPlaceholder {
role: unknown;
permission: unknown;
__experimental_feature: unknown;
}

export type RoleKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['role'] extends string
? ClerkAuthorization['role']
: AuthorizationKeysBase['role']
: AuthorizationKeysBase['role'];

export type PermissionKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['permission'] extends string
? ClerkAuthorization['permission']
: AuthorizationKeysBase['permission']
: AuthorizationKeysBase['permission'];

export type FeatureKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['__experimental_feature'] extends string
? ClerkAuthorization['__experimental_feature']
: AuthorizationKeysBase['__experimental_feature']
: AuthorizationKeysBase['__experimental_feature'];
1 change: 1 addition & 0 deletions packages/types/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ export * from './appearance';
export * from './elementIds';
export * from './attributes';
export * from './authConfig';
export * from './authorization';
export * from './backupCode';
export * from './clerk';
export * from './client';
Expand Down
7 changes: 6 additions & 1 deletion packages/types/src/jwtv2.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,14 +119,19 @@ type JWTPayloadBase = {
* Any other JWT Claim Set member.
*/
[propName: string]: unknown;

/**
* Feature claims, you can have multiple features in the same claim. e.g.: "impersonation,emails"
* @experimental
*/
fea?: string | null;

@octoperoctoperApr 3, 2025

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.

I think we will first need to have JWT versioning before proceeding with this addition - reference

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.

I agree, I'll move this one to draft, and we can update it later with the versioning changes.

};

export type VersionedJwtPayload =
| {
ver?: never;

/**
*
* Active organization permissions.
*/
org_permissions?: OrganizationCustomPermissionKey[];
Expand Down
19 changes: 17 additions & 2 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { FeatureKey } from './authorization';
import type {
BackupCodeAttempt,
EmailCodeAttempt,
Expand DownExpand Up@@ -52,12 +53,19 @@ export type CheckAuthorizationParamsWithCustomPermissions = WithReverification<
| {
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
role?: never;
permission: OrganizationCustomPermissionKey;
__experimental_feature?: never;
}
| { role?: never; permission?: never }
| {
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| { role?: never; permission?: never; __experimental_feature?: never }
>;

export type CheckAuthorization = CheckAuthorizationFn<CheckAuthorizationParams>;
Expand DownExpand Up@@ -90,12 +98,19 @@ export type CheckAuthorizationParamsFromSessionClaims<P extends OrganizationCust
| {
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
role?: never;
permission: DisallowSystemPermissions<P>;
__experimental_feature?: never;
}
| {
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| { role?: never; permission?: never }
| { role?: never; permission?: never; __experimental_feature?: never }
>;

/**
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
Closed
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
9 changes: 9 additions & 0 deletions .changeset/curvy-teeth-watch.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/backend': patch
'@clerk/clerk-js': patch
'@clerk/clerk-react': patch
'@clerk/shared': patch
'@clerk/types': patch
---

Add feature param to has
26 changes: 23 additions & 3 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ type SignedInAuthObjectProperties = {
* [fistFactorAge, secondFactorAge]
*/
factorVerificationAge: [firstFactorAge: number, secondFactorAge: number] | null;
__experimental_features?: string | null;
};

/**
Expand DownExpand Up@@ -114,6 +115,7 @@ const generateSignedInAuthObjectProperties = (claims: JwtPayload): SignedInAuthO
orgSlug: claims.org_slug,
orgPermissions,
factorVerificationAge,
__experimental_features: claims.fea,
};
};

Expand All@@ -125,8 +127,18 @@ export function signedInAuthObject(
sessionToken: string,
sessionClaims: JwtPayload,
): SignedInAuthObject {
const { actor, sessionId, sessionStatus, userId, orgId, orgRole, orgSlug, orgPermissions, factorVerificationAge } =
generateSignedInAuthObjectProperties(sessionClaims);
const {
actor,
sessionId,
sessionStatus,
userId,
orgId,
orgRole,
orgSlug,
orgPermissions,
factorVerificationAge,
__experimental_features,
} = generateSignedInAuthObjectProperties(sessionClaims);
const apiClient = createBackendApiClient(authenticateContext);
const getToken = createGetToken({
sessionId,
Expand All@@ -145,8 +157,16 @@ export function signedInAuthObject(
orgSlug,
orgPermissions,
factorVerificationAge,
__experimental_features,
getToken,
has: createCheckAuthorization({ orgId, orgRole, orgPermissions, userId, factorVerificationAge }),
has: createCheckAuthorization({
orgId,
orgRole,
orgPermissions,
userId,
factorVerificationAge,
__experimental_features,
}),
debug: createDebug({ ...authenticateContext, sessionToken }),
};
}
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,8 @@ export class Session extends BaseResource implements SessionResource {
orgId: activeMembership?.id,
orgRole: activeMembership?.role,
orgPermissions: activeMembership?.permissions,
// TODO: retrieve features
__experimental_features: 'testfeature',
})(params);
};

Expand Down
15 changes: 14 additions & 1 deletion packages/react/src/components/controlComponents.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { deprecated } from '@clerk/shared/deprecated';
import type {
CheckAuthorizationWithCustomPermissions,
FeatureKey,
HandleOAuthCallbackParams,
OrganizationCustomPermissionKey,
OrganizationCustomRoleKey,
Expand DownExpand Up@@ -61,21 +62,31 @@ export type ProtectProps = React.PropsWithChildren<
condition?: never;
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
condition?: never;
role?: never;
permission: OrganizationCustomPermissionKey;
__experimental_feature?: never;
}
| {
condition: (has: CheckAuthorizationWithCustomPermissions) => boolean;
role?: never;
permission?: never;
__experimental_feature?: never;
}
| {
condition?: never;
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| {
condition?: never;
role?: never;
permission?: never;
__experimental_feature?: never;
}
) & {
fallback?: React.ReactNode;
Expand All@@ -89,8 +100,10 @@ export type ProtectProps = React.PropsWithChildren<
* ```
* <Protect permission="a_permission_key" />
* <Protect role="a_role_key" />
* <Protect __experimental_feature"a_feature_key" />
* <Protect condition={(has) => has({permission:"a_permission_key"})} />
* <Protect condition={(has) => has({role:"a_role_key"})} />
* <Protect condition={(has) => has({__experimental_feature:"a_feature_key"})} />
* <Protect fallback={<p>Unauthorized</p>} />
* ```
*/
Expand DownExpand Up@@ -127,7 +140,7 @@ export const Protect = ({ children, fallback, treatPendingAsSignedOut, ...restAu
return unauthorized;
}

if (restAuthorizedParams.role || restAuthorizedParams.permission) {
if (restAuthorizedParams.role || restAuthorizedParams.permission || restAuthorizedParams.__experimental_feature) {
if (has(restAuthorizedParams)) {
return authorized;
}
Expand Down
15 changes: 13 additions & 2 deletions packages/react/src/hooks/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,17 @@ export function useDerivedAuth(
authObject: any,
{ treatPendingAsSignedOut = true }: PendingSessionOptions = {},
): UseAuthReturn {
const { userId, orgId, orgRole, has, signOut, getToken, orgPermissions, factorVerificationAge } = authObject ?? {};
const {
userId,
orgId,
orgRole,
has,
signOut,
getToken,
orgPermissions,
factorVerificationAge,
__experimental_features,
} = authObject ?? {};

const derivedHas = useCallback(
(params: Parameters<CheckAuthorizationWithCustomPermissions>[0]) => {
Expand All@@ -157,9 +167,10 @@ export function useDerivedAuth(
orgRole,
orgPermissions,
factorVerificationAge,
__experimental_features,
})(params);
},
[has, userId, orgId, orgRole, orgPermissions, factorVerificationAge],
[has, userId, orgId, orgRole, orgPermissions, factorVerificationAge, __experimental_features],
);

const payload = resolveAuthState({
Expand Down
31 changes: 31 additions & 0 deletions packages/shared/src/authorization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,13 +20,19 @@ type AuthorizationOptions = {
orgRole: string | null | undefined;
orgPermissions: string[] | null | undefined;
factorVerificationAge: [number, number] | null;
__experimental_features?: string | null;
};

type CheckOrgAuthorization = (
params: { role?: OrganizationCustomRoleKey; permission?: OrganizationCustomPermissionKey },
{ orgId, orgRole, orgPermissions }: AuthorizationOptions,
) => boolean | null;

type CheckFeatureAuthorization = (
params: { __experimental_feature?: string },
{ __experimental_features }: AuthorizationOptions,
) => boolean | null;

type CheckReverificationAuthorization = (
params: {
reverification?: ReverificationConfig;
Expand DownExpand Up@@ -85,6 +91,25 @@ const checkOrgAuthorization: CheckOrgAuthorization = (params, options) => {
return null;
};

const checkFeatureAuthorization: CheckFeatureAuthorization = (param, options) => {
const { __experimental_feature: feature } = param;
const { __experimental_features } = options;

if (!feature) {
return null;
}

if (!__experimental_features) {
return null;
}

if (typeof __experimental_features === 'string') {
return __experimental_features.split(',').includes(feature);
}

return null;
};

const validateReverificationConfig = (config: ReverificationConfig | undefined | null) => {
if (!config) {
return false;
Expand DownExpand Up@@ -156,6 +181,11 @@ const createCheckAuthorization = (options: AuthorizationOptions): CheckAuthoriza

const orgAuthorization = checkOrgAuthorization(params, options);
const reverificationAuthorization = checkReverificationAuthorization(params, options);
const featureAuthorization = checkFeatureAuthorization(params, options);

if (featureAuthorization) {
return featureAuthorization;
}

if ([orgAuthorization, reverificationAuthorization].some(a => a === null)) {
return [orgAuthorization, reverificationAuthorization].some(a => a === true);
Expand All@@ -175,6 +205,7 @@ type AuthStateOptions = {
orgRole?: OrganizationCustomRoleKey | null;
orgSlug?: string | null;
orgPermissions?: OrganizationCustomPermissionKey[] | null;
__experimental_features?: string | null;
getToken: GetToken;
signOut: SignOut;
has: (params: Parameters<CheckAuthorizationWithCustomPermissions>[0]) => boolean;
Expand Down
34 changes: 34 additions & 0 deletions packages/types/src/authorization.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
declare global {
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
interface ClerkAuthorization {}
}

interface AuthorizationKeysBase {
role: string;
permission: string;
__experimental_feature: string;
}

interface AuthorizationKeysPlaceholder {
role: unknown;
permission: unknown;
__experimental_feature: unknown;
}

export type RoleKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['role'] extends string
? ClerkAuthorization['role']
: AuthorizationKeysBase['role']
: AuthorizationKeysBase['role'];

export type PermissionKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['permission'] extends string
? ClerkAuthorization['permission']
: AuthorizationKeysBase['permission']
: AuthorizationKeysBase['permission'];

export type FeatureKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['__experimental_feature'] extends string
? ClerkAuthorization['__experimental_feature']
: AuthorizationKeysBase['__experimental_feature']
: AuthorizationKeysBase['__experimental_feature'];
1 change: 1 addition & 0 deletions packages/types/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ export * from './appearance';
export * from './elementIds';
export * from './attributes';
export * from './authConfig';
export * from './authorization';
export * from './backupCode';
export * from './clerk';
export * from './client';
Expand Down
7 changes: 6 additions & 1 deletion packages/types/src/jwtv2.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,14 +119,19 @@ type JWTPayloadBase = {
* Any other JWT Claim Set member.
*/
[propName: string]: unknown;

/**
* Feature claims, you can have multiple features in the same claim. e.g.: "impersonation,emails"
* @experimental
*/
fea?: string | null;

@octoperoctoperApr 3, 2025

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.

I think we will first need to have JWT versioning before proceeding with this addition - reference

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.

I agree, I'll move this one to draft, and we can update it later with the versioning changes.

};

export type VersionedJwtPayload =
| {
ver?: never;

/**
*
* Active organization permissions.
*/
org_permissions?: OrganizationCustomPermissionKey[];
Expand Down
19 changes: 17 additions & 2 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { FeatureKey } from './authorization';
import type {
BackupCodeAttempt,
EmailCodeAttempt,
Expand DownExpand Up@@ -52,12 +53,19 @@ export type CheckAuthorizationParamsWithCustomPermissions = WithReverification<
| {
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
role?: never;
permission: OrganizationCustomPermissionKey;
__experimental_feature?: never;
}
| { role?: never; permission?: never }
| {
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| { role?: never; permission?: never; __experimental_feature?: never }
>;

export type CheckAuthorization = CheckAuthorizationFn<CheckAuthorizationParams>;
Expand DownExpand Up@@ -90,12 +98,19 @@ export type CheckAuthorizationParamsFromSessionClaims<P extends OrganizationCust
| {
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
role?: never;
permission: DisallowSystemPermissions<P>;
__experimental_feature?: never;
}
| {
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| { role?: never; permission?: never }
| { role?: never; permission?: never; __experimental_feature?: never }
>;

/**
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
Closed
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
9 changes: 9 additions & 0 deletions .changeset/curvy-teeth-watch.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/backend': patch
'@clerk/clerk-js': patch
'@clerk/clerk-react': patch
'@clerk/shared': patch
'@clerk/types': patch
---

Add feature param to has
26 changes: 23 additions & 3 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ type SignedInAuthObjectProperties = {
* [fistFactorAge, secondFactorAge]
*/
factorVerificationAge: [firstFactorAge: number, secondFactorAge: number] | null;
__experimental_features?: string | null;
};

/**
Expand DownExpand Up@@ -114,6 +115,7 @@ const generateSignedInAuthObjectProperties = (claims: JwtPayload): SignedInAuthO
orgSlug: claims.org_slug,
orgPermissions,
factorVerificationAge,
__experimental_features: claims.fea,
};
};

Expand All@@ -125,8 +127,18 @@ export function signedInAuthObject(
sessionToken: string,
sessionClaims: JwtPayload,
): SignedInAuthObject {
const { actor, sessionId, sessionStatus, userId, orgId, orgRole, orgSlug, orgPermissions, factorVerificationAge } =
generateSignedInAuthObjectProperties(sessionClaims);
const {
actor,
sessionId,
sessionStatus,
userId,
orgId,
orgRole,
orgSlug,
orgPermissions,
factorVerificationAge,
__experimental_features,
} = generateSignedInAuthObjectProperties(sessionClaims);
const apiClient = createBackendApiClient(authenticateContext);
const getToken = createGetToken({
sessionId,
Expand All@@ -145,8 +157,16 @@ export function signedInAuthObject(
orgSlug,
orgPermissions,
factorVerificationAge,
__experimental_features,
getToken,
has: createCheckAuthorization({ orgId, orgRole, orgPermissions, userId, factorVerificationAge }),
has: createCheckAuthorization({
orgId,
orgRole,
orgPermissions,
userId,
factorVerificationAge,
__experimental_features,
}),
debug: createDebug({ ...authenticateContext, sessionToken }),
};
}
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,8 @@ export class Session extends BaseResource implements SessionResource {
orgId: activeMembership?.id,
orgRole: activeMembership?.role,
orgPermissions: activeMembership?.permissions,
// TODO: retrieve features
__experimental_features: 'testfeature',
})(params);
};

Expand Down
15 changes: 14 additions & 1 deletion packages/react/src/components/controlComponents.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { deprecated } from '@clerk/shared/deprecated';
import type {
CheckAuthorizationWithCustomPermissions,
FeatureKey,
HandleOAuthCallbackParams,
OrganizationCustomPermissionKey,
OrganizationCustomRoleKey,
Expand DownExpand Up@@ -61,21 +62,31 @@ export type ProtectProps = React.PropsWithChildren<
condition?: never;
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
condition?: never;
role?: never;
permission: OrganizationCustomPermissionKey;
__experimental_feature?: never;
}
| {
condition: (has: CheckAuthorizationWithCustomPermissions) => boolean;
role?: never;
permission?: never;
__experimental_feature?: never;
}
| {
condition?: never;
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| {
condition?: never;
role?: never;
permission?: never;
__experimental_feature?: never;
}
) & {
fallback?: React.ReactNode;
Expand All@@ -89,8 +100,10 @@ export type ProtectProps = React.PropsWithChildren<
* ```
* <Protect permission="a_permission_key" />
* <Protect role="a_role_key" />
* <Protect __experimental_feature"a_feature_key" />
* <Protect condition={(has) => has({permission:"a_permission_key"})} />
* <Protect condition={(has) => has({role:"a_role_key"})} />
* <Protect condition={(has) => has({__experimental_feature:"a_feature_key"})} />
* <Protect fallback={<p>Unauthorized</p>} />
* ```
*/
Expand DownExpand Up@@ -127,7 +140,7 @@ export const Protect = ({ children, fallback, treatPendingAsSignedOut, ...restAu
return unauthorized;
}

if (restAuthorizedParams.role || restAuthorizedParams.permission) {
if (restAuthorizedParams.role || restAuthorizedParams.permission || restAuthorizedParams.__experimental_feature) {
if (has(restAuthorizedParams)) {
return authorized;
}
Expand Down
15 changes: 13 additions & 2 deletions packages/react/src/hooks/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,17 @@ export function useDerivedAuth(
authObject: any,
{ treatPendingAsSignedOut = true }: PendingSessionOptions = {},
): UseAuthReturn {
const { userId, orgId, orgRole, has, signOut, getToken, orgPermissions, factorVerificationAge } = authObject ?? {};
const {
userId,
orgId,
orgRole,
has,
signOut,
getToken,
orgPermissions,
factorVerificationAge,
__experimental_features,
} = authObject ?? {};

const derivedHas = useCallback(
(params: Parameters<CheckAuthorizationWithCustomPermissions>[0]) => {
Expand All@@ -157,9 +167,10 @@ export function useDerivedAuth(
orgRole,
orgPermissions,
factorVerificationAge,
__experimental_features,
})(params);
},
[has, userId, orgId, orgRole, orgPermissions, factorVerificationAge],
[has, userId, orgId, orgRole, orgPermissions, factorVerificationAge, __experimental_features],
);

const payload = resolveAuthState({
Expand Down
31 changes: 31 additions & 0 deletions packages/shared/src/authorization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,13 +20,19 @@ type AuthorizationOptions = {
orgRole: string | null | undefined;
orgPermissions: string[] | null | undefined;
factorVerificationAge: [number, number] | null;
__experimental_features?: string | null;
};

type CheckOrgAuthorization = (
params: { role?: OrganizationCustomRoleKey; permission?: OrganizationCustomPermissionKey },
{ orgId, orgRole, orgPermissions }: AuthorizationOptions,
) => boolean | null;

type CheckFeatureAuthorization = (
params: { __experimental_feature?: string },
{ __experimental_features }: AuthorizationOptions,
) => boolean | null;

type CheckReverificationAuthorization = (
params: {
reverification?: ReverificationConfig;
Expand DownExpand Up@@ -85,6 +91,25 @@ const checkOrgAuthorization: CheckOrgAuthorization = (params, options) => {
return null;
};

const checkFeatureAuthorization: CheckFeatureAuthorization = (param, options) => {
const { __experimental_feature: feature } = param;
const { __experimental_features } = options;

if (!feature) {
return null;
}

if (!__experimental_features) {
return null;
}

if (typeof __experimental_features === 'string') {
return __experimental_features.split(',').includes(feature);
}

return null;
};

const validateReverificationConfig = (config: ReverificationConfig | undefined | null) => {
if (!config) {
return false;
Expand DownExpand Up@@ -156,6 +181,11 @@ const createCheckAuthorization = (options: AuthorizationOptions): CheckAuthoriza

const orgAuthorization = checkOrgAuthorization(params, options);
const reverificationAuthorization = checkReverificationAuthorization(params, options);
const featureAuthorization = checkFeatureAuthorization(params, options);

if (featureAuthorization) {
return featureAuthorization;
}

if ([orgAuthorization, reverificationAuthorization].some(a => a === null)) {
return [orgAuthorization, reverificationAuthorization].some(a => a === true);
Expand All@@ -175,6 +205,7 @@ type AuthStateOptions = {
orgRole?: OrganizationCustomRoleKey | null;
orgSlug?: string | null;
orgPermissions?: OrganizationCustomPermissionKey[] | null;
__experimental_features?: string | null;
getToken: GetToken;
signOut: SignOut;
has: (params: Parameters<CheckAuthorizationWithCustomPermissions>[0]) => boolean;
Expand Down
34 changes: 34 additions & 0 deletions packages/types/src/authorization.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
declare global {
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
interface ClerkAuthorization {}
}

interface AuthorizationKeysBase {
role: string;
permission: string;
__experimental_feature: string;
}

interface AuthorizationKeysPlaceholder {
role: unknown;
permission: unknown;
__experimental_feature: unknown;
}

export type RoleKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['role'] extends string
? ClerkAuthorization['role']
: AuthorizationKeysBase['role']
: AuthorizationKeysBase['role'];

export type PermissionKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['permission'] extends string
? ClerkAuthorization['permission']
: AuthorizationKeysBase['permission']
: AuthorizationKeysBase['permission'];

export type FeatureKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['__experimental_feature'] extends string
? ClerkAuthorization['__experimental_feature']
: AuthorizationKeysBase['__experimental_feature']
: AuthorizationKeysBase['__experimental_feature'];
1 change: 1 addition & 0 deletions packages/types/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ export * from './appearance';
export * from './elementIds';
export * from './attributes';
export * from './authConfig';
export * from './authorization';
export * from './backupCode';
export * from './clerk';
export * from './client';
Expand Down
7 changes: 6 additions & 1 deletion packages/types/src/jwtv2.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,14 +119,19 @@ type JWTPayloadBase = {
* Any other JWT Claim Set member.
*/
[propName: string]: unknown;

/**
* Feature claims, you can have multiple features in the same claim. e.g.: "impersonation,emails"
* @experimental
*/
fea?: string | null;

@octoperoctoperApr 3, 2025

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.

I think we will first need to have JWT versioning before proceeding with this addition - reference

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.

I agree, I'll move this one to draft, and we can update it later with the versioning changes.

};

export type VersionedJwtPayload =
| {
ver?: never;

/**
*
* Active organization permissions.
*/
org_permissions?: OrganizationCustomPermissionKey[];
Expand Down
19 changes: 17 additions & 2 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { FeatureKey } from './authorization';
import type {
BackupCodeAttempt,
EmailCodeAttempt,
Expand DownExpand Up@@ -52,12 +53,19 @@ export type CheckAuthorizationParamsWithCustomPermissions = WithReverification<
| {
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
role?: never;
permission: OrganizationCustomPermissionKey;
__experimental_feature?: never;
}
| { role?: never; permission?: never }
| {
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| { role?: never; permission?: never; __experimental_feature?: never }
>;

export type CheckAuthorization = CheckAuthorizationFn<CheckAuthorizationParams>;
Expand DownExpand Up@@ -90,12 +98,19 @@ export type CheckAuthorizationParamsFromSessionClaims<P extends OrganizationCust
| {
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
role?: never;
permission: DisallowSystemPermissions<P>;
__experimental_feature?: never;
}
| {
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| { role?: never; permission?: never }
| { role?: never; permission?: never; __experimental_feature?: never }
>;

/**
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
Closed
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
9 changes: 9 additions & 0 deletions .changeset/curvy-teeth-watch.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/backend': patch
'@clerk/clerk-js': patch
'@clerk/clerk-react': patch
'@clerk/shared': patch
'@clerk/types': patch
---

Add feature param to has
26 changes: 23 additions & 3 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ type SignedInAuthObjectProperties = {
* [fistFactorAge, secondFactorAge]
*/
factorVerificationAge: [firstFactorAge: number, secondFactorAge: number] | null;
__experimental_features?: string | null;
};

/**
Expand DownExpand Up@@ -114,6 +115,7 @@ const generateSignedInAuthObjectProperties = (claims: JwtPayload): SignedInAuthO
orgSlug: claims.org_slug,
orgPermissions,
factorVerificationAge,
__experimental_features: claims.fea,
};
};

Expand All@@ -125,8 +127,18 @@ export function signedInAuthObject(
sessionToken: string,
sessionClaims: JwtPayload,
): SignedInAuthObject {
const { actor, sessionId, sessionStatus, userId, orgId, orgRole, orgSlug, orgPermissions, factorVerificationAge } =
generateSignedInAuthObjectProperties(sessionClaims);
const {
actor,
sessionId,
sessionStatus,
userId,
orgId,
orgRole,
orgSlug,
orgPermissions,
factorVerificationAge,
__experimental_features,
} = generateSignedInAuthObjectProperties(sessionClaims);
const apiClient = createBackendApiClient(authenticateContext);
const getToken = createGetToken({
sessionId,
Expand All@@ -145,8 +157,16 @@ export function signedInAuthObject(
orgSlug,
orgPermissions,
factorVerificationAge,
__experimental_features,
getToken,
has: createCheckAuthorization({ orgId, orgRole, orgPermissions, userId, factorVerificationAge }),
has: createCheckAuthorization({
orgId,
orgRole,
orgPermissions,
userId,
factorVerificationAge,
__experimental_features,
}),
debug: createDebug({ ...authenticateContext, sessionToken }),
};
}
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,8 @@ export class Session extends BaseResource implements SessionResource {
orgId: activeMembership?.id,
orgRole: activeMembership?.role,
orgPermissions: activeMembership?.permissions,
// TODO: retrieve features
__experimental_features: 'testfeature',
})(params);
};

Expand Down
15 changes: 14 additions & 1 deletion packages/react/src/components/controlComponents.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { deprecated } from '@clerk/shared/deprecated';
import type {
CheckAuthorizationWithCustomPermissions,
FeatureKey,
HandleOAuthCallbackParams,
OrganizationCustomPermissionKey,
OrganizationCustomRoleKey,
Expand DownExpand Up@@ -61,21 +62,31 @@ export type ProtectProps = React.PropsWithChildren<
condition?: never;
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
condition?: never;
role?: never;
permission: OrganizationCustomPermissionKey;
__experimental_feature?: never;
}
| {
condition: (has: CheckAuthorizationWithCustomPermissions) => boolean;
role?: never;
permission?: never;
__experimental_feature?: never;
}
| {
condition?: never;
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| {
condition?: never;
role?: never;
permission?: never;
__experimental_feature?: never;
}
) & {
fallback?: React.ReactNode;
Expand All@@ -89,8 +100,10 @@ export type ProtectProps = React.PropsWithChildren<
* ```
* <Protect permission="a_permission_key" />
* <Protect role="a_role_key" />
* <Protect __experimental_feature"a_feature_key" />
* <Protect condition={(has) => has({permission:"a_permission_key"})} />
* <Protect condition={(has) => has({role:"a_role_key"})} />
* <Protect condition={(has) => has({__experimental_feature:"a_feature_key"})} />
* <Protect fallback={<p>Unauthorized</p>} />
* ```
*/
Expand DownExpand Up@@ -127,7 +140,7 @@ export const Protect = ({ children, fallback, treatPendingAsSignedOut, ...restAu
return unauthorized;
}

if (restAuthorizedParams.role || restAuthorizedParams.permission) {
if (restAuthorizedParams.role || restAuthorizedParams.permission || restAuthorizedParams.__experimental_feature) {
if (has(restAuthorizedParams)) {
return authorized;
}
Expand Down
15 changes: 13 additions & 2 deletions packages/react/src/hooks/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,17 @@ export function useDerivedAuth(
authObject: any,
{ treatPendingAsSignedOut = true }: PendingSessionOptions = {},
): UseAuthReturn {
const { userId, orgId, orgRole, has, signOut, getToken, orgPermissions, factorVerificationAge } = authObject ?? {};
const {
userId,
orgId,
orgRole,
has,
signOut,
getToken,
orgPermissions,
factorVerificationAge,
__experimental_features,
} = authObject ?? {};

const derivedHas = useCallback(
(params: Parameters<CheckAuthorizationWithCustomPermissions>[0]) => {
Expand All@@ -157,9 +167,10 @@ export function useDerivedAuth(
orgRole,
orgPermissions,
factorVerificationAge,
__experimental_features,
})(params);
},
[has, userId, orgId, orgRole, orgPermissions, factorVerificationAge],
[has, userId, orgId, orgRole, orgPermissions, factorVerificationAge, __experimental_features],
);

const payload = resolveAuthState({
Expand Down
31 changes: 31 additions & 0 deletions packages/shared/src/authorization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,13 +20,19 @@ type AuthorizationOptions = {
orgRole: string | null | undefined;
orgPermissions: string[] | null | undefined;
factorVerificationAge: [number, number] | null;
__experimental_features?: string | null;
};

type CheckOrgAuthorization = (
params: { role?: OrganizationCustomRoleKey; permission?: OrganizationCustomPermissionKey },
{ orgId, orgRole, orgPermissions }: AuthorizationOptions,
) => boolean | null;

type CheckFeatureAuthorization = (
params: { __experimental_feature?: string },
{ __experimental_features }: AuthorizationOptions,
) => boolean | null;

type CheckReverificationAuthorization = (
params: {
reverification?: ReverificationConfig;
Expand DownExpand Up@@ -85,6 +91,25 @@ const checkOrgAuthorization: CheckOrgAuthorization = (params, options) => {
return null;
};

const checkFeatureAuthorization: CheckFeatureAuthorization = (param, options) => {
const { __experimental_feature: feature } = param;
const { __experimental_features } = options;

if (!feature) {
return null;
}

if (!__experimental_features) {
return null;
}

if (typeof __experimental_features === 'string') {
return __experimental_features.split(',').includes(feature);
}

return null;
};

const validateReverificationConfig = (config: ReverificationConfig | undefined | null) => {
if (!config) {
return false;
Expand DownExpand Up@@ -156,6 +181,11 @@ const createCheckAuthorization = (options: AuthorizationOptions): CheckAuthoriza

const orgAuthorization = checkOrgAuthorization(params, options);
const reverificationAuthorization = checkReverificationAuthorization(params, options);
const featureAuthorization = checkFeatureAuthorization(params, options);

if (featureAuthorization) {
return featureAuthorization;
}

if ([orgAuthorization, reverificationAuthorization].some(a => a === null)) {
return [orgAuthorization, reverificationAuthorization].some(a => a === true);
Expand All@@ -175,6 +205,7 @@ type AuthStateOptions = {
orgRole?: OrganizationCustomRoleKey | null;
orgSlug?: string | null;
orgPermissions?: OrganizationCustomPermissionKey[] | null;
__experimental_features?: string | null;
getToken: GetToken;
signOut: SignOut;
has: (params: Parameters<CheckAuthorizationWithCustomPermissions>[0]) => boolean;
Expand Down
34 changes: 34 additions & 0 deletions packages/types/src/authorization.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
declare global {
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
interface ClerkAuthorization {}
}

interface AuthorizationKeysBase {
role: string;
permission: string;
__experimental_feature: string;
}

interface AuthorizationKeysPlaceholder {
role: unknown;
permission: unknown;
__experimental_feature: unknown;
}

export type RoleKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['role'] extends string
? ClerkAuthorization['role']
: AuthorizationKeysBase['role']
: AuthorizationKeysBase['role'];

export type PermissionKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['permission'] extends string
? ClerkAuthorization['permission']
: AuthorizationKeysBase['permission']
: AuthorizationKeysBase['permission'];

export type FeatureKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['__experimental_feature'] extends string
? ClerkAuthorization['__experimental_feature']
: AuthorizationKeysBase['__experimental_feature']
: AuthorizationKeysBase['__experimental_feature'];
1 change: 1 addition & 0 deletions packages/types/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ export * from './appearance';
export * from './elementIds';
export * from './attributes';
export * from './authConfig';
export * from './authorization';
export * from './backupCode';
export * from './clerk';
export * from './client';
Expand Down
7 changes: 6 additions & 1 deletion packages/types/src/jwtv2.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,14 +119,19 @@ type JWTPayloadBase = {
* Any other JWT Claim Set member.
*/
[propName: string]: unknown;

/**
* Feature claims, you can have multiple features in the same claim. e.g.: "impersonation,emails"
* @experimental
*/
fea?: string | null;

@octoperoctoperApr 3, 2025

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.

I think we will first need to have JWT versioning before proceeding with this addition - reference

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.

I agree, I'll move this one to draft, and we can update it later with the versioning changes.

};

export type VersionedJwtPayload =
| {
ver?: never;

/**
*
* Active organization permissions.
*/
org_permissions?: OrganizationCustomPermissionKey[];
Expand Down
19 changes: 17 additions & 2 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { FeatureKey } from './authorization';
import type {
BackupCodeAttempt,
EmailCodeAttempt,
Expand DownExpand Up@@ -52,12 +53,19 @@ export type CheckAuthorizationParamsWithCustomPermissions = WithReverification<
| {
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
role?: never;
permission: OrganizationCustomPermissionKey;
__experimental_feature?: never;
}
| { role?: never; permission?: never }
| {
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| { role?: never; permission?: never; __experimental_feature?: never }
>;

export type CheckAuthorization = CheckAuthorizationFn<CheckAuthorizationParams>;
Expand DownExpand Up@@ -90,12 +98,19 @@ export type CheckAuthorizationParamsFromSessionClaims<P extends OrganizationCust
| {
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
role?: never;
permission: DisallowSystemPermissions<P>;
__experimental_feature?: never;
}
| {
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| { role?: never; permission?: never }
| { role?: never; permission?: never; __experimental_feature?: never }
>;

/**
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
Closed
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
9 changes: 9 additions & 0 deletions .changeset/curvy-teeth-watch.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/backend': patch
'@clerk/clerk-js': patch
'@clerk/clerk-react': patch
'@clerk/shared': patch
'@clerk/types': patch
---

Add feature param to has
26 changes: 23 additions & 3 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,7 @@ type SignedInAuthObjectProperties = {
* [fistFactorAge, secondFactorAge]
*/
factorVerificationAge: [firstFactorAge: number, secondFactorAge: number] | null;
__experimental_features?: string | null;
};

/**
Expand DownExpand Up@@ -114,6 +115,7 @@ const generateSignedInAuthObjectProperties = (claims: JwtPayload): SignedInAuthO
orgSlug: claims.org_slug,
orgPermissions,
factorVerificationAge,
__experimental_features: claims.fea,
};
};

Expand All@@ -125,8 +127,18 @@ export function signedInAuthObject(
sessionToken: string,
sessionClaims: JwtPayload,
): SignedInAuthObject {
const { actor, sessionId, sessionStatus, userId, orgId, orgRole, orgSlug, orgPermissions, factorVerificationAge } =
generateSignedInAuthObjectProperties(sessionClaims);
const {
actor,
sessionId,
sessionStatus,
userId,
orgId,
orgRole,
orgSlug,
orgPermissions,
factorVerificationAge,
__experimental_features,
} = generateSignedInAuthObjectProperties(sessionClaims);
const apiClient = createBackendApiClient(authenticateContext);
const getToken = createGetToken({
sessionId,
Expand All@@ -145,8 +157,16 @@ export function signedInAuthObject(
orgSlug,
orgPermissions,
factorVerificationAge,
__experimental_features,
getToken,
has: createCheckAuthorization({ orgId, orgRole, orgPermissions, userId, factorVerificationAge }),
has: createCheckAuthorization({
orgId,
orgRole,
orgPermissions,
userId,
factorVerificationAge,
__experimental_features,
}),
debug: createDebug({ ...authenticateContext, sessionToken }),
};
}
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,8 @@ export class Session extends BaseResource implements SessionResource {
orgId: activeMembership?.id,
orgRole: activeMembership?.role,
orgPermissions: activeMembership?.permissions,
// TODO: retrieve features
__experimental_features: 'testfeature',
})(params);
};

Expand Down
15 changes: 14 additions & 1 deletion packages/react/src/components/controlComponents.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { deprecated } from '@clerk/shared/deprecated';
import type {
CheckAuthorizationWithCustomPermissions,
FeatureKey,
HandleOAuthCallbackParams,
OrganizationCustomPermissionKey,
OrganizationCustomRoleKey,
Expand DownExpand Up@@ -61,21 +62,31 @@ export type ProtectProps = React.PropsWithChildren<
condition?: never;
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
condition?: never;
role?: never;
permission: OrganizationCustomPermissionKey;
__experimental_feature?: never;
}
| {
condition: (has: CheckAuthorizationWithCustomPermissions) => boolean;
role?: never;
permission?: never;
__experimental_feature?: never;
}
| {
condition?: never;
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| {
condition?: never;
role?: never;
permission?: never;
__experimental_feature?: never;
}
) & {
fallback?: React.ReactNode;
Expand All@@ -89,8 +100,10 @@ export type ProtectProps = React.PropsWithChildren<
* ```
* <Protect permission="a_permission_key" />
* <Protect role="a_role_key" />
* <Protect __experimental_feature"a_feature_key" />
* <Protect condition={(has) => has({permission:"a_permission_key"})} />
* <Protect condition={(has) => has({role:"a_role_key"})} />
* <Protect condition={(has) => has({__experimental_feature:"a_feature_key"})} />
* <Protect fallback={<p>Unauthorized</p>} />
* ```
*/
Expand DownExpand Up@@ -127,7 +140,7 @@ export const Protect = ({ children, fallback, treatPendingAsSignedOut, ...restAu
return unauthorized;
}

if (restAuthorizedParams.role || restAuthorizedParams.permission) {
if (restAuthorizedParams.role || restAuthorizedParams.permission || restAuthorizedParams.__experimental_feature) {
if (has(restAuthorizedParams)) {
return authorized;
}
Expand Down
15 changes: 13 additions & 2 deletions packages/react/src/hooks/useAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,17 @@ export function useDerivedAuth(
authObject: any,
{ treatPendingAsSignedOut = true }: PendingSessionOptions = {},
): UseAuthReturn {
const { userId, orgId, orgRole, has, signOut, getToken, orgPermissions, factorVerificationAge } = authObject ?? {};
const {
userId,
orgId,
orgRole,
has,
signOut,
getToken,
orgPermissions,
factorVerificationAge,
__experimental_features,
} = authObject ?? {};

const derivedHas = useCallback(
(params: Parameters<CheckAuthorizationWithCustomPermissions>[0]) => {
Expand All@@ -157,9 +167,10 @@ export function useDerivedAuth(
orgRole,
orgPermissions,
factorVerificationAge,
__experimental_features,
})(params);
},
[has, userId, orgId, orgRole, orgPermissions, factorVerificationAge],
[has, userId, orgId, orgRole, orgPermissions, factorVerificationAge, __experimental_features],
);

const payload = resolveAuthState({
Expand Down
31 changes: 31 additions & 0 deletions packages/shared/src/authorization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,13 +20,19 @@ type AuthorizationOptions = {
orgRole: string | null | undefined;
orgPermissions: string[] | null | undefined;
factorVerificationAge: [number, number] | null;
__experimental_features?: string | null;
};

type CheckOrgAuthorization = (
params: { role?: OrganizationCustomRoleKey; permission?: OrganizationCustomPermissionKey },
{ orgId, orgRole, orgPermissions }: AuthorizationOptions,
) => boolean | null;

type CheckFeatureAuthorization = (
params: { __experimental_feature?: string },
{ __experimental_features }: AuthorizationOptions,
) => boolean | null;

type CheckReverificationAuthorization = (
params: {
reverification?: ReverificationConfig;
Expand DownExpand Up@@ -85,6 +91,25 @@ const checkOrgAuthorization: CheckOrgAuthorization = (params, options) => {
return null;
};

const checkFeatureAuthorization: CheckFeatureAuthorization = (param, options) => {
const { __experimental_feature: feature } = param;
const { __experimental_features } = options;

if (!feature) {
return null;
}

if (!__experimental_features) {
return null;
}

if (typeof __experimental_features === 'string') {
return __experimental_features.split(',').includes(feature);
}

return null;
};

const validateReverificationConfig = (config: ReverificationConfig | undefined | null) => {
if (!config) {
return false;
Expand DownExpand Up@@ -156,6 +181,11 @@ const createCheckAuthorization = (options: AuthorizationOptions): CheckAuthoriza

const orgAuthorization = checkOrgAuthorization(params, options);
const reverificationAuthorization = checkReverificationAuthorization(params, options);
const featureAuthorization = checkFeatureAuthorization(params, options);

if (featureAuthorization) {
return featureAuthorization;
}

if ([orgAuthorization, reverificationAuthorization].some(a => a === null)) {
return [orgAuthorization, reverificationAuthorization].some(a => a === true);
Expand All@@ -175,6 +205,7 @@ type AuthStateOptions = {
orgRole?: OrganizationCustomRoleKey | null;
orgSlug?: string | null;
orgPermissions?: OrganizationCustomPermissionKey[] | null;
__experimental_features?: string | null;
getToken: GetToken;
signOut: SignOut;
has: (params: Parameters<CheckAuthorizationWithCustomPermissions>[0]) => boolean;
Expand Down
34 changes: 34 additions & 0 deletions packages/types/src/authorization.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
declare global {
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
interface ClerkAuthorization {}
}

interface AuthorizationKeysBase {
role: string;
permission: string;
__experimental_feature: string;
}

interface AuthorizationKeysPlaceholder {
role: unknown;
permission: unknown;
__experimental_feature: unknown;
}

export type RoleKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['role'] extends string
? ClerkAuthorization['role']
: AuthorizationKeysBase['role']
: AuthorizationKeysBase['role'];

export type PermissionKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['permission'] extends string
? ClerkAuthorization['permission']
: AuthorizationKeysBase['permission']
: AuthorizationKeysBase['permission'];

export type FeatureKey = ClerkAuthorization extends AuthorizationKeysPlaceholder
? ClerkAuthorization['__experimental_feature'] extends string
? ClerkAuthorization['__experimental_feature']
: AuthorizationKeysBase['__experimental_feature']
: AuthorizationKeysBase['__experimental_feature'];
1 change: 1 addition & 0 deletions packages/types/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ export * from './appearance';
export * from './elementIds';
export * from './attributes';
export * from './authConfig';
export * from './authorization';
export * from './backupCode';
export * from './clerk';
export * from './client';
Expand Down
7 changes: 6 additions & 1 deletion packages/types/src/jwtv2.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,14 +119,19 @@ type JWTPayloadBase = {
* Any other JWT Claim Set member.
*/
[propName: string]: unknown;

/**
* Feature claims, you can have multiple features in the same claim. e.g.: "impersonation,emails"
* @experimental
*/
fea?: string | null;

@octoperoctoperApr 3, 2025

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.

I think we will first need to have JWT versioning before proceeding with this addition - reference

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.

I agree, I'll move this one to draft, and we can update it later with the versioning changes.

};

export type VersionedJwtPayload =
| {
ver?: never;

/**
*
* Active organization permissions.
*/
org_permissions?: OrganizationCustomPermissionKey[];
Expand Down
19 changes: 17 additions & 2 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { FeatureKey } from './authorization';
import type {
BackupCodeAttempt,
EmailCodeAttempt,
Expand DownExpand Up@@ -52,12 +53,19 @@ export type CheckAuthorizationParamsWithCustomPermissions = WithReverification<
| {
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
role?: never;
permission: OrganizationCustomPermissionKey;
__experimental_feature?: never;
}
| { role?: never; permission?: never }
| {
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| { role?: never; permission?: never; __experimental_feature?: never }
>;

export type CheckAuthorization = CheckAuthorizationFn<CheckAuthorizationParams>;
Expand DownExpand Up@@ -90,12 +98,19 @@ export type CheckAuthorizationParamsFromSessionClaims<P extends OrganizationCust
| {
role: OrganizationCustomRoleKey;
permission?: never;
__experimental_feature?: never;
}
| {
role?: never;
permission: DisallowSystemPermissions<P>;
__experimental_feature?: never;
}
| {
role?: never;
permission?: never;
__experimental_feature: FeatureKey;
}
| { role?: never; permission?: never }
| { role?: never; permission?: never; __experimental_feature?: never }
>;

/**
Expand Down