@sanity/sdk 2.3.0 → 2.3.1

package/dist/index.d.ts

@@ -288,6 +288,10 @@ interface DashboardContext {
   env?: string;
   orgId?: string;
 }
+/**
+ * The method of authentication used.
+ * @internal
+ */
 type AuthMethodOptions = 'localstorage' | 'cookie' | undefined;
 /**
  * @public

package/dist/index.js

@@ -404,31 +404,34 @@ async function checkForCookieAuth(projectId, clientFactory) {
     return !1;
   }
 }
-function getStudioTokenFromLocalStorage(storageArea, projectId) {
-  if (!storageArea || !projectId) return null;
-  const studioStorageKey = `__studio_auth_token_${projectId}`;
-  return getTokenFromStorage(storageArea, studioStorageKey) || null;
+function getStudioTokenFromLocalStorage(storageArea, storageKey) {
+  return !storageArea || !storageKey ? null : getTokenFromStorage(storageArea, storageKey) || null;
 }
 const subscribeToStateAndFetchCurrentUser = ({
-  state
+  state,
+  instance
 }) => {
-  const { clientFactory, apiHost } = state.get().options;
+  const { clientFactory, apiHost } = state.get().options, useProjectHostname = !!instance.config.studioMode?.enabled, projectId = instance.config.projectId;
   return state.observable.pipe(
-    map(({ authState }) => authState),
+    map(({ authState, options }) => ({ authState, authMethod: options.authMethod })),
     filter(
-      (authState) => authState.type === AuthStateType.LOGGED_IN && !authState.currentUser
+      (value) => value.authState.type === AuthStateType.LOGGED_IN && !value.authState.currentUser
     ),
-    map((authState) => authState.token),
-    distinctUntilChanged()
+    map((value) => ({ token: value.authState.token, authMethod: value.authMethod })),
+    distinctUntilChanged(
+      (prev, curr) => prev.token === curr.token && prev.authMethod === curr.authMethod
+    )
   ).pipe(
     map(
-      (token) => clientFactory({
+      ({ token, authMethod }) => clientFactory({
         apiVersion: DEFAULT_API_VERSION$1,
         requestTagPrefix: REQUEST_TAG_PREFIX,
-        token,
+        token: authMethod === "cookie" ? void 0 : token,
         ignoreBrowserTokenWarning: !0,
-        useProjectHostname: !1,
+        useProjectHostname,
         useCdn: !1,
+        ...authMethod === "cookie" ? { withCredentials: !0 } : {},
+        ...useProjectHostname && projectId ? { projectId } : {},
         ...apiHost && { apiHost }
       })
     ),
@@ -473,8 +476,8 @@ const authStore = {
       clientFactory = createClient,
       initialLocationHref = getDefaultLocation()
     } = instance.config.auth ?? {};
-    let storageArea = instance.config.auth?.storageArea;
-    const storageKey = "__sanity_auth_token";
+    let storageArea = instance.config.auth?.storageArea, storageKey = "__sanity_auth_token";
+    const studioModeEnabled = instance.config.studioMode?.enabled;
     let loginDomain = "https://www.sanity.io";
     try {
       apiHost && new URL(apiHost).hostname.endsWith(".sanity.work") && (loginDomain = "https://www.sanity.work");
@@ -492,13 +495,15 @@ const authStore = {
     } catch (err) {
       console.error("Failed to parse dashboard context from initial location:", err);
     }
-    isInDashboard || (storageArea = storageArea ?? getDefaultStorage());
+    (!isInDashboard || studioModeEnabled) && (storageArea = storageArea ?? getDefaultStorage());
     let token, authMethod;
-    instance.config.studioMode?.enabled ? (token = getStudioTokenFromLocalStorage(storageArea, instance.config.projectId), token ? authMethod = "localstorage" : checkForCookieAuth(instance.config.projectId, clientFactory).then((isCookieAuthEnabled) => {
-      isCookieAuthEnabled && (authMethod = "cookie");
-    })) : (token = getTokenFromStorage(storageArea, storageKey), token && (authMethod = "localstorage"));
+    if (studioModeEnabled) {
+      const studioStorageKey = `__studio_auth_token_${instance.config.projectId ?? ""}`;
+      storageKey = studioStorageKey, token = getStudioTokenFromLocalStorage(storageArea, studioStorageKey), token && (authMethod = "localstorage");
+    } else
+      token = getTokenFromStorage(storageArea, storageKey), token && (authMethod = "localstorage");
     let authState;
-    return providedToken ? authState = { type: AuthStateType.LOGGED_IN, token: providedToken, currentUser: null } : getAuthCode(callbackUrl, initialLocationHref) || getTokenFromLocation(initialLocationHref) ? authState = { type: AuthStateType.LOGGING_IN, isExchangingToken: !1 } : token && !isInDashboard ? authState = { type: AuthStateType.LOGGED_IN, token, currentUser: null } : authState = { type: AuthStateType.LOGGED_OUT, isDestroyingSession: !1 }, {
+    return providedToken ? authState = { type: AuthStateType.LOGGED_IN, token: providedToken, currentUser: null } : token && studioModeEnabled ? authState = { type: AuthStateType.LOGGED_IN, token: token ?? "", currentUser: null } : getAuthCode(callbackUrl, initialLocationHref) || getTokenFromLocation(initialLocationHref) ? authState = { type: AuthStateType.LOGGING_IN, isExchangingToken: !1 } : token && !isInDashboard && !studioModeEnabled ? authState = { type: AuthStateType.LOGGED_IN, token, currentUser: null } : authState = { type: AuthStateType.LOGGED_OUT, isDestroyingSession: !1 }, {
       authState,
       dashboardContext,
       options: {
@@ -517,7 +522,21 @@ const authStore = {
   },
   initialize(context) {
     const subscriptions = [];
-    return subscriptions.push(subscribeToStateAndFetchCurrentUser(context)), context.state.get().options?.storageArea && subscriptions.push(subscribeToStorageEventsAndSetToken(context)), tokenRefresherRunning || (tokenRefresherRunning = !0, subscriptions.push(refreshStampedToken(context))), () => {
+    subscriptions.push(subscribeToStateAndFetchCurrentUser(context)), context.state.get().options?.storageArea && subscriptions.push(subscribeToStorageEventsAndSetToken(context));
+    try {
+      const { instance, state } = context, studioModeEnabled = !!instance.config.studioMode?.enabled, token = state.get().authState?.type === AuthStateType.LOGGED_IN ? state.get().authState.token : null;
+      if (studioModeEnabled && !token) {
+        const projectId = instance.config.projectId, clientFactory = state.get().options.clientFactory;
+        checkForCookieAuth(projectId, clientFactory).then((isCookieAuthEnabled) => {
+          isCookieAuthEnabled && state.set("enableCookieAuth", (prev) => ({
+            options: { ...prev.options, authMethod: "cookie" },
+            authState: prev.authState.type === AuthStateType.LOGGED_IN ? prev.authState : { type: AuthStateType.LOGGED_IN, token: "", currentUser: null }
+          }));
+        });
+      }
+    } catch {
+    }
+    return tokenRefresherRunning || (tokenRefresherRunning = !0, subscriptions.push(refreshStampedToken(context))), () => {
       for (const subscription of subscriptions)
         subscription.unsubscribe();
     };
@@ -3883,7 +3902,7 @@ function getCorsErrorProjectId(error) {
   const projMatch = (error.message || "").match(/manage\/project\/([^/?#]+)/);
   return projMatch ? projMatch[1] : null;
 }
-var version = "2.3.0";
+var version = "2.3.1";
 const CORE_SDK_VERSION = getEnv("PKG_VERSION") || `${version}-development`;
 export {
   AuthStateType,