fix(fetching): 🐛 Fixed a nuxt resolve bug with custom fetch

package.json

@@ -36,6 +36,7 @@
   "dependencies": {
     "@nuxt/devtools-kit": "^1.7.0",
     "@nuxt/devtools-ui-kit": "^1.7.0",
+    "@nuxt/kit": "^3.15.0",
     "consola": "^3.3.3",
     "defu": "^6.1.4",
     "h3": "^1.13.0",
@@ -51,7 +52,6 @@
     "@antfu/eslint-config": "^3.12.1",
     "@nuxt/devtools": "^1.7.0",
     "@nuxt/eslint-config": "^0.7.4",
-    "@nuxt/kit": "^3.15.0",
     "@nuxt/module-builder": "^0.8.4",
     "@nuxt/schema": "^3.15.0",
     "@nuxt/test-utils": "^3.15.1",

playground/nuxt.config.ts

@@ -2,7 +2,7 @@ import { defineNuxtConfig } from 'nuxt/config'
 
 export default defineNuxtConfig({
   modules: [
-    'nuxt-oidc-auth',
+    '../src/module',
     '@unocss/nuxt',
     '@nuxtjs/color-mode',
   ],

playground/package.json

@@ -9,7 +9,7 @@
     "generate": "nuxi generate"
   },
   "dependencies": {
-    "nuxt": "^3.13.2",
+    "nuxt": "^3.15.0",
     "vue": "^3.5.12"
   },
   "devDependencies": {

src/runtime/providers/auth0.ts

@@ -1,7 +1,6 @@
 import { ofetch } from 'ofetch'
 import { normalizeURL, withHttps, withoutTrailingSlash } from 'ufo'
-import { createProviderFetch } from '../server/utils/oidc'
-import { defineOidcProvider } from '../server/utils/provider'
+import { createProviderFetch, defineOidcProvider } from '../server/utils/provider'
 
 interface Auth0ProviderConfig {
   /**

src/runtime/providers/entra.ts

@@ -1,7 +1,6 @@
 import { ofetch } from 'ofetch'
 import { parseURL } from 'ufo'
-import { createProviderFetch } from '../server/utils/oidc'
-import { defineOidcProvider } from '../server/utils/provider'
+import { createProviderFetch, defineOidcProvider } from '../server/utils/provider'
 
 type EntraIdRequiredFields = 'clientId' | 'clientSecret' | 'authorizationUrl' | 'tokenUrl' | 'redirectUri'
 

src/runtime/providers/keycloak.ts

@@ -1,7 +1,6 @@
 import { ofetch } from 'ofetch'
 import { generateProviderUrl } from '../server/utils/config'
-import { createProviderFetch } from '../server/utils/oidc'
-import { defineOidcProvider } from '../server/utils/provider'
+import { createProviderFetch, defineOidcProvider } from '../server/utils/provider'
 
 type KeycloakRequiredFields = 'baseUrl' | 'clientId' | 'clientSecret' | 'redirectUri'
 

src/runtime/providers/zitadel.ts

@@ -1,7 +1,6 @@
 import { ofetch } from 'ofetch'
 import { normalizeURL, withHttps, withoutTrailingSlash } from 'ufo'
-import { createProviderFetch } from '../server/utils/oidc'
-import { defineOidcProvider, type OidcProviderConfig } from '../server/utils/provider'
+import { createProviderFetch, defineOidcProvider, type OidcProviderConfig } from '../server/utils/provider'
 
 type ZitadelRequiredFields = 'baseUrl' | 'clientId' | 'clientSecret'
 

src/runtime/server/handler/callback.ts

@@ -1,14 +1,14 @@
 import type { H3Event } from 'h3'
 import type { OAuthConfig, PersistentSession, ProviderKeys, TokenRequest, TokenRespose, Tokens, UserSession } from '../../types'
-import type { OidcProviderConfig } from '../utils/provider'
 // @ts-expect-error - Missing Nitro type exports in Nuxt
 import { useRuntimeConfig, useStorage } from '#imports'
 import { deleteCookie, eventHandler, getQuery, getRequestURL, readBody, sendRedirect } from 'h3'
 import { normalizeURL, parseURL } from 'ufo'
 import { textToBase64 } from 'undio'
 import * as providerPresets from '../../providers'
 import { validateConfig } from '../utils/config'
-import { configMerger, convertObjectToSnakeCase, convertTokenRequestToType, createProviderFetch, oidcErrorHandler, useOidcLogger } from '../utils/oidc'
+import { configMerger, convertObjectToSnakeCase, convertTokenRequestToType, oidcErrorHandler, useOidcLogger } from '../utils/oidc'
+import { createProviderFetch, type OidcProviderConfig } from '../utils/provider'
 import { encryptToken, type JwtPayload, parseJwtToken, validateToken } from '../utils/security'
 import { getUserSessionId, setUserSession, useAuthSession } from '../utils/session'
 

src/runtime/server/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../../../.nuxt/tsconfig.server.json"
+}

src/runtime/server/utils/oidc.ts

@@ -1,14 +1,12 @@
 import type { H3Event } from 'h3'
 import type { RefreshTokenRequest, TokenRequest, TokenRespose, UserSession } from '../../types'
-import type { OidcProviderConfig } from './provider'
 import { createConsola } from 'consola'
 import { createDefu } from 'defu'
 import { sendRedirect } from 'h3'
-import { ofetch } from 'ofetch'
 import { snakeCase } from 'scule'
 import { normalizeURL } from 'ufo'
-import { ProxyAgent } from 'undici'
 import { textToBase64 } from 'undio'
+import { createProviderFetch, type OidcProviderConfig } from './provider'
 import { parseJwtToken } from './security'
 import { clearUserSession } from './session'
 
@@ -24,14 +22,6 @@ export const configMerger = createDefu((obj, key, value) => {
   }
 })
 
-export function createProviderFetch(config: OidcProviderConfig) {
-  if (config.proxy) {
-    const proxyAgent = config.ignoreProxyCertificateErrors ? new ProxyAgent({ uri: config.proxy, requestTls: { rejectUnauthorized: false } }) : new ProxyAgent({ uri: config.proxy })
-    return ofetch.create({ dispatcher: proxyAgent })
-  }
-  return ofetch
-}
-
 export async function refreshAccessToken(refreshToken: string, config: OidcProviderConfig) {
   const logger = useOidcLogger()
   const customFetch = createProviderFetch(config)

src/runtime/server/utils/provider.ts

@@ -1,5 +1,7 @@
 import type { ProviderSessionConfig } from '../../types'
 import { createDefu } from 'defu'
+import { ofetch } from 'ofetch'
+import { ProxyAgent } from 'undici'
 
 type MakePropertiesRequired<T, K extends keyof T> = T & Required<Pick<T, K>>
 
@@ -262,3 +264,11 @@ export function defineOidcProvider<TConfig, TRequired extends keyof (OidcProvide
   const mergedConfig = configMerger(config, defaults)
   return mergedConfig as MakePropertiesRequired<Partial<typeof mergedConfig>, TRequired & 'redirectUri'>
 }
+
+export function createProviderFetch(config: OidcProviderConfig) {
+  if (config.proxy) {
+    const proxyAgent = config.ignoreProxyCertificateErrors ? new ProxyAgent({ uri: config.proxy, requestTls: { rejectUnauthorized: false } }) : new ProxyAgent({ uri: config.proxy })
+    return ofetch.create({ dispatcher: proxyAgent })
+  }
+  return ofetch
+}

tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "./.nuxt/tsconfig.json",
   "exclude": [
     "client",
+    "node_modules",
     "playground",
     "dist",
     "docs"