chore(clerk-js): Centralize cookie code into single module

Author: dimkl

packages/clerk-js/src/core/__tests__/clerk.redirects.test.ts

@@ -1,5 +1,5 @@
+import type { DevBrowser } from '../auth/devBrowser';
 import { Clerk } from '../clerk';
-import type { DevBrowser } from '../devBrowser';
 import type { DisplayConfig } from '../resources/internal';
 import { Client, Environment } from '../resources/internal';
 
@@ -10,7 +10,7 @@ jest.mock('../resources/Client');
 jest.mock('../resources/Environment');
 
 // Because Jest, don't ask me why...
-jest.mock('../devBrowser', () => ({
+jest.mock('../auth/devBrowser', () => ({
   createDevBrowser: (): DevBrowser => ({
     clear: jest.fn(),
     setup: jest.fn(),

packages/clerk-js/src/core/services/authentication/SessionCookiePoller.ts renamed to packages/clerk-js/src/core/auth/SessionCookiePoller.ts

@@ -1,6 +1,6 @@
 import { createWorkerTimers } from '@clerk/shared';
 
-import { SafeLock } from '../../../utils';
+import { SafeLock } from './safeLock';
 
 const REFRESH_SESSION_TOKEN_LOCK_KEY = 'clerk.lock.refreshSessionToken';
 const INTERVAL_IN_MS = 5 * 1000;

packages/clerk-js/src/core/services/authentication/SessionCookieService.ts renamed to packages/clerk-js/src/core/auth/SessionCookieService.ts

@@ -1,11 +1,11 @@
 import { is4xxError, isClerkAPIResponseError, isNetworkError } from '@clerk/shared/error';
 import type { Clerk, EnvironmentResource, SessionResource, TokenResource } from '@clerk/types';
 
-import { inBrowser } from '../../../utils';
-import { setClientUatCookie } from '../../../utils/cookies/clientUat';
-import { removeSessionCookie, setSessionCookie } from '../../../utils/cookies/session';
-import { clerkCoreErrorTokenRefreshFailed } from '../../errors';
-import { eventBus, events } from '../../events';
+import { inBrowser } from '../../utils';
+import { clerkCoreErrorTokenRefreshFailed } from '../errors';
+import { eventBus, events } from '../events';
+import { setClientUatCookie } from './cookies/clientUat';
+import { removeSessionCookie, setSessionCookie } from './cookies/session';
 import { SessionCookiePoller } from './SessionCookiePoller';
 
 export class SessionCookieService {

packages/clerk-js/src/core/__tests__/devBrowser.test.ts renamed to packages/clerk-js/src/core/auth/__tests__/devBrowser.test.ts

@@ -1,5 +1,5 @@
+import type { FapiClient } from '../../fapiClient';
 import { createDevBrowser } from '../devBrowser';
-import type { FapiClient } from '../fapiClient';
 
 type RecursivePartial<T> = {
   [P in keyof T]?: RecursivePartial<T[P]>;

packages/clerk-js/src/utils/cookies/__tests__/getCookieDomain.test.ts renamed to packages/clerk-js/src/core/auth/__tests__/getCookieDomain.test.ts

@@ -2,8 +2,8 @@ import { createCookieHandler } from '@clerk/shared/cookie';
 import { addYears } from '@clerk/shared/date';
 import type { ClientResource } from '@clerk/types';
 
-import { inCrossOriginIframe } from '../../utils';
-import { getCookieDomain } from './getCookieDomain';
+import { inCrossOriginIframe } from '../../../utils';
+import { getCookieDomain } from '../getCookieDomain';
 
 const CLIENT_UAT_COOKIE_NAME = '__client_uat';
 

packages/clerk-js/src/utils/cookies/clientUat.ts renamed to packages/clerk-js/src/core/auth/cookies/clientUat.ts

@@ -2,7 +2,7 @@ import { createCookieHandler } from '@clerk/shared/cookie';
 import { addYears } from '@clerk/shared/date';
 import { DEV_BROWSER_JWT_KEY } from '@clerk/shared/devBrowser';
 
-import { inCrossOriginIframe } from '../../utils';
+import { inCrossOriginIframe } from '../../../utils';
 
 export const devBrowserCookie = createCookieHandler(DEV_BROWSER_JWT_KEY);
 

packages/clerk-js/src/utils/cookies/devBrowser.ts renamed to packages/clerk-js/src/core/auth/cookies/devBrowser.ts

@@ -1,7 +1,7 @@
 import { createCookieHandler } from '@clerk/shared/cookie';
 import { addYears } from '@clerk/shared/date';
 
-import { inCrossOriginIframe } from '../../utils';
+import { inCrossOriginIframe } from '../../../utils';
 
 const SESSION_COOKIE_NAME = '__session';
 

packages/clerk-js/src/utils/cookies/session.ts renamed to packages/clerk-js/src/core/auth/cookies/session.ts

@@ -2,10 +2,10 @@ import { DEV_BROWSER_JWT_HEADER, extractDevBrowserJWTFromURL, setDevBrowserJWTIn
 import { parseErrors } from '@clerk/shared/error';
 import type { ClerkAPIErrorJSON } from '@clerk/types';
 
-import { isDevOrStagingUrl } from '../utils';
-import { getDevBrowserCookie, removeDevBrowserCookie, setDevBrowserCookie } from '../utils/cookies/devBrowser';
-import { clerkErrorDevInitFailed } from './errors';
-import type { FapiClient } from './fapiClient';
+import { isDevOrStagingUrl } from '../../utils';
+import { clerkErrorDevInitFailed } from '../errors';
+import type { FapiClient } from '../fapiClient';
+import { getDevBrowserCookie, removeDevBrowserCookie, setDevBrowserCookie } from './cookies/devBrowser';
 
 export interface DevBrowser {
   clear(): void;

packages/clerk-js/src/core/devBrowser.ts renamed to packages/clerk-js/src/core/auth/devBrowser.ts

@@ -85,12 +85,13 @@ import {
   windowNavigate,
 } from '../utils';
 import { assertNoLegacyProp } from '../utils/assertNoLegacyProp';
-import { getClientUatCookie } from '../utils/cookies/clientUat';
 import { memoizeListenerCallback } from '../utils/memoizeStateListenerCallback';
 import { RedirectUrls } from '../utils/redirectUrls';
+import { getClientUatCookie } from './auth/cookies/clientUat';
+import type { DevBrowser } from './auth/devBrowser';
+import { createDevBrowser } from './auth/devBrowser';
+import { SessionCookieService } from './auth/SessionCookieService';
 import { CLERK_SATELLITE_URL, CLERK_SYNCED, ERROR_CODES } from './constants';
-import type { DevBrowser } from './devBrowser';
-import { createDevBrowser } from './devBrowser';
 import {
   clerkErrorInitFailed,
   clerkInvalidSignInUrlFormat,
@@ -111,7 +112,6 @@ import {
   Environment,
   Organization,
 } from './resources/internal';
-import { SessionCookieService } from './services';
 import { warnings } from './warnings';
 
 export type ClerkCoreBroadcastChannelEvent = { type: 'signout' };

packages/clerk-js/src/utils/cookies/getCookieDomain.ts renamed to packages/clerk-js/src/core/auth/getCookieDomain.ts

@@ -17,7 +17,6 @@ export * from './props';
 export * from './queryStateParams';
 export * from './querystring';
 export * from './runtime';
-export * from './safeLock';
 export * from './url';
 export * from './web3';
 export * from './windowNavigate';