1
1
import type { createClerkEventBus } from '@clerk/shared/clerkEventBus' ;
2
2
import { clerkEvents } from '@clerk/shared/clerkEventBus' ;
3
- import { createCookieHandler } from '@clerk/shared/cookie' ;
3
+ import type { createCookieHandler } from '@clerk/shared/cookie' ;
4
4
import { setDevBrowserJWTInURL } from '@clerk/shared/devBrowser' ;
5
5
import { is4xxError , isClerkAPIResponseError , isClerkRuntimeError , isNetworkError } from '@clerk/shared/error' ;
6
6
import { noop } from '@clerk/shared/utils' ;
@@ -9,6 +9,7 @@ import type { Clerk, InstanceType } from '@clerk/types';
9
9
import { clerkMissingDevBrowserJwt } from '../errors' ;
10
10
import { eventBus , events } from '../events' ;
11
11
import type { FapiClient } from '../fapiClient' ;
12
+ import { createActiveContextCookie } from './cookies/activeContext' ;
12
13
import type { ClientUatCookieHandler } from './cookies/clientUat' ;
13
14
import { createClientUatCookie } from './cookies/clientUat' ;
14
15
import type { SessionCookieHandler } from './cookies/session' ;
@@ -75,7 +76,7 @@ export class AuthCookieService {
75
76
76
77
this . clientUat = createClientUatCookie ( cookieSuffix ) ;
77
78
this . sessionCookie = createSessionCookie ( cookieSuffix ) ;
78
- this . activeCookie = createCookieHandler ( 'clerk_active_context' ) ;
79
+ this . activeCookie = createActiveContextCookie ( ) ;
79
80
this . devBrowser = createDevBrowser ( {
80
81
frontendApi : clerk . frontendApi ,
81
82
fapiClient,
@@ -84,10 +85,6 @@ export class AuthCookieService {
84
85
}
85
86
86
87
public async setup ( ) {
87
- // Cleanup old cookie
88
- // TODO: This should be removed after 2025-08-01
89
- createCookieHandler ( 'clerk_active_org' ) . remove ( ) ;
90
-
91
88
if ( this . instanceType === 'production' ) {
92
89
return this . setupProduction ( ) ;
93
90
} else {
0 commit comments