Skip to content

fix: auth race condition when using the SDK in the Studio structure #646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

fix: auth race condition when using the SDK in the Studio structure #646

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55f6aef
fix: auth race condition when using the SDK in the Studio structure
ryanbonial Oct 1, 2025
0ed7610
chore: fix tests
ryanbonial Oct 1, 2025
0fda85f
chore: fix comment
ryanbonial Oct 1, 2025
6ded12c
Merge branch 'main' into SDK-640/fix-studio-mode-auth
ryanbonial Oct 2, 2025
4cd66f0
refactor(auth): update storage key handling for studio mode
ryanbonial Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion packages/core/src/auth/subscribeToStateAndFetchCurrentUser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ import {type AuthState, type AuthStoreState} from './authStore'

export const subscribeToStateAndFetchCurrentUser = ({
state,
instance,
}: StoreContext<AuthStoreState>): Subscription => {
const {clientFactory, apiHost} = state.get().options
const useProjectHostname = !!instance.config.studioMode?.enabled
const projectId = instance.config.projectId

const currentUser$ = state.observable
.pipe(
Expand All @@ -28,8 +31,9 @@ export const subscribeToStateAndFetchCurrentUser = ({
requestTagPrefix: REQUEST_TAG_PREFIX,
token,
ignoreBrowserTokenWarning: true,
useProjectHostname: false,
useProjectHostname,
useCdn: false,
...(useProjectHostname && projectId ? {projectId} : {}),
...(apiHost && {apiHost}),
}),
),
Expand Down
7 changes: 6 additions & 1 deletion packages/react/src/components/auth/AuthBoundary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {useCorsOriginError} from '../../hooks/errors/useCorsOriginError'
import {CorsErrorComponent} from '../errors/CorsErrorComponent'
import {isInIframe} from '../utils'
Expand Down Expand Up @@ -169,7 +170,11 @@ 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()
Expand Down
Loading