fix(clerk-js): Broadcast sign out to all tabs on long lived clients - #5133

Merged
panteliselef merged 10 commits into
mainfrom
elef/fix-remove-sessions-client-update
Feb 19, 2025
Merged

fix(clerk-js): Broadcast sign out to all tabs on long lived clients#5133
panteliselef merged 10 commits into
mainfrom
elef/fix-remove-sessions-client-update

Conversation

@panteliselef

@panteliselefpanteliselef commented Feb 11, 2025

Copy link
Copy Markdown
Contributor

Description

Seems like our broadcasting logic inside setActive really depended on having the client being deleted and so that updateClient would never be called to update Clerk.user and Clerk.session.

Since Long lived clients, we are no longer deleting the client, which means updateClient would run before setActive causing the broadcasting logic to always be skipped.

The solution the PR suggests is to explicitly broadcast when signOut() is called. As in improvement, we should broadcast the sign out event when user.delete() gets called.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

@changeset-bot

changeset-botBot commented Feb 11, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 3cd011e

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 3 packages
NameType
@clerk/clerk-jsPatch
@clerk/chrome-extensionPatch
@clerk/clerk-expoPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Feb 11, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for Git ↗︎

NameStatusPreviewCommentsUpdated (UTC)
clerk-js-sandbox✅ Ready (Inspect)Visit Preview💬 Add feedbackFeb 18, 2025 9:34am

Comment threadpackages/clerk-js/src/core/resources/Client.ts Outdated
Comment on lines -881 to -918
// If this.session exists, then signOut was triggered by the current tab
// and should emit. Other tabs should not emit the same event again
const shouldSignOutSession = this.session && newSession === null;
if (shouldSignOutSession) {
this.#broadcastSignOutEvent();
eventBus.dispatch(events.TokenUpdate, { token: null });
}

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Since we are no longer delete the client on sign out, this.session would always be null, causing broadcasting to never occur.

Also removing eventBus.dispatch(events.TokenUpdate, { token: null }) does not cause issues, because the code a few lines below will handle it appropriately.

@panteliselefpanteliselef self-assigned this Feb 13, 2025
});

await mainTab.po.expect.toBeSignedOut();
await mainTab.po.expect.toBeSignedOut({ timeOut: 2 * 1_000 });

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Previously the test was passing after 40-50 seconds because either /touch or /tokens would force update the state.

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
Comment on lines +377 to +379

// Notify other tabs that user is signing out.
this.__internal_broadcastSignOutEvent();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Explicitly broadcast inside signOut() instead of attempting to detect if setActive({ session: null}) should notify

});
};

// TODO: Deprecate this one, and mark it as internal. Is there actual benefit for external developers to use this ? Should they ever reach for it ?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

What do you think about this ? Would we ever ask people to use this in a custom flow ?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Most likely not, it should really be something that's handled internally.

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
};

#broadcastSignOutEvent = () => {
public __internal_broadcastSignOutEvent = () => {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Alternatively we could use the event bus

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍 let's use the event bus, that way we can avoid a new Clerk method.

@panteliselefpanteliselef changed the title fix(clerk-js): Avoid updating client when removing all sessionsfix(clerk-js): Broadcast sign out to all tabs on long lived clientsFeb 17, 2025
@panteliselef
panteliselef marked this pull request as ready for review February 17, 2025 20:44
Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
};

#broadcastSignOutEvent = () => {
public __internal_broadcastSignOutEvent = () => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍 let's use the event bus, that way we can avoid a new Clerk method.

});
};

// TODO: Deprecate this one, and mark it as internal. Is there actual benefit for external developers to use this ? Should they ever reach for it ?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Most likely not, it should really be something that's handled internally.

path: this.path() + '/sessions',
}) as unknown as Promise<ClientResource>;
}).then(e => {
SessionTokenCache.clear();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I don't think this is the right place for this call. What's the desired behavior? SessionTokenCache is cleared on sign out?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Correct, clearing the cache on sign out.

We're calling SessionTokenCache.clear() on Client.destroy(), on Session.end(), and on Session.remove(). Giving the fact that we clear the cache on an individual session removal, i think we should do the same when removing all of them.

Comment threadpackages/clerk-js/src/core/resources/User.ts Outdated
Comment on lines +378 to +379
// Notify other tabs that user is signing out.
eventBus.dispatch(events.UserSignOut, null);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

❓ should we be doing this later in the sign out flow?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Previously inside setActive it was one of the first things that got called. And since by that point we have already cleared cookies seems appropriate.


export const events = {
TokenUpdate: 'token:update',
UserSignOut: 'user:signOut',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

💭 (optional) what do you think about just calling this even signOut? I'm not sure we need the user: scope.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I was thinking the same, I added the scope to respect the pattern. Since it does not do any harm, I think I'll leave it as is.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Fair enough, I wouldn't say 1 event indicates a pattern though 😉

@panteliselef
panteliselef merged commit 14c1bfa into mainFeb 19, 2025
@panteliselef
panteliselef deleted the elef/fix-remove-sessions-client-update branch February 19, 2025 11:12
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@panteliselef@brkalow@clerk-cookie
, '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): Broadcast sign out to all tabs on long lived clients - #5133

Merged
panteliselef merged 10 commits into
mainfrom
elef/fix-remove-sessions-client-update
Feb 19, 2025
Merged

fix(clerk-js): Broadcast sign out to all tabs on long lived clients#5133
panteliselef merged 10 commits into
mainfrom
elef/fix-remove-sessions-client-update

Conversation

@panteliselef

@panteliselefpanteliselef commented Feb 11, 2025

Copy link
Copy Markdown
Contributor

Description

Seems like our broadcasting logic inside setActive really depended on having the client being deleted and so that updateClient would never be called to update Clerk.user and Clerk.session.

Since Long lived clients, we are no longer deleting the client, which means updateClient would run before setActive causing the broadcasting logic to always be skipped.

The solution the PR suggests is to explicitly broadcast when signOut() is called. As in improvement, we should broadcast the sign out event when user.delete() gets called.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

@changeset-bot

changeset-botBot commented Feb 11, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 3cd011e

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 3 packages
NameType
@clerk/clerk-jsPatch
@clerk/chrome-extensionPatch
@clerk/clerk-expoPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Feb 11, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for Git ↗︎

NameStatusPreviewCommentsUpdated (UTC)
clerk-js-sandbox✅ Ready (Inspect)Visit Preview💬 Add feedbackFeb 18, 2025 9:34am

Comment threadpackages/clerk-js/src/core/resources/Client.ts Outdated
Comment on lines -881 to -918
// If this.session exists, then signOut was triggered by the current tab
// and should emit. Other tabs should not emit the same event again
const shouldSignOutSession = this.session && newSession === null;
if (shouldSignOutSession) {
this.#broadcastSignOutEvent();
eventBus.dispatch(events.TokenUpdate, { token: null });
}

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Since we are no longer delete the client on sign out, this.session would always be null, causing broadcasting to never occur.

Also removing eventBus.dispatch(events.TokenUpdate, { token: null }) does not cause issues, because the code a few lines below will handle it appropriately.

@panteliselefpanteliselef self-assigned this Feb 13, 2025
});

await mainTab.po.expect.toBeSignedOut();
await mainTab.po.expect.toBeSignedOut({ timeOut: 2 * 1_000 });

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Previously the test was passing after 40-50 seconds because either /touch or /tokens would force update the state.

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
Comment on lines +377 to +379

// Notify other tabs that user is signing out.
this.__internal_broadcastSignOutEvent();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Explicitly broadcast inside signOut() instead of attempting to detect if setActive({ session: null}) should notify

});
};

// TODO: Deprecate this one, and mark it as internal. Is there actual benefit for external developers to use this ? Should they ever reach for it ?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

What do you think about this ? Would we ever ask people to use this in a custom flow ?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Most likely not, it should really be something that's handled internally.

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
};

#broadcastSignOutEvent = () => {
public __internal_broadcastSignOutEvent = () => {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Alternatively we could use the event bus

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍 let's use the event bus, that way we can avoid a new Clerk method.

@panteliselefpanteliselef changed the title fix(clerk-js): Avoid updating client when removing all sessionsfix(clerk-js): Broadcast sign out to all tabs on long lived clientsFeb 17, 2025
@panteliselef
panteliselef marked this pull request as ready for review February 17, 2025 20:44
Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
};

#broadcastSignOutEvent = () => {
public __internal_broadcastSignOutEvent = () => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍 let's use the event bus, that way we can avoid a new Clerk method.

});
};

// TODO: Deprecate this one, and mark it as internal. Is there actual benefit for external developers to use this ? Should they ever reach for it ?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Most likely not, it should really be something that's handled internally.

path: this.path() + '/sessions',
}) as unknown as Promise<ClientResource>;
}).then(e => {
SessionTokenCache.clear();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I don't think this is the right place for this call. What's the desired behavior? SessionTokenCache is cleared on sign out?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Correct, clearing the cache on sign out.

We're calling SessionTokenCache.clear() on Client.destroy(), on Session.end(), and on Session.remove(). Giving the fact that we clear the cache on an individual session removal, i think we should do the same when removing all of them.

Comment threadpackages/clerk-js/src/core/resources/User.ts Outdated
Comment on lines +378 to +379
// Notify other tabs that user is signing out.
eventBus.dispatch(events.UserSignOut, null);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

❓ should we be doing this later in the sign out flow?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Previously inside setActive it was one of the first things that got called. And since by that point we have already cleared cookies seems appropriate.


export const events = {
TokenUpdate: 'token:update',
UserSignOut: 'user:signOut',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

💭 (optional) what do you think about just calling this even signOut? I'm not sure we need the user: scope.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I was thinking the same, I added the scope to respect the pattern. Since it does not do any harm, I think I'll leave it as is.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Fair enough, I wouldn't say 1 event indicates a pattern though 😉

@panteliselef
panteliselef merged commit 14c1bfa into mainFeb 19, 2025
@panteliselef
panteliselef deleted the elef/fix-remove-sessions-client-update branch February 19, 2025 11:12
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@panteliselef@brkalow@clerk-cookie
, '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): Broadcast sign out to all tabs on long lived clients - #5133

Merged
panteliselef merged 10 commits into
mainfrom
elef/fix-remove-sessions-client-update
Feb 19, 2025
Merged

fix(clerk-js): Broadcast sign out to all tabs on long lived clients#5133
panteliselef merged 10 commits into
mainfrom
elef/fix-remove-sessions-client-update

Conversation

@panteliselef

@panteliselefpanteliselef commented Feb 11, 2025

Copy link
Copy Markdown
Contributor

Description

Seems like our broadcasting logic inside setActive really depended on having the client being deleted and so that updateClient would never be called to update Clerk.user and Clerk.session.

Since Long lived clients, we are no longer deleting the client, which means updateClient would run before setActive causing the broadcasting logic to always be skipped.

The solution the PR suggests is to explicitly broadcast when signOut() is called. As in improvement, we should broadcast the sign out event when user.delete() gets called.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

@changeset-bot

changeset-botBot commented Feb 11, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 3cd011e

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 3 packages
NameType
@clerk/clerk-jsPatch
@clerk/chrome-extensionPatch
@clerk/clerk-expoPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Feb 11, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for Git ↗︎

NameStatusPreviewCommentsUpdated (UTC)
clerk-js-sandbox✅ Ready (Inspect)Visit Preview💬 Add feedbackFeb 18, 2025 9:34am

Comment threadpackages/clerk-js/src/core/resources/Client.ts Outdated
Comment on lines -881 to -918
// If this.session exists, then signOut was triggered by the current tab
// and should emit. Other tabs should not emit the same event again
const shouldSignOutSession = this.session && newSession === null;
if (shouldSignOutSession) {
this.#broadcastSignOutEvent();
eventBus.dispatch(events.TokenUpdate, { token: null });
}

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Since we are no longer delete the client on sign out, this.session would always be null, causing broadcasting to never occur.

Also removing eventBus.dispatch(events.TokenUpdate, { token: null }) does not cause issues, because the code a few lines below will handle it appropriately.

@panteliselefpanteliselef self-assigned this Feb 13, 2025
});

await mainTab.po.expect.toBeSignedOut();
await mainTab.po.expect.toBeSignedOut({ timeOut: 2 * 1_000 });

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Previously the test was passing after 40-50 seconds because either /touch or /tokens would force update the state.

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
Comment on lines +377 to +379

// Notify other tabs that user is signing out.
this.__internal_broadcastSignOutEvent();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Explicitly broadcast inside signOut() instead of attempting to detect if setActive({ session: null}) should notify

});
};

// TODO: Deprecate this one, and mark it as internal. Is there actual benefit for external developers to use this ? Should they ever reach for it ?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

What do you think about this ? Would we ever ask people to use this in a custom flow ?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Most likely not, it should really be something that's handled internally.

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
};

#broadcastSignOutEvent = () => {
public __internal_broadcastSignOutEvent = () => {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Alternatively we could use the event bus

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍 let's use the event bus, that way we can avoid a new Clerk method.

@panteliselefpanteliselef changed the title fix(clerk-js): Avoid updating client when removing all sessionsfix(clerk-js): Broadcast sign out to all tabs on long lived clientsFeb 17, 2025
@panteliselef
panteliselef marked this pull request as ready for review February 17, 2025 20:44
Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
};

#broadcastSignOutEvent = () => {
public __internal_broadcastSignOutEvent = () => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍 let's use the event bus, that way we can avoid a new Clerk method.

});
};

// TODO: Deprecate this one, and mark it as internal. Is there actual benefit for external developers to use this ? Should they ever reach for it ?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Most likely not, it should really be something that's handled internally.

path: this.path() + '/sessions',
}) as unknown as Promise<ClientResource>;
}).then(e => {
SessionTokenCache.clear();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I don't think this is the right place for this call. What's the desired behavior? SessionTokenCache is cleared on sign out?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Correct, clearing the cache on sign out.

We're calling SessionTokenCache.clear() on Client.destroy(), on Session.end(), and on Session.remove(). Giving the fact that we clear the cache on an individual session removal, i think we should do the same when removing all of them.

Comment threadpackages/clerk-js/src/core/resources/User.ts Outdated
Comment on lines +378 to +379
// Notify other tabs that user is signing out.
eventBus.dispatch(events.UserSignOut, null);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

❓ should we be doing this later in the sign out flow?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Previously inside setActive it was one of the first things that got called. And since by that point we have already cleared cookies seems appropriate.


export const events = {
TokenUpdate: 'token:update',
UserSignOut: 'user:signOut',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

💭 (optional) what do you think about just calling this even signOut? I'm not sure we need the user: scope.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I was thinking the same, I added the scope to respect the pattern. Since it does not do any harm, I think I'll leave it as is.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Fair enough, I wouldn't say 1 event indicates a pattern though 😉

@panteliselef
panteliselef merged commit 14c1bfa into mainFeb 19, 2025
@panteliselef
panteliselef deleted the elef/fix-remove-sessions-client-update branch February 19, 2025 11:12
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@panteliselef@brkalow@clerk-cookie
, '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): Broadcast sign out to all tabs on long lived clients - #5133

Merged
panteliselef merged 10 commits into
mainfrom
elef/fix-remove-sessions-client-update
Feb 19, 2025
Merged

fix(clerk-js): Broadcast sign out to all tabs on long lived clients#5133
panteliselef merged 10 commits into
mainfrom
elef/fix-remove-sessions-client-update

Conversation

@panteliselef

@panteliselefpanteliselef commented Feb 11, 2025

Copy link
Copy Markdown
Contributor

Description

Seems like our broadcasting logic inside setActive really depended on having the client being deleted and so that updateClient would never be called to update Clerk.user and Clerk.session.

Since Long lived clients, we are no longer deleting the client, which means updateClient would run before setActive causing the broadcasting logic to always be skipped.

The solution the PR suggests is to explicitly broadcast when signOut() is called. As in improvement, we should broadcast the sign out event when user.delete() gets called.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

@changeset-bot

changeset-botBot commented Feb 11, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 3cd011e

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 3 packages
NameType
@clerk/clerk-jsPatch
@clerk/chrome-extensionPatch
@clerk/clerk-expoPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Feb 11, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for Git ↗︎

NameStatusPreviewCommentsUpdated (UTC)
clerk-js-sandbox✅ Ready (Inspect)Visit Preview💬 Add feedbackFeb 18, 2025 9:34am

Comment threadpackages/clerk-js/src/core/resources/Client.ts Outdated
Comment on lines -881 to -918
// If this.session exists, then signOut was triggered by the current tab
// and should emit. Other tabs should not emit the same event again
const shouldSignOutSession = this.session && newSession === null;
if (shouldSignOutSession) {
this.#broadcastSignOutEvent();
eventBus.dispatch(events.TokenUpdate, { token: null });
}

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Since we are no longer delete the client on sign out, this.session would always be null, causing broadcasting to never occur.

Also removing eventBus.dispatch(events.TokenUpdate, { token: null }) does not cause issues, because the code a few lines below will handle it appropriately.

@panteliselefpanteliselef self-assigned this Feb 13, 2025
});

await mainTab.po.expect.toBeSignedOut();
await mainTab.po.expect.toBeSignedOut({ timeOut: 2 * 1_000 });

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Previously the test was passing after 40-50 seconds because either /touch or /tokens would force update the state.

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
Comment on lines +377 to +379

// Notify other tabs that user is signing out.
this.__internal_broadcastSignOutEvent();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Explicitly broadcast inside signOut() instead of attempting to detect if setActive({ session: null}) should notify

});
};

// TODO: Deprecate this one, and mark it as internal. Is there actual benefit for external developers to use this ? Should they ever reach for it ?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

What do you think about this ? Would we ever ask people to use this in a custom flow ?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Most likely not, it should really be something that's handled internally.

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
};

#broadcastSignOutEvent = () => {
public __internal_broadcastSignOutEvent = () => {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Alternatively we could use the event bus

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍 let's use the event bus, that way we can avoid a new Clerk method.

@panteliselefpanteliselef changed the title fix(clerk-js): Avoid updating client when removing all sessionsfix(clerk-js): Broadcast sign out to all tabs on long lived clientsFeb 17, 2025
@panteliselef
panteliselef marked this pull request as ready for review February 17, 2025 20:44
Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
};

#broadcastSignOutEvent = () => {
public __internal_broadcastSignOutEvent = () => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍 let's use the event bus, that way we can avoid a new Clerk method.

});
};

// TODO: Deprecate this one, and mark it as internal. Is there actual benefit for external developers to use this ? Should they ever reach for it ?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Most likely not, it should really be something that's handled internally.

path: this.path() + '/sessions',
}) as unknown as Promise<ClientResource>;
}).then(e => {
SessionTokenCache.clear();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I don't think this is the right place for this call. What's the desired behavior? SessionTokenCache is cleared on sign out?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Correct, clearing the cache on sign out.

We're calling SessionTokenCache.clear() on Client.destroy(), on Session.end(), and on Session.remove(). Giving the fact that we clear the cache on an individual session removal, i think we should do the same when removing all of them.

Comment threadpackages/clerk-js/src/core/resources/User.ts Outdated
Comment on lines +378 to +379
// Notify other tabs that user is signing out.
eventBus.dispatch(events.UserSignOut, null);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

❓ should we be doing this later in the sign out flow?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Previously inside setActive it was one of the first things that got called. And since by that point we have already cleared cookies seems appropriate.


export const events = {
TokenUpdate: 'token:update',
UserSignOut: 'user:signOut',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

💭 (optional) what do you think about just calling this even signOut? I'm not sure we need the user: scope.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I was thinking the same, I added the scope to respect the pattern. Since it does not do any harm, I think I'll leave it as is.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Fair enough, I wouldn't say 1 event indicates a pattern though 😉

@panteliselef
panteliselef merged commit 14c1bfa into mainFeb 19, 2025
@panteliselef
panteliselef deleted the elef/fix-remove-sessions-client-update branch February 19, 2025 11:12
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@panteliselef@brkalow@clerk-cookie
, '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): Broadcast sign out to all tabs on long lived clients - #5133

Merged
panteliselef merged 10 commits into
mainfrom
elef/fix-remove-sessions-client-update
Feb 19, 2025
Merged

fix(clerk-js): Broadcast sign out to all tabs on long lived clients#5133
panteliselef merged 10 commits into
mainfrom
elef/fix-remove-sessions-client-update

Conversation

@panteliselef

@panteliselefpanteliselef commented Feb 11, 2025

Copy link
Copy Markdown
Contributor

Description

Seems like our broadcasting logic inside setActive really depended on having the client being deleted and so that updateClient would never be called to update Clerk.user and Clerk.session.

Since Long lived clients, we are no longer deleting the client, which means updateClient would run before setActive causing the broadcasting logic to always be skipped.

The solution the PR suggests is to explicitly broadcast when signOut() is called. As in improvement, we should broadcast the sign out event when user.delete() gets called.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

@changeset-bot

changeset-botBot commented Feb 11, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 3cd011e

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 3 packages
NameType
@clerk/clerk-jsPatch
@clerk/chrome-extensionPatch
@clerk/clerk-expoPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Feb 11, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for Git ↗︎

NameStatusPreviewCommentsUpdated (UTC)
clerk-js-sandbox✅ Ready (Inspect)Visit Preview💬 Add feedbackFeb 18, 2025 9:34am

Comment threadpackages/clerk-js/src/core/resources/Client.ts Outdated
Comment on lines -881 to -918
// If this.session exists, then signOut was triggered by the current tab
// and should emit. Other tabs should not emit the same event again
const shouldSignOutSession = this.session && newSession === null;
if (shouldSignOutSession) {
this.#broadcastSignOutEvent();
eventBus.dispatch(events.TokenUpdate, { token: null });
}

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Since we are no longer delete the client on sign out, this.session would always be null, causing broadcasting to never occur.

Also removing eventBus.dispatch(events.TokenUpdate, { token: null }) does not cause issues, because the code a few lines below will handle it appropriately.

@panteliselefpanteliselef self-assigned this Feb 13, 2025
});

await mainTab.po.expect.toBeSignedOut();
await mainTab.po.expect.toBeSignedOut({ timeOut: 2 * 1_000 });

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Previously the test was passing after 40-50 seconds because either /touch or /tokens would force update the state.

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
Comment on lines +377 to +379

// Notify other tabs that user is signing out.
this.__internal_broadcastSignOutEvent();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Explicitly broadcast inside signOut() instead of attempting to detect if setActive({ session: null}) should notify

});
};

// TODO: Deprecate this one, and mark it as internal. Is there actual benefit for external developers to use this ? Should they ever reach for it ?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

What do you think about this ? Would we ever ask people to use this in a custom flow ?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Most likely not, it should really be something that's handled internally.

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
};

#broadcastSignOutEvent = () => {
public __internal_broadcastSignOutEvent = () => {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Alternatively we could use the event bus

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍 let's use the event bus, that way we can avoid a new Clerk method.

@panteliselefpanteliselef changed the title fix(clerk-js): Avoid updating client when removing all sessionsfix(clerk-js): Broadcast sign out to all tabs on long lived clientsFeb 17, 2025
@panteliselef
panteliselef marked this pull request as ready for review February 17, 2025 20:44
Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
};

#broadcastSignOutEvent = () => {
public __internal_broadcastSignOutEvent = () => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍 let's use the event bus, that way we can avoid a new Clerk method.

});
};

// TODO: Deprecate this one, and mark it as internal. Is there actual benefit for external developers to use this ? Should they ever reach for it ?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Most likely not, it should really be something that's handled internally.

path: this.path() + '/sessions',
}) as unknown as Promise<ClientResource>;
}).then(e => {
SessionTokenCache.clear();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I don't think this is the right place for this call. What's the desired behavior? SessionTokenCache is cleared on sign out?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Correct, clearing the cache on sign out.

We're calling SessionTokenCache.clear() on Client.destroy(), on Session.end(), and on Session.remove(). Giving the fact that we clear the cache on an individual session removal, i think we should do the same when removing all of them.

Comment threadpackages/clerk-js/src/core/resources/User.ts Outdated
Comment on lines +378 to +379
// Notify other tabs that user is signing out.
eventBus.dispatch(events.UserSignOut, null);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

❓ should we be doing this later in the sign out flow?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Previously inside setActive it was one of the first things that got called. And since by that point we have already cleared cookies seems appropriate.


export const events = {
TokenUpdate: 'token:update',
UserSignOut: 'user:signOut',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

💭 (optional) what do you think about just calling this even signOut? I'm not sure we need the user: scope.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I was thinking the same, I added the scope to respect the pattern. Since it does not do any harm, I think I'll leave it as is.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Fair enough, I wouldn't say 1 event indicates a pattern though 😉

@panteliselef
panteliselef merged commit 14c1bfa into mainFeb 19, 2025
@panteliselef
panteliselef deleted the elef/fix-remove-sessions-client-update branch February 19, 2025 11:12
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@panteliselef@brkalow@clerk-cookie
, '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): Broadcast sign out to all tabs on long lived clients - #5133

Merged
panteliselef merged 10 commits into
mainfrom
elef/fix-remove-sessions-client-update
Feb 19, 2025
Merged

fix(clerk-js): Broadcast sign out to all tabs on long lived clients#5133
panteliselef merged 10 commits into
mainfrom
elef/fix-remove-sessions-client-update

Conversation

@panteliselef

@panteliselefpanteliselef commented Feb 11, 2025

Copy link
Copy Markdown
Contributor

Description

Seems like our broadcasting logic inside setActive really depended on having the client being deleted and so that updateClient would never be called to update Clerk.user and Clerk.session.

Since Long lived clients, we are no longer deleting the client, which means updateClient would run before setActive causing the broadcasting logic to always be skipped.

The solution the PR suggests is to explicitly broadcast when signOut() is called. As in improvement, we should broadcast the sign out event when user.delete() gets called.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

@changeset-bot

changeset-botBot commented Feb 11, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 3cd011e

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 3 packages
NameType
@clerk/clerk-jsPatch
@clerk/chrome-extensionPatch
@clerk/clerk-expoPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Feb 11, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for Git ↗︎

NameStatusPreviewCommentsUpdated (UTC)
clerk-js-sandbox✅ Ready (Inspect)Visit Preview💬 Add feedbackFeb 18, 2025 9:34am

Comment threadpackages/clerk-js/src/core/resources/Client.ts Outdated
Comment on lines -881 to -918
// If this.session exists, then signOut was triggered by the current tab
// and should emit. Other tabs should not emit the same event again
const shouldSignOutSession = this.session && newSession === null;
if (shouldSignOutSession) {
this.#broadcastSignOutEvent();
eventBus.dispatch(events.TokenUpdate, { token: null });
}

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Since we are no longer delete the client on sign out, this.session would always be null, causing broadcasting to never occur.

Also removing eventBus.dispatch(events.TokenUpdate, { token: null }) does not cause issues, because the code a few lines below will handle it appropriately.

@panteliselefpanteliselef self-assigned this Feb 13, 2025
});

await mainTab.po.expect.toBeSignedOut();
await mainTab.po.expect.toBeSignedOut({ timeOut: 2 * 1_000 });

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Previously the test was passing after 40-50 seconds because either /touch or /tokens would force update the state.

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
Comment on lines +377 to +379

// Notify other tabs that user is signing out.
this.__internal_broadcastSignOutEvent();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Explicitly broadcast inside signOut() instead of attempting to detect if setActive({ session: null}) should notify

});
};

// TODO: Deprecate this one, and mark it as internal. Is there actual benefit for external developers to use this ? Should they ever reach for it ?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

What do you think about this ? Would we ever ask people to use this in a custom flow ?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Most likely not, it should really be something that's handled internally.

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
};

#broadcastSignOutEvent = () => {
public __internal_broadcastSignOutEvent = () => {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Alternatively we could use the event bus

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍 let's use the event bus, that way we can avoid a new Clerk method.

@panteliselefpanteliselef changed the title fix(clerk-js): Avoid updating client when removing all sessionsfix(clerk-js): Broadcast sign out to all tabs on long lived clientsFeb 17, 2025
@panteliselef
panteliselef marked this pull request as ready for review February 17, 2025 20:44
Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
};

#broadcastSignOutEvent = () => {
public __internal_broadcastSignOutEvent = () => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍 let's use the event bus, that way we can avoid a new Clerk method.

});
};

// TODO: Deprecate this one, and mark it as internal. Is there actual benefit for external developers to use this ? Should they ever reach for it ?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Most likely not, it should really be something that's handled internally.

path: this.path() + '/sessions',
}) as unknown as Promise<ClientResource>;
}).then(e => {
SessionTokenCache.clear();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I don't think this is the right place for this call. What's the desired behavior? SessionTokenCache is cleared on sign out?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Correct, clearing the cache on sign out.

We're calling SessionTokenCache.clear() on Client.destroy(), on Session.end(), and on Session.remove(). Giving the fact that we clear the cache on an individual session removal, i think we should do the same when removing all of them.

Comment threadpackages/clerk-js/src/core/resources/User.ts Outdated
Comment on lines +378 to +379
// Notify other tabs that user is signing out.
eventBus.dispatch(events.UserSignOut, null);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

❓ should we be doing this later in the sign out flow?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Previously inside setActive it was one of the first things that got called. And since by that point we have already cleared cookies seems appropriate.


export const events = {
TokenUpdate: 'token:update',
UserSignOut: 'user:signOut',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

💭 (optional) what do you think about just calling this even signOut? I'm not sure we need the user: scope.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I was thinking the same, I added the scope to respect the pattern. Since it does not do any harm, I think I'll leave it as is.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Fair enough, I wouldn't say 1 event indicates a pattern though 😉

@panteliselef
panteliselef merged commit 14c1bfa into mainFeb 19, 2025
@panteliselef
panteliselef deleted the elef/fix-remove-sessions-client-update branch February 19, 2025 11:12
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@panteliselef@brkalow@clerk-cookie
, '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): Broadcast sign out to all tabs on long lived clients - #5133

Merged
panteliselef merged 10 commits into
mainfrom
elef/fix-remove-sessions-client-update
Feb 19, 2025
Merged

fix(clerk-js): Broadcast sign out to all tabs on long lived clients#5133
panteliselef merged 10 commits into
mainfrom
elef/fix-remove-sessions-client-update

Conversation

@panteliselef

@panteliselefpanteliselef commented Feb 11, 2025

Copy link
Copy Markdown
Contributor

Description

Seems like our broadcasting logic inside setActive really depended on having the client being deleted and so that updateClient would never be called to update Clerk.user and Clerk.session.

Since Long lived clients, we are no longer deleting the client, which means updateClient would run before setActive causing the broadcasting logic to always be skipped.

The solution the PR suggests is to explicitly broadcast when signOut() is called. As in improvement, we should broadcast the sign out event when user.delete() gets called.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

@changeset-bot

changeset-botBot commented Feb 11, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 3cd011e

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 3 packages
NameType
@clerk/clerk-jsPatch
@clerk/chrome-extensionPatch
@clerk/clerk-expoPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Feb 11, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for Git ↗︎

NameStatusPreviewCommentsUpdated (UTC)
clerk-js-sandbox✅ Ready (Inspect)Visit Preview💬 Add feedbackFeb 18, 2025 9:34am

Comment threadpackages/clerk-js/src/core/resources/Client.ts Outdated
Comment on lines -881 to -918
// If this.session exists, then signOut was triggered by the current tab
// and should emit. Other tabs should not emit the same event again
const shouldSignOutSession = this.session && newSession === null;
if (shouldSignOutSession) {
this.#broadcastSignOutEvent();
eventBus.dispatch(events.TokenUpdate, { token: null });
}

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Since we are no longer delete the client on sign out, this.session would always be null, causing broadcasting to never occur.

Also removing eventBus.dispatch(events.TokenUpdate, { token: null }) does not cause issues, because the code a few lines below will handle it appropriately.

@panteliselefpanteliselef self-assigned this Feb 13, 2025
});

await mainTab.po.expect.toBeSignedOut();
await mainTab.po.expect.toBeSignedOut({ timeOut: 2 * 1_000 });

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Previously the test was passing after 40-50 seconds because either /touch or /tokens would force update the state.

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
Comment on lines +377 to +379

// Notify other tabs that user is signing out.
this.__internal_broadcastSignOutEvent();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Explicitly broadcast inside signOut() instead of attempting to detect if setActive({ session: null}) should notify

});
};

// TODO: Deprecate this one, and mark it as internal. Is there actual benefit for external developers to use this ? Should they ever reach for it ?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

What do you think about this ? Would we ever ask people to use this in a custom flow ?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Most likely not, it should really be something that's handled internally.

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
};

#broadcastSignOutEvent = () => {
public __internal_broadcastSignOutEvent = () => {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Alternatively we could use the event bus

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍 let's use the event bus, that way we can avoid a new Clerk method.

@panteliselefpanteliselef changed the title fix(clerk-js): Avoid updating client when removing all sessionsfix(clerk-js): Broadcast sign out to all tabs on long lived clientsFeb 17, 2025
@panteliselef
panteliselef marked this pull request as ready for review February 17, 2025 20:44
Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
};

#broadcastSignOutEvent = () => {
public __internal_broadcastSignOutEvent = () => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍 let's use the event bus, that way we can avoid a new Clerk method.

});
};

// TODO: Deprecate this one, and mark it as internal. Is there actual benefit for external developers to use this ? Should they ever reach for it ?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Most likely not, it should really be something that's handled internally.

path: this.path() + '/sessions',
}) as unknown as Promise<ClientResource>;
}).then(e => {
SessionTokenCache.clear();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I don't think this is the right place for this call. What's the desired behavior? SessionTokenCache is cleared on sign out?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Correct, clearing the cache on sign out.

We're calling SessionTokenCache.clear() on Client.destroy(), on Session.end(), and on Session.remove(). Giving the fact that we clear the cache on an individual session removal, i think we should do the same when removing all of them.

Comment threadpackages/clerk-js/src/core/resources/User.ts Outdated
Comment on lines +378 to +379
// Notify other tabs that user is signing out.
eventBus.dispatch(events.UserSignOut, null);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

❓ should we be doing this later in the sign out flow?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Previously inside setActive it was one of the first things that got called. And since by that point we have already cleared cookies seems appropriate.


export const events = {
TokenUpdate: 'token:update',
UserSignOut: 'user:signOut',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

💭 (optional) what do you think about just calling this even signOut? I'm not sure we need the user: scope.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I was thinking the same, I added the scope to respect the pattern. Since it does not do any harm, I think I'll leave it as is.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Fair enough, I wouldn't say 1 event indicates a pattern though 😉

@panteliselef
panteliselef merged commit 14c1bfa into mainFeb 19, 2025
@panteliselef
panteliselef deleted the elef/fix-remove-sessions-client-update branch February 19, 2025 11:12
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@panteliselef@brkalow@clerk-cookie
, '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): Broadcast sign out to all tabs on long lived clients - #5133

Merged
panteliselef merged 10 commits into
mainfrom
elef/fix-remove-sessions-client-update
Feb 19, 2025
Merged

fix(clerk-js): Broadcast sign out to all tabs on long lived clients#5133
panteliselef merged 10 commits into
mainfrom
elef/fix-remove-sessions-client-update

Conversation

@panteliselef

@panteliselefpanteliselef commented Feb 11, 2025

Copy link
Copy Markdown
Contributor

Description

Seems like our broadcasting logic inside setActive really depended on having the client being deleted and so that updateClient would never be called to update Clerk.user and Clerk.session.

Since Long lived clients, we are no longer deleting the client, which means updateClient would run before setActive causing the broadcasting logic to always be skipped.

The solution the PR suggests is to explicitly broadcast when signOut() is called. As in improvement, we should broadcast the sign out event when user.delete() gets called.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

@changeset-bot

changeset-botBot commented Feb 11, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 3cd011e

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 3 packages
NameType
@clerk/clerk-jsPatch
@clerk/chrome-extensionPatch
@clerk/clerk-expoPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Feb 11, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for Git ↗︎

NameStatusPreviewCommentsUpdated (UTC)
clerk-js-sandbox✅ Ready (Inspect)Visit Preview💬 Add feedbackFeb 18, 2025 9:34am

Comment threadpackages/clerk-js/src/core/resources/Client.ts Outdated
Comment on lines -881 to -918
// If this.session exists, then signOut was triggered by the current tab
// and should emit. Other tabs should not emit the same event again
const shouldSignOutSession = this.session && newSession === null;
if (shouldSignOutSession) {
this.#broadcastSignOutEvent();
eventBus.dispatch(events.TokenUpdate, { token: null });
}

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Since we are no longer delete the client on sign out, this.session would always be null, causing broadcasting to never occur.

Also removing eventBus.dispatch(events.TokenUpdate, { token: null }) does not cause issues, because the code a few lines below will handle it appropriately.

@panteliselefpanteliselef self-assigned this Feb 13, 2025
});

await mainTab.po.expect.toBeSignedOut();
await mainTab.po.expect.toBeSignedOut({ timeOut: 2 * 1_000 });

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Previously the test was passing after 40-50 seconds because either /touch or /tokens would force update the state.

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
Comment on lines +377 to +379

// Notify other tabs that user is signing out.
this.__internal_broadcastSignOutEvent();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Explicitly broadcast inside signOut() instead of attempting to detect if setActive({ session: null}) should notify

});
};

// TODO: Deprecate this one, and mark it as internal. Is there actual benefit for external developers to use this ? Should they ever reach for it ?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

What do you think about this ? Would we ever ask people to use this in a custom flow ?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Most likely not, it should really be something that's handled internally.

Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
};

#broadcastSignOutEvent = () => {
public __internal_broadcastSignOutEvent = () => {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Alternatively we could use the event bus

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍 let's use the event bus, that way we can avoid a new Clerk method.

@panteliselefpanteliselef changed the title fix(clerk-js): Avoid updating client when removing all sessionsfix(clerk-js): Broadcast sign out to all tabs on long lived clientsFeb 17, 2025
@panteliselef
panteliselef marked this pull request as ready for review February 17, 2025 20:44
Comment threadpackages/clerk-js/src/core/clerk.ts Outdated
};

#broadcastSignOutEvent = () => {
public __internal_broadcastSignOutEvent = () => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍 let's use the event bus, that way we can avoid a new Clerk method.

});
};

// TODO: Deprecate this one, and mark it as internal. Is there actual benefit for external developers to use this ? Should they ever reach for it ?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Most likely not, it should really be something that's handled internally.

path: this.path() + '/sessions',
}) as unknown as Promise<ClientResource>;
}).then(e => {
SessionTokenCache.clear();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I don't think this is the right place for this call. What's the desired behavior? SessionTokenCache is cleared on sign out?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Correct, clearing the cache on sign out.

We're calling SessionTokenCache.clear() on Client.destroy(), on Session.end(), and on Session.remove(). Giving the fact that we clear the cache on an individual session removal, i think we should do the same when removing all of them.

Comment threadpackages/clerk-js/src/core/resources/User.ts Outdated
Comment on lines +378 to +379
// Notify other tabs that user is signing out.
eventBus.dispatch(events.UserSignOut, null);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

❓ should we be doing this later in the sign out flow?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Previously inside setActive it was one of the first things that got called. And since by that point we have already cleared cookies seems appropriate.


export const events = {
TokenUpdate: 'token:update',
UserSignOut: 'user:signOut',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

💭 (optional) what do you think about just calling this even signOut? I'm not sure we need the user: scope.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I was thinking the same, I added the scope to respect the pattern. Since it does not do any harm, I think I'll leave it as is.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Fair enough, I wouldn't say 1 event indicates a pattern though 😉

@panteliselef
panteliselef merged commit 14c1bfa into mainFeb 19, 2025
@panteliselef
panteliselef deleted the elef/fix-remove-sessions-client-update branch February 19, 2025 11:12
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@panteliselef@brkalow@clerk-cookie