Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions src/module/runtime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ export function setupRuntimeConfig(input: SetupRuntimeConfigInput): { useHubKV:

nuxt.options.runtimeConfig.public = nuxt.options.runtimeConfig.public || {}
const configuredSiteUrl = nuxt.options.runtimeConfig.public.siteUrl as string | undefined
if (!configuredSiteUrl && process.env.NUXT_PUBLIC_SITE_URL)
nuxt.options.runtimeConfig.public.siteUrl = process.env.NUXT_PUBLIC_SITE_URL
nuxt.options.runtimeConfig.public.siteUrl = configuredSiteUrl || process.env.NUXT_PUBLIC_SITE_URL || ''

nuxt.options.runtimeConfig.public.auth = defu(nuxt.options.runtimeConfig.public.auth as Record<string, unknown>, {
redirects: {
Expand Down
3 changes: 2 additions & 1 deletion src/runtime/app/composables/useAuthClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ export function useRawAuthClient(): AppAuthClient | null {

const runtimeConfig = useRuntimeConfig()
const requestURL = useRequestURL()
const siteUrl = typeof runtimeConfig.public.siteUrl === 'string' ? runtimeConfig.public.siteUrl : requestURL.origin
const configuredSiteUrl = runtimeConfig.public.siteUrl
const siteUrl = typeof configuredSiteUrl === 'string' && configuredSiteUrl ? configuredSiteUrl : requestURL.origin
return getClient(siteUrl)
}

Expand Down
17 changes: 17 additions & 0 deletions test/runtime-config.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,23 @@ afterEach(() => {
})

describe('setupRuntimeConfig siteUrl hydration', () => {
it('declares public.siteUrl when no value is configured', () => {
delete process.env.NUXT_PUBLIC_SITE_URL
const nuxt = createNuxtWithRuntimeConfig()
const consola = createConsolaMock()

setupRuntimeConfig({
nuxt,
options: {},
clientOnly: true,
databaseProvider: 'none',
hasNuxtHub: false,
consola,
})

expect(nuxt.options.runtimeConfig.public.siteUrl).toBe('')
})

it('hydrates public.siteUrl from NUXT_PUBLIC_SITE_URL when missing', () => {
process.env.NUXT_PUBLIC_SITE_URL = 'http://localhost:3000'
const nuxt = createNuxtWithRuntimeConfig()
Expand Down
10 changes: 10 additions & 0 deletions test/use-auth-client.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,14 @@ describe('useAuthClient', () => {
expect(isReactive(client!.signIn.email)).toBe(false)
await expect(client!.signIn.email({ email: 'user@example.com', password: 'password' })).resolves.toEqual({ ok: true })
})

it('falls back to the request origin when runtime siteUrl is empty', async () => {
setRuntimeFlags({ client: true, server: false })
runtimeConfig.public.siteUrl = ''

const useAuthClient = await loadUseAuthClient()
useAuthClient()

expect(createAppAuthClient).toHaveBeenLastCalledWith(requestURL.origin)
})
})
Loading