fix(clerk-js): Cache logic around org ID pass to getToken()#4013

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
brkalow merged 8 commits into from
Aug 23, 2024
Merged

fix(clerk-js): Cache logic around org ID pass to getToken() #4013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d7a2dc4
fix cache logic around org ID pass to getToken()
brkalow Aug 23, 2024
44a66d4
Adds changeset
brkalow Aug 23, 2024
1bf4d40
Simplify logic
brkalow Aug 23, 2024
195172f
Updates tests to fix a flake, and ensure we're validating the case wh…
brkalow Aug 23, 2024
9fa7815
Adds additional test case for the cache hydration case
brkalow Aug 23, 2024
f5ac1e2
Test case where cache is hydrated with a specific organization, makin…
brkalow Aug 23, 2024
e58e153
fixes lint error
brkalow Aug 23, 2024
c7eab6c
fixes prettier issue
brkalow Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .changeset/early-ads-notice.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
Comment on lines +1 to +2

@brkalowbrkalowAug 23, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Fixes a bug in an unreleased PR, so it didn't feel necessary to have an entry for this. (#3786)

20 changes: 11 additions & 9 deletions packages/clerk-js/src/core/resources/Session.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,9 @@ export class Session extends BaseResource implements SessionResource {
// e.g. session id is 'sess_abc12345' and jwt template name is 'haris'
// The session token ID will be 'sess_abc12345' and the jwt template token ID will be 'sess_abc12345-haris'
#getCacheId(template?: string, organizationId?: string) {
return [this.id, template, organizationId, this.updatedAt.getTime()].filter(Boolean).join('-');
const resolvedOrganizationId =
typeof organizationId === 'undefined' ? this.lastActiveOrganizationId : organizationId;
return [this.id, template, resolvedOrganizationId, this.updatedAt.getTime()].filter(Boolean).join('-');
Comment on lines +121 to +123

@brkalowbrkalowAug 23, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

additional bug: when the token cache is hydrated on init, the cache key didn't include the organization ID.

}

protected fromJSON(data: SessionJSON | null): this {
Expand DownExpand Up@@ -151,12 +153,12 @@ export class Session extends BaseResource implements SessionResource {
return null;
}

const {
leewayInSeconds,
template,
skipCache = false,
organizationId = Session.clerk.organization?.id,
} = options || {};
const { leewayInSeconds, template, skipCache = false } = options || {};

// If no organization ID is provided, default to the selected organization in memory
// Note: this explicitly allows passing `null` or `""`, which should select the personal workspace.
const organizationId =
typeof options?.organizationId === 'undefined' ? Session.clerk.organization?.id : options?.organizationId;

if (!template && Number(leewayInSeconds) >= 60) {
throw new Error('Leeway can not exceed the token lifespan (60 seconds)');
Expand All@@ -166,7 +168,7 @@ export class Session extends BaseResource implements SessionResource {
const cachedEntry = skipCache ? undefined : SessionTokenCache.get({ tokenId }, leewayInSeconds);

// Dispatch tokenUpdate only for __session tokens with the session's active organization ID, and not JWT templates
const shouldDispatchTokenUpdate = !template && options?.organizationId === Session.clerk.organization?.id;

@brkalowbrkalowAug 23, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

One bug: organizationId gets a default value, but options.organizationId does not, so this check wasn't working as intended 👀

const shouldDispatchTokenUpdate = !template && organizationId === Session.clerk.organization?.id;

if (cachedEntry) {
const cachedToken = await cachedEntry.tokenResolver;
Expand All@@ -178,7 +180,7 @@ export class Session extends BaseResource implements SessionResource {
}
const path = template ? `${this.path()}/tokens/${template}` : `${this.path()}/tokens`;
// TODO: update template endpoint to accept organizationId
const params = template ? {} : { ...(organizationId && { organizationId }) };
const params = template ? {} : { organizationId };
const tokenResolver = Token.create(path, params);
SessionTokenCache.set({ tokenId, tokenResolver });
return tokenResolver.then(token => {
Expand Down
64 changes: 63 additions & 1 deletion packages/clerk-js/src/core/resources/__tests__/Session.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,14 @@ import type { OrganizationJSON, SessionJSON } from '@clerk/types';
import { eventBus } from '../../events';
import { createFapiClient } from '../../fapiClient';
import { clerkMock, createUser, mockDevClerkInstance, mockJwt, mockNetworkFailedFetch } from '../../test/fixtures';
import { SessionTokenCache } from '../../tokenCache';
import { BaseResource, Organization, Session } from '../internal';

describe('Session', () => {
afterEach(() => {
SessionTokenCache.clear();
});

describe('creating new session', () => {
let dispatchSpy;

Expand All@@ -19,6 +24,7 @@ describe('Session', () => {
BaseResource.clerk = null as any;
// @ts-ignore
global.fetch?.mockClear();
SessionTokenCache.clear();
});

it('dispatches token:update event on initialization with lastActiveToken', () => {
Expand DownExpand Up@@ -53,7 +59,56 @@ describe('Session', () => {
BaseResource.clerk = null as any;
});

it('dispatches token:update event on getToken', async () => {
it('dispatches token:update event on getToken without active organization', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

await session.getToken();

expect(dispatchSpy).toHaveBeenCalledTimes(1);
expect(dispatchSpy.mock.calls[0]).toMatchSnapshot();
});

it('hydrates token cache from lastActiveToken', async () => {
BaseResource.clerk = clerkMock({
organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
}) as any;

const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: 'activeOrganization',
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

const token = await session.getToken();

await session.getToken({ organizationId: 'activeOrganization' });

expect(BaseResource.clerk.getFapiClient().request).not.toHaveBeenCalled();

expect(token).toEqual(mockJwt);
expect(dispatchSpy).toHaveBeenCalledTimes(3);
});

it('dispatches token:update event on getToken with active organization', async () => {
BaseResource.clerk = clerkMock({
organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
}) as any;

const session = new Session({
status: 'active',
id: 'session_1',
Expand All@@ -72,6 +127,10 @@ describe('Session', () => {
});

it('does not dispatch token:update if template is provided', async () => {
BaseResource.clerk = clerkMock({
organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
}) as any;

const session = new Session({
status: 'active',
id: 'session_1',
Expand All@@ -92,6 +151,7 @@ describe('Session', () => {
BaseResource.clerk = clerkMock({
organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
}) as any;

const session = new Session({
status: 'active',
id: 'session_1',
Expand All@@ -112,6 +172,7 @@ describe('Session', () => {
BaseResource.clerk = clerkMock({
organization: new Organization({ id: 'anotherOrganization' } as OrganizationJSON),
}) as any;

const session = new Session({
status: 'active',
id: 'session_1',
Expand DownExpand Up@@ -163,6 +224,7 @@ describe('Session', () => {

const token = await session.getToken();

expect(global.fetch).toHaveBeenCalled();
expect(dispatchSpy).toHaveBeenCalledTimes(1);
expect(token).toEqual(null);
});
Expand Down
36 changes: 35 additions & 1 deletion packages/clerk-js/src/core/resources/__tests__/__snapshots__/Session.test.ts.snap
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,41 @@ exports[`Session creating new session dispatches token:update event on initializ
]
`;

exports[`Session getToken() dispatches token:update event on getToken 1`] = `
exports[`Session getToken() dispatches token:update event on getToken with active organization 1`] = `
[
"token:update",
{
"token": Token {
"getRawString": [Function],
"jwt": {
"claims": {
"__raw": "eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ.eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9.n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg",
"azp": "https://accounts.inspired.puma-74.lcl.dev",
"exp": 1666648310,
"iat": 1666648250,
"iss": "https://clerk.inspired.puma-74.lcl.dev",
"nbf": 1666648240,
"sid": "sess_2GbDB4enNdCa5vS1zpC3Xzg9tK9",
"sub": "user_2GIpXOEpVyJw51rkZn9Kmnc6Sxr",
},
"encoded": {
"header": "eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ",
"payload": "eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9",
"signature": "n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg",
},
"header": {
"alg": "RS256",
"kid": "ins_2GIoQhbUpy0hX7B2cVkuTMinXoD",
"typ": "JWT",
},
},
"pathRoot": "/client/sessions/session_1/tokens",
},
},
]
`;

exports[`Session getToken() dispatches token:update event on getToken without active organization 1`] = `
[
"token:update",
{
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix(clerk-js): Cache logic around org ID pass to getToken()#4013

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

brkalow
merged 8 commits into

from

Aug 23, 2024
 Merged


fix(clerk-js): Cache logic around org ID pass to getToken()
#4013
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
d7a2dc4

fix cache logic around org ID pass to getToken()


brkalow Aug 23, 2024
44a66d4

Adds changeset


brkalow Aug 23, 2024
1bf4d40

Simplify logic


brkalow Aug 23, 2024
195172f

Updates tests to fix a flake, and ensure we're validating the case wh…


brkalow Aug 23, 2024
9fa7815

Adds additional test case for the cache hydration case


brkalow Aug 23, 2024
f5ac1e2

Test case where cache is hydrated with a specific organization, makin…


brkalow Aug 23, 2024
e58e153

fixes lint error


brkalow Aug 23, 2024
c7eab6c

fixes prettier issue


brkalow Aug 23, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/early-ads-notice.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

Comment on lines

+1
 to 
+2

@brkalowbrkalowAug 23, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Fixes a bug in an unreleased PR, so it didn't feel necessary to have an entry for this. (#3786)

20 changes: 11 additions & 9 deletions
packages/clerk-js/src/core/resources/Session.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,9 @@ export class Session extends BaseResource implements SessionResource {
 // e.g. session id is 'sess_abc12345' and jwt template name is 'haris'
 // The session token ID will be 'sess_abc12345' and the jwt template token ID will be 'sess_abc12345-haris'
 #getCacheId(template?: string, organizationId?: string) {
 return [this.id, template, organizationId, this.updatedAt.getTime()].filter(Boolean).join('-');
 const resolvedOrganizationId =
 typeof organizationId === 'undefined' ? this.lastActiveOrganizationId : organizationId;
 return [this.id, template, resolvedOrganizationId, this.updatedAt.getTime()].filter(Boolean).join('-');

Comment on lines

+121
 to 
+123

@brkalowbrkalowAug 23, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

additional bug: when the token cache is hydrated on init, the cache key didn't include the organization ID.
 }

 protected fromJSON(data: SessionJSON | null): this {
Expand DownExpand Up@@ -151,12 +153,12 @@ export class Session extends BaseResource implements SessionResource {
 return null;
 }

 const {
 leewayInSeconds,
 template,
 skipCache = false,
organizationId = Session.clerk.organization?.id,
} = options || {};
 const { leewayInSeconds, template, skipCache = false } = options || {};

// If no organization ID is provided, default to the selected organization in memory
// Note: this explicitly allows passing `null` or `""`, which should select the personal workspace.
const organizationId =
 typeof options?.organizationId === 'undefined' ? Session.clerk.organization?.id : options?.organizationId;

 if (!template && Number(leewayInSeconds) >= 60) {
 throw new Error('Leeway can not exceed the token lifespan (60 seconds)');
Expand All@@ -166,7 +168,7 @@ export class Session extends BaseResource implements SessionResource {
 const cachedEntry = skipCache ? undefined : SessionTokenCache.get({ tokenId }, leewayInSeconds);

 // Dispatch tokenUpdate only for __session tokens with the session's active organization ID, and not JWT templates
 const shouldDispatchTokenUpdate = !template && options?.organizationId === Session.clerk.organization?.id;
@brkalowbrkalowAug 23, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

One bug: organizationId gets a default value, but options.organizationId does not, so this check wasn't working as intended 👀
 const shouldDispatchTokenUpdate = !template && organizationId === Session.clerk.organization?.id;

 if (cachedEntry) {
 const cachedToken = await cachedEntry.tokenResolver;
Expand All@@ -178,7 +180,7 @@ export class Session extends BaseResource implements SessionResource {
 }
 const path = template ? `${this.path()}/tokens/${template}` : `${this.path()}/tokens`;
 // TODO: update template endpoint to accept organizationId
 const params = template ? {} : { ...(organizationId && { organizationId }) };
 const params = template ? {} : { organizationId };
 const tokenResolver = Token.create(path, params);
 SessionTokenCache.set({ tokenId, tokenResolver });
 return tokenResolver.then(token => {
Expand Down

64 changes: 63 additions & 1 deletion
packages/clerk-js/src/core/resources/__tests__/Session.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,14 @@ import type { OrganizationJSON, SessionJSON } from '@clerk/types';
import { eventBus } from '../../events';
import { createFapiClient } from '../../fapiClient';
import { clerkMock, createUser, mockDevClerkInstance, mockJwt, mockNetworkFailedFetch } from '../../test/fixtures';
import { SessionTokenCache } from '../../tokenCache';
import { BaseResource, Organization, Session } from '../internal';

describe('Session', () => {
 afterEach(() => {
 SessionTokenCache.clear();
 });

 describe('creating new session', () => {
 let dispatchSpy;

Expand All@@ -19,6 +24,7 @@ describe('Session', () => {
 BaseResource.clerk = null as any;
 // @ts-ignore
 global.fetch?.mockClear();
 SessionTokenCache.clear();
 });

 it('dispatches token:update event on initialization with lastActiveToken', () => {
Expand DownExpand Up@@ -53,7 +59,56 @@ describe('Session', () => {
 BaseResource.clerk = null as any;
 });

 it('dispatches token:update event on getToken', async () => {
 it('dispatches token:update event on getToken without active organization', async () => {
 const session = new Session({
 status: 'active',
 id: 'session_1',
 object: 'session',
 user: createUser({}),
 last_active_organization_id: null,
 actor: null,
 created_at: new Date().getTime(),
 updated_at: new Date().getTime(),
 } as SessionJSON);

 await session.getToken();

 expect(dispatchSpy).toHaveBeenCalledTimes(1);
 expect(dispatchSpy.mock.calls[0]).toMatchSnapshot();
 });

 it('hydrates token cache from lastActiveToken', async () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
 object: 'session',
 user: createUser({}),
 last_active_organization_id: 'activeOrganization',
 last_active_token: { object: 'token', jwt: mockJwt },
 actor: null,
 created_at: new Date().getTime(),
 updated_at: new Date().getTime(),
 } as SessionJSON);

 const token = await session.getToken();

 await session.getToken({ organizationId: 'activeOrganization' });

 expect(BaseResource.clerk.getFapiClient().request).not.toHaveBeenCalled();

 expect(token).toEqual(mockJwt);
 expect(dispatchSpy).toHaveBeenCalledTimes(3);
 });

 it('dispatches token:update event on getToken with active organization', async () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand All@@ -72,6 +127,10 @@ describe('Session', () => {
 });

 it('does not dispatch token:update if template is provided', async () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand All@@ -92,6 +151,7 @@ describe('Session', () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand All@@ -112,6 +172,7 @@ describe('Session', () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'anotherOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand DownExpand Up@@ -163,6 +224,7 @@ describe('Session', () => {

 const token = await session.getToken();

 expect(global.fetch).toHaveBeenCalled();
 expect(dispatchSpy).toHaveBeenCalledTimes(1);
 expect(token).toEqual(null);
 });
Expand Down

36 changes: 35 additions & 1 deletion
packages/clerk-js/src/core/resources/__tests__/__snapshots__/Session.test.ts.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,41 @@ exports[`Session creating new session dispatches token:update event on initializ
]
`;

exports[`Session getToken() dispatches token:update event on getToken 1`] = `
exports[`Session getToken() dispatches token:update event on getToken with active organization 1`] = `
[
 "token:update",
 {
 "token": Token {
 "getRawString": [Function],
 "jwt": {
 "claims": {
 "__raw": "eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ.eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9.n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg",
 "azp": "https://accounts.inspired.puma-74.lcl.dev",
 "exp": 1666648310,
 "iat": 1666648250,
 "iss": "https://clerk.inspired.puma-74.lcl.dev",
 "nbf": 1666648240,
 "sid": "sess_2GbDB4enNdCa5vS1zpC3Xzg9tK9",
 "sub": "user_2GIpXOEpVyJw51rkZn9Kmnc6Sxr",
 },
 "encoded": {
 "header": "eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ",
 "payload": "eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9",
 "signature": "n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg",
 },
 "header": {
 "alg": "RS256",
 "kid": "ins_2GIoQhbUpy0hX7B2cVkuTMinXoD",
 "typ": "JWT",
 },
 },
 "pathRoot": "/client/sessions/session_1/tokens",
 },
 },
]
`;

exports[`Session getToken() dispatches token:update event on getToken without active organization 1`] = `
[
 "token:update",
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(clerk-js): Cache logic around org ID pass to getToken()#4013

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

brkalow
merged 8 commits into

from

Aug 23, 2024
 Merged


fix(clerk-js): Cache logic around org ID pass to getToken()
#4013
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
d7a2dc4

fix cache logic around org ID pass to getToken()


brkalow Aug 23, 2024
44a66d4

Adds changeset


brkalow Aug 23, 2024
1bf4d40

Simplify logic


brkalow Aug 23, 2024
195172f

Updates tests to fix a flake, and ensure we're validating the case wh…


brkalow Aug 23, 2024
9fa7815

Adds additional test case for the cache hydration case


brkalow Aug 23, 2024
f5ac1e2

Test case where cache is hydrated with a specific organization, makin…


brkalow Aug 23, 2024
e58e153

fixes lint error


brkalow Aug 23, 2024
c7eab6c

fixes prettier issue


brkalow Aug 23, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/early-ads-notice.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

Comment on lines

+1
 to 
+2

@brkalowbrkalowAug 23, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Fixes a bug in an unreleased PR, so it didn't feel necessary to have an entry for this. (#3786)

20 changes: 11 additions & 9 deletions
packages/clerk-js/src/core/resources/Session.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,9 @@ export class Session extends BaseResource implements SessionResource {
 // e.g. session id is 'sess_abc12345' and jwt template name is 'haris'
 // The session token ID will be 'sess_abc12345' and the jwt template token ID will be 'sess_abc12345-haris'
 #getCacheId(template?: string, organizationId?: string) {
 return [this.id, template, organizationId, this.updatedAt.getTime()].filter(Boolean).join('-');
 const resolvedOrganizationId =
 typeof organizationId === 'undefined' ? this.lastActiveOrganizationId : organizationId;
 return [this.id, template, resolvedOrganizationId, this.updatedAt.getTime()].filter(Boolean).join('-');

Comment on lines

+121
 to 
+123

@brkalowbrkalowAug 23, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

additional bug: when the token cache is hydrated on init, the cache key didn't include the organization ID.
 }

 protected fromJSON(data: SessionJSON | null): this {
Expand DownExpand Up@@ -151,12 +153,12 @@ export class Session extends BaseResource implements SessionResource {
 return null;
 }

 const {
 leewayInSeconds,
 template,
 skipCache = false,
organizationId = Session.clerk.organization?.id,
} = options || {};
 const { leewayInSeconds, template, skipCache = false } = options || {};

// If no organization ID is provided, default to the selected organization in memory
// Note: this explicitly allows passing `null` or `""`, which should select the personal workspace.
const organizationId =
 typeof options?.organizationId === 'undefined' ? Session.clerk.organization?.id : options?.organizationId;

 if (!template && Number(leewayInSeconds) >= 60) {
 throw new Error('Leeway can not exceed the token lifespan (60 seconds)');
Expand All@@ -166,7 +168,7 @@ export class Session extends BaseResource implements SessionResource {
 const cachedEntry = skipCache ? undefined : SessionTokenCache.get({ tokenId }, leewayInSeconds);

 // Dispatch tokenUpdate only for __session tokens with the session's active organization ID, and not JWT templates
 const shouldDispatchTokenUpdate = !template && options?.organizationId === Session.clerk.organization?.id;
@brkalowbrkalowAug 23, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

One bug: organizationId gets a default value, but options.organizationId does not, so this check wasn't working as intended 👀
 const shouldDispatchTokenUpdate = !template && organizationId === Session.clerk.organization?.id;

 if (cachedEntry) {
 const cachedToken = await cachedEntry.tokenResolver;
Expand All@@ -178,7 +180,7 @@ export class Session extends BaseResource implements SessionResource {
 }
 const path = template ? `${this.path()}/tokens/${template}` : `${this.path()}/tokens`;
 // TODO: update template endpoint to accept organizationId
 const params = template ? {} : { ...(organizationId && { organizationId }) };
 const params = template ? {} : { organizationId };
 const tokenResolver = Token.create(path, params);
 SessionTokenCache.set({ tokenId, tokenResolver });
 return tokenResolver.then(token => {
Expand Down

64 changes: 63 additions & 1 deletion
packages/clerk-js/src/core/resources/__tests__/Session.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,14 @@ import type { OrganizationJSON, SessionJSON } from '@clerk/types';
import { eventBus } from '../../events';
import { createFapiClient } from '../../fapiClient';
import { clerkMock, createUser, mockDevClerkInstance, mockJwt, mockNetworkFailedFetch } from '../../test/fixtures';
import { SessionTokenCache } from '../../tokenCache';
import { BaseResource, Organization, Session } from '../internal';

describe('Session', () => {
 afterEach(() => {
 SessionTokenCache.clear();
 });

 describe('creating new session', () => {
 let dispatchSpy;

Expand All@@ -19,6 +24,7 @@ describe('Session', () => {
 BaseResource.clerk = null as any;
 // @ts-ignore
 global.fetch?.mockClear();
 SessionTokenCache.clear();
 });

 it('dispatches token:update event on initialization with lastActiveToken', () => {
Expand DownExpand Up@@ -53,7 +59,56 @@ describe('Session', () => {
 BaseResource.clerk = null as any;
 });

 it('dispatches token:update event on getToken', async () => {
 it('dispatches token:update event on getToken without active organization', async () => {
 const session = new Session({
 status: 'active',
 id: 'session_1',
 object: 'session',
 user: createUser({}),
 last_active_organization_id: null,
 actor: null,
 created_at: new Date().getTime(),
 updated_at: new Date().getTime(),
 } as SessionJSON);

 await session.getToken();

 expect(dispatchSpy).toHaveBeenCalledTimes(1);
 expect(dispatchSpy.mock.calls[0]).toMatchSnapshot();
 });

 it('hydrates token cache from lastActiveToken', async () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
 object: 'session',
 user: createUser({}),
 last_active_organization_id: 'activeOrganization',
 last_active_token: { object: 'token', jwt: mockJwt },
 actor: null,
 created_at: new Date().getTime(),
 updated_at: new Date().getTime(),
 } as SessionJSON);

 const token = await session.getToken();

 await session.getToken({ organizationId: 'activeOrganization' });

 expect(BaseResource.clerk.getFapiClient().request).not.toHaveBeenCalled();

 expect(token).toEqual(mockJwt);
 expect(dispatchSpy).toHaveBeenCalledTimes(3);
 });

 it('dispatches token:update event on getToken with active organization', async () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand All@@ -72,6 +127,10 @@ describe('Session', () => {
 });

 it('does not dispatch token:update if template is provided', async () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand All@@ -92,6 +151,7 @@ describe('Session', () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand All@@ -112,6 +172,7 @@ describe('Session', () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'anotherOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand DownExpand Up@@ -163,6 +224,7 @@ describe('Session', () => {

 const token = await session.getToken();

 expect(global.fetch).toHaveBeenCalled();
 expect(dispatchSpy).toHaveBeenCalledTimes(1);
 expect(token).toEqual(null);
 });
Expand Down

36 changes: 35 additions & 1 deletion
packages/clerk-js/src/core/resources/__tests__/__snapshots__/Session.test.ts.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,41 @@ exports[`Session creating new session dispatches token:update event on initializ
]
`;

exports[`Session getToken() dispatches token:update event on getToken 1`] = `
exports[`Session getToken() dispatches token:update event on getToken with active organization 1`] = `
[
 "token:update",
 {
 "token": Token {
 "getRawString": [Function],
 "jwt": {
 "claims": {
 "__raw": "eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ.eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9.n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg",
 "azp": "https://accounts.inspired.puma-74.lcl.dev",
 "exp": 1666648310,
 "iat": 1666648250,
 "iss": "https://clerk.inspired.puma-74.lcl.dev",
 "nbf": 1666648240,
 "sid": "sess_2GbDB4enNdCa5vS1zpC3Xzg9tK9",
 "sub": "user_2GIpXOEpVyJw51rkZn9Kmnc6Sxr",
 },
 "encoded": {
 "header": "eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ",
 "payload": "eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9",
 "signature": "n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg",
 },
 "header": {
 "alg": "RS256",
 "kid": "ins_2GIoQhbUpy0hX7B2cVkuTMinXoD",
 "typ": "JWT",
 },
 },
 "pathRoot": "/client/sessions/session_1/tokens",
 },
 },
]
`;

exports[`Session getToken() dispatches token:update event on getToken without active organization 1`] = `
[
 "token:update",
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(clerk-js): Cache logic around org ID pass to getToken()#4013

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

brkalow
merged 8 commits into

from

Aug 23, 2024
 Merged


fix(clerk-js): Cache logic around org ID pass to getToken()
#4013
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
d7a2dc4

fix cache logic around org ID pass to getToken()


brkalow Aug 23, 2024
44a66d4

Adds changeset


brkalow Aug 23, 2024
1bf4d40

Simplify logic


brkalow Aug 23, 2024
195172f

Updates tests to fix a flake, and ensure we're validating the case wh…


brkalow Aug 23, 2024
9fa7815

Adds additional test case for the cache hydration case


brkalow Aug 23, 2024
f5ac1e2

Test case where cache is hydrated with a specific organization, makin…


brkalow Aug 23, 2024
e58e153

fixes lint error


brkalow Aug 23, 2024
c7eab6c

fixes prettier issue


brkalow Aug 23, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/early-ads-notice.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

Comment on lines

+1
 to 
+2

@brkalowbrkalowAug 23, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Fixes a bug in an unreleased PR, so it didn't feel necessary to have an entry for this. (#3786)

20 changes: 11 additions & 9 deletions
packages/clerk-js/src/core/resources/Session.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,9 @@ export class Session extends BaseResource implements SessionResource {
 // e.g. session id is 'sess_abc12345' and jwt template name is 'haris'
 // The session token ID will be 'sess_abc12345' and the jwt template token ID will be 'sess_abc12345-haris'
 #getCacheId(template?: string, organizationId?: string) {
 return [this.id, template, organizationId, this.updatedAt.getTime()].filter(Boolean).join('-');
 const resolvedOrganizationId =
 typeof organizationId === 'undefined' ? this.lastActiveOrganizationId : organizationId;
 return [this.id, template, resolvedOrganizationId, this.updatedAt.getTime()].filter(Boolean).join('-');

Comment on lines

+121
 to 
+123

@brkalowbrkalowAug 23, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

additional bug: when the token cache is hydrated on init, the cache key didn't include the organization ID.
 }

 protected fromJSON(data: SessionJSON | null): this {
Expand DownExpand Up@@ -151,12 +153,12 @@ export class Session extends BaseResource implements SessionResource {
 return null;
 }

 const {
 leewayInSeconds,
 template,
 skipCache = false,
organizationId = Session.clerk.organization?.id,
} = options || {};
 const { leewayInSeconds, template, skipCache = false } = options || {};

// If no organization ID is provided, default to the selected organization in memory
// Note: this explicitly allows passing `null` or `""`, which should select the personal workspace.
const organizationId =
 typeof options?.organizationId === 'undefined' ? Session.clerk.organization?.id : options?.organizationId;

 if (!template && Number(leewayInSeconds) >= 60) {
 throw new Error('Leeway can not exceed the token lifespan (60 seconds)');
Expand All@@ -166,7 +168,7 @@ export class Session extends BaseResource implements SessionResource {
 const cachedEntry = skipCache ? undefined : SessionTokenCache.get({ tokenId }, leewayInSeconds);

 // Dispatch tokenUpdate only for __session tokens with the session's active organization ID, and not JWT templates
 const shouldDispatchTokenUpdate = !template && options?.organizationId === Session.clerk.organization?.id;
@brkalowbrkalowAug 23, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

One bug: organizationId gets a default value, but options.organizationId does not, so this check wasn't working as intended 👀
 const shouldDispatchTokenUpdate = !template && organizationId === Session.clerk.organization?.id;

 if (cachedEntry) {
 const cachedToken = await cachedEntry.tokenResolver;
Expand All@@ -178,7 +180,7 @@ export class Session extends BaseResource implements SessionResource {
 }
 const path = template ? `${this.path()}/tokens/${template}` : `${this.path()}/tokens`;
 // TODO: update template endpoint to accept organizationId
 const params = template ? {} : { ...(organizationId && { organizationId }) };
 const params = template ? {} : { organizationId };
 const tokenResolver = Token.create(path, params);
 SessionTokenCache.set({ tokenId, tokenResolver });
 return tokenResolver.then(token => {
Expand Down

64 changes: 63 additions & 1 deletion
packages/clerk-js/src/core/resources/__tests__/Session.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,14 @@ import type { OrganizationJSON, SessionJSON } from '@clerk/types';
import { eventBus } from '../../events';
import { createFapiClient } from '../../fapiClient';
import { clerkMock, createUser, mockDevClerkInstance, mockJwt, mockNetworkFailedFetch } from '../../test/fixtures';
import { SessionTokenCache } from '../../tokenCache';
import { BaseResource, Organization, Session } from '../internal';

describe('Session', () => {
 afterEach(() => {
 SessionTokenCache.clear();
 });

 describe('creating new session', () => {
 let dispatchSpy;

Expand All@@ -19,6 +24,7 @@ describe('Session', () => {
 BaseResource.clerk = null as any;
 // @ts-ignore
 global.fetch?.mockClear();
 SessionTokenCache.clear();
 });

 it('dispatches token:update event on initialization with lastActiveToken', () => {
Expand DownExpand Up@@ -53,7 +59,56 @@ describe('Session', () => {
 BaseResource.clerk = null as any;
 });

 it('dispatches token:update event on getToken', async () => {
 it('dispatches token:update event on getToken without active organization', async () => {
 const session = new Session({
 status: 'active',
 id: 'session_1',
 object: 'session',
 user: createUser({}),
 last_active_organization_id: null,
 actor: null,
 created_at: new Date().getTime(),
 updated_at: new Date().getTime(),
 } as SessionJSON);

 await session.getToken();

 expect(dispatchSpy).toHaveBeenCalledTimes(1);
 expect(dispatchSpy.mock.calls[0]).toMatchSnapshot();
 });

 it('hydrates token cache from lastActiveToken', async () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
 object: 'session',
 user: createUser({}),
 last_active_organization_id: 'activeOrganization',
 last_active_token: { object: 'token', jwt: mockJwt },
 actor: null,
 created_at: new Date().getTime(),
 updated_at: new Date().getTime(),
 } as SessionJSON);

 const token = await session.getToken();

 await session.getToken({ organizationId: 'activeOrganization' });

 expect(BaseResource.clerk.getFapiClient().request).not.toHaveBeenCalled();

 expect(token).toEqual(mockJwt);
 expect(dispatchSpy).toHaveBeenCalledTimes(3);
 });

 it('dispatches token:update event on getToken with active organization', async () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand All@@ -72,6 +127,10 @@ describe('Session', () => {
 });

 it('does not dispatch token:update if template is provided', async () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand All@@ -92,6 +151,7 @@ describe('Session', () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand All@@ -112,6 +172,7 @@ describe('Session', () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'anotherOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand DownExpand Up@@ -163,6 +224,7 @@ describe('Session', () => {

 const token = await session.getToken();

 expect(global.fetch).toHaveBeenCalled();
 expect(dispatchSpy).toHaveBeenCalledTimes(1);
 expect(token).toEqual(null);
 });
Expand Down

36 changes: 35 additions & 1 deletion
packages/clerk-js/src/core/resources/__tests__/__snapshots__/Session.test.ts.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,41 @@ exports[`Session creating new session dispatches token:update event on initializ
]
`;

exports[`Session getToken() dispatches token:update event on getToken 1`] = `
exports[`Session getToken() dispatches token:update event on getToken with active organization 1`] = `
[
 "token:update",
 {
 "token": Token {
 "getRawString": [Function],
 "jwt": {
 "claims": {
 "__raw": "eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ.eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9.n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg",
 "azp": "https://accounts.inspired.puma-74.lcl.dev",
 "exp": 1666648310,
 "iat": 1666648250,
 "iss": "https://clerk.inspired.puma-74.lcl.dev",
 "nbf": 1666648240,
 "sid": "sess_2GbDB4enNdCa5vS1zpC3Xzg9tK9",
 "sub": "user_2GIpXOEpVyJw51rkZn9Kmnc6Sxr",
 },
 "encoded": {
 "header": "eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ",
 "payload": "eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9",
 "signature": "n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg",
 },
 "header": {
 "alg": "RS256",
 "kid": "ins_2GIoQhbUpy0hX7B2cVkuTMinXoD",
 "typ": "JWT",
 },
 },
 "pathRoot": "/client/sessions/session_1/tokens",
 },
 },
]
`;

exports[`Session getToken() dispatches token:update event on getToken without active organization 1`] = `
[
 "token:update",
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix(clerk-js): Cache logic around org ID pass to getToken()#4013

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

brkalow
merged 8 commits into

from

Aug 23, 2024
 Merged


fix(clerk-js): Cache logic around org ID pass to getToken()
#4013
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
d7a2dc4

fix cache logic around org ID pass to getToken()


brkalow Aug 23, 2024
44a66d4

Adds changeset


brkalow Aug 23, 2024
1bf4d40

Simplify logic


brkalow Aug 23, 2024
195172f

Updates tests to fix a flake, and ensure we're validating the case wh…


brkalow Aug 23, 2024
9fa7815

Adds additional test case for the cache hydration case


brkalow Aug 23, 2024
f5ac1e2

Test case where cache is hydrated with a specific organization, makin…


brkalow Aug 23, 2024
e58e153

fixes lint error


brkalow Aug 23, 2024
c7eab6c

fixes prettier issue


brkalow Aug 23, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/early-ads-notice.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

Comment on lines

+1
 to 
+2

@brkalowbrkalowAug 23, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Fixes a bug in an unreleased PR, so it didn't feel necessary to have an entry for this. (#3786)

20 changes: 11 additions & 9 deletions
packages/clerk-js/src/core/resources/Session.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,9 @@ export class Session extends BaseResource implements SessionResource {
 // e.g. session id is 'sess_abc12345' and jwt template name is 'haris'
 // The session token ID will be 'sess_abc12345' and the jwt template token ID will be 'sess_abc12345-haris'
 #getCacheId(template?: string, organizationId?: string) {
 return [this.id, template, organizationId, this.updatedAt.getTime()].filter(Boolean).join('-');
 const resolvedOrganizationId =
 typeof organizationId === 'undefined' ? this.lastActiveOrganizationId : organizationId;
 return [this.id, template, resolvedOrganizationId, this.updatedAt.getTime()].filter(Boolean).join('-');

Comment on lines

+121
 to 
+123

@brkalowbrkalowAug 23, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

additional bug: when the token cache is hydrated on init, the cache key didn't include the organization ID.
 }

 protected fromJSON(data: SessionJSON | null): this {
Expand DownExpand Up@@ -151,12 +153,12 @@ export class Session extends BaseResource implements SessionResource {
 return null;
 }

 const {
 leewayInSeconds,
 template,
 skipCache = false,
organizationId = Session.clerk.organization?.id,
} = options || {};
 const { leewayInSeconds, template, skipCache = false } = options || {};

// If no organization ID is provided, default to the selected organization in memory
// Note: this explicitly allows passing `null` or `""`, which should select the personal workspace.
const organizationId =
 typeof options?.organizationId === 'undefined' ? Session.clerk.organization?.id : options?.organizationId;

 if (!template && Number(leewayInSeconds) >= 60) {
 throw new Error('Leeway can not exceed the token lifespan (60 seconds)');
Expand All@@ -166,7 +168,7 @@ export class Session extends BaseResource implements SessionResource {
 const cachedEntry = skipCache ? undefined : SessionTokenCache.get({ tokenId }, leewayInSeconds);

 // Dispatch tokenUpdate only for __session tokens with the session's active organization ID, and not JWT templates
 const shouldDispatchTokenUpdate = !template && options?.organizationId === Session.clerk.organization?.id;
@brkalowbrkalowAug 23, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

One bug: organizationId gets a default value, but options.organizationId does not, so this check wasn't working as intended 👀
 const shouldDispatchTokenUpdate = !template && organizationId === Session.clerk.organization?.id;

 if (cachedEntry) {
 const cachedToken = await cachedEntry.tokenResolver;
Expand All@@ -178,7 +180,7 @@ export class Session extends BaseResource implements SessionResource {
 }
 const path = template ? `${this.path()}/tokens/${template}` : `${this.path()}/tokens`;
 // TODO: update template endpoint to accept organizationId
 const params = template ? {} : { ...(organizationId && { organizationId }) };
 const params = template ? {} : { organizationId };
 const tokenResolver = Token.create(path, params);
 SessionTokenCache.set({ tokenId, tokenResolver });
 return tokenResolver.then(token => {
Expand Down

64 changes: 63 additions & 1 deletion
packages/clerk-js/src/core/resources/__tests__/Session.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,14 @@ import type { OrganizationJSON, SessionJSON } from '@clerk/types';
import { eventBus } from '../../events';
import { createFapiClient } from '../../fapiClient';
import { clerkMock, createUser, mockDevClerkInstance, mockJwt, mockNetworkFailedFetch } from '../../test/fixtures';
import { SessionTokenCache } from '../../tokenCache';
import { BaseResource, Organization, Session } from '../internal';

describe('Session', () => {
 afterEach(() => {
 SessionTokenCache.clear();
 });

 describe('creating new session', () => {
 let dispatchSpy;

Expand All@@ -19,6 +24,7 @@ describe('Session', () => {
 BaseResource.clerk = null as any;
 // @ts-ignore
 global.fetch?.mockClear();
 SessionTokenCache.clear();
 });

 it('dispatches token:update event on initialization with lastActiveToken', () => {
Expand DownExpand Up@@ -53,7 +59,56 @@ describe('Session', () => {
 BaseResource.clerk = null as any;
 });

 it('dispatches token:update event on getToken', async () => {
 it('dispatches token:update event on getToken without active organization', async () => {
 const session = new Session({
 status: 'active',
 id: 'session_1',
 object: 'session',
 user: createUser({}),
 last_active_organization_id: null,
 actor: null,
 created_at: new Date().getTime(),
 updated_at: new Date().getTime(),
 } as SessionJSON);

 await session.getToken();

 expect(dispatchSpy).toHaveBeenCalledTimes(1);
 expect(dispatchSpy.mock.calls[0]).toMatchSnapshot();
 });

 it('hydrates token cache from lastActiveToken', async () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
 object: 'session',
 user: createUser({}),
 last_active_organization_id: 'activeOrganization',
 last_active_token: { object: 'token', jwt: mockJwt },
 actor: null,
 created_at: new Date().getTime(),
 updated_at: new Date().getTime(),
 } as SessionJSON);

 const token = await session.getToken();

 await session.getToken({ organizationId: 'activeOrganization' });

 expect(BaseResource.clerk.getFapiClient().request).not.toHaveBeenCalled();

 expect(token).toEqual(mockJwt);
 expect(dispatchSpy).toHaveBeenCalledTimes(3);
 });

 it('dispatches token:update event on getToken with active organization', async () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand All@@ -72,6 +127,10 @@ describe('Session', () => {
 });

 it('does not dispatch token:update if template is provided', async () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand All@@ -92,6 +151,7 @@ describe('Session', () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand All@@ -112,6 +172,7 @@ describe('Session', () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'anotherOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand DownExpand Up@@ -163,6 +224,7 @@ describe('Session', () => {

 const token = await session.getToken();

 expect(global.fetch).toHaveBeenCalled();
 expect(dispatchSpy).toHaveBeenCalledTimes(1);
 expect(token).toEqual(null);
 });
Expand Down

36 changes: 35 additions & 1 deletion
packages/clerk-js/src/core/resources/__tests__/__snapshots__/Session.test.ts.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,41 @@ exports[`Session creating new session dispatches token:update event on initializ
]
`;

exports[`Session getToken() dispatches token:update event on getToken 1`] = `
exports[`Session getToken() dispatches token:update event on getToken with active organization 1`] = `
[
 "token:update",
 {
 "token": Token {
 "getRawString": [Function],
 "jwt": {
 "claims": {
 "__raw": "eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ.eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9.n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg",
 "azp": "https://accounts.inspired.puma-74.lcl.dev",
 "exp": 1666648310,
 "iat": 1666648250,
 "iss": "https://clerk.inspired.puma-74.lcl.dev",
 "nbf": 1666648240,
 "sid": "sess_2GbDB4enNdCa5vS1zpC3Xzg9tK9",
 "sub": "user_2GIpXOEpVyJw51rkZn9Kmnc6Sxr",
 },
 "encoded": {
 "header": "eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ",
 "payload": "eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9",
 "signature": "n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg",
 },
 "header": {
 "alg": "RS256",
 "kid": "ins_2GIoQhbUpy0hX7B2cVkuTMinXoD",
 "typ": "JWT",
 },
 },
 "pathRoot": "/client/sessions/session_1/tokens",
 },
 },
]
`;

exports[`Session getToken() dispatches token:update event on getToken without active organization 1`] = `
[
 "token:update",
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(clerk-js): Cache logic around org ID pass to getToken()#4013

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

brkalow
merged 8 commits into

from

Aug 23, 2024
 Merged


fix(clerk-js): Cache logic around org ID pass to getToken()
#4013
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
d7a2dc4

fix cache logic around org ID pass to getToken()


brkalow Aug 23, 2024
44a66d4

Adds changeset


brkalow Aug 23, 2024
1bf4d40

Simplify logic


brkalow Aug 23, 2024
195172f

Updates tests to fix a flake, and ensure we're validating the case wh…


brkalow Aug 23, 2024
9fa7815

Adds additional test case for the cache hydration case


brkalow Aug 23, 2024
f5ac1e2

Test case where cache is hydrated with a specific organization, makin…


brkalow Aug 23, 2024
e58e153

fixes lint error


brkalow Aug 23, 2024
c7eab6c

fixes prettier issue


brkalow Aug 23, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/early-ads-notice.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

Comment on lines

+1
 to 
+2

@brkalowbrkalowAug 23, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Fixes a bug in an unreleased PR, so it didn't feel necessary to have an entry for this. (#3786)

20 changes: 11 additions & 9 deletions
packages/clerk-js/src/core/resources/Session.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,9 @@ export class Session extends BaseResource implements SessionResource {
 // e.g. session id is 'sess_abc12345' and jwt template name is 'haris'
 // The session token ID will be 'sess_abc12345' and the jwt template token ID will be 'sess_abc12345-haris'
 #getCacheId(template?: string, organizationId?: string) {
 return [this.id, template, organizationId, this.updatedAt.getTime()].filter(Boolean).join('-');
 const resolvedOrganizationId =
 typeof organizationId === 'undefined' ? this.lastActiveOrganizationId : organizationId;
 return [this.id, template, resolvedOrganizationId, this.updatedAt.getTime()].filter(Boolean).join('-');

Comment on lines

+121
 to 
+123

@brkalowbrkalowAug 23, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

additional bug: when the token cache is hydrated on init, the cache key didn't include the organization ID.
 }

 protected fromJSON(data: SessionJSON | null): this {
Expand DownExpand Up@@ -151,12 +153,12 @@ export class Session extends BaseResource implements SessionResource {
 return null;
 }

 const {
 leewayInSeconds,
 template,
 skipCache = false,
organizationId = Session.clerk.organization?.id,
} = options || {};
 const { leewayInSeconds, template, skipCache = false } = options || {};

// If no organization ID is provided, default to the selected organization in memory
// Note: this explicitly allows passing `null` or `""`, which should select the personal workspace.
const organizationId =
 typeof options?.organizationId === 'undefined' ? Session.clerk.organization?.id : options?.organizationId;

 if (!template && Number(leewayInSeconds) >= 60) {
 throw new Error('Leeway can not exceed the token lifespan (60 seconds)');
Expand All@@ -166,7 +168,7 @@ export class Session extends BaseResource implements SessionResource {
 const cachedEntry = skipCache ? undefined : SessionTokenCache.get({ tokenId }, leewayInSeconds);

 // Dispatch tokenUpdate only for __session tokens with the session's active organization ID, and not JWT templates
 const shouldDispatchTokenUpdate = !template && options?.organizationId === Session.clerk.organization?.id;
@brkalowbrkalowAug 23, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

One bug: organizationId gets a default value, but options.organizationId does not, so this check wasn't working as intended 👀
 const shouldDispatchTokenUpdate = !template && organizationId === Session.clerk.organization?.id;

 if (cachedEntry) {
 const cachedToken = await cachedEntry.tokenResolver;
Expand All@@ -178,7 +180,7 @@ export class Session extends BaseResource implements SessionResource {
 }
 const path = template ? `${this.path()}/tokens/${template}` : `${this.path()}/tokens`;
 // TODO: update template endpoint to accept organizationId
 const params = template ? {} : { ...(organizationId && { organizationId }) };
 const params = template ? {} : { organizationId };
 const tokenResolver = Token.create(path, params);
 SessionTokenCache.set({ tokenId, tokenResolver });
 return tokenResolver.then(token => {
Expand Down

64 changes: 63 additions & 1 deletion
packages/clerk-js/src/core/resources/__tests__/Session.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,14 @@ import type { OrganizationJSON, SessionJSON } from '@clerk/types';
import { eventBus } from '../../events';
import { createFapiClient } from '../../fapiClient';
import { clerkMock, createUser, mockDevClerkInstance, mockJwt, mockNetworkFailedFetch } from '../../test/fixtures';
import { SessionTokenCache } from '../../tokenCache';
import { BaseResource, Organization, Session } from '../internal';

describe('Session', () => {
 afterEach(() => {
 SessionTokenCache.clear();
 });

 describe('creating new session', () => {
 let dispatchSpy;

Expand All@@ -19,6 +24,7 @@ describe('Session', () => {
 BaseResource.clerk = null as any;
 // @ts-ignore
 global.fetch?.mockClear();
 SessionTokenCache.clear();
 });

 it('dispatches token:update event on initialization with lastActiveToken', () => {
Expand DownExpand Up@@ -53,7 +59,56 @@ describe('Session', () => {
 BaseResource.clerk = null as any;
 });

 it('dispatches token:update event on getToken', async () => {
 it('dispatches token:update event on getToken without active organization', async () => {
 const session = new Session({
 status: 'active',
 id: 'session_1',
 object: 'session',
 user: createUser({}),
 last_active_organization_id: null,
 actor: null,
 created_at: new Date().getTime(),
 updated_at: new Date().getTime(),
 } as SessionJSON);

 await session.getToken();

 expect(dispatchSpy).toHaveBeenCalledTimes(1);
 expect(dispatchSpy.mock.calls[0]).toMatchSnapshot();
 });

 it('hydrates token cache from lastActiveToken', async () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
 object: 'session',
 user: createUser({}),
 last_active_organization_id: 'activeOrganization',
 last_active_token: { object: 'token', jwt: mockJwt },
 actor: null,
 created_at: new Date().getTime(),
 updated_at: new Date().getTime(),
 } as SessionJSON);

 const token = await session.getToken();

 await session.getToken({ organizationId: 'activeOrganization' });

 expect(BaseResource.clerk.getFapiClient().request).not.toHaveBeenCalled();

 expect(token).toEqual(mockJwt);
 expect(dispatchSpy).toHaveBeenCalledTimes(3);
 });

 it('dispatches token:update event on getToken with active organization', async () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand All@@ -72,6 +127,10 @@ describe('Session', () => {
 });

 it('does not dispatch token:update if template is provided', async () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand All@@ -92,6 +151,7 @@ describe('Session', () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand All@@ -112,6 +172,7 @@ describe('Session', () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'anotherOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand DownExpand Up@@ -163,6 +224,7 @@ describe('Session', () => {

 const token = await session.getToken();

 expect(global.fetch).toHaveBeenCalled();
 expect(dispatchSpy).toHaveBeenCalledTimes(1);
 expect(token).toEqual(null);
 });
Expand Down

36 changes: 35 additions & 1 deletion
packages/clerk-js/src/core/resources/__tests__/__snapshots__/Session.test.ts.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,41 @@ exports[`Session creating new session dispatches token:update event on initializ
]
`;

exports[`Session getToken() dispatches token:update event on getToken 1`] = `
exports[`Session getToken() dispatches token:update event on getToken with active organization 1`] = `
[
 "token:update",
 {
 "token": Token {
 "getRawString": [Function],
 "jwt": {
 "claims": {
 "__raw": "eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ.eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9.n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg",
 "azp": "https://accounts.inspired.puma-74.lcl.dev",
 "exp": 1666648310,
 "iat": 1666648250,
 "iss": "https://clerk.inspired.puma-74.lcl.dev",
 "nbf": 1666648240,
 "sid": "sess_2GbDB4enNdCa5vS1zpC3Xzg9tK9",
 "sub": "user_2GIpXOEpVyJw51rkZn9Kmnc6Sxr",
 },
 "encoded": {
 "header": "eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ",
 "payload": "eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9",
 "signature": "n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg",
 },
 "header": {
 "alg": "RS256",
 "kid": "ins_2GIoQhbUpy0hX7B2cVkuTMinXoD",
 "typ": "JWT",
 },
 },
 "pathRoot": "/client/sessions/session_1/tokens",
 },
 },
]
`;

exports[`Session getToken() dispatches token:update event on getToken without active organization 1`] = `
[
 "token:update",
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(clerk-js): Cache logic around org ID pass to getToken()#4013

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

brkalow
merged 8 commits into

from

Aug 23, 2024
 Merged


fix(clerk-js): Cache logic around org ID pass to getToken()
#4013
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
d7a2dc4

fix cache logic around org ID pass to getToken()


brkalow Aug 23, 2024
44a66d4

Adds changeset


brkalow Aug 23, 2024
1bf4d40

Simplify logic


brkalow Aug 23, 2024
195172f

Updates tests to fix a flake, and ensure we're validating the case wh…


brkalow Aug 23, 2024
9fa7815

Adds additional test case for the cache hydration case


brkalow Aug 23, 2024
f5ac1e2

Test case where cache is hydrated with a specific organization, makin…


brkalow Aug 23, 2024
e58e153

fixes lint error


brkalow Aug 23, 2024
c7eab6c

fixes prettier issue


brkalow Aug 23, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/early-ads-notice.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

Comment on lines

+1
 to 
+2

@brkalowbrkalowAug 23, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Fixes a bug in an unreleased PR, so it didn't feel necessary to have an entry for this. (#3786)

20 changes: 11 additions & 9 deletions
packages/clerk-js/src/core/resources/Session.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,9 @@ export class Session extends BaseResource implements SessionResource {
 // e.g. session id is 'sess_abc12345' and jwt template name is 'haris'
 // The session token ID will be 'sess_abc12345' and the jwt template token ID will be 'sess_abc12345-haris'
 #getCacheId(template?: string, organizationId?: string) {
 return [this.id, template, organizationId, this.updatedAt.getTime()].filter(Boolean).join('-');
 const resolvedOrganizationId =
 typeof organizationId === 'undefined' ? this.lastActiveOrganizationId : organizationId;
 return [this.id, template, resolvedOrganizationId, this.updatedAt.getTime()].filter(Boolean).join('-');

Comment on lines

+121
 to 
+123

@brkalowbrkalowAug 23, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

additional bug: when the token cache is hydrated on init, the cache key didn't include the organization ID.
 }

 protected fromJSON(data: SessionJSON | null): this {
Expand DownExpand Up@@ -151,12 +153,12 @@ export class Session extends BaseResource implements SessionResource {
 return null;
 }

 const {
 leewayInSeconds,
 template,
 skipCache = false,
organizationId = Session.clerk.organization?.id,
} = options || {};
 const { leewayInSeconds, template, skipCache = false } = options || {};

// If no organization ID is provided, default to the selected organization in memory
// Note: this explicitly allows passing `null` or `""`, which should select the personal workspace.
const organizationId =
 typeof options?.organizationId === 'undefined' ? Session.clerk.organization?.id : options?.organizationId;

 if (!template && Number(leewayInSeconds) >= 60) {
 throw new Error('Leeway can not exceed the token lifespan (60 seconds)');
Expand All@@ -166,7 +168,7 @@ export class Session extends BaseResource implements SessionResource {
 const cachedEntry = skipCache ? undefined : SessionTokenCache.get({ tokenId }, leewayInSeconds);

 // Dispatch tokenUpdate only for __session tokens with the session's active organization ID, and not JWT templates
 const shouldDispatchTokenUpdate = !template && options?.organizationId === Session.clerk.organization?.id;
@brkalowbrkalowAug 23, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

One bug: organizationId gets a default value, but options.organizationId does not, so this check wasn't working as intended 👀
 const shouldDispatchTokenUpdate = !template && organizationId === Session.clerk.organization?.id;

 if (cachedEntry) {
 const cachedToken = await cachedEntry.tokenResolver;
Expand All@@ -178,7 +180,7 @@ export class Session extends BaseResource implements SessionResource {
 }
 const path = template ? `${this.path()}/tokens/${template}` : `${this.path()}/tokens`;
 // TODO: update template endpoint to accept organizationId
 const params = template ? {} : { ...(organizationId && { organizationId }) };
 const params = template ? {} : { organizationId };
 const tokenResolver = Token.create(path, params);
 SessionTokenCache.set({ tokenId, tokenResolver });
 return tokenResolver.then(token => {
Expand Down

64 changes: 63 additions & 1 deletion
packages/clerk-js/src/core/resources/__tests__/Session.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,14 @@ import type { OrganizationJSON, SessionJSON } from '@clerk/types';
import { eventBus } from '../../events';
import { createFapiClient } from '../../fapiClient';
import { clerkMock, createUser, mockDevClerkInstance, mockJwt, mockNetworkFailedFetch } from '../../test/fixtures';
import { SessionTokenCache } from '../../tokenCache';
import { BaseResource, Organization, Session } from '../internal';

describe('Session', () => {
 afterEach(() => {
 SessionTokenCache.clear();
 });

 describe('creating new session', () => {
 let dispatchSpy;

Expand All@@ -19,6 +24,7 @@ describe('Session', () => {
 BaseResource.clerk = null as any;
 // @ts-ignore
 global.fetch?.mockClear();
 SessionTokenCache.clear();
 });

 it('dispatches token:update event on initialization with lastActiveToken', () => {
Expand DownExpand Up@@ -53,7 +59,56 @@ describe('Session', () => {
 BaseResource.clerk = null as any;
 });

 it('dispatches token:update event on getToken', async () => {
 it('dispatches token:update event on getToken without active organization', async () => {
 const session = new Session({
 status: 'active',
 id: 'session_1',
 object: 'session',
 user: createUser({}),
 last_active_organization_id: null,
 actor: null,
 created_at: new Date().getTime(),
 updated_at: new Date().getTime(),
 } as SessionJSON);

 await session.getToken();

 expect(dispatchSpy).toHaveBeenCalledTimes(1);
 expect(dispatchSpy.mock.calls[0]).toMatchSnapshot();
 });

 it('hydrates token cache from lastActiveToken', async () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
 object: 'session',
 user: createUser({}),
 last_active_organization_id: 'activeOrganization',
 last_active_token: { object: 'token', jwt: mockJwt },
 actor: null,
 created_at: new Date().getTime(),
 updated_at: new Date().getTime(),
 } as SessionJSON);

 const token = await session.getToken();

 await session.getToken({ organizationId: 'activeOrganization' });

 expect(BaseResource.clerk.getFapiClient().request).not.toHaveBeenCalled();

 expect(token).toEqual(mockJwt);
 expect(dispatchSpy).toHaveBeenCalledTimes(3);
 });

 it('dispatches token:update event on getToken with active organization', async () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand All@@ -72,6 +127,10 @@ describe('Session', () => {
 });

 it('does not dispatch token:update if template is provided', async () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand All@@ -92,6 +151,7 @@ describe('Session', () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand All@@ -112,6 +172,7 @@ describe('Session', () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'anotherOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand DownExpand Up@@ -163,6 +224,7 @@ describe('Session', () => {

 const token = await session.getToken();

 expect(global.fetch).toHaveBeenCalled();
 expect(dispatchSpy).toHaveBeenCalledTimes(1);
 expect(token).toEqual(null);
 });
Expand Down

36 changes: 35 additions & 1 deletion
packages/clerk-js/src/core/resources/__tests__/__snapshots__/Session.test.ts.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,41 @@ exports[`Session creating new session dispatches token:update event on initializ
]
`;

exports[`Session getToken() dispatches token:update event on getToken 1`] = `
exports[`Session getToken() dispatches token:update event on getToken with active organization 1`] = `
[
 "token:update",
 {
 "token": Token {
 "getRawString": [Function],
 "jwt": {
 "claims": {
 "__raw": "eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ.eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9.n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg",
 "azp": "https://accounts.inspired.puma-74.lcl.dev",
 "exp": 1666648310,
 "iat": 1666648250,
 "iss": "https://clerk.inspired.puma-74.lcl.dev",
 "nbf": 1666648240,
 "sid": "sess_2GbDB4enNdCa5vS1zpC3Xzg9tK9",
 "sub": "user_2GIpXOEpVyJw51rkZn9Kmnc6Sxr",
 },
 "encoded": {
 "header": "eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ",
 "payload": "eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9",
 "signature": "n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg",
 },
 "header": {
 "alg": "RS256",
 "kid": "ins_2GIoQhbUpy0hX7B2cVkuTMinXoD",
 "typ": "JWT",
 },
 },
 "pathRoot": "/client/sessions/session_1/tokens",
 },
 },
]
`;

exports[`Session getToken() dispatches token:update event on getToken without active organization 1`] = `
[
 "token:update",
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix(clerk-js): Cache logic around org ID pass to getToken()#4013

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

brkalow
merged 8 commits into

from

Aug 23, 2024
 Merged


fix(clerk-js): Cache logic around org ID pass to getToken()
#4013
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
d7a2dc4

fix cache logic around org ID pass to getToken()


brkalow Aug 23, 2024
44a66d4

Adds changeset


brkalow Aug 23, 2024
1bf4d40

Simplify logic


brkalow Aug 23, 2024
195172f

Updates tests to fix a flake, and ensure we're validating the case wh…


brkalow Aug 23, 2024
9fa7815

Adds additional test case for the cache hydration case


brkalow Aug 23, 2024
f5ac1e2

Test case where cache is hydrated with a specific organization, makin…


brkalow Aug 23, 2024
e58e153

fixes lint error


brkalow Aug 23, 2024
c7eab6c

fixes prettier issue


brkalow Aug 23, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.changeset/early-ads-notice.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

Comment on lines

+1
 to 
+2

@brkalowbrkalowAug 23, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Fixes a bug in an unreleased PR, so it didn't feel necessary to have an entry for this. (#3786)

20 changes: 11 additions & 9 deletions
packages/clerk-js/src/core/resources/Session.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,9 @@ export class Session extends BaseResource implements SessionResource {
 // e.g. session id is 'sess_abc12345' and jwt template name is 'haris'
 // The session token ID will be 'sess_abc12345' and the jwt template token ID will be 'sess_abc12345-haris'
 #getCacheId(template?: string, organizationId?: string) {
 return [this.id, template, organizationId, this.updatedAt.getTime()].filter(Boolean).join('-');
 const resolvedOrganizationId =
 typeof organizationId === 'undefined' ? this.lastActiveOrganizationId : organizationId;
 return [this.id, template, resolvedOrganizationId, this.updatedAt.getTime()].filter(Boolean).join('-');

Comment on lines

+121
 to 
+123

@brkalowbrkalowAug 23, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

additional bug: when the token cache is hydrated on init, the cache key didn't include the organization ID.
 }

 protected fromJSON(data: SessionJSON | null): this {
Expand DownExpand Up@@ -151,12 +153,12 @@ export class Session extends BaseResource implements SessionResource {
 return null;
 }

 const {
 leewayInSeconds,
 template,
 skipCache = false,
organizationId = Session.clerk.organization?.id,
} = options || {};
 const { leewayInSeconds, template, skipCache = false } = options || {};

// If no organization ID is provided, default to the selected organization in memory
// Note: this explicitly allows passing `null` or `""`, which should select the personal workspace.
const organizationId =
 typeof options?.organizationId === 'undefined' ? Session.clerk.organization?.id : options?.organizationId;

 if (!template && Number(leewayInSeconds) >= 60) {
 throw new Error('Leeway can not exceed the token lifespan (60 seconds)');
Expand All@@ -166,7 +168,7 @@ export class Session extends BaseResource implements SessionResource {
 const cachedEntry = skipCache ? undefined : SessionTokenCache.get({ tokenId }, leewayInSeconds);

 // Dispatch tokenUpdate only for __session tokens with the session's active organization ID, and not JWT templates
 const shouldDispatchTokenUpdate = !template && options?.organizationId === Session.clerk.organization?.id;
@brkalowbrkalowAug 23, 2024

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

One bug: organizationId gets a default value, but options.organizationId does not, so this check wasn't working as intended 👀
 const shouldDispatchTokenUpdate = !template && organizationId === Session.clerk.organization?.id;

 if (cachedEntry) {
 const cachedToken = await cachedEntry.tokenResolver;
Expand All@@ -178,7 +180,7 @@ export class Session extends BaseResource implements SessionResource {
 }
 const path = template ? `${this.path()}/tokens/${template}` : `${this.path()}/tokens`;
 // TODO: update template endpoint to accept organizationId
 const params = template ? {} : { ...(organizationId && { organizationId }) };
 const params = template ? {} : { organizationId };
 const tokenResolver = Token.create(path, params);
 SessionTokenCache.set({ tokenId, tokenResolver });
 return tokenResolver.then(token => {
Expand Down

64 changes: 63 additions & 1 deletion
packages/clerk-js/src/core/resources/__tests__/Session.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,14 @@ import type { OrganizationJSON, SessionJSON } from '@clerk/types';
import { eventBus } from '../../events';
import { createFapiClient } from '../../fapiClient';
import { clerkMock, createUser, mockDevClerkInstance, mockJwt, mockNetworkFailedFetch } from '../../test/fixtures';
import { SessionTokenCache } from '../../tokenCache';
import { BaseResource, Organization, Session } from '../internal';

describe('Session', () => {
 afterEach(() => {
 SessionTokenCache.clear();
 });

 describe('creating new session', () => {
 let dispatchSpy;

Expand All@@ -19,6 +24,7 @@ describe('Session', () => {
 BaseResource.clerk = null as any;
 // @ts-ignore
 global.fetch?.mockClear();
 SessionTokenCache.clear();
 });

 it('dispatches token:update event on initialization with lastActiveToken', () => {
Expand DownExpand Up@@ -53,7 +59,56 @@ describe('Session', () => {
 BaseResource.clerk = null as any;
 });

 it('dispatches token:update event on getToken', async () => {
 it('dispatches token:update event on getToken without active organization', async () => {
 const session = new Session({
 status: 'active',
 id: 'session_1',
 object: 'session',
 user: createUser({}),
 last_active_organization_id: null,
 actor: null,
 created_at: new Date().getTime(),
 updated_at: new Date().getTime(),
 } as SessionJSON);

 await session.getToken();

 expect(dispatchSpy).toHaveBeenCalledTimes(1);
 expect(dispatchSpy.mock.calls[0]).toMatchSnapshot();
 });

 it('hydrates token cache from lastActiveToken', async () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
 object: 'session',
 user: createUser({}),
 last_active_organization_id: 'activeOrganization',
 last_active_token: { object: 'token', jwt: mockJwt },
 actor: null,
 created_at: new Date().getTime(),
 updated_at: new Date().getTime(),
 } as SessionJSON);

 const token = await session.getToken();

 await session.getToken({ organizationId: 'activeOrganization' });

 expect(BaseResource.clerk.getFapiClient().request).not.toHaveBeenCalled();

 expect(token).toEqual(mockJwt);
 expect(dispatchSpy).toHaveBeenCalledTimes(3);
 });

 it('dispatches token:update event on getToken with active organization', async () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand All@@ -72,6 +127,10 @@ describe('Session', () => {
 });

 it('does not dispatch token:update if template is provided', async () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand All@@ -92,6 +151,7 @@ describe('Session', () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'activeOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand All@@ -112,6 +172,7 @@ describe('Session', () => {
 BaseResource.clerk = clerkMock({
 organization: new Organization({ id: 'anotherOrganization' } as OrganizationJSON),
 }) as any;

 const session = new Session({
 status: 'active',
 id: 'session_1',
Expand DownExpand Up@@ -163,6 +224,7 @@ describe('Session', () => {

 const token = await session.getToken();

 expect(global.fetch).toHaveBeenCalled();
 expect(dispatchSpy).toHaveBeenCalledTimes(1);
 expect(token).toEqual(null);
 });
Expand Down

36 changes: 35 additions & 1 deletion
packages/clerk-js/src/core/resources/__tests__/__snapshots__/Session.test.ts.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,41 @@ exports[`Session creating new session dispatches token:update event on initializ
]
`;

exports[`Session getToken() dispatches token:update event on getToken 1`] = `
exports[`Session getToken() dispatches token:update event on getToken with active organization 1`] = `
[
 "token:update",
 {
 "token": Token {
 "getRawString": [Function],
 "jwt": {
 "claims": {
 "__raw": "eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ.eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9.n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg",
 "azp": "https://accounts.inspired.puma-74.lcl.dev",
 "exp": 1666648310,
 "iat": 1666648250,
 "iss": "https://clerk.inspired.puma-74.lcl.dev",
 "nbf": 1666648240,
 "sid": "sess_2GbDB4enNdCa5vS1zpC3Xzg9tK9",
 "sub": "user_2GIpXOEpVyJw51rkZn9Kmnc6Sxr",
 },
 "encoded": {
 "header": "eyJhbGciOiJSUzI1NiIsImtpZCI6Imluc18yR0lvUWhiVXB5MGhYN0IyY1ZrdVRNaW5Yb0QiLCJ0eXAiOiJKV1QifQ",
 "payload": "eyJhenAiOiJodHRwczovL2FjY291bnRzLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsImV4cCI6MTY2NjY0ODMxMCwiaWF0IjoxNjY2NjQ4MjUwLCJpc3MiOiJodHRwczovL2NsZXJrLmluc3BpcmVkLnB1bWEtNzQubGNsLmRldiIsIm5iZiI6MTY2NjY0ODI0MCwic2lkIjoic2Vzc18yR2JEQjRlbk5kQ2E1dlMxenBDM1h6Zzl0SzkiLCJzdWIiOiJ1c2VyXzJHSXBYT0VwVnlKdzUxcmtabjlLbW5jNlN4ciJ9",
 "signature": "n1Usc-DLDftqA0Xb-_2w8IGs4yjCmwc5RngwbSRvwevuZOIuRoeHmE2sgCdEvjfJEa7ewL6EVGVcM557TWPW--g_J1XQPwBy8tXfz7-S73CEuyRFiR97L2AHRdvRtvGtwR-o6l8aHaFxtlmfWbQXfg4kFJz2UGe9afmh3U9-f_4JOZ5fa3mI98UMy1-bo20vjXeWQ9aGrqaxHQxjnzzC-1Kpi5LdPvhQ16H0dPB8MHRTSM5TAuLKTpPV7wqixmbtcc2-0k6b9FKYZNqRVTaIyV-lifZloBvdzlfOF8nW1VVH_fx-iW5Q3hovHFcJIULHEC1kcAYTubbxzpgeVQepGg",
 },
 "header": {
 "alg": "RS256",
 "kid": "ins_2GIoQhbUpy0hX7B2cVkuTMinXoD",
 "typ": "JWT",
 },
 },
 "pathRoot": "/client/sessions/session_1/tokens",
 },
 },
]
`;

exports[`Session getToken() dispatches token:update event on getToken without active organization 1`] = `
[
 "token:update",
 {
Expand Down