Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .changeset/eleven-apricots-rest.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
---
"@clerk/clerk-js": minor
"@clerk/backend": minor
"@clerk/clerk-react": minor
"@clerk/types": minor
---

Experimental support: Expect a new sessionClaim called `fva` that tracks the age of verified factor groups.

### Server side

This can be applied to any helper that returns the auth object

**Nextjs example**

```ts
auth(). __experimental_factorVerificationAge
```

### Client side

**React example**
```ts
const { session } = useSession()
session?. __experimental_factorVerificationAge
```
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,13 @@ export type SignedInAuthObject = {
orgRole: OrganizationCustomRoleKey | undefined;
orgSlug: string | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | undefined;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [number | null, number | null];
getToken: ServerGetToken;
has: CheckAuthorizationWithCustomPermissions;
debug: AuthObjectDebug;
Expand All@@ -51,6 +58,13 @@ export type SignedOutAuthObject = {
orgRole: null;
orgSlug: null;
orgPermissions: null;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [null, null];
getToken: ServerGetToken;
has: CheckAuthorizationWithCustomPermissions;
debug: AuthObjectDebug;
Expand DownExpand Up@@ -86,6 +100,7 @@ export function signedInAuthObject(
org_slug: orgSlug,
org_permissions: orgPermissions,
sub: userId,
fva: __experimental_factorVerificationAge,
} = sessionClaims;
const apiClient = createBackendApiClient(authenticateContext);
const getToken = createGetToken({
Expand All@@ -103,6 +118,7 @@ export function signedInAuthObject(
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
getToken,
has: createHasAuthorization({ orgId, orgRole, orgPermissions, userId }),
debug: createDebug({ ...authenticateContext, sessionToken }),
Expand All@@ -122,6 +138,7 @@ export function signedOutAuthObject(debugData?: AuthObjectDebugData): SignedOutA
orgRole: null,
orgSlug: null,
orgPermissions: null,
__experimental_factorVerificationAge: [null, null],
getToken: () => Promise.resolve(null),
has: () => false,
debug: createDebug(debugData),
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@@ -39,6 +39,7 @@ export class Session extends BaseResource implements SessionResource {
actor!: ActJWTClaim | null;
user!: UserResource | null;
publicUserData!: PublicUserData;
__experimental_factorVerificationAge: [number | null, number | null] = [null, null];
expireAt!: Date;
abandonAt!: Date;
createdAt!: Date;
Expand DownExpand Up@@ -235,6 +236,7 @@ export class Session extends BaseResource implements SessionResource {
this.status = data.status;
this.expireAt = unixEpochToDate(data.expire_at);
this.abandonAt = unixEpochToDate(data.abandon_at);
this.__experimental_factorVerificationAge = data.factor_verification_age;
this.lastActiveAt = unixEpochToDate(data.last_active_at);
this.lastActiveOrganizationId = data.last_active_organization_id;
this.actor = data.actor;
Expand Down
10 changes: 9 additions & 1 deletion packages/clerk-js/src/utils/memoizeStateListenerCallback.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ function sessionChanged(prev: SessionResource, next: SessionResource): boolean {
return (
prev.id !== next.id ||
prev.updatedAt.getTime() < next.updatedAt.getTime() ||
sessionUserMembershipPermissionsChanged(next, prev)
sessionFVAChanged(prev, next) ||
sessionUserMembershipPermissionsChanged(prev, next)
);
}

Expand All@@ -49,6 +50,13 @@ function userMembershipsChanged(prev: UserResource, next: UserResource): boolean
);
}

function sessionFVAChanged(prev: SessionResource, next: SessionResource): boolean {
return (
prev.__experimental_factorVerificationAge[0] !== next.__experimental_factorVerificationAge[0] ||
prev.__experimental_factorVerificationAge[1] !== next.__experimental_factorVerificationAge[1]
);
}

function sessionUserMembershipPermissionsChanged(prev: SessionResource, next: SessionResource): boolean {
if (prev.lastActiveOrganizationId !== next.lastActiveOrganizationId) {
return true;
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/contexts/AuthContext.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,5 @@ export const [AuthContext, useAuthContext] = createContextAndHook<{
orgRole: OrganizationCustomRoleKey | null | undefined;
orgSlug: string | null | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | null | undefined;
__experimental_factorVerificationAge: [number | null, number | null];
}>('AuthContext');
30 changes: 25 additions & 5 deletions packages/react/src/contexts/ClerkContextProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,15 +35,35 @@ export function ClerkContextProvider(props: ClerkContextProvider): JSX.Element |
const clerkCtx = React.useMemo(() => ({ value: clerk }), [clerkLoaded]);
const clientCtx = React.useMemo(() => ({ value: state.client }), [state.client]);

const { sessionId, session, userId, user, orgId, actor, organization, orgRole, orgSlug, orgPermissions } =
derivedState;
const {
sessionId,
session,
userId,
user,
orgId,
actor,
organization,
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
} = derivedState;

const authCtx = React.useMemo(() => {
const value = { sessionId, userId, actor, orgId, orgRole, orgSlug, orgPermissions };
const value = {
sessionId,
userId,
actor,
orgId,
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
};
return { value };
}, [sessionId, userId, actor, orgId, orgRole, orgSlug]);
const userCtx = React.useMemo(() => ({ value: user }), [userId, user]);
}, [sessionId, userId, actor, orgId, orgRole, orgSlug, __experimental_factorVerificationAge]);
const sessionCtx = React.useMemo(() => ({ value: session }), [sessionId, session]);
const userCtx = React.useMemo(() => ({ value: user }), [userId, user]);
const organizationCtx = React.useMemo(() => {
const value = {
organization: organization,
Expand Down
6 changes: 6 additions & 0 deletions packages/react/src/utils/deriveState.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ const deriveFromSsrInitialState = (initialState: InitialState) => {
const orgPermissions = initialState.orgPermissions as OrganizationCustomPermissionKey[];
const orgSlug = initialState.orgSlug;
const actor = initialState.actor;
const __experimental_factorVerificationAge = initialState.__experimental_factorVerificationAge;

return {
userId,
Expand All@@ -38,6 +39,7 @@ const deriveFromSsrInitialState = (initialState: InitialState) => {
orgPermissions,
orgSlug,
actor,
__experimental_factorVerificationAge,
};
};

Expand All@@ -46,6 +48,9 @@ const deriveFromClientSideState = (state: Resources) => {
const user = state.user;
const sessionId: string | null | undefined = state.session ? state.session.id : state.session;
const session = state.session;
const __experimental_factorVerificationAge: [number | null, number | null] = state.session
? state.session.__experimental_factorVerificationAge
: [null, null];
const actor = session?.actor;
const organization = state.organization;
const orgId: string | null | undefined = state.organization ? state.organization.id : state.organization;
Expand All@@ -67,5 +72,6 @@ const deriveFromClientSideState = (state: Resources) => {
orgSlug,
orgPermissions,
actor,
__experimental_factorVerificationAge,
};
};
7 changes: 7 additions & 0 deletions packages/types/src/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,13 @@ export interface SessionJSON extends ClerkResourceJSON {
object: 'session';
id: string;
status: SessionStatus;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
factor_verification_age: [number | null, number | null];
expire_at: number;
abandon_at: number;
last_active_at: number;
Expand Down
8 changes: 8 additions & 0 deletions packages/types/src/jwtv2.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,14 @@ export interface JwtPayload extends CustomJwtSessionClaims {
*/
org_permissions?: OrganizationCustomPermissionKey[];

/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
fva: [number | null, number | null];

Comment on lines +109 to +111

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.

@chanioxaris please confirm that the actual session claim will be called fva

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.

As where we stand right now, that's correct!

/**
* Any other JWT Claim Set member.
*/
Expand Down
7 changes: 7 additions & 0 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,13 @@ export interface SessionResource extends ClerkResource {
status: SessionStatus;
expireAt: Date;
abandonAt: Date;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [number | null, number | null];
lastActiveToken: TokenResource | null;
lastActiveOrganizationId: string | null;
lastActiveAt: Date;
Expand Down
1 change: 1 addition & 0 deletions packages/types/src/ssr.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,5 @@ export type InitialState = Serializable<{
orgSlug: string | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | undefined;
organization: OrganizationResource | undefined;
__experimental_factorVerificationAge: [number | null, number | null];
}>;
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .changeset/eleven-apricots-rest.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
---
"@clerk/clerk-js": minor
"@clerk/backend": minor
"@clerk/clerk-react": minor
"@clerk/types": minor
---

Experimental support: Expect a new sessionClaim called `fva` that tracks the age of verified factor groups.

### Server side

This can be applied to any helper that returns the auth object

**Nextjs example**

```ts
auth(). __experimental_factorVerificationAge
```

### Client side

**React example**
```ts
const { session } = useSession()
session?. __experimental_factorVerificationAge
```
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,13 @@ export type SignedInAuthObject = {
orgRole: OrganizationCustomRoleKey | undefined;
orgSlug: string | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | undefined;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [number | null, number | null];
getToken: ServerGetToken;
has: CheckAuthorizationWithCustomPermissions;
debug: AuthObjectDebug;
Expand All@@ -51,6 +58,13 @@ export type SignedOutAuthObject = {
orgRole: null;
orgSlug: null;
orgPermissions: null;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [null, null];
getToken: ServerGetToken;
has: CheckAuthorizationWithCustomPermissions;
debug: AuthObjectDebug;
Expand DownExpand Up@@ -86,6 +100,7 @@ export function signedInAuthObject(
org_slug: orgSlug,
org_permissions: orgPermissions,
sub: userId,
fva: __experimental_factorVerificationAge,
} = sessionClaims;
const apiClient = createBackendApiClient(authenticateContext);
const getToken = createGetToken({
Expand All@@ -103,6 +118,7 @@ export function signedInAuthObject(
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
getToken,
has: createHasAuthorization({ orgId, orgRole, orgPermissions, userId }),
debug: createDebug({ ...authenticateContext, sessionToken }),
Expand All@@ -122,6 +138,7 @@ export function signedOutAuthObject(debugData?: AuthObjectDebugData): SignedOutA
orgRole: null,
orgSlug: null,
orgPermissions: null,
__experimental_factorVerificationAge: [null, null],
getToken: () => Promise.resolve(null),
has: () => false,
debug: createDebug(debugData),
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@@ -39,6 +39,7 @@ export class Session extends BaseResource implements SessionResource {
actor!: ActJWTClaim | null;
user!: UserResource | null;
publicUserData!: PublicUserData;
__experimental_factorVerificationAge: [number | null, number | null] = [null, null];
expireAt!: Date;
abandonAt!: Date;
createdAt!: Date;
Expand DownExpand Up@@ -235,6 +236,7 @@ export class Session extends BaseResource implements SessionResource {
this.status = data.status;
this.expireAt = unixEpochToDate(data.expire_at);
this.abandonAt = unixEpochToDate(data.abandon_at);
this.__experimental_factorVerificationAge = data.factor_verification_age;
this.lastActiveAt = unixEpochToDate(data.last_active_at);
this.lastActiveOrganizationId = data.last_active_organization_id;
this.actor = data.actor;
Expand Down
10 changes: 9 additions & 1 deletion packages/clerk-js/src/utils/memoizeStateListenerCallback.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ function sessionChanged(prev: SessionResource, next: SessionResource): boolean {
return (
prev.id !== next.id ||
prev.updatedAt.getTime() < next.updatedAt.getTime() ||
sessionUserMembershipPermissionsChanged(next, prev)
sessionFVAChanged(prev, next) ||
sessionUserMembershipPermissionsChanged(prev, next)
);
}

Expand All@@ -49,6 +50,13 @@ function userMembershipsChanged(prev: UserResource, next: UserResource): boolean
);
}

function sessionFVAChanged(prev: SessionResource, next: SessionResource): boolean {
return (
prev.__experimental_factorVerificationAge[0] !== next.__experimental_factorVerificationAge[0] ||
prev.__experimental_factorVerificationAge[1] !== next.__experimental_factorVerificationAge[1]
);
}

function sessionUserMembershipPermissionsChanged(prev: SessionResource, next: SessionResource): boolean {
if (prev.lastActiveOrganizationId !== next.lastActiveOrganizationId) {
return true;
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/contexts/AuthContext.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,5 @@ export const [AuthContext, useAuthContext] = createContextAndHook<{
orgRole: OrganizationCustomRoleKey | null | undefined;
orgSlug: string | null | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | null | undefined;
__experimental_factorVerificationAge: [number | null, number | null];
}>('AuthContext');
30 changes: 25 additions & 5 deletions packages/react/src/contexts/ClerkContextProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,15 +35,35 @@ export function ClerkContextProvider(props: ClerkContextProvider): JSX.Element |
const clerkCtx = React.useMemo(() => ({ value: clerk }), [clerkLoaded]);
const clientCtx = React.useMemo(() => ({ value: state.client }), [state.client]);

const { sessionId, session, userId, user, orgId, actor, organization, orgRole, orgSlug, orgPermissions } =
derivedState;
const {
sessionId,
session,
userId,
user,
orgId,
actor,
organization,
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
} = derivedState;

const authCtx = React.useMemo(() => {
const value = { sessionId, userId, actor, orgId, orgRole, orgSlug, orgPermissions };
const value = {
sessionId,
userId,
actor,
orgId,
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
};
return { value };
}, [sessionId, userId, actor, orgId, orgRole, orgSlug]);
const userCtx = React.useMemo(() => ({ value: user }), [userId, user]);
}, [sessionId, userId, actor, orgId, orgRole, orgSlug, __experimental_factorVerificationAge]);
const sessionCtx = React.useMemo(() => ({ value: session }), [sessionId, session]);
const userCtx = React.useMemo(() => ({ value: user }), [userId, user]);
const organizationCtx = React.useMemo(() => {
const value = {
organization: organization,
Expand Down
6 changes: 6 additions & 0 deletions packages/react/src/utils/deriveState.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ const deriveFromSsrInitialState = (initialState: InitialState) => {
const orgPermissions = initialState.orgPermissions as OrganizationCustomPermissionKey[];
const orgSlug = initialState.orgSlug;
const actor = initialState.actor;
const __experimental_factorVerificationAge = initialState.__experimental_factorVerificationAge;

return {
userId,
Expand All@@ -38,6 +39,7 @@ const deriveFromSsrInitialState = (initialState: InitialState) => {
orgPermissions,
orgSlug,
actor,
__experimental_factorVerificationAge,
};
};

Expand All@@ -46,6 +48,9 @@ const deriveFromClientSideState = (state: Resources) => {
const user = state.user;
const sessionId: string | null | undefined = state.session ? state.session.id : state.session;
const session = state.session;
const __experimental_factorVerificationAge: [number | null, number | null] = state.session
? state.session.__experimental_factorVerificationAge
: [null, null];
const actor = session?.actor;
const organization = state.organization;
const orgId: string | null | undefined = state.organization ? state.organization.id : state.organization;
Expand All@@ -67,5 +72,6 @@ const deriveFromClientSideState = (state: Resources) => {
orgSlug,
orgPermissions,
actor,
__experimental_factorVerificationAge,
};
};
7 changes: 7 additions & 0 deletions packages/types/src/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,13 @@ export interface SessionJSON extends ClerkResourceJSON {
object: 'session';
id: string;
status: SessionStatus;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
factor_verification_age: [number | null, number | null];
expire_at: number;
abandon_at: number;
last_active_at: number;
Expand Down
8 changes: 8 additions & 0 deletions packages/types/src/jwtv2.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,14 @@ export interface JwtPayload extends CustomJwtSessionClaims {
*/
org_permissions?: OrganizationCustomPermissionKey[];

/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
fva: [number | null, number | null];

Comment on lines +109 to +111

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.

@chanioxaris please confirm that the actual session claim will be called fva

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.

As where we stand right now, that's correct!

/**
* Any other JWT Claim Set member.
*/
Expand Down
7 changes: 7 additions & 0 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,13 @@ export interface SessionResource extends ClerkResource {
status: SessionStatus;
expireAt: Date;
abandonAt: Date;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [number | null, number | null];
lastActiveToken: TokenResource | null;
lastActiveOrganizationId: string | null;
lastActiveAt: Date;
Expand Down
1 change: 1 addition & 0 deletions packages/types/src/ssr.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,5 @@ export type InitialState = Serializable<{
orgSlug: string | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | undefined;
organization: OrganizationResource | undefined;
__experimental_factorVerificationAge: [number | null, number | null];
}>;
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .changeset/eleven-apricots-rest.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
---
"@clerk/clerk-js": minor
"@clerk/backend": minor
"@clerk/clerk-react": minor
"@clerk/types": minor
---

Experimental support: Expect a new sessionClaim called `fva` that tracks the age of verified factor groups.

### Server side

This can be applied to any helper that returns the auth object

**Nextjs example**

```ts
auth(). __experimental_factorVerificationAge
```

### Client side

**React example**
```ts
const { session } = useSession()
session?. __experimental_factorVerificationAge
```
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,13 @@ export type SignedInAuthObject = {
orgRole: OrganizationCustomRoleKey | undefined;
orgSlug: string | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | undefined;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [number | null, number | null];
getToken: ServerGetToken;
has: CheckAuthorizationWithCustomPermissions;
debug: AuthObjectDebug;
Expand All@@ -51,6 +58,13 @@ export type SignedOutAuthObject = {
orgRole: null;
orgSlug: null;
orgPermissions: null;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [null, null];
getToken: ServerGetToken;
has: CheckAuthorizationWithCustomPermissions;
debug: AuthObjectDebug;
Expand DownExpand Up@@ -86,6 +100,7 @@ export function signedInAuthObject(
org_slug: orgSlug,
org_permissions: orgPermissions,
sub: userId,
fva: __experimental_factorVerificationAge,
} = sessionClaims;
const apiClient = createBackendApiClient(authenticateContext);
const getToken = createGetToken({
Expand All@@ -103,6 +118,7 @@ export function signedInAuthObject(
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
getToken,
has: createHasAuthorization({ orgId, orgRole, orgPermissions, userId }),
debug: createDebug({ ...authenticateContext, sessionToken }),
Expand All@@ -122,6 +138,7 @@ export function signedOutAuthObject(debugData?: AuthObjectDebugData): SignedOutA
orgRole: null,
orgSlug: null,
orgPermissions: null,
__experimental_factorVerificationAge: [null, null],
getToken: () => Promise.resolve(null),
has: () => false,
debug: createDebug(debugData),
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@@ -39,6 +39,7 @@ export class Session extends BaseResource implements SessionResource {
actor!: ActJWTClaim | null;
user!: UserResource | null;
publicUserData!: PublicUserData;
__experimental_factorVerificationAge: [number | null, number | null] = [null, null];
expireAt!: Date;
abandonAt!: Date;
createdAt!: Date;
Expand DownExpand Up@@ -235,6 +236,7 @@ export class Session extends BaseResource implements SessionResource {
this.status = data.status;
this.expireAt = unixEpochToDate(data.expire_at);
this.abandonAt = unixEpochToDate(data.abandon_at);
this.__experimental_factorVerificationAge = data.factor_verification_age;
this.lastActiveAt = unixEpochToDate(data.last_active_at);
this.lastActiveOrganizationId = data.last_active_organization_id;
this.actor = data.actor;
Expand Down
10 changes: 9 additions & 1 deletion packages/clerk-js/src/utils/memoizeStateListenerCallback.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ function sessionChanged(prev: SessionResource, next: SessionResource): boolean {
return (
prev.id !== next.id ||
prev.updatedAt.getTime() < next.updatedAt.getTime() ||
sessionUserMembershipPermissionsChanged(next, prev)
sessionFVAChanged(prev, next) ||
sessionUserMembershipPermissionsChanged(prev, next)
);
}

Expand All@@ -49,6 +50,13 @@ function userMembershipsChanged(prev: UserResource, next: UserResource): boolean
);
}

function sessionFVAChanged(prev: SessionResource, next: SessionResource): boolean {
return (
prev.__experimental_factorVerificationAge[0] !== next.__experimental_factorVerificationAge[0] ||
prev.__experimental_factorVerificationAge[1] !== next.__experimental_factorVerificationAge[1]
);
}

function sessionUserMembershipPermissionsChanged(prev: SessionResource, next: SessionResource): boolean {
if (prev.lastActiveOrganizationId !== next.lastActiveOrganizationId) {
return true;
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/contexts/AuthContext.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,5 @@ export const [AuthContext, useAuthContext] = createContextAndHook<{
orgRole: OrganizationCustomRoleKey | null | undefined;
orgSlug: string | null | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | null | undefined;
__experimental_factorVerificationAge: [number | null, number | null];
}>('AuthContext');
30 changes: 25 additions & 5 deletions packages/react/src/contexts/ClerkContextProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,15 +35,35 @@ export function ClerkContextProvider(props: ClerkContextProvider): JSX.Element |
const clerkCtx = React.useMemo(() => ({ value: clerk }), [clerkLoaded]);
const clientCtx = React.useMemo(() => ({ value: state.client }), [state.client]);

const { sessionId, session, userId, user, orgId, actor, organization, orgRole, orgSlug, orgPermissions } =
derivedState;
const {
sessionId,
session,
userId,
user,
orgId,
actor,
organization,
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
} = derivedState;

const authCtx = React.useMemo(() => {
const value = { sessionId, userId, actor, orgId, orgRole, orgSlug, orgPermissions };
const value = {
sessionId,
userId,
actor,
orgId,
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
};
return { value };
}, [sessionId, userId, actor, orgId, orgRole, orgSlug]);
const userCtx = React.useMemo(() => ({ value: user }), [userId, user]);
}, [sessionId, userId, actor, orgId, orgRole, orgSlug, __experimental_factorVerificationAge]);
const sessionCtx = React.useMemo(() => ({ value: session }), [sessionId, session]);
const userCtx = React.useMemo(() => ({ value: user }), [userId, user]);
const organizationCtx = React.useMemo(() => {
const value = {
organization: organization,
Expand Down
6 changes: 6 additions & 0 deletions packages/react/src/utils/deriveState.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ const deriveFromSsrInitialState = (initialState: InitialState) => {
const orgPermissions = initialState.orgPermissions as OrganizationCustomPermissionKey[];
const orgSlug = initialState.orgSlug;
const actor = initialState.actor;
const __experimental_factorVerificationAge = initialState.__experimental_factorVerificationAge;

return {
userId,
Expand All@@ -38,6 +39,7 @@ const deriveFromSsrInitialState = (initialState: InitialState) => {
orgPermissions,
orgSlug,
actor,
__experimental_factorVerificationAge,
};
};

Expand All@@ -46,6 +48,9 @@ const deriveFromClientSideState = (state: Resources) => {
const user = state.user;
const sessionId: string | null | undefined = state.session ? state.session.id : state.session;
const session = state.session;
const __experimental_factorVerificationAge: [number | null, number | null] = state.session
? state.session.__experimental_factorVerificationAge
: [null, null];
const actor = session?.actor;
const organization = state.organization;
const orgId: string | null | undefined = state.organization ? state.organization.id : state.organization;
Expand All@@ -67,5 +72,6 @@ const deriveFromClientSideState = (state: Resources) => {
orgSlug,
orgPermissions,
actor,
__experimental_factorVerificationAge,
};
};
7 changes: 7 additions & 0 deletions packages/types/src/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,13 @@ export interface SessionJSON extends ClerkResourceJSON {
object: 'session';
id: string;
status: SessionStatus;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
factor_verification_age: [number | null, number | null];
expire_at: number;
abandon_at: number;
last_active_at: number;
Expand Down
8 changes: 8 additions & 0 deletions packages/types/src/jwtv2.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,14 @@ export interface JwtPayload extends CustomJwtSessionClaims {
*/
org_permissions?: OrganizationCustomPermissionKey[];

/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
fva: [number | null, number | null];

Comment on lines +109 to +111

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.

@chanioxaris please confirm that the actual session claim will be called fva

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.

As where we stand right now, that's correct!

/**
* Any other JWT Claim Set member.
*/
Expand Down
7 changes: 7 additions & 0 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,13 @@ export interface SessionResource extends ClerkResource {
status: SessionStatus;
expireAt: Date;
abandonAt: Date;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [number | null, number | null];
lastActiveToken: TokenResource | null;
lastActiveOrganizationId: string | null;
lastActiveAt: Date;
Expand Down
1 change: 1 addition & 0 deletions packages/types/src/ssr.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,5 @@ export type InitialState = Serializable<{
orgSlug: string | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | undefined;
organization: OrganizationResource | undefined;
__experimental_factorVerificationAge: [number | null, number | null];
}>;
, '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 \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .changeset/eleven-apricots-rest.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
---
"@clerk/clerk-js": minor
"@clerk/backend": minor
"@clerk/clerk-react": minor
"@clerk/types": minor
---

Experimental support: Expect a new sessionClaim called `fva` that tracks the age of verified factor groups.

### Server side

This can be applied to any helper that returns the auth object

**Nextjs example**

```ts
auth(). __experimental_factorVerificationAge
```

### Client side

**React example**
```ts
const { session } = useSession()
session?. __experimental_factorVerificationAge
```
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,13 @@ export type SignedInAuthObject = {
orgRole: OrganizationCustomRoleKey | undefined;
orgSlug: string | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | undefined;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [number | null, number | null];
getToken: ServerGetToken;
has: CheckAuthorizationWithCustomPermissions;
debug: AuthObjectDebug;
Expand All@@ -51,6 +58,13 @@ export type SignedOutAuthObject = {
orgRole: null;
orgSlug: null;
orgPermissions: null;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [null, null];
getToken: ServerGetToken;
has: CheckAuthorizationWithCustomPermissions;
debug: AuthObjectDebug;
Expand DownExpand Up@@ -86,6 +100,7 @@ export function signedInAuthObject(
org_slug: orgSlug,
org_permissions: orgPermissions,
sub: userId,
fva: __experimental_factorVerificationAge,
} = sessionClaims;
const apiClient = createBackendApiClient(authenticateContext);
const getToken = createGetToken({
Expand All@@ -103,6 +118,7 @@ export function signedInAuthObject(
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
getToken,
has: createHasAuthorization({ orgId, orgRole, orgPermissions, userId }),
debug: createDebug({ ...authenticateContext, sessionToken }),
Expand All@@ -122,6 +138,7 @@ export function signedOutAuthObject(debugData?: AuthObjectDebugData): SignedOutA
orgRole: null,
orgSlug: null,
orgPermissions: null,
__experimental_factorVerificationAge: [null, null],
getToken: () => Promise.resolve(null),
has: () => false,
debug: createDebug(debugData),
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@@ -39,6 +39,7 @@ export class Session extends BaseResource implements SessionResource {
actor!: ActJWTClaim | null;
user!: UserResource | null;
publicUserData!: PublicUserData;
__experimental_factorVerificationAge: [number | null, number | null] = [null, null];
expireAt!: Date;
abandonAt!: Date;
createdAt!: Date;
Expand DownExpand Up@@ -235,6 +236,7 @@ export class Session extends BaseResource implements SessionResource {
this.status = data.status;
this.expireAt = unixEpochToDate(data.expire_at);
this.abandonAt = unixEpochToDate(data.abandon_at);
this.__experimental_factorVerificationAge = data.factor_verification_age;
this.lastActiveAt = unixEpochToDate(data.last_active_at);
this.lastActiveOrganizationId = data.last_active_organization_id;
this.actor = data.actor;
Expand Down
10 changes: 9 additions & 1 deletion packages/clerk-js/src/utils/memoizeStateListenerCallback.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ function sessionChanged(prev: SessionResource, next: SessionResource): boolean {
return (
prev.id !== next.id ||
prev.updatedAt.getTime() < next.updatedAt.getTime() ||
sessionUserMembershipPermissionsChanged(next, prev)
sessionFVAChanged(prev, next) ||
sessionUserMembershipPermissionsChanged(prev, next)
);
}

Expand All@@ -49,6 +50,13 @@ function userMembershipsChanged(prev: UserResource, next: UserResource): boolean
);
}

function sessionFVAChanged(prev: SessionResource, next: SessionResource): boolean {
return (
prev.__experimental_factorVerificationAge[0] !== next.__experimental_factorVerificationAge[0] ||
prev.__experimental_factorVerificationAge[1] !== next.__experimental_factorVerificationAge[1]
);
}

function sessionUserMembershipPermissionsChanged(prev: SessionResource, next: SessionResource): boolean {
if (prev.lastActiveOrganizationId !== next.lastActiveOrganizationId) {
return true;
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/contexts/AuthContext.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,5 @@ export const [AuthContext, useAuthContext] = createContextAndHook<{
orgRole: OrganizationCustomRoleKey | null | undefined;
orgSlug: string | null | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | null | undefined;
__experimental_factorVerificationAge: [number | null, number | null];
}>('AuthContext');
30 changes: 25 additions & 5 deletions packages/react/src/contexts/ClerkContextProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,15 +35,35 @@ export function ClerkContextProvider(props: ClerkContextProvider): JSX.Element |
const clerkCtx = React.useMemo(() => ({ value: clerk }), [clerkLoaded]);
const clientCtx = React.useMemo(() => ({ value: state.client }), [state.client]);

const { sessionId, session, userId, user, orgId, actor, organization, orgRole, orgSlug, orgPermissions } =
derivedState;
const {
sessionId,
session,
userId,
user,
orgId,
actor,
organization,
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
} = derivedState;

const authCtx = React.useMemo(() => {
const value = { sessionId, userId, actor, orgId, orgRole, orgSlug, orgPermissions };
const value = {
sessionId,
userId,
actor,
orgId,
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
};
return { value };
}, [sessionId, userId, actor, orgId, orgRole, orgSlug]);
const userCtx = React.useMemo(() => ({ value: user }), [userId, user]);
}, [sessionId, userId, actor, orgId, orgRole, orgSlug, __experimental_factorVerificationAge]);
const sessionCtx = React.useMemo(() => ({ value: session }), [sessionId, session]);
const userCtx = React.useMemo(() => ({ value: user }), [userId, user]);
const organizationCtx = React.useMemo(() => {
const value = {
organization: organization,
Expand Down
6 changes: 6 additions & 0 deletions packages/react/src/utils/deriveState.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ const deriveFromSsrInitialState = (initialState: InitialState) => {
const orgPermissions = initialState.orgPermissions as OrganizationCustomPermissionKey[];
const orgSlug = initialState.orgSlug;
const actor = initialState.actor;
const __experimental_factorVerificationAge = initialState.__experimental_factorVerificationAge;

return {
userId,
Expand All@@ -38,6 +39,7 @@ const deriveFromSsrInitialState = (initialState: InitialState) => {
orgPermissions,
orgSlug,
actor,
__experimental_factorVerificationAge,
};
};

Expand All@@ -46,6 +48,9 @@ const deriveFromClientSideState = (state: Resources) => {
const user = state.user;
const sessionId: string | null | undefined = state.session ? state.session.id : state.session;
const session = state.session;
const __experimental_factorVerificationAge: [number | null, number | null] = state.session
? state.session.__experimental_factorVerificationAge
: [null, null];
const actor = session?.actor;
const organization = state.organization;
const orgId: string | null | undefined = state.organization ? state.organization.id : state.organization;
Expand All@@ -67,5 +72,6 @@ const deriveFromClientSideState = (state: Resources) => {
orgSlug,
orgPermissions,
actor,
__experimental_factorVerificationAge,
};
};
7 changes: 7 additions & 0 deletions packages/types/src/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,13 @@ export interface SessionJSON extends ClerkResourceJSON {
object: 'session';
id: string;
status: SessionStatus;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
factor_verification_age: [number | null, number | null];
expire_at: number;
abandon_at: number;
last_active_at: number;
Expand Down
8 changes: 8 additions & 0 deletions packages/types/src/jwtv2.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,14 @@ export interface JwtPayload extends CustomJwtSessionClaims {
*/
org_permissions?: OrganizationCustomPermissionKey[];

/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
fva: [number | null, number | null];

Comment on lines +109 to +111

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.

@chanioxaris please confirm that the actual session claim will be called fva

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.

As where we stand right now, that's correct!

/**
* Any other JWT Claim Set member.
*/
Expand Down
7 changes: 7 additions & 0 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,13 @@ export interface SessionResource extends ClerkResource {
status: SessionStatus;
expireAt: Date;
abandonAt: Date;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [number | null, number | null];
lastActiveToken: TokenResource | null;
lastActiveOrganizationId: string | null;
lastActiveAt: Date;
Expand Down
1 change: 1 addition & 0 deletions packages/types/src/ssr.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,5 @@ export type InitialState = Serializable<{
orgSlug: string | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | undefined;
organization: OrganizationResource | undefined;
__experimental_factorVerificationAge: [number | null, number | null];
}>;
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .changeset/eleven-apricots-rest.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
---
"@clerk/clerk-js": minor
"@clerk/backend": minor
"@clerk/clerk-react": minor
"@clerk/types": minor
---

Experimental support: Expect a new sessionClaim called `fva` that tracks the age of verified factor groups.

### Server side

This can be applied to any helper that returns the auth object

**Nextjs example**

```ts
auth(). __experimental_factorVerificationAge
```

### Client side

**React example**
```ts
const { session } = useSession()
session?. __experimental_factorVerificationAge
```
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,13 @@ export type SignedInAuthObject = {
orgRole: OrganizationCustomRoleKey | undefined;
orgSlug: string | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | undefined;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [number | null, number | null];
getToken: ServerGetToken;
has: CheckAuthorizationWithCustomPermissions;
debug: AuthObjectDebug;
Expand All@@ -51,6 +58,13 @@ export type SignedOutAuthObject = {
orgRole: null;
orgSlug: null;
orgPermissions: null;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [null, null];
getToken: ServerGetToken;
has: CheckAuthorizationWithCustomPermissions;
debug: AuthObjectDebug;
Expand DownExpand Up@@ -86,6 +100,7 @@ export function signedInAuthObject(
org_slug: orgSlug,
org_permissions: orgPermissions,
sub: userId,
fva: __experimental_factorVerificationAge,
} = sessionClaims;
const apiClient = createBackendApiClient(authenticateContext);
const getToken = createGetToken({
Expand All@@ -103,6 +118,7 @@ export function signedInAuthObject(
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
getToken,
has: createHasAuthorization({ orgId, orgRole, orgPermissions, userId }),
debug: createDebug({ ...authenticateContext, sessionToken }),
Expand All@@ -122,6 +138,7 @@ export function signedOutAuthObject(debugData?: AuthObjectDebugData): SignedOutA
orgRole: null,
orgSlug: null,
orgPermissions: null,
__experimental_factorVerificationAge: [null, null],
getToken: () => Promise.resolve(null),
has: () => false,
debug: createDebug(debugData),
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@@ -39,6 +39,7 @@ export class Session extends BaseResource implements SessionResource {
actor!: ActJWTClaim | null;
user!: UserResource | null;
publicUserData!: PublicUserData;
__experimental_factorVerificationAge: [number | null, number | null] = [null, null];
expireAt!: Date;
abandonAt!: Date;
createdAt!: Date;
Expand DownExpand Up@@ -235,6 +236,7 @@ export class Session extends BaseResource implements SessionResource {
this.status = data.status;
this.expireAt = unixEpochToDate(data.expire_at);
this.abandonAt = unixEpochToDate(data.abandon_at);
this.__experimental_factorVerificationAge = data.factor_verification_age;
this.lastActiveAt = unixEpochToDate(data.last_active_at);
this.lastActiveOrganizationId = data.last_active_organization_id;
this.actor = data.actor;
Expand Down
10 changes: 9 additions & 1 deletion packages/clerk-js/src/utils/memoizeStateListenerCallback.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ function sessionChanged(prev: SessionResource, next: SessionResource): boolean {
return (
prev.id !== next.id ||
prev.updatedAt.getTime() < next.updatedAt.getTime() ||
sessionUserMembershipPermissionsChanged(next, prev)
sessionFVAChanged(prev, next) ||
sessionUserMembershipPermissionsChanged(prev, next)
);
}

Expand All@@ -49,6 +50,13 @@ function userMembershipsChanged(prev: UserResource, next: UserResource): boolean
);
}

function sessionFVAChanged(prev: SessionResource, next: SessionResource): boolean {
return (
prev.__experimental_factorVerificationAge[0] !== next.__experimental_factorVerificationAge[0] ||
prev.__experimental_factorVerificationAge[1] !== next.__experimental_factorVerificationAge[1]
);
}

function sessionUserMembershipPermissionsChanged(prev: SessionResource, next: SessionResource): boolean {
if (prev.lastActiveOrganizationId !== next.lastActiveOrganizationId) {
return true;
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/contexts/AuthContext.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,5 @@ export const [AuthContext, useAuthContext] = createContextAndHook<{
orgRole: OrganizationCustomRoleKey | null | undefined;
orgSlug: string | null | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | null | undefined;
__experimental_factorVerificationAge: [number | null, number | null];
}>('AuthContext');
30 changes: 25 additions & 5 deletions packages/react/src/contexts/ClerkContextProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,15 +35,35 @@ export function ClerkContextProvider(props: ClerkContextProvider): JSX.Element |
const clerkCtx = React.useMemo(() => ({ value: clerk }), [clerkLoaded]);
const clientCtx = React.useMemo(() => ({ value: state.client }), [state.client]);

const { sessionId, session, userId, user, orgId, actor, organization, orgRole, orgSlug, orgPermissions } =
derivedState;
const {
sessionId,
session,
userId,
user,
orgId,
actor,
organization,
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
} = derivedState;

const authCtx = React.useMemo(() => {
const value = { sessionId, userId, actor, orgId, orgRole, orgSlug, orgPermissions };
const value = {
sessionId,
userId,
actor,
orgId,
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
};
return { value };
}, [sessionId, userId, actor, orgId, orgRole, orgSlug]);
const userCtx = React.useMemo(() => ({ value: user }), [userId, user]);
}, [sessionId, userId, actor, orgId, orgRole, orgSlug, __experimental_factorVerificationAge]);
const sessionCtx = React.useMemo(() => ({ value: session }), [sessionId, session]);
const userCtx = React.useMemo(() => ({ value: user }), [userId, user]);
const organizationCtx = React.useMemo(() => {
const value = {
organization: organization,
Expand Down
6 changes: 6 additions & 0 deletions packages/react/src/utils/deriveState.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ const deriveFromSsrInitialState = (initialState: InitialState) => {
const orgPermissions = initialState.orgPermissions as OrganizationCustomPermissionKey[];
const orgSlug = initialState.orgSlug;
const actor = initialState.actor;
const __experimental_factorVerificationAge = initialState.__experimental_factorVerificationAge;

return {
userId,
Expand All@@ -38,6 +39,7 @@ const deriveFromSsrInitialState = (initialState: InitialState) => {
orgPermissions,
orgSlug,
actor,
__experimental_factorVerificationAge,
};
};

Expand All@@ -46,6 +48,9 @@ const deriveFromClientSideState = (state: Resources) => {
const user = state.user;
const sessionId: string | null | undefined = state.session ? state.session.id : state.session;
const session = state.session;
const __experimental_factorVerificationAge: [number | null, number | null] = state.session
? state.session.__experimental_factorVerificationAge
: [null, null];
const actor = session?.actor;
const organization = state.organization;
const orgId: string | null | undefined = state.organization ? state.organization.id : state.organization;
Expand All@@ -67,5 +72,6 @@ const deriveFromClientSideState = (state: Resources) => {
orgSlug,
orgPermissions,
actor,
__experimental_factorVerificationAge,
};
};
7 changes: 7 additions & 0 deletions packages/types/src/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,13 @@ export interface SessionJSON extends ClerkResourceJSON {
object: 'session';
id: string;
status: SessionStatus;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
factor_verification_age: [number | null, number | null];
expire_at: number;
abandon_at: number;
last_active_at: number;
Expand Down
8 changes: 8 additions & 0 deletions packages/types/src/jwtv2.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,14 @@ export interface JwtPayload extends CustomJwtSessionClaims {
*/
org_permissions?: OrganizationCustomPermissionKey[];

/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
fva: [number | null, number | null];

Comment on lines +109 to +111

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.

@chanioxaris please confirm that the actual session claim will be called fva

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.

As where we stand right now, that's correct!

/**
* Any other JWT Claim Set member.
*/
Expand Down
7 changes: 7 additions & 0 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,13 @@ export interface SessionResource extends ClerkResource {
status: SessionStatus;
expireAt: Date;
abandonAt: Date;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [number | null, number | null];
lastActiveToken: TokenResource | null;
lastActiveOrganizationId: string | null;
lastActiveAt: Date;
Expand Down
1 change: 1 addition & 0 deletions packages/types/src/ssr.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,5 @@ export type InitialState = Serializable<{
orgSlug: string | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | undefined;
organization: OrganizationResource | undefined;
__experimental_factorVerificationAge: [number | null, number | null];
}>;
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .changeset/eleven-apricots-rest.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
---
"@clerk/clerk-js": minor
"@clerk/backend": minor
"@clerk/clerk-react": minor
"@clerk/types": minor
---

Experimental support: Expect a new sessionClaim called `fva` that tracks the age of verified factor groups.

### Server side

This can be applied to any helper that returns the auth object

**Nextjs example**

```ts
auth(). __experimental_factorVerificationAge
```

### Client side

**React example**
```ts
const { session } = useSession()
session?. __experimental_factorVerificationAge
```
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,13 @@ export type SignedInAuthObject = {
orgRole: OrganizationCustomRoleKey | undefined;
orgSlug: string | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | undefined;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [number | null, number | null];
getToken: ServerGetToken;
has: CheckAuthorizationWithCustomPermissions;
debug: AuthObjectDebug;
Expand All@@ -51,6 +58,13 @@ export type SignedOutAuthObject = {
orgRole: null;
orgSlug: null;
orgPermissions: null;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [null, null];
getToken: ServerGetToken;
has: CheckAuthorizationWithCustomPermissions;
debug: AuthObjectDebug;
Expand DownExpand Up@@ -86,6 +100,7 @@ export function signedInAuthObject(
org_slug: orgSlug,
org_permissions: orgPermissions,
sub: userId,
fva: __experimental_factorVerificationAge,
} = sessionClaims;
const apiClient = createBackendApiClient(authenticateContext);
const getToken = createGetToken({
Expand All@@ -103,6 +118,7 @@ export function signedInAuthObject(
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
getToken,
has: createHasAuthorization({ orgId, orgRole, orgPermissions, userId }),
debug: createDebug({ ...authenticateContext, sessionToken }),
Expand All@@ -122,6 +138,7 @@ export function signedOutAuthObject(debugData?: AuthObjectDebugData): SignedOutA
orgRole: null,
orgSlug: null,
orgPermissions: null,
__experimental_factorVerificationAge: [null, null],
getToken: () => Promise.resolve(null),
has: () => false,
debug: createDebug(debugData),
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@@ -39,6 +39,7 @@ export class Session extends BaseResource implements SessionResource {
actor!: ActJWTClaim | null;
user!: UserResource | null;
publicUserData!: PublicUserData;
__experimental_factorVerificationAge: [number | null, number | null] = [null, null];
expireAt!: Date;
abandonAt!: Date;
createdAt!: Date;
Expand DownExpand Up@@ -235,6 +236,7 @@ export class Session extends BaseResource implements SessionResource {
this.status = data.status;
this.expireAt = unixEpochToDate(data.expire_at);
this.abandonAt = unixEpochToDate(data.abandon_at);
this.__experimental_factorVerificationAge = data.factor_verification_age;
this.lastActiveAt = unixEpochToDate(data.last_active_at);
this.lastActiveOrganizationId = data.last_active_organization_id;
this.actor = data.actor;
Expand Down
10 changes: 9 additions & 1 deletion packages/clerk-js/src/utils/memoizeStateListenerCallback.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ function sessionChanged(prev: SessionResource, next: SessionResource): boolean {
return (
prev.id !== next.id ||
prev.updatedAt.getTime() < next.updatedAt.getTime() ||
sessionUserMembershipPermissionsChanged(next, prev)
sessionFVAChanged(prev, next) ||
sessionUserMembershipPermissionsChanged(prev, next)
);
}

Expand All@@ -49,6 +50,13 @@ function userMembershipsChanged(prev: UserResource, next: UserResource): boolean
);
}

function sessionFVAChanged(prev: SessionResource, next: SessionResource): boolean {
return (
prev.__experimental_factorVerificationAge[0] !== next.__experimental_factorVerificationAge[0] ||
prev.__experimental_factorVerificationAge[1] !== next.__experimental_factorVerificationAge[1]
);
}

function sessionUserMembershipPermissionsChanged(prev: SessionResource, next: SessionResource): boolean {
if (prev.lastActiveOrganizationId !== next.lastActiveOrganizationId) {
return true;
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/contexts/AuthContext.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,5 @@ export const [AuthContext, useAuthContext] = createContextAndHook<{
orgRole: OrganizationCustomRoleKey | null | undefined;
orgSlug: string | null | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | null | undefined;
__experimental_factorVerificationAge: [number | null, number | null];
}>('AuthContext');
30 changes: 25 additions & 5 deletions packages/react/src/contexts/ClerkContextProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,15 +35,35 @@ export function ClerkContextProvider(props: ClerkContextProvider): JSX.Element |
const clerkCtx = React.useMemo(() => ({ value: clerk }), [clerkLoaded]);
const clientCtx = React.useMemo(() => ({ value: state.client }), [state.client]);

const { sessionId, session, userId, user, orgId, actor, organization, orgRole, orgSlug, orgPermissions } =
derivedState;
const {
sessionId,
session,
userId,
user,
orgId,
actor,
organization,
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
} = derivedState;

const authCtx = React.useMemo(() => {
const value = { sessionId, userId, actor, orgId, orgRole, orgSlug, orgPermissions };
const value = {
sessionId,
userId,
actor,
orgId,
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
};
return { value };
}, [sessionId, userId, actor, orgId, orgRole, orgSlug]);
const userCtx = React.useMemo(() => ({ value: user }), [userId, user]);
}, [sessionId, userId, actor, orgId, orgRole, orgSlug, __experimental_factorVerificationAge]);
const sessionCtx = React.useMemo(() => ({ value: session }), [sessionId, session]);
const userCtx = React.useMemo(() => ({ value: user }), [userId, user]);
const organizationCtx = React.useMemo(() => {
const value = {
organization: organization,
Expand Down
6 changes: 6 additions & 0 deletions packages/react/src/utils/deriveState.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ const deriveFromSsrInitialState = (initialState: InitialState) => {
const orgPermissions = initialState.orgPermissions as OrganizationCustomPermissionKey[];
const orgSlug = initialState.orgSlug;
const actor = initialState.actor;
const __experimental_factorVerificationAge = initialState.__experimental_factorVerificationAge;

return {
userId,
Expand All@@ -38,6 +39,7 @@ const deriveFromSsrInitialState = (initialState: InitialState) => {
orgPermissions,
orgSlug,
actor,
__experimental_factorVerificationAge,
};
};

Expand All@@ -46,6 +48,9 @@ const deriveFromClientSideState = (state: Resources) => {
const user = state.user;
const sessionId: string | null | undefined = state.session ? state.session.id : state.session;
const session = state.session;
const __experimental_factorVerificationAge: [number | null, number | null] = state.session
? state.session.__experimental_factorVerificationAge
: [null, null];
const actor = session?.actor;
const organization = state.organization;
const orgId: string | null | undefined = state.organization ? state.organization.id : state.organization;
Expand All@@ -67,5 +72,6 @@ const deriveFromClientSideState = (state: Resources) => {
orgSlug,
orgPermissions,
actor,
__experimental_factorVerificationAge,
};
};
7 changes: 7 additions & 0 deletions packages/types/src/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,13 @@ export interface SessionJSON extends ClerkResourceJSON {
object: 'session';
id: string;
status: SessionStatus;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
factor_verification_age: [number | null, number | null];
expire_at: number;
abandon_at: number;
last_active_at: number;
Expand Down
8 changes: 8 additions & 0 deletions packages/types/src/jwtv2.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,14 @@ export interface JwtPayload extends CustomJwtSessionClaims {
*/
org_permissions?: OrganizationCustomPermissionKey[];

/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
fva: [number | null, number | null];

Comment on lines +109 to +111

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.

@chanioxaris please confirm that the actual session claim will be called fva

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.

As where we stand right now, that's correct!

/**
* Any other JWT Claim Set member.
*/
Expand Down
7 changes: 7 additions & 0 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,13 @@ export interface SessionResource extends ClerkResource {
status: SessionStatus;
expireAt: Date;
abandonAt: Date;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [number | null, number | null];
lastActiveToken: TokenResource | null;
lastActiveOrganizationId: string | null;
lastActiveAt: Date;
Expand Down
1 change: 1 addition & 0 deletions packages/types/src/ssr.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,5 @@ export type InitialState = Serializable<{
orgSlug: string | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | undefined;
organization: OrganizationResource | undefined;
__experimental_factorVerificationAge: [number | null, number | null];
}>;
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .changeset/eleven-apricots-rest.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
---
"@clerk/clerk-js": minor
"@clerk/backend": minor
"@clerk/clerk-react": minor
"@clerk/types": minor
---

Experimental support: Expect a new sessionClaim called `fva` that tracks the age of verified factor groups.

### Server side

This can be applied to any helper that returns the auth object

**Nextjs example**

```ts
auth(). __experimental_factorVerificationAge
```

### Client side

**React example**
```ts
const { session } = useSession()
session?. __experimental_factorVerificationAge
```
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,13 @@ export type SignedInAuthObject = {
orgRole: OrganizationCustomRoleKey | undefined;
orgSlug: string | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | undefined;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [number | null, number | null];
getToken: ServerGetToken;
has: CheckAuthorizationWithCustomPermissions;
debug: AuthObjectDebug;
Expand All@@ -51,6 +58,13 @@ export type SignedOutAuthObject = {
orgRole: null;
orgSlug: null;
orgPermissions: null;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [null, null];
getToken: ServerGetToken;
has: CheckAuthorizationWithCustomPermissions;
debug: AuthObjectDebug;
Expand DownExpand Up@@ -86,6 +100,7 @@ export function signedInAuthObject(
org_slug: orgSlug,
org_permissions: orgPermissions,
sub: userId,
fva: __experimental_factorVerificationAge,
} = sessionClaims;
const apiClient = createBackendApiClient(authenticateContext);
const getToken = createGetToken({
Expand All@@ -103,6 +118,7 @@ export function signedInAuthObject(
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
getToken,
has: createHasAuthorization({ orgId, orgRole, orgPermissions, userId }),
debug: createDebug({ ...authenticateContext, sessionToken }),
Expand All@@ -122,6 +138,7 @@ export function signedOutAuthObject(debugData?: AuthObjectDebugData): SignedOutA
orgRole: null,
orgSlug: null,
orgPermissions: null,
__experimental_factorVerificationAge: [null, null],
getToken: () => Promise.resolve(null),
has: () => false,
debug: createDebug(debugData),
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@@ -39,6 +39,7 @@ export class Session extends BaseResource implements SessionResource {
actor!: ActJWTClaim | null;
user!: UserResource | null;
publicUserData!: PublicUserData;
__experimental_factorVerificationAge: [number | null, number | null] = [null, null];
expireAt!: Date;
abandonAt!: Date;
createdAt!: Date;
Expand DownExpand Up@@ -235,6 +236,7 @@ export class Session extends BaseResource implements SessionResource {
this.status = data.status;
this.expireAt = unixEpochToDate(data.expire_at);
this.abandonAt = unixEpochToDate(data.abandon_at);
this.__experimental_factorVerificationAge = data.factor_verification_age;
this.lastActiveAt = unixEpochToDate(data.last_active_at);
this.lastActiveOrganizationId = data.last_active_organization_id;
this.actor = data.actor;
Expand Down
10 changes: 9 additions & 1 deletion packages/clerk-js/src/utils/memoizeStateListenerCallback.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ function sessionChanged(prev: SessionResource, next: SessionResource): boolean {
return (
prev.id !== next.id ||
prev.updatedAt.getTime() < next.updatedAt.getTime() ||
sessionUserMembershipPermissionsChanged(next, prev)
sessionFVAChanged(prev, next) ||
sessionUserMembershipPermissionsChanged(prev, next)
);
}

Expand All@@ -49,6 +50,13 @@ function userMembershipsChanged(prev: UserResource, next: UserResource): boolean
);
}

function sessionFVAChanged(prev: SessionResource, next: SessionResource): boolean {
return (
prev.__experimental_factorVerificationAge[0] !== next.__experimental_factorVerificationAge[0] ||
prev.__experimental_factorVerificationAge[1] !== next.__experimental_factorVerificationAge[1]
);
}

function sessionUserMembershipPermissionsChanged(prev: SessionResource, next: SessionResource): boolean {
if (prev.lastActiveOrganizationId !== next.lastActiveOrganizationId) {
return true;
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/contexts/AuthContext.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,5 @@ export const [AuthContext, useAuthContext] = createContextAndHook<{
orgRole: OrganizationCustomRoleKey | null | undefined;
orgSlug: string | null | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | null | undefined;
__experimental_factorVerificationAge: [number | null, number | null];
}>('AuthContext');
30 changes: 25 additions & 5 deletions packages/react/src/contexts/ClerkContextProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,15 +35,35 @@ export function ClerkContextProvider(props: ClerkContextProvider): JSX.Element |
const clerkCtx = React.useMemo(() => ({ value: clerk }), [clerkLoaded]);
const clientCtx = React.useMemo(() => ({ value: state.client }), [state.client]);

const { sessionId, session, userId, user, orgId, actor, organization, orgRole, orgSlug, orgPermissions } =
derivedState;
const {
sessionId,
session,
userId,
user,
orgId,
actor,
organization,
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
} = derivedState;

const authCtx = React.useMemo(() => {
const value = { sessionId, userId, actor, orgId, orgRole, orgSlug, orgPermissions };
const value = {
sessionId,
userId,
actor,
orgId,
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
};
return { value };
}, [sessionId, userId, actor, orgId, orgRole, orgSlug]);
const userCtx = React.useMemo(() => ({ value: user }), [userId, user]);
}, [sessionId, userId, actor, orgId, orgRole, orgSlug, __experimental_factorVerificationAge]);
const sessionCtx = React.useMemo(() => ({ value: session }), [sessionId, session]);
const userCtx = React.useMemo(() => ({ value: user }), [userId, user]);
const organizationCtx = React.useMemo(() => {
const value = {
organization: organization,
Expand Down
6 changes: 6 additions & 0 deletions packages/react/src/utils/deriveState.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ const deriveFromSsrInitialState = (initialState: InitialState) => {
const orgPermissions = initialState.orgPermissions as OrganizationCustomPermissionKey[];
const orgSlug = initialState.orgSlug;
const actor = initialState.actor;
const __experimental_factorVerificationAge = initialState.__experimental_factorVerificationAge;

return {
userId,
Expand All@@ -38,6 +39,7 @@ const deriveFromSsrInitialState = (initialState: InitialState) => {
orgPermissions,
orgSlug,
actor,
__experimental_factorVerificationAge,
};
};

Expand All@@ -46,6 +48,9 @@ const deriveFromClientSideState = (state: Resources) => {
const user = state.user;
const sessionId: string | null | undefined = state.session ? state.session.id : state.session;
const session = state.session;
const __experimental_factorVerificationAge: [number | null, number | null] = state.session
? state.session.__experimental_factorVerificationAge
: [null, null];
const actor = session?.actor;
const organization = state.organization;
const orgId: string | null | undefined = state.organization ? state.organization.id : state.organization;
Expand All@@ -67,5 +72,6 @@ const deriveFromClientSideState = (state: Resources) => {
orgSlug,
orgPermissions,
actor,
__experimental_factorVerificationAge,
};
};
7 changes: 7 additions & 0 deletions packages/types/src/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,13 @@ export interface SessionJSON extends ClerkResourceJSON {
object: 'session';
id: string;
status: SessionStatus;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
factor_verification_age: [number | null, number | null];
expire_at: number;
abandon_at: number;
last_active_at: number;
Expand Down
8 changes: 8 additions & 0 deletions packages/types/src/jwtv2.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,14 @@ export interface JwtPayload extends CustomJwtSessionClaims {
*/
org_permissions?: OrganizationCustomPermissionKey[];

/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
fva: [number | null, number | null];

Comment on lines +109 to +111

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.

@chanioxaris please confirm that the actual session claim will be called fva

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.

As where we stand right now, that's correct!

/**
* Any other JWT Claim Set member.
*/
Expand Down
7 changes: 7 additions & 0 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,13 @@ export interface SessionResource extends ClerkResource {
status: SessionStatus;
expireAt: Date;
abandonAt: Date;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [number | null, number | null];
lastActiveToken: TokenResource | null;
lastActiveOrganizationId: string | null;
lastActiveAt: Date;
Expand Down
1 change: 1 addition & 0 deletions packages/types/src/ssr.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,5 @@ export type InitialState = Serializable<{
orgSlug: string | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | undefined;
organization: OrganizationResource | undefined;
__experimental_factorVerificationAge: [number | null, number | null];
}>;
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .changeset/eleven-apricots-rest.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
---
"@clerk/clerk-js": minor
"@clerk/backend": minor
"@clerk/clerk-react": minor
"@clerk/types": minor
---

Experimental support: Expect a new sessionClaim called `fva` that tracks the age of verified factor groups.

### Server side

This can be applied to any helper that returns the auth object

**Nextjs example**

```ts
auth(). __experimental_factorVerificationAge
```

### Client side

**React example**
```ts
const { session } = useSession()
session?. __experimental_factorVerificationAge
```
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,13 @@ export type SignedInAuthObject = {
orgRole: OrganizationCustomRoleKey | undefined;
orgSlug: string | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | undefined;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [number | null, number | null];
getToken: ServerGetToken;
has: CheckAuthorizationWithCustomPermissions;
debug: AuthObjectDebug;
Expand All@@ -51,6 +58,13 @@ export type SignedOutAuthObject = {
orgRole: null;
orgSlug: null;
orgPermissions: null;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [null, null];
getToken: ServerGetToken;
has: CheckAuthorizationWithCustomPermissions;
debug: AuthObjectDebug;
Expand DownExpand Up@@ -86,6 +100,7 @@ export function signedInAuthObject(
org_slug: orgSlug,
org_permissions: orgPermissions,
sub: userId,
fva: __experimental_factorVerificationAge,
} = sessionClaims;
const apiClient = createBackendApiClient(authenticateContext);
const getToken = createGetToken({
Expand All@@ -103,6 +118,7 @@ export function signedInAuthObject(
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
getToken,
has: createHasAuthorization({ orgId, orgRole, orgPermissions, userId }),
debug: createDebug({ ...authenticateContext, sessionToken }),
Expand All@@ -122,6 +138,7 @@ export function signedOutAuthObject(debugData?: AuthObjectDebugData): SignedOutA
orgRole: null,
orgSlug: null,
orgPermissions: null,
__experimental_factorVerificationAge: [null, null],
getToken: () => Promise.resolve(null),
has: () => false,
debug: createDebug(debugData),
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@@ -39,6 +39,7 @@ export class Session extends BaseResource implements SessionResource {
actor!: ActJWTClaim | null;
user!: UserResource | null;
publicUserData!: PublicUserData;
__experimental_factorVerificationAge: [number | null, number | null] = [null, null];
expireAt!: Date;
abandonAt!: Date;
createdAt!: Date;
Expand DownExpand Up@@ -235,6 +236,7 @@ export class Session extends BaseResource implements SessionResource {
this.status = data.status;
this.expireAt = unixEpochToDate(data.expire_at);
this.abandonAt = unixEpochToDate(data.abandon_at);
this.__experimental_factorVerificationAge = data.factor_verification_age;
this.lastActiveAt = unixEpochToDate(data.last_active_at);
this.lastActiveOrganizationId = data.last_active_organization_id;
this.actor = data.actor;
Expand Down
10 changes: 9 additions & 1 deletion packages/clerk-js/src/utils/memoizeStateListenerCallback.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ function sessionChanged(prev: SessionResource, next: SessionResource): boolean {
return (
prev.id !== next.id ||
prev.updatedAt.getTime() < next.updatedAt.getTime() ||
sessionUserMembershipPermissionsChanged(next, prev)
sessionFVAChanged(prev, next) ||
sessionUserMembershipPermissionsChanged(prev, next)
);
}

Expand All@@ -49,6 +50,13 @@ function userMembershipsChanged(prev: UserResource, next: UserResource): boolean
);
}

function sessionFVAChanged(prev: SessionResource, next: SessionResource): boolean {
return (
prev.__experimental_factorVerificationAge[0] !== next.__experimental_factorVerificationAge[0] ||
prev.__experimental_factorVerificationAge[1] !== next.__experimental_factorVerificationAge[1]
);
}

function sessionUserMembershipPermissionsChanged(prev: SessionResource, next: SessionResource): boolean {
if (prev.lastActiveOrganizationId !== next.lastActiveOrganizationId) {
return true;
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/contexts/AuthContext.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,4 +9,5 @@ export const [AuthContext, useAuthContext] = createContextAndHook<{
orgRole: OrganizationCustomRoleKey | null | undefined;
orgSlug: string | null | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | null | undefined;
__experimental_factorVerificationAge: [number | null, number | null];
}>('AuthContext');
30 changes: 25 additions & 5 deletions packages/react/src/contexts/ClerkContextProvider.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,15 +35,35 @@ export function ClerkContextProvider(props: ClerkContextProvider): JSX.Element |
const clerkCtx = React.useMemo(() => ({ value: clerk }), [clerkLoaded]);
const clientCtx = React.useMemo(() => ({ value: state.client }), [state.client]);

const { sessionId, session, userId, user, orgId, actor, organization, orgRole, orgSlug, orgPermissions } =
derivedState;
const {
sessionId,
session,
userId,
user,
orgId,
actor,
organization,
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
} = derivedState;

const authCtx = React.useMemo(() => {
const value = { sessionId, userId, actor, orgId, orgRole, orgSlug, orgPermissions };
const value = {
sessionId,
userId,
actor,
orgId,
orgRole,
orgSlug,
orgPermissions,
__experimental_factorVerificationAge,
};
return { value };
}, [sessionId, userId, actor, orgId, orgRole, orgSlug]);
const userCtx = React.useMemo(() => ({ value: user }), [userId, user]);
}, [sessionId, userId, actor, orgId, orgRole, orgSlug, __experimental_factorVerificationAge]);
const sessionCtx = React.useMemo(() => ({ value: session }), [sessionId, session]);
const userCtx = React.useMemo(() => ({ value: user }), [userId, user]);
const organizationCtx = React.useMemo(() => {
const value = {
organization: organization,
Expand Down
6 changes: 6 additions & 0 deletions packages/react/src/utils/deriveState.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ const deriveFromSsrInitialState = (initialState: InitialState) => {
const orgPermissions = initialState.orgPermissions as OrganizationCustomPermissionKey[];
const orgSlug = initialState.orgSlug;
const actor = initialState.actor;
const __experimental_factorVerificationAge = initialState.__experimental_factorVerificationAge;

return {
userId,
Expand All@@ -38,6 +39,7 @@ const deriveFromSsrInitialState = (initialState: InitialState) => {
orgPermissions,
orgSlug,
actor,
__experimental_factorVerificationAge,
};
};

Expand All@@ -46,6 +48,9 @@ const deriveFromClientSideState = (state: Resources) => {
const user = state.user;
const sessionId: string | null | undefined = state.session ? state.session.id : state.session;
const session = state.session;
const __experimental_factorVerificationAge: [number | null, number | null] = state.session
? state.session.__experimental_factorVerificationAge
: [null, null];
const actor = session?.actor;
const organization = state.organization;
const orgId: string | null | undefined = state.organization ? state.organization.id : state.organization;
Expand All@@ -67,5 +72,6 @@ const deriveFromClientSideState = (state: Resources) => {
orgSlug,
orgPermissions,
actor,
__experimental_factorVerificationAge,
};
};
7 changes: 7 additions & 0 deletions packages/types/src/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,13 @@ export interface SessionJSON extends ClerkResourceJSON {
object: 'session';
id: string;
status: SessionStatus;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
factor_verification_age: [number | null, number | null];
expire_at: number;
abandon_at: number;
last_active_at: number;
Expand Down
8 changes: 8 additions & 0 deletions packages/types/src/jwtv2.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,14 @@ export interface JwtPayload extends CustomJwtSessionClaims {
*/
org_permissions?: OrganizationCustomPermissionKey[];

/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
fva: [number | null, number | null];

Comment on lines +109 to +111

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.

@chanioxaris please confirm that the actual session claim will be called fva

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.

As where we stand right now, that's correct!

/**
* Any other JWT Claim Set member.
*/
Expand Down
7 changes: 7 additions & 0 deletions packages/types/src/session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,13 @@ export interface SessionResource extends ClerkResource {
status: SessionStatus;
expireAt: Date;
abandonAt: Date;
/**
* Factor Verification Age
* Each item represents the minutes that have passed since the last time a first or second factor were verified.
* [fistFactorAge, secondFactorAge]
* @experimental This API is experimental and may change at any moment.
*/
__experimental_factorVerificationAge: [number | null, number | null];
lastActiveToken: TokenResource | null;
lastActiveOrganizationId: string | null;
lastActiveAt: Date;
Expand Down
1 change: 1 addition & 0 deletions packages/types/src/ssr.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,5 @@ export type InitialState = Serializable<{
orgSlug: string | undefined;
orgPermissions: OrganizationCustomPermissionKey[] | undefined;
organization: OrganizationResource | undefined;
__experimental_factorVerificationAge: [number | null, number | null];
}>;