Skip to content

Commit b1db6ec

Browse files
authored
fix(#927): fix the warnings produced by Nuxt when awaiting runtime config (#959)
1 parent dd77b70 commit b1db6ec

File tree

4 files changed

+11
-22
lines changed

4 files changed

+11
-22
lines changed

src/runtime/composables/authjs/useAuth.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function getCsrfTokenWithNuxt(nuxt: NuxtApp) {
6464
type SignInResult = void | { error: string | null, status: number, ok: boolean, url: any }
6565
const signIn: SignInFunc<SupportedProviders, SignInResult> = async (provider, options, authorizationParams) => {
6666
const nuxt = useNuxtApp()
67-
const runtimeConfig = await callWithNuxt(nuxt, useRuntimeConfig)
67+
const runtimeConfig = useRuntimeConfig()
6868

6969
// 1. Lead to error page if no providers are available
7070
const configuredProviders = await getProviders()

src/runtime/composables/local/useAuth.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ type Credentials = { username?: string, email?: string, password?: string } & Re
1717
const signIn: SignInFunc<Credentials, any> = async (credentials, signInOptions, signInParams, signInHeaders) => {
1818
const nuxt = useNuxtApp()
1919

20-
const runtimeConfig = await callWithNuxt(nuxt, useRuntimeConfig)
20+
const runtimeConfig = useRuntimeConfig()
2121
const config = useTypedBackendConfig(runtimeConfig, 'local')
2222
const { path, method } = config.endpoints.signIn
2323
const response = await _fetch<Record<string, any>>(nuxt, path, {
@@ -75,7 +75,7 @@ const signIn: SignInFunc<Credentials, any> = async (credentials, signInOptions,
7575

7676
const signOut: SignOutFunc = async (signOutOptions) => {
7777
const nuxt = useNuxtApp()
78-
const runtimeConfig = await callWithNuxt(nuxt, useRuntimeConfig)
78+
const runtimeConfig = useRuntimeConfig()
7979
const config = useTypedBackendConfig(runtimeConfig, 'local')
8080
const { data, token, rawToken, refreshToken, rawRefreshToken }: UseAuthStateReturn = await callWithNuxt(nuxt, useAuthState)
8181

src/runtime/utils/extractFromRuntimeConfig.ts

-16
This file was deleted.

src/runtime/utils/fetch.ts

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
import { resolveApiUrlPath } from './url'
22
import { ERROR_PREFIX } from './logger'
3-
import { callWithNuxt, useRuntimeConfig } from '#app'
4-
import type { useNuxtApp } from '#imports'
3+
import { type useNuxtApp, useRuntimeConfig } from '#imports'
4+
import { callWithNuxt } from '#app/nuxt'
55

66
export async function _fetch<T>(nuxt: ReturnType<typeof useNuxtApp>, path: string, fetchOptions?: Parameters<typeof $fetch>[1]): Promise<T> {
7-
const runtimeConfig = await callWithNuxt(nuxt, useRuntimeConfig)
7+
// This fixes https://github.com/sidebase/nuxt-auth/issues/927
8+
const runtimeConfigOrPromise = callWithNuxt(nuxt, useRuntimeConfig)
9+
const runtimeConfig = 'public' in runtimeConfigOrPromise
10+
? runtimeConfigOrPromise
11+
: await runtimeConfigOrPromise
12+
813
const joinedPath = resolveApiUrlPath(path, runtimeConfig)
914

1015
// Prevent callback recursion when doing internal routing

0 commit comments

Comments
 (0)