diff --git a/src/module.ts b/src/module.ts index 8aafe5c..9574257 100644 --- a/src/module.ts +++ b/src/module.ts @@ -6,8 +6,6 @@ import { setupDevToolsUI } from './devtools' import * as providerPresets from './runtime/providers' import { generateProviderUrl, replaceInjectedParameters } from './runtime/server/utils/config' -const { resolve } = createResolver(import.meta.url) - declare module '@nuxt/schema' { interface RuntimeConfig { oidc: ModuleOptions @@ -47,12 +45,15 @@ export default defineNuxtModule({ }, defaults: DEFAULTS, setup(options, nuxt) { + const resolver = createResolver(import.meta.url) + const { resolve } = resolver + const logger = useLogger('nuxt-oidc-auth') if (!options.enabled) return // Types - nuxt.options.alias['#oidc-auth'] = resolve('./types') + nuxt.options.alias['#oidc-auth'] = resolve('./runtime/types') // App addImportsDir(resolve('./runtime/composables')) @@ -226,7 +227,7 @@ export default defineNuxtModule({ } if (options.devtools) - setupDevToolsUI(nuxt, createResolver(import.meta.url)) + setupDevToolsUI(nuxt, resolver) // Runtime Config nuxt.options.runtimeConfig.oidc = defu( diff --git a/src/runtime/types.ts b/src/runtime/types.ts index 302e6b3..25905d5 100644 --- a/src/runtime/types.ts +++ b/src/runtime/types.ts @@ -169,6 +169,8 @@ export interface AuthorizationResponse { id_token?: string } +export interface User {} + export interface UserSession { provider: ProviderKeysWithDev canRefresh: boolean @@ -176,7 +178,7 @@ export interface UserSession { singleSignOut?: boolean loggedInAt?: number updatedAt?: number - userInfo?: Record + userInfo?: User userName?: string claims?: Record accessToken?: string