sanity 5.30.0-next.2 → 5.30.0-next.3

package/lib/_chunks-es/version.js

@@ -1,4 +1,4 @@
-var version = "5.30.0-next.2+cf5baeb268";
+var version = "5.30.0-next.3+2ae1370ae1";
 let buildVersion;
 try {
   buildVersion = process.env.PKG_BUILD_VERSION;
@@ -7,7 +7,7 @@ try {
 try {
   buildVersion = buildVersion || // This is replaced by `@sanity/pkg-utils` at build time
   // and must always be references by its full static name, e.g. no optional chaining, no `if (process && process.env)` etc.
-  "5.30.0-next.2+cf5baeb268";
+  "5.30.0-next.3+2ae1370ae1";
 } catch {
 }
 const SANITY_VERSION = buildVersion || `${version}-dev`;

package/lib/index.js

@@ -4806,6 +4806,7 @@ function createLoginComponent({
   loginMethod,
   redirectOnSingle,
   wasLogout,
+  isHandlingCallback,
   ...providerOptions
 }) {
   function LoginComponent(t0) {
@@ -4853,7 +4854,7 @@ function createLoginComponent({
       providers: providers_1,
       lastUsedProvider: lastUsedProvider_0,
       isLoading
-    } = providerData, redirectUrlForRedirectOnSingle = redirectOnSingle && !wasLogout() && providers_1?.length === 1 && providers_1?.[0] && createHrefForProvider({
+    } = providerData, redirectUrlForRedirectOnSingle = redirectOnSingle && !wasLogout() && !isHandlingCallback() && providers_1?.length === 1 && providers_1?.[0] && createHrefForProvider({
       loginMethod,
       projectId,
       url: providers_1[0].url,
@@ -5114,7 +5115,7 @@ function _createAuthStore({
   }))).pipe(shareReplay({
     bufferSize: 1,
     refCount: !0
-  }))), dualClient$ = concat(of(initialDualClient), merge(hashTokenChange, tokenStorage.value.pipe(skip(1))).pipe(map((nextTokenState) => clientFactory({
+  }))), dualClient$ = merge(hashTokenChange, tokenStorage.value).pipe(map((nextTokenState) => clientFactory({
     ...AUTH_CLIENT_OPTIONS,
     ...hostOptions,
     projectId,
@@ -5125,12 +5126,12 @@ function _createAuthStore({
     } : {
       withCredentials: !0
     }
-  })))).pipe(shareReplay({
+  })), shareReplay({
     bufferSize: 1,
     refCount: !0
   })), cookieAuthChanged$ = cookieAuthState.value.pipe(filter((v) => v?.authenticated !== "pending"), distinctUntilChanged(isEqual$1)), cookieWorkspaceClient$ = cookieAuthChanged$.pipe(map(({
     authenticated
-  }) => authenticated ? cookieClient : void 0)), workspaceClient$ = (loginMethod === "dual" ? dualClient$ : loginMethod === "cookie" ? cookieWorkspaceClient$ : tokenClient$).pipe(distinctUntilChanged()), dualCookieRecheck$ = loginMethod === "dual" ? cookieAuthChanged$.pipe(skip(1), switchMap(() => dualClient$)) : EMPTY$5, authState$ = concat(initial$, merge(workspaceClient$.pipe(skip(1)), dualCookieRecheck$).pipe(mergeMap(async (client) => {
+  }) => authenticated ? cookieClient : void 0)), workspaceClient$ = (loginMethod === "dual" ? dualClient$ : loginMethod === "cookie" ? cookieWorkspaceClient$ : tokenClient$).pipe(distinctUntilChanged()), dualCookieRecheck$ = loginMethod === "dual" ? cookieAuthChanged$.pipe(skip(1), switchMap(() => dualClient$)) : EMPTY$5, initialToken = currentTokenState?.token ?? null, dualTokenRecheck$ = loginMethod === "dual" ? tokenStorage.value.pipe(map((state) => state?.token ?? null), distinctUntilChanged(), filter((token) => typeof token == "string" && token !== initialToken), switchMap(() => dualClient$)) : EMPTY$5, authState$ = concat(initial$, merge(workspaceClient$.pipe(skip(1)), dualCookieRecheck$, dualTokenRecheck$).pipe(mergeMap(async (client) => {
     if (!client)
       return {
         client: cookieClient,
@@ -5156,6 +5157,7 @@ function _createAuthStore({
       resetOnRefCountZero: () => timer(1e3)
     })
   );
+  let _isHandlingCallback = !1;
   async function handleCallbackUrl() {
     const startTime = performance.now(), sessionId2 = getSessionId2();
     if (clearHashSessionId(), !sessionId2)
@@ -5165,6 +5167,14 @@ function _createAuthStore({
         success: !0,
         durationMs: Math.round(performance.now() - startTime)
       };
+    _isHandlingCallback = !0;
+    try {
+      return await processCallback(sessionId2, startTime);
+    } finally {
+      _isHandlingCallback = !1;
+    }
+  }
+  async function processCallback(sessionId2, startTime) {
     const exchangeClient = clientFactory({
       ...AUTH_CLIENT_OPTIONS,
       ...hostOptions,
@@ -5190,34 +5200,51 @@ function _createAuthStore({
       };
     }
     const exchangeDurationMs = Math.round(performance.now() - exchangeStart);
-    if (loginMethod === "dual" || loginMethod === "cookie") {
+    if (loginMethod === "dual") {
+      tokenStorage.update({
+        token
+      });
       const probeStart = performance.now(), authProbe = await probeCurrentUser(exchangeClient), probeDurationMs = Math.round(performance.now() - probeStart), durationMs = Math.round(performance.now() - startTime);
-      if (cookieAuthState.update({
+      return cookieAuthState.update({
         authenticated: authProbe.authenticated
-      }), authProbe.authenticated)
-        return {
-          flow: "exchange",
-          loginMethod,
-          success: !0,
-          durationMs,
-          exchangeDurationMs,
-          probeDurationMs,
-          authMethod: "cookie"
-        };
-      if (loginMethod === "cookie")
-        return {
-          loginMethod,
-          flow: "exchange",
-          success: !1,
-          durationMs,
-          exchangeDurationMs,
-          probeDurationMs,
-          failureReason: "cookie probe failed in cookie-only mode",
-          error: {
-            type: "cookie-blocked",
-            message: "Authentication could not be completed because this browser appears to block third-party cookies. This studio is configured to use cookie-based authentication only. Try using a different browser, disabling strict cookie blocking, or ask the studio administrator to enable token-based authentication."
-          }
-        };
+      }), {
+        flow: "exchange",
+        loginMethod,
+        success: !!token,
+        durationMs,
+        exchangeDurationMs,
+        probeDurationMs,
+        // Report cookie as the transport when the probe passed, otherwise token —
+        // either way the token is stored and available as a fallback.
+        authMethod: authProbe.authenticated ? "cookie" : "token",
+        failureReason: token ? void 0 : "token exchange returned empty token"
+      };
+    }
+    if (loginMethod === "cookie") {
+      const probeStart = performance.now(), authProbe = await probeCurrentUser(exchangeClient), probeDurationMs = Math.round(performance.now() - probeStart), durationMs = Math.round(performance.now() - startTime);
+      return cookieAuthState.update({
+        authenticated: authProbe.authenticated
+      }), authProbe.authenticated ? {
+        flow: "exchange",
+        loginMethod,
+        success: !0,
+        durationMs,
+        exchangeDurationMs,
+        probeDurationMs,
+        authMethod: "cookie"
+      } : {
+        loginMethod,
+        flow: "exchange",
+        success: !1,
+        durationMs,
+        exchangeDurationMs,
+        probeDurationMs,
+        failureReason: "cookie probe failed in cookie-only mode",
+        error: {
+          type: "cookie-blocked",
+          message: "Authentication could not be completed because this browser appears to block third-party cookies. This studio is configured to use cookie-based authentication only. Try using a different browser, disabling strict cookie blocking, or ask the studio administrator to enable token-based authentication."
+        }
+      };
     }
     return tokenStorage.update({
       token
@@ -5255,7 +5282,8 @@ function _createAuthStore({
     ...providerOptions,
     client$: authState$.pipe(map((state) => state.client)),
     loginMethod,
-    wasLogout: () => _didLogOut
+    wasLogout: () => _didLogOut,
+    isHandlingCallback: () => _isHandlingCallback
   });
   return {
     handleCallbackUrl,