@sanity/sdk-react 2.3.0 → 2.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/sdk-react",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "private": false,
   "description": "Sanity SDK React toolkit for Content OS",
   "keywords": [
@@ -51,7 +51,7 @@
     "react-compiler-runtime": "19.1.0-rc.2",
     "react-error-boundary": "^5.0.0",
     "rxjs": "^7.8.2",
-    "@sanity/sdk": "2.3.0"
+    "@sanity/sdk": "2.3.1"
   },
   "devDependencies": {
     "@sanity/browserslist-config": "^1.0.5",
@@ -76,8 +76,8 @@
     "vite": "^6.3.4",
     "vitest": "^3.1.2",
     "@repo/config-eslint": "0.0.0",
-    "@repo/config-test": "0.0.1",
     "@repo/package.bundle": "3.82.0",
+    "@repo/config-test": "0.0.1",
     "@repo/package.config": "0.0.1",
     "@repo/tsconfig": "0.0.1"
   },

package/src/components/auth/AuthBoundary.tsx

@@ -7,6 +7,7 @@ import {ComlinkTokenRefreshProvider} from '../../context/ComlinkTokenRefresh'
 import {useAuthState} from '../../hooks/auth/useAuthState'
 import {useLoginUrl} from '../../hooks/auth/useLoginUrl'
 import {useVerifyOrgProjects} from '../../hooks/auth/useVerifyOrgProjects'
+import {useSanityInstance} from '../../hooks/context/useSanityInstance'
 import {CorsErrorComponent} from '../errors/CorsErrorComponent'
 import {isInIframe} from '../utils'
 import {AuthError} from './AuthError'
@@ -154,17 +155,21 @@ function AuthSwitch({
   ...props
 }: AuthSwitchProps) {
   const authState = useAuthState()
-  const orgError = useVerifyOrgProjects(!verifyOrganization, projectIds)
+  const instance = useSanityInstance()
+  const studioModeEnabled = instance.config.studioMode?.enabled
+  const disableVerifyOrg =
+    !verifyOrganization || studioModeEnabled || authState.type !== AuthStateType.LOGGED_IN
+  const orgError = useVerifyOrgProjects(disableVerifyOrg, projectIds)
 
   const isLoggedOut = authState.type === AuthStateType.LOGGED_OUT && !authState.isDestroyingSession
   const loginUrl = useLoginUrl()
 
   useEffect(() => {
-    if (isLoggedOut && !isInIframe()) {
-      // We don't want to redirect to login if we're in the Dashboard
+    if (isLoggedOut && !isInIframe() && !studioModeEnabled) {
+      // We don't want to redirect to login if we're in the Dashboard nor in studio mode
       window.location.href = loginUrl
     }
-  }, [isLoggedOut, loginUrl])
+  }, [isLoggedOut, loginUrl, studioModeEnabled])
 
   // Only check the error if verification is enabled
   if (verifyOrganization && orgError) {

package/src/context/ComlinkTokenRefresh.test.tsx

@@ -5,6 +5,7 @@ import {afterEach, beforeEach, describe, expect, it, type Mock, vi} from 'vitest
 
 import {useAuthState} from '../hooks/auth/useAuthState'
 import {useWindowConnection} from '../hooks/comlink/useWindowConnection'
+import {useSanityInstance} from '../hooks/context/useSanityInstance'
 import {ComlinkTokenRefreshProvider} from './ComlinkTokenRefresh'
 import {ResourceProvider} from './ResourceProvider'
 
@@ -26,13 +27,24 @@ vi.mock('../hooks/comlink/useWindowConnection', () => ({
   useWindowConnection: vi.fn(),
 }))
 
+vi.mock('../hooks/context/useSanityInstance', () => ({
+  useSanityInstance: vi.fn(),
+}))
+
 // Use simpler mock typings
 const mockGetIsInDashboardState = getIsInDashboardState as Mock
 const mockSetAuthToken = setAuthToken as Mock
 const mockUseAuthState = useAuthState as Mock
 const mockUseWindowConnection = useWindowConnection as Mock
+const mockUseSanityInstance = useSanityInstance as unknown as Mock
 
 const mockFetch = vi.fn()
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const mockSanityInstance: any = {
+  projectId: 'test',
+  dataset: 'test',
+  config: {studioMode: {enabled: false}},
+}
 
 describe('ComlinkTokenRefresh', () => {
   beforeEach(() => {
@@ -40,6 +52,7 @@ describe('ComlinkTokenRefresh', () => {
     mockGetIsInDashboardState.mockReturnValue({getCurrent: vi.fn(() => false)})
     mockUseAuthState.mockReturnValue({type: AuthStateType.LOGGED_IN})
     mockUseWindowConnection.mockReturnValue({fetch: mockFetch})
+    mockUseSanityInstance.mockReturnValue(mockSanityInstance)
   })
 
   afterEach(() => {
@@ -89,7 +102,8 @@ describe('ComlinkTokenRefresh', () => {
         mockGetIsInDashboardState.mockReturnValue({getCurrent: () => true})
       })
 
-      it('should initialize useWindowConnection with correct parameters', () => {
+      it('should initialize useWindowConnection with correct parameters when not in studio mode', () => {
+        // Simulate studio mode disabled by default
         render(
           <ResourceProvider projectId="test-project" dataset="test-dataset" fallback={null}>
             <ComlinkTokenRefreshProvider>
@@ -106,7 +120,7 @@ describe('ComlinkTokenRefresh', () => {
         )
       })
 
-      it('should handle received token', async () => {
+      it('should handle received token when not in studio mode', async () => {
         mockUseAuthState.mockReturnValue({
           type: AuthStateType.ERROR,
           error: {statusCode: 401, message: 'Unauthorized'},
@@ -129,7 +143,7 @@ describe('ComlinkTokenRefresh', () => {
         expect(mockFetch).toHaveBeenCalledTimes(1)
       })
 
-      it('should not set auth token if received token is null', async () => {
+      it('should not set auth token if received token is null when not in studio mode', async () => {
         mockUseAuthState.mockReturnValue({
           type: AuthStateType.ERROR,
           error: {statusCode: 401, message: 'Unauthorized'},
@@ -151,7 +165,7 @@ describe('ComlinkTokenRefresh', () => {
         expect(mockSetAuthToken).not.toHaveBeenCalled()
       })
 
-      it('should handle fetch errors gracefully', async () => {
+      it('should handle fetch errors gracefully when not in studio mode', async () => {
         mockUseAuthState.mockReturnValue({
           type: AuthStateType.ERROR,
           error: {statusCode: 401, message: 'Unauthorized'},
@@ -174,7 +188,7 @@ describe('ComlinkTokenRefresh', () => {
       })
 
       describe('Automatic token refresh', () => {
-        it('should not request new token for non-401 errors', async () => {
+        it('should not request new token for non-401 errors when not in studio mode', async () => {
           mockUseAuthState.mockReturnValue({type: AuthStateType.LOGGED_IN})
           const {rerender} = render(
             <ResourceProvider fallback={null}>
@@ -205,7 +219,7 @@ describe('ComlinkTokenRefresh', () => {
           expect(mockFetch).not.toHaveBeenCalled()
         })
 
-        it('should request new token on LOGGED_OUT state', async () => {
+        it('should request new token on LOGGED_OUT state when not in studio mode', async () => {
           mockUseAuthState.mockReturnValue({type: AuthStateType.LOGGED_IN})
           const {rerender} = render(
             <ResourceProvider fallback={null}>
@@ -228,6 +242,28 @@ describe('ComlinkTokenRefresh', () => {
 
           expect(mockFetch).toHaveBeenCalledWith('dashboard/v1/auth/tokens/create')
         })
+
+        describe('when in studio mode', () => {
+          beforeEach(() => {
+            // Make the instance report studio mode enabled
+            mockUseSanityInstance.mockReturnValue({
+              ...mockSanityInstance,
+              config: {studioMode: {enabled: true}},
+            })
+          })
+
+          it('should not render DashboardTokenRefresh when studio mode enabled', () => {
+            render(
+              <ComlinkTokenRefreshProvider>
+                <div>Test</div>
+              </ComlinkTokenRefreshProvider>,
+            )
+
+            // In studio mode, provider should return children directly
+            // So window connection should not be initialized
+            expect(mockUseWindowConnection).not.toHaveBeenCalled()
+          })
+        })
       })
     })
   })

package/src/context/ComlinkTokenRefresh.tsx

@@ -130,8 +130,9 @@ function DashboardTokenRefresh({children}: PropsWithChildren) {
 export const ComlinkTokenRefreshProvider: React.FC<PropsWithChildren> = ({children}) => {
   const instance = useSanityInstance()
   const isInDashboard = useMemo(() => getIsInDashboardState(instance).getCurrent(), [instance])
+  const studioModeEnabled = !!instance.config.studioMode?.enabled
 
-  if (isInDashboard) {
+  if (isInDashboard && !studioModeEnabled) {
     return <DashboardTokenRefresh>{children}</DashboardTokenRefresh>
   }