Skip to content

Fix session cookie creation race: skip initial token refresh, wrap extension auth hooks #6563

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
christian-byrne merged 5 commits into from
Nov 8, 2025
Merged

Fix session cookie creation race: skip initial token refresh, wrap extension auth hooks #6563

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3719a46
fix(auth/session): dedupe session creation, skip initial token refres…
benceruleanlu Nov 4, 2025
93c3c3f
Remove uneeded inflight coalescing
benceruleanlu Nov 4, 2025
b4cfaf7
Delete unit test
benceruleanlu Nov 4, 2025
fd75975
Readd unit test
benceruleanlu Nov 4, 2025
17f2048
extensions: add structured error context for auth hooks; clarify list…
benceruleanlu Nov 5, 2025
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
Prev Previous commit
extensions: add structured error context for auth hooks; clarify list… 
…ener lifecycle; address PR #6563 review comments
  • Loading branch information
@benceruleanlu
benceruleanlu committed Nov 5, 2025
commit 17f204892c8a475c84e9b1cf61825d0d161de922
41 changes: 34 additions & 7 deletions src/services/extensionService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ export const useExtensionService = () => {
const extensionStore = useExtensionStore()
const settingStore = useSettingStore()
const keybindingStore = useKeybindingStore()
const { wrapWithErrorHandling, wrapWithErrorHandlingAsync } =
useErrorHandling()
const {
wrapWithErrorHandling,
wrapWithErrorHandlingAsync,
toastErrorHandler
} = useErrorHandling()

/**
* Loads all extensions from the API into the window in parallel
Expand Down Expand Up @@ -80,7 +83,15 @@ export const useExtensionService = () => {
if (extension.onAuthUserResolved) {
const { onUserResolved } = useCurrentUser()
const handleUserResolved = wrapWithErrorHandlingAsync(
(user: AuthUserInfo) => extension.onAuthUserResolved?.(user, app)
(user: AuthUserInfo) => extension.onAuthUserResolved?.(user, app),
(error) => {
console.error('[Extension Auth Hook Error]', {
extension: extension.name,
hook: 'onAuthUserResolved',
error
})
toastErrorHandler(error)
}
)
onUserResolved((user) => {
void handleUserResolved(user)
Copy link
Member Author

@benceruleanlu benceruleanlu Nov 5, 2025

Choose a reason for hiding this comment

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

Addressed: the async wrapper now adds structured error context for auth hooks — we log the extension name and the hook (e.g., onAuthUserResolved) and still route to the shared toast. This makes triage clearer without changing UX.

Expand All @@ -89,8 +100,16 @@ export const useExtensionService = () => {

if (extension.onAuthTokenRefreshed) {
const { onTokenRefreshed } = useCurrentUser()
const handleTokenRefreshed = wrapWithErrorHandlingAsync(() =>
extension.onAuthTokenRefreshed?.()
const handleTokenRefreshed = wrapWithErrorHandlingAsync(
() => extension.onAuthTokenRefreshed?.(),
(error) => {
console.error('[Extension Auth Hook Error]', {
extension: extension.name,
hook: 'onAuthTokenRefreshed',
error
})
toastErrorHandler(error)
}
)
onTokenRefreshed(() => {
void handleTokenRefreshed()
Copy link
Member Author

@benceruleanlu benceruleanlu Nov 5, 2025

Choose a reason for hiding this comment

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

Clarification: the wrapper’s return is intentionally discarded (void handleUserResolved(user)). Extension hooks are void | Promise<void>, so a potential undefined return from the wrapper doesn’t affect behavior.

Expand All @@ -99,8 +118,16 @@ export const useExtensionService = () => {

if (extension.onAuthUserLogout) {
const { onUserLogout } = useCurrentUser()
const handleUserLogout = wrapWithErrorHandlingAsync(() =>
extension.onAuthUserLogout?.()
const handleUserLogout = wrapWithErrorHandlingAsync(
() => extension.onAuthUserLogout?.(),
(error) => {
console.error('[Extension Auth Hook Error]', {
extension: extension.name,
hook: 'onAuthUserLogout',
error
})
toastErrorHandler(error)
}
)
onUserLogout(() => {
void handleUserLogout()
Expand Down