Skip to content

Commit 07dd6a2

Browse files
committed
fix: using user provided properties
1 parent bff2e70 commit 07dd6a2

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

src/module.ts

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { defineNuxtModule, createResolver, addServerHandler, addComponent, addPlugin, addImportsDir, addRouteMiddleware, addServerImportsDir } from '@nuxt/kit'
22
import { defu } from 'defu'
3-
import type { RuntimeModuleOptions, ModuleOptions, DatabaseConfig } from './types'
3+
import type { RuntimeModuleOptions, ModuleOptions } from './types'
44

55
export const defaultOptions: ModuleOptions = {
66
connector: {
@@ -88,20 +88,13 @@ export default defineNuxtModule<RuntimeModuleOptions>({
8888
// Add public runtime config for client-side access
8989
nuxt.options.runtimeConfig.public = nuxt.options.runtimeConfig.public || {}
9090
nuxt.options.runtimeConfig.public.nuxtUsers = {
91-
passwordValidation: {
92-
minLength: options.passwordValidation?.minLength || defaultOptions.passwordValidation.minLength,
93-
requireUppercase: options.passwordValidation?.requireUppercase ?? defaultOptions.passwordValidation.requireUppercase,
94-
requireLowercase: options.passwordValidation?.requireLowercase ?? defaultOptions.passwordValidation.requireLowercase,
95-
requireNumbers: options.passwordValidation?.requireNumbers ?? defaultOptions.passwordValidation.requireNumbers,
96-
requireSpecialChars: options.passwordValidation?.requireSpecialChars ?? defaultOptions.passwordValidation.requireSpecialChars,
97-
preventCommonPasswords: options.passwordValidation?.preventCommonPasswords ?? defaultOptions.passwordValidation.preventCommonPasswords,
98-
},
91+
passwordValidation: runtimeConfigOptions.passwordValidation,
9992
auth: {
10093
whitelist: (() => {
101-
const combinedWhitelist = [...(defaultOptions.auth?.whitelist || []), ...(options.auth?.whitelist || [])]
94+
const combinedWhitelist = [...(defaultOptions.auth?.whitelist || []), ...(runtimeConfigOptions.auth?.whitelist || [])]
10295
// Auto-whitelist related endpoints if /register is whitelisted
10396
if (combinedWhitelist.includes('/register')) {
104-
const apiBasePath = options.apiBasePath || defaultOptions.apiBasePath
97+
const apiBasePath = runtimeConfigOptions.apiBasePath || defaultOptions.apiBasePath
10598
const registrationEndpoints = [
10699
'/confirm-email', // Page route for email confirmation
107100
`${apiBasePath}/register`, // API endpoint for registration
@@ -116,9 +109,9 @@ export default defineNuxtModule<RuntimeModuleOptions>({
116109
}
117110
return combinedWhitelist
118111
})(),
119-
permissions: options.auth?.permissions || defaultOptions.auth.permissions
112+
permissions: runtimeConfigOptions.auth?.permissions || defaultOptions.auth.permissions
120113
},
121-
apiBasePath: options.apiBasePath || defaultOptions.apiBasePath
114+
apiBasePath: runtimeConfigOptions.apiBasePath || defaultOptions.apiBasePath
122115
}
123116

124117
addPlugin({

0 commit comments

Comments
 (0)