feat(clerk-js,nextjs): Introduce multipleAppsSameDomain Clerk option …

…to support cookie suffixing
clerk · Apr 12, 2024 · 2bf01fe · 2bf01fe
1 parent fcadc28
commit 2bf01fe
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 21 deletions.
diff --git a/packages/clerk-js/src/core/auth/SessionCookieService.ts b/packages/clerk-js/src/core/auth/SessionCookieService.ts
@@ -1,8 +1,7 @@
 import { setDevBrowserJWTInURL } from '@clerk/shared/devBrowser';
 import { is4xxError, isClerkAPIResponseError, isNetworkError } from '@clerk/shared/error';
-import type { Clerk, EnvironmentResource, TokenResource } from '@clerk/types';
+import type { Clerk, EnvironmentResource } from '@clerk/types';
 
-import { inBrowser } from '../../utils';
 import { clerkCoreErrorTokenRefreshFailed, clerkMissingDevBrowserJwt } from '../errors';
 import { eventBus, events } from '../events';
 import type { FapiClient } from '../fapiClient';
@@ -14,6 +13,8 @@ import type { DevBrowser } from './devBrowser';
 import { createDevBrowser } from './devBrowser';
 import { SessionCookiePoller } from './SessionCookiePoller';
 
+// TODO: make SessionCookieService singleton since it handles updating cookies using a poller
+// and we need to avoid updating them concurrently.
 export class SessionCookieService {
   private environment: EnvironmentResource | undefined;
   private poller: SessionCookiePoller | null = null;
@@ -24,7 +25,7 @@ export class SessionCookieService {
   constructor(private clerk: Clerk, fapiClient: FapiClient, multipleAppsSameDomainEnabled = false) {
     // set cookie on token update
     eventBus.on(events.TokenUpdate, ({ token }) => {
-      this.updateSessionCookie(token?.getRawString());
+      this.updateSessionCookie(token && token.getRawString());
       this.setClientUatCookieForDevelopmentInstances();
     });
 
@@ -90,10 +91,6 @@ export class SessionCookieService {
   }
 
   private refreshTokenOnVisibilityChange() {
-    if (!inBrowser()) {
-      return;
-    }
-
     document.addEventListener('visibilitychange', () => {
       if (document.visibilityState === 'visible') {
         void this.refreshSessionToken();
@@ -102,28 +99,19 @@ export class SessionCookieService {
   }
 
   private async refreshSessionToken(): Promise<void> {
-    if (!inBrowser()) {
-      return;
-    }
-
     if (!this.clerk.session) {
       return;
     }
 
     try {
-      this.updateSessionCookie(await this.clerk.session?.getToken());
+      await this.clerk.session.getToken();
     } catch (e) {
       return this.handleGetTokenError(e);
     }
   }
 
-  private updateSessionCookie(token: TokenResource | string | undefined | null) {
-    const rawToken = typeof token === 'string' ? token : token?.getRawString();
-
-    if (rawToken) {
-      return this.sessionCookie.set(rawToken);
-    }
-    return this.sessionCookie.remove();
+  private updateSessionCookie(token: string | null) {
+    return token ? this.sessionCookie.set(token) : this.sessionCookie.remove();
   }
 
   private setClientUatCookieForDevelopmentInstances() {

diff --git a/packages/clerk-js/src/core/auth/devBrowser.ts b/packages/clerk-js/src/core/auth/devBrowser.ts
@@ -60,6 +60,7 @@ export function createDevBrowser(
       if (devBrowserJWT && request?.url) {
         request.url = setDevBrowserJWTInURL(request.url, devBrowserJWT);
       }
+      request.url?.searchParams.append('_multiple_apps_same_domain', withSuffix.toString());
     });
 
     fapiClient.onAfterResponse((_, response) => {

diff --git a/packages/clerk-js/src/core/clerk.ts b/packages/clerk-js/src/core/clerk.ts
@@ -1394,7 +1394,7 @@ export class Clerk implements ClerkInterface {
   };
 
   #loadInStandardBrowser = async (): Promise<boolean> => {
-    this.#authService = new SessionCookieService(this, this.#fapiClient);
+    this.#authService = new SessionCookieService(this, this.#fapiClient, this.#options.multipleAppsSameDomain);
 
     /**
      * 1. Create the devBrowser.

diff --git a/packages/nextjs/src/pages/ClerkProvider.tsx b/packages/nextjs/src/pages/ClerkProvider.tsx
@@ -33,7 +33,11 @@ export function ClerkProvider({ children, ...props }: NextClerkProviderProps): J
 
   const navigate = (to: string) => push(to);
   const replaceNavigate = (to: string) => replace(to);
-  const mergedProps = mergeNextClerkPropsWithEnv({ ...props, routerPush: navigate, routerReplace: replaceNavigate });
+  const mergedProps = mergeNextClerkPropsWithEnv({
+    ...props,
+    routerPush: navigate,
+    routerReplace: replaceNavigate,
+  });
   // ClerkProvider automatically injects __clerk_ssr_state
   // getAuth returns a user-facing authServerSideProps that hides __clerk_ssr_state
   // @ts-expect-error initialState is hidden from the types as it's a private prop

diff --git a/packages/nextjs/src/utils/mergeNextClerkPropsWithEnv.ts b/packages/nextjs/src/utils/mergeNextClerkPropsWithEnv.ts
@@ -22,5 +22,6 @@ export const mergeNextClerkPropsWithEnv = (props: Omit<NextClerkProviderProps, '
       debug: isTruthy(process.env.NEXT_PUBLIC_CLERK_TELEMETRY_DEBUG),
     },
     sdkMetadata: SDK_METADATA,
+    multipleAppsSameDomain: true,
   };
 };
diff --git a/packages/types/src/clerk.ts b/packages/types/src/clerk.ts
@@ -551,6 +551,7 @@ export type ClerkOptions = ClerkOptionsNavigation &
         };
 
     sdkMetadata?: SDKMetadata;
+    multipleAppsSameDomain?: boolean;
   };
 
 export interface NavigateOptions {