fix(#927): fix the warnings produced by Nuxt when awaiting runtime co…

…nfig (#959)
sidebase · Dec 12, 2024 · b1db6ec · b1db6ec
1 parent dd77b70
commit b1db6ec
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 22 deletions.
diff --git a/src/runtime/composables/authjs/useAuth.ts b/src/runtime/composables/authjs/useAuth.ts
@@ -64,7 +64,7 @@ function getCsrfTokenWithNuxt(nuxt: NuxtApp) {
 type SignInResult = void | { error: string | null, status: number, ok: boolean, url: any }
 const signIn: SignInFunc<SupportedProviders, SignInResult> = async (provider, options, authorizationParams) => {
   const nuxt = useNuxtApp()
-  const runtimeConfig = await callWithNuxt(nuxt, useRuntimeConfig)
+  const runtimeConfig = useRuntimeConfig()
 
   // 1. Lead to error page if no providers are available
   const configuredProviders = await getProviders()

diff --git a/src/runtime/composables/local/useAuth.ts b/src/runtime/composables/local/useAuth.ts
@@ -17,7 +17,7 @@ type Credentials = { username?: string, email?: string, password?: string } & Re
 const signIn: SignInFunc<Credentials, any> = async (credentials, signInOptions, signInParams, signInHeaders) => {
   const nuxt = useNuxtApp()
 
-  const runtimeConfig = await callWithNuxt(nuxt, useRuntimeConfig)
+  const runtimeConfig = useRuntimeConfig()
   const config = useTypedBackendConfig(runtimeConfig, 'local')
   const { path, method } = config.endpoints.signIn
   const response = await _fetch<Record<string, any>>(nuxt, path, {
@@ -75,7 +75,7 @@ const signIn: SignInFunc<Credentials, any> = async (credentials, signInOptions,
 
 const signOut: SignOutFunc = async (signOutOptions) => {
   const nuxt = useNuxtApp()
-  const runtimeConfig = await callWithNuxt(nuxt, useRuntimeConfig)
+  const runtimeConfig = useRuntimeConfig()
   const config = useTypedBackendConfig(runtimeConfig, 'local')
   const { data, token, rawToken, refreshToken, rawRefreshToken }: UseAuthStateReturn = await callWithNuxt(nuxt, useAuthState)
 

diff --git a/src/runtime/utils/extractFromRuntimeConfig.ts b/src/runtime/utils/extractFromRuntimeConfig.ts
diff --git a/src/runtime/utils/fetch.ts b/src/runtime/utils/fetch.ts
@@ -1,10 +1,15 @@
 import { resolveApiUrlPath } from './url'
 import { ERROR_PREFIX } from './logger'
-import { callWithNuxt, useRuntimeConfig } from '#app'
-import type { useNuxtApp } from '#imports'
+import { type useNuxtApp, useRuntimeConfig } from '#imports'
+import { callWithNuxt } from '#app/nuxt'
 
 export async function _fetch<T>(nuxt: ReturnType<typeof useNuxtApp>, path: string, fetchOptions?: Parameters<typeof $fetch>[1]): Promise<T> {
-  const runtimeConfig = await callWithNuxt(nuxt, useRuntimeConfig)
+  // This fixes https://github.com/sidebase/nuxt-auth/issues/927
+  const runtimeConfigOrPromise = callWithNuxt(nuxt, useRuntimeConfig)
+  const runtimeConfig = 'public' in runtimeConfigOrPromise
+    ? runtimeConfigOrPromise
+    : await runtimeConfigOrPromise
+
   const joinedPath = resolveApiUrlPath(path, runtimeConfig)
 
   // Prevent callback recursion when doing internal routing