@lenne.tech/nest-server 11.10.2 → 11.10.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/config.env.js +16 -133
- package/dist/config.env.js.map +1 -1
- package/dist/core/common/interfaces/server-options.interface.d.ts +4 -0
- package/dist/core/modules/better-auth/better-auth.config.d.ts +3 -0
- package/dist/core/modules/better-auth/better-auth.config.js +176 -47
- package/dist/core/modules/better-auth/better-auth.config.js.map +1 -1
- package/dist/core/modules/better-auth/core-better-auth-api.middleware.d.ts +5 -1
- package/dist/core/modules/better-auth/core-better-auth-api.middleware.js +101 -8
- package/dist/core/modules/better-auth/core-better-auth-api.middleware.js.map +1 -1
- package/dist/core/modules/better-auth/core-better-auth-challenge.service.d.ts +20 -0
- package/dist/core/modules/better-auth/core-better-auth-challenge.service.js +142 -0
- package/dist/core/modules/better-auth/core-better-auth-challenge.service.js.map +1 -0
- package/dist/core/modules/better-auth/core-better-auth-user.mapper.js +1 -1
- package/dist/core/modules/better-auth/core-better-auth-user.mapper.js.map +1 -1
- package/dist/core/modules/better-auth/core-better-auth-web.helper.d.ts +2 -0
- package/dist/core/modules/better-auth/core-better-auth-web.helper.js +29 -1
- package/dist/core/modules/better-auth/core-better-auth-web.helper.js.map +1 -1
- package/dist/core/modules/better-auth/core-better-auth.controller.js +5 -13
- package/dist/core/modules/better-auth/core-better-auth.controller.js.map +1 -1
- package/dist/core/modules/better-auth/core-better-auth.middleware.d.ts +0 -1
- package/dist/core/modules/better-auth/core-better-auth.middleware.js +6 -19
- package/dist/core/modules/better-auth/core-better-auth.middleware.js.map +1 -1
- package/dist/core/modules/better-auth/core-better-auth.module.d.ts +4 -1
- package/dist/core/modules/better-auth/core-better-auth.module.js +53 -19
- package/dist/core/modules/better-auth/core-better-auth.module.js.map +1 -1
- package/dist/core/modules/better-auth/core-better-auth.resolver.js +7 -6
- package/dist/core/modules/better-auth/core-better-auth.resolver.js.map +1 -1
- package/dist/core/modules/better-auth/core-better-auth.service.d.ts +0 -2
- package/dist/core/modules/better-auth/core-better-auth.service.js +23 -37
- package/dist/core/modules/better-auth/core-better-auth.service.js.map +1 -1
- package/dist/core.module.js +3 -0
- package/dist/core.module.js.map +1 -1
- package/dist/server/modules/better-auth/better-auth.module.d.ts +4 -1
- package/dist/server/modules/better-auth/better-auth.module.js +4 -1
- package/dist/server/modules/better-auth/better-auth.module.js.map +1 -1
- package/dist/server/server.module.js +1 -4
- package/dist/server/server.module.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/config.env.ts +24 -174
- package/src/core/common/interfaces/server-options.interface.ts +288 -35
- package/src/core/modules/better-auth/INTEGRATION-CHECKLIST.md +82 -56
- package/src/core/modules/better-auth/README.md +132 -35
- package/src/core/modules/better-auth/better-auth.config.ts +402 -70
- package/src/core/modules/better-auth/core-better-auth-api.middleware.ts +158 -18
- package/src/core/modules/better-auth/core-better-auth-challenge.service.ts +254 -0
- package/src/core/modules/better-auth/core-better-auth-user.mapper.ts +1 -1
- package/src/core/modules/better-auth/core-better-auth-web.helper.ts +64 -1
- package/src/core/modules/better-auth/core-better-auth.controller.ts +6 -14
- package/src/core/modules/better-auth/core-better-auth.middleware.ts +7 -20
- package/src/core/modules/better-auth/core-better-auth.module.ts +135 -25
- package/src/core/modules/better-auth/core-better-auth.resolver.ts +7 -6
- package/src/core/modules/better-auth/core-better-auth.service.ts +27 -48
- package/src/core.module.ts +5 -0
- package/src/server/modules/better-auth/better-auth.module.ts +40 -10
- package/src/server/server.module.ts +2 -4
package/dist/config.env.js
CHANGED
|
@@ -8,55 +8,10 @@ dotenv.config();
|
|
|
8
8
|
const config = {
|
|
9
9
|
development: {
|
|
10
10
|
auth: {
|
|
11
|
-
legacyEndpoints: {
|
|
12
|
-
enabled: true,
|
|
13
|
-
},
|
|
11
|
+
legacyEndpoints: { enabled: true },
|
|
14
12
|
},
|
|
15
13
|
automaticObjectIdFiltering: true,
|
|
16
|
-
|
|
17
|
-
basePath: '/iam',
|
|
18
|
-
baseUrl: 'http://localhost:3000',
|
|
19
|
-
jwt: {
|
|
20
|
-
enabled: true,
|
|
21
|
-
expiresIn: '15m',
|
|
22
|
-
},
|
|
23
|
-
passkey: {
|
|
24
|
-
enabled: false,
|
|
25
|
-
origin: 'http://localhost:3000',
|
|
26
|
-
rpId: 'localhost',
|
|
27
|
-
rpName: 'Nest Server Development',
|
|
28
|
-
},
|
|
29
|
-
rateLimit: {
|
|
30
|
-
enabled: true,
|
|
31
|
-
max: 20,
|
|
32
|
-
message: 'Too many requests, please try again later.',
|
|
33
|
-
skipEndpoints: ['/session', '/callback'],
|
|
34
|
-
strictEndpoints: ['/sign-in', '/sign-up', '/forgot-password', '/reset-password'],
|
|
35
|
-
windowSeconds: 60,
|
|
36
|
-
},
|
|
37
|
-
secret: 'BETTER_AUTH_SECRET_DEV_32_CHARS_MIN',
|
|
38
|
-
socialProviders: {
|
|
39
|
-
apple: {
|
|
40
|
-
clientId: process.env.SOCIAL_APPLE_CLIENT_ID || '',
|
|
41
|
-
clientSecret: process.env.SOCIAL_APPLE_CLIENT_SECRET || '',
|
|
42
|
-
enabled: false,
|
|
43
|
-
},
|
|
44
|
-
github: {
|
|
45
|
-
clientId: process.env.SOCIAL_GITHUB_CLIENT_ID || '',
|
|
46
|
-
clientSecret: process.env.SOCIAL_GITHUB_CLIENT_SECRET || '',
|
|
47
|
-
enabled: false,
|
|
48
|
-
},
|
|
49
|
-
google: {
|
|
50
|
-
clientId: process.env.SOCIAL_GOOGLE_CLIENT_ID || '',
|
|
51
|
-
clientSecret: process.env.SOCIAL_GOOGLE_CLIENT_SECRET || '',
|
|
52
|
-
enabled: false,
|
|
53
|
-
},
|
|
54
|
-
},
|
|
55
|
-
twoFactor: {
|
|
56
|
-
appName: 'Nest Server Development',
|
|
57
|
-
enabled: false,
|
|
58
|
-
},
|
|
59
|
-
},
|
|
14
|
+
baseUrl: 'http://localhost:3000',
|
|
60
15
|
compression: true,
|
|
61
16
|
cookies: false,
|
|
62
17
|
email: {
|
|
@@ -148,56 +103,21 @@ const config = {
|
|
|
148
103
|
},
|
|
149
104
|
local: {
|
|
150
105
|
auth: {
|
|
151
|
-
legacyEndpoints: {
|
|
152
|
-
enabled: true,
|
|
153
|
-
},
|
|
106
|
+
legacyEndpoints: { enabled: true },
|
|
154
107
|
},
|
|
155
108
|
automaticObjectIdFiltering: true,
|
|
156
109
|
betterAuth: {
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
enabled: true,
|
|
160
|
-
jwt: {
|
|
161
|
-
enabled: true,
|
|
162
|
-
expiresIn: '15m',
|
|
163
|
-
},
|
|
164
|
-
passkey: {
|
|
165
|
-
enabled: true,
|
|
166
|
-
origin: 'http://localhost:3000',
|
|
167
|
-
rpId: 'localhost',
|
|
168
|
-
rpName: 'Nest Server Local',
|
|
169
|
-
},
|
|
170
|
-
rateLimit: {
|
|
171
|
-
enabled: true,
|
|
172
|
-
max: 100,
|
|
173
|
-
message: 'Too many requests, please try again later.',
|
|
174
|
-
skipEndpoints: ['/session', '/callback'],
|
|
175
|
-
strictEndpoints: ['/sign-in', '/sign-up', '/forgot-password', '/reset-password'],
|
|
176
|
-
windowSeconds: 60,
|
|
177
|
-
},
|
|
110
|
+
jwt: { enabled: true, expiresIn: '15m' },
|
|
111
|
+
passkey: { enabled: true, origin: 'http://localhost:3001', rpId: 'localhost', rpName: 'Nest Server Local' },
|
|
112
|
+
rateLimit: { enabled: true, max: 100, windowSeconds: 60 },
|
|
178
113
|
secret: 'BETTER_AUTH_SECRET_LOCAL_32_CHARS_M',
|
|
179
114
|
socialProviders: {
|
|
180
|
-
apple: {
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
enabled: false,
|
|
184
|
-
},
|
|
185
|
-
github: {
|
|
186
|
-
clientId: process.env.SOCIAL_GITHUB_CLIENT_ID || '',
|
|
187
|
-
clientSecret: process.env.SOCIAL_GITHUB_CLIENT_SECRET || '',
|
|
188
|
-
enabled: false,
|
|
189
|
-
},
|
|
190
|
-
google: {
|
|
191
|
-
clientId: process.env.SOCIAL_GOOGLE_CLIENT_ID || '',
|
|
192
|
-
clientSecret: process.env.SOCIAL_GOOGLE_CLIENT_SECRET || '',
|
|
193
|
-
enabled: false,
|
|
194
|
-
},
|
|
115
|
+
apple: { clientId: '', clientSecret: '', enabled: false },
|
|
116
|
+
github: { clientId: '', clientSecret: '', enabled: false },
|
|
117
|
+
google: { clientId: '', clientSecret: '', enabled: false },
|
|
195
118
|
},
|
|
196
119
|
trustedOrigins: ['http://localhost:3000', 'http://localhost:3001'],
|
|
197
|
-
twoFactor: {
|
|
198
|
-
appName: 'Nest Server Local',
|
|
199
|
-
enabled: true,
|
|
200
|
-
},
|
|
120
|
+
twoFactor: { appName: 'Nest Server Local', enabled: true },
|
|
201
121
|
},
|
|
202
122
|
compression: true,
|
|
203
123
|
cookies: false,
|
|
@@ -304,55 +224,18 @@ const config = {
|
|
|
304
224
|
},
|
|
305
225
|
production: {
|
|
306
226
|
auth: {
|
|
307
|
-
legacyEndpoints: {
|
|
308
|
-
enabled: process.env.LEGACY_AUTH_ENABLED !== 'false',
|
|
309
|
-
},
|
|
227
|
+
legacyEndpoints: { enabled: process.env.LEGACY_AUTH_ENABLED !== 'false' },
|
|
310
228
|
},
|
|
311
229
|
automaticObjectIdFiltering: true,
|
|
230
|
+
baseUrl: process.env.BASE_URL,
|
|
312
231
|
betterAuth: {
|
|
313
|
-
|
|
314
|
-
baseUrl: process.env.BETTER_AUTH_URL || 'https://example.com',
|
|
315
|
-
jwt: {
|
|
316
|
-
enabled: true,
|
|
317
|
-
expiresIn: '15m',
|
|
318
|
-
},
|
|
319
|
-
passkey: {
|
|
320
|
-
enabled: false,
|
|
321
|
-
origin: process.env.BETTER_AUTH_URL || 'https://example.com',
|
|
322
|
-
rpId: process.env.PASSKEY_RP_ID || 'example.com',
|
|
323
|
-
rpName: process.env.PASSKEY_RP_NAME || 'Nest Server Production',
|
|
324
|
-
},
|
|
325
|
-
rateLimit: {
|
|
326
|
-
enabled: process.env.RATE_LIMIT_ENABLED !== 'false',
|
|
327
|
-
max: parseInt(process.env.RATE_LIMIT_MAX || '10', 10),
|
|
328
|
-
message: process.env.RATE_LIMIT_MESSAGE || 'Too many requests, please try again later.',
|
|
329
|
-
skipEndpoints: ['/session', '/callback'],
|
|
330
|
-
strictEndpoints: ['/sign-in', '/sign-up', '/forgot-password', '/reset-password'],
|
|
331
|
-
windowSeconds: parseInt(process.env.RATE_LIMIT_WINDOW_SECONDS || '60', 10),
|
|
332
|
-
},
|
|
232
|
+
rateLimit: { enabled: process.env.RATE_LIMIT_ENABLED !== 'false', max: parseInt(process.env.RATE_LIMIT_MAX || '10', 10) },
|
|
333
233
|
secret: process.env.BETTER_AUTH_SECRET,
|
|
334
234
|
socialProviders: {
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
clientSecret: process.env.SOCIAL_APPLE_CLIENT_SECRET || '',
|
|
338
|
-
enabled: !!process.env.SOCIAL_APPLE_CLIENT_ID,
|
|
339
|
-
},
|
|
340
|
-
github: {
|
|
341
|
-
clientId: process.env.SOCIAL_GITHUB_CLIENT_ID || '',
|
|
342
|
-
clientSecret: process.env.SOCIAL_GITHUB_CLIENT_SECRET || '',
|
|
343
|
-
enabled: !!process.env.SOCIAL_GITHUB_CLIENT_ID,
|
|
344
|
-
},
|
|
345
|
-
google: {
|
|
346
|
-
clientId: process.env.SOCIAL_GOOGLE_CLIENT_ID || '',
|
|
347
|
-
clientSecret: process.env.SOCIAL_GOOGLE_CLIENT_SECRET || '',
|
|
348
|
-
enabled: !!process.env.SOCIAL_GOOGLE_CLIENT_ID,
|
|
349
|
-
},
|
|
350
|
-
},
|
|
351
|
-
trustedOrigins: process.env.TRUSTED_ORIGINS?.split(',') || [],
|
|
352
|
-
twoFactor: {
|
|
353
|
-
appName: process.env.TWO_FACTOR_APP_NAME || 'Nest Server',
|
|
354
|
-
enabled: process.env.TWO_FACTOR_ENABLED === 'true',
|
|
235
|
+
github: { clientId: process.env.SOCIAL_GITHUB_CLIENT_ID || '', clientSecret: process.env.SOCIAL_GITHUB_CLIENT_SECRET || '' },
|
|
236
|
+
google: { clientId: process.env.SOCIAL_GOOGLE_CLIENT_ID || '', clientSecret: process.env.SOCIAL_GOOGLE_CLIENT_SECRET || '' },
|
|
355
237
|
},
|
|
238
|
+
twoFactor: { appName: process.env.TWO_FACTOR_APP_NAME || 'Nest Server' },
|
|
356
239
|
},
|
|
357
240
|
compression: true,
|
|
358
241
|
cookies: false,
|
package/dist/config.env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.env.js","sourceRoot":"","sources":["../src/config.env.ts"],"names":[],"mappings":";;AAAA,+CAAkD;AAClD,iCAAiC;AACjC,+BAA4B;AAE5B,uEAA2E;
|
|
1
|
+
{"version":3,"file":"config.env.js","sourceRoot":"","sources":["../src/config.env.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,6 +38,8 @@ export interface IBetterAuthJwtConfig {
|
|
|
38
38
|
}
|
|
39
39
|
export interface IBetterAuthPasskeyConfig {
|
|
40
40
|
authenticatorAttachment?: 'cross-platform' | 'platform';
|
|
41
|
+
challengeStorage?: 'cookie' | 'database';
|
|
42
|
+
challengeTtlSeconds?: number;
|
|
41
43
|
enabled?: boolean;
|
|
42
44
|
origin?: string;
|
|
43
45
|
residentKey?: 'discouraged' | 'preferred' | 'required';
|
|
@@ -90,8 +92,10 @@ export interface IJwt {
|
|
|
90
92
|
signInOptions?: JwtSignOptions;
|
|
91
93
|
}
|
|
92
94
|
export interface IServerOptions {
|
|
95
|
+
appUrl?: string;
|
|
93
96
|
auth?: IAuth;
|
|
94
97
|
automaticObjectIdFiltering?: boolean;
|
|
98
|
+
baseUrl?: string;
|
|
95
99
|
betterAuth?: boolean | IBetterAuth;
|
|
96
100
|
brevo?: {
|
|
97
101
|
apiKey: string;
|
|
@@ -5,5 +5,8 @@ export interface CreateBetterAuthOptions {
|
|
|
5
5
|
config: IBetterAuth;
|
|
6
6
|
db: any;
|
|
7
7
|
fallbackSecrets?: (string | undefined)[];
|
|
8
|
+
serverAppUrl?: string;
|
|
9
|
+
serverBaseUrl?: string;
|
|
10
|
+
serverEnv?: string;
|
|
8
11
|
}
|
|
9
12
|
export declare function createBetterAuthInstance(options: CreateBetterAuthOptions): BetterAuthInstance | null;
|
|
@@ -17,20 +17,28 @@ function createBetterAuthInstance(options) {
|
|
|
17
17
|
if (config?.enabled === false) {
|
|
18
18
|
return null;
|
|
19
19
|
}
|
|
20
|
-
const
|
|
20
|
+
const resolvedUrls = resolveUrls(options);
|
|
21
|
+
for (const warning of resolvedUrls.warnings) {
|
|
22
|
+
logger.log(warning);
|
|
23
|
+
}
|
|
24
|
+
const passkeyNormalization = normalizePasskeyConfig(config, resolvedUrls);
|
|
25
|
+
for (const warning of passkeyNormalization.warnings) {
|
|
26
|
+
logger.warn(warning);
|
|
27
|
+
}
|
|
28
|
+
const validation = validateConfig(config, fallbackSecrets, passkeyNormalization);
|
|
21
29
|
for (const warning of validation.warnings) {
|
|
22
30
|
logger.warn(warning);
|
|
23
31
|
}
|
|
24
32
|
if (!validation.valid) {
|
|
25
33
|
throw new Error(`BetterAuth configuration invalid: ${validation.errors.join('; ')}`);
|
|
26
34
|
}
|
|
27
|
-
const plugins = buildPlugins(config);
|
|
35
|
+
const plugins = buildPlugins(config, passkeyNormalization);
|
|
28
36
|
const socialProviders = buildSocialProviders(config);
|
|
29
|
-
const trustedOrigins = buildTrustedOrigins(config);
|
|
37
|
+
const trustedOrigins = buildTrustedOrigins(config, passkeyNormalization, resolvedUrls);
|
|
30
38
|
const additionalFields = buildUserFields(config);
|
|
31
39
|
const betterAuthConfig = {
|
|
32
40
|
basePath: config.basePath || '/iam',
|
|
33
|
-
baseURL: config.baseUrl || 'http://localhost:3000',
|
|
41
|
+
baseURL: resolvedUrls.baseUrl || config.baseUrl || 'http://localhost:3000',
|
|
34
42
|
database: (0, mongodb_1.mongodbAdapter)(db),
|
|
35
43
|
emailAndPassword: {
|
|
36
44
|
enabled: config.emailAndPassword?.enabled !== false,
|
|
@@ -49,7 +57,7 @@ function createBetterAuthInstance(options) {
|
|
|
49
57
|
const finalConfig = config.options ? { ...betterAuthConfig, ...config.options } : betterAuthConfig;
|
|
50
58
|
return (0, better_auth_1.betterAuth)(finalConfig);
|
|
51
59
|
}
|
|
52
|
-
function buildPlugins(config) {
|
|
60
|
+
function buildPlugins(config, passkeyNormalization) {
|
|
53
61
|
const plugins = [];
|
|
54
62
|
const jwtExplicitlyDisabled = config.jwt === false || (typeof config.jwt === 'object' && config.jwt?.enabled === false);
|
|
55
63
|
if (!jwtExplicitlyDisabled) {
|
|
@@ -60,30 +68,31 @@ function buildPlugins(config) {
|
|
|
60
68
|
},
|
|
61
69
|
}));
|
|
62
70
|
}
|
|
63
|
-
const
|
|
64
|
-
if (
|
|
71
|
+
const twoFactorExplicitlyDisabled = config.twoFactor === false || (typeof config.twoFactor === 'object' && config.twoFactor?.enabled === false);
|
|
72
|
+
if (!twoFactorExplicitlyDisabled) {
|
|
73
|
+
const twoFactorConfig = typeof config.twoFactor === 'object' ? config.twoFactor : {};
|
|
65
74
|
plugins.push((0, plugins_1.twoFactor)({
|
|
66
75
|
issuer: twoFactorConfig.appName || 'Nest Server',
|
|
67
76
|
}));
|
|
68
77
|
}
|
|
69
|
-
|
|
70
|
-
|
|
78
|
+
if (passkeyNormalization.enabled && passkeyNormalization.normalizedConfig) {
|
|
79
|
+
const normalizedPasskey = passkeyNormalization.normalizedConfig;
|
|
71
80
|
const passkeyOptions = {
|
|
72
|
-
origin:
|
|
73
|
-
rpID:
|
|
74
|
-
rpName:
|
|
81
|
+
origin: normalizedPasskey.origin,
|
|
82
|
+
rpID: normalizedPasskey.rpId,
|
|
83
|
+
rpName: normalizedPasskey.rpName,
|
|
75
84
|
};
|
|
76
|
-
if (
|
|
77
|
-
passkeyOptions.authenticatorAttachment =
|
|
85
|
+
if (normalizedPasskey.authenticatorAttachment) {
|
|
86
|
+
passkeyOptions.authenticatorAttachment = normalizedPasskey.authenticatorAttachment;
|
|
78
87
|
}
|
|
79
|
-
if (
|
|
80
|
-
passkeyOptions.residentKey =
|
|
88
|
+
if (normalizedPasskey.residentKey) {
|
|
89
|
+
passkeyOptions.residentKey = normalizedPasskey.residentKey;
|
|
81
90
|
}
|
|
82
|
-
if (
|
|
83
|
-
passkeyOptions.userVerification =
|
|
91
|
+
if (normalizedPasskey.userVerification) {
|
|
92
|
+
passkeyOptions.userVerification = normalizedPasskey.userVerification;
|
|
84
93
|
}
|
|
85
|
-
if (
|
|
86
|
-
passkeyOptions.webAuthnChallengeCookie =
|
|
94
|
+
if (normalizedPasskey.webAuthnChallengeCookie) {
|
|
95
|
+
passkeyOptions.webAuthnChallengeCookie = normalizedPasskey.webAuthnChallengeCookie;
|
|
87
96
|
}
|
|
88
97
|
plugins.push((0, passkey_1.passkey)(passkeyOptions));
|
|
89
98
|
}
|
|
@@ -106,13 +115,15 @@ function buildSocialProviders(config) {
|
|
|
106
115
|
}
|
|
107
116
|
return socialProvidersConfig;
|
|
108
117
|
}
|
|
109
|
-
function buildTrustedOrigins(config) {
|
|
118
|
+
function buildTrustedOrigins(config, passkeyNormalization, resolvedUrls) {
|
|
110
119
|
if (config.trustedOrigins?.length) {
|
|
111
120
|
return config.trustedOrigins;
|
|
112
121
|
}
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
122
|
+
if (passkeyNormalization.enabled && passkeyNormalization.trustedOrigins?.length) {
|
|
123
|
+
return passkeyNormalization.trustedOrigins;
|
|
124
|
+
}
|
|
125
|
+
if (resolvedUrls.appUrl) {
|
|
126
|
+
return [resolvedUrls.appUrl];
|
|
116
127
|
}
|
|
117
128
|
return undefined;
|
|
118
129
|
}
|
|
@@ -167,20 +178,6 @@ function getAutoGeneratedSecret() {
|
|
|
167
178
|
}
|
|
168
179
|
return cachedAutoGeneratedSecret;
|
|
169
180
|
}
|
|
170
|
-
function getPluginConfig(config) {
|
|
171
|
-
if (!isPluginEnabled(config))
|
|
172
|
-
return undefined;
|
|
173
|
-
if (typeof config === 'boolean')
|
|
174
|
-
return {};
|
|
175
|
-
return config;
|
|
176
|
-
}
|
|
177
|
-
function isPluginEnabled(config) {
|
|
178
|
-
if (config === undefined)
|
|
179
|
-
return false;
|
|
180
|
-
if (typeof config === 'boolean')
|
|
181
|
-
return config;
|
|
182
|
-
return config.enabled !== false;
|
|
183
|
-
}
|
|
184
181
|
function isValidSecretLength(secret) {
|
|
185
182
|
return secret && secret.length >= 32;
|
|
186
183
|
}
|
|
@@ -193,7 +190,136 @@ function isValidUrl(url) {
|
|
|
193
190
|
return false;
|
|
194
191
|
}
|
|
195
192
|
}
|
|
196
|
-
|
|
193
|
+
const LOCALHOST_DEFAULTS = {
|
|
194
|
+
API_URL: 'http://localhost:3000',
|
|
195
|
+
APP_URL: 'http://localhost:3001',
|
|
196
|
+
};
|
|
197
|
+
const LOCALHOST_ENVS = ['local', 'ci', 'e2e'];
|
|
198
|
+
function deriveAppUrlFromBaseUrl(baseUrl) {
|
|
199
|
+
try {
|
|
200
|
+
const url = new URL(baseUrl);
|
|
201
|
+
const hostname = url.hostname;
|
|
202
|
+
if (hostname.startsWith('api.')) {
|
|
203
|
+
url.hostname = hostname.substring(4);
|
|
204
|
+
return url.origin;
|
|
205
|
+
}
|
|
206
|
+
return url.origin;
|
|
207
|
+
}
|
|
208
|
+
catch {
|
|
209
|
+
return baseUrl;
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
function extractRpIdFromUrl(url) {
|
|
213
|
+
try {
|
|
214
|
+
const parsedUrl = new URL(url);
|
|
215
|
+
const hostname = parsedUrl.hostname;
|
|
216
|
+
if (hostname === 'localhost' || hostname === '127.0.0.1') {
|
|
217
|
+
return 'localhost';
|
|
218
|
+
}
|
|
219
|
+
const parts = hostname.split('.');
|
|
220
|
+
if (parts.length <= 2) {
|
|
221
|
+
return hostname;
|
|
222
|
+
}
|
|
223
|
+
return parts.slice(-2).join('.');
|
|
224
|
+
}
|
|
225
|
+
catch {
|
|
226
|
+
return 'localhost';
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
function normalizePasskeyConfig(config, resolvedUrls) {
|
|
230
|
+
const warnings = [];
|
|
231
|
+
const isExplicitlyDisabled = config.passkey === false || (typeof config.passkey === 'object' && config.passkey?.enabled === false);
|
|
232
|
+
if (isExplicitlyDisabled) {
|
|
233
|
+
return { enabled: false, normalizedConfig: null, trustedOrigins: null, warnings };
|
|
234
|
+
}
|
|
235
|
+
const rawConfig = typeof config.passkey === 'object' ? config.passkey : {};
|
|
236
|
+
const finalRpId = rawConfig.rpId || resolvedUrls.rpId;
|
|
237
|
+
const finalOrigin = rawConfig.origin || resolvedUrls.appUrl;
|
|
238
|
+
const finalTrustedOrigins = config.trustedOrigins?.length ? config.trustedOrigins : resolvedUrls.appUrl ? [resolvedUrls.appUrl] : undefined;
|
|
239
|
+
const hasRequiredConfig = finalRpId && finalOrigin && finalTrustedOrigins?.length;
|
|
240
|
+
if (!hasRequiredConfig) {
|
|
241
|
+
const missingFields = [];
|
|
242
|
+
if (!finalRpId)
|
|
243
|
+
missingFields.push('rpId');
|
|
244
|
+
if (!finalOrigin)
|
|
245
|
+
missingFields.push('origin');
|
|
246
|
+
if (!finalTrustedOrigins?.length)
|
|
247
|
+
missingFields.push('trustedOrigins');
|
|
248
|
+
warnings.push(`⚠️ PASSKEY DISABLED: Cannot auto-detect required values (${missingFields.join(', ')}). ` +
|
|
249
|
+
'To enable Passkey, set baseUrl in your config or configure passkey values explicitly.');
|
|
250
|
+
warnings.push('Fix options:\n' +
|
|
251
|
+
' 1. Set baseUrl: "https://api.example.com" → auto-detects appUrl, rpId, origin\n' +
|
|
252
|
+
' 2. Set env: "local" → uses localhost:3000 (API) and localhost:3001 (App) defaults\n' +
|
|
253
|
+
' 3. Disable Passkey explicitly: passkey: false (no warning)');
|
|
254
|
+
return { enabled: false, normalizedConfig: null, trustedOrigins: null, warnings };
|
|
255
|
+
}
|
|
256
|
+
if (!rawConfig.rpId && resolvedUrls.rpId) {
|
|
257
|
+
warnings.push(`PASSKEY: Using rpId="${finalRpId}" (auto-detected from appUrl)`);
|
|
258
|
+
}
|
|
259
|
+
if (!rawConfig.origin && resolvedUrls.appUrl) {
|
|
260
|
+
warnings.push(`PASSKEY: Using origin="${finalOrigin}" (= appUrl)`);
|
|
261
|
+
}
|
|
262
|
+
if (!config.trustedOrigins?.length && resolvedUrls.appUrl) {
|
|
263
|
+
warnings.push(`PASSKEY: Using trustedOrigins=${JSON.stringify(finalTrustedOrigins)} (= [appUrl])`);
|
|
264
|
+
}
|
|
265
|
+
const normalizedConfig = {
|
|
266
|
+
origin: finalOrigin,
|
|
267
|
+
rpId: finalRpId,
|
|
268
|
+
rpName: rawConfig.rpName || 'Nest Server',
|
|
269
|
+
};
|
|
270
|
+
if (rawConfig.authenticatorAttachment) {
|
|
271
|
+
normalizedConfig.authenticatorAttachment = rawConfig.authenticatorAttachment;
|
|
272
|
+
}
|
|
273
|
+
if (rawConfig.challengeStorage) {
|
|
274
|
+
normalizedConfig.challengeStorage = rawConfig.challengeStorage;
|
|
275
|
+
}
|
|
276
|
+
if (rawConfig.challengeTtlSeconds) {
|
|
277
|
+
normalizedConfig.challengeTtlSeconds = rawConfig.challengeTtlSeconds;
|
|
278
|
+
}
|
|
279
|
+
if (rawConfig.residentKey) {
|
|
280
|
+
normalizedConfig.residentKey = rawConfig.residentKey;
|
|
281
|
+
}
|
|
282
|
+
if (rawConfig.userVerification) {
|
|
283
|
+
normalizedConfig.userVerification = rawConfig.userVerification;
|
|
284
|
+
}
|
|
285
|
+
if (rawConfig.webAuthnChallengeCookie) {
|
|
286
|
+
normalizedConfig.webAuthnChallengeCookie = rawConfig.webAuthnChallengeCookie;
|
|
287
|
+
}
|
|
288
|
+
return {
|
|
289
|
+
enabled: true,
|
|
290
|
+
normalizedConfig,
|
|
291
|
+
trustedOrigins: finalTrustedOrigins,
|
|
292
|
+
warnings,
|
|
293
|
+
};
|
|
294
|
+
}
|
|
295
|
+
function resolveUrls(options) {
|
|
296
|
+
const { config, serverAppUrl, serverBaseUrl, serverEnv } = options;
|
|
297
|
+
const warnings = [];
|
|
298
|
+
const usesLocalhostDefaults = LOCALHOST_ENVS.includes(serverEnv || '');
|
|
299
|
+
let baseUrl = config.baseUrl || serverBaseUrl;
|
|
300
|
+
if (!baseUrl && usesLocalhostDefaults) {
|
|
301
|
+
baseUrl = LOCALHOST_DEFAULTS.API_URL;
|
|
302
|
+
warnings.push(`URL: Using localhost default baseUrl="${baseUrl}" (env: '${serverEnv}')`);
|
|
303
|
+
}
|
|
304
|
+
let appUrl = serverAppUrl;
|
|
305
|
+
const isBaseUrlLocalhost = baseUrl && (baseUrl.includes('localhost') || baseUrl.includes('127.0.0.1'));
|
|
306
|
+
if (!appUrl && usesLocalhostDefaults && isBaseUrlLocalhost) {
|
|
307
|
+
appUrl = LOCALHOST_DEFAULTS.APP_URL;
|
|
308
|
+
warnings.push(`URL: Using localhost default appUrl="${appUrl}" (env: '${serverEnv}')`);
|
|
309
|
+
}
|
|
310
|
+
if (!appUrl && baseUrl) {
|
|
311
|
+
appUrl = deriveAppUrlFromBaseUrl(baseUrl);
|
|
312
|
+
if (appUrl !== baseUrl) {
|
|
313
|
+
warnings.push(`URL: Auto-derived appUrl="${appUrl}" from baseUrl="${baseUrl}"`);
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
let rpId;
|
|
317
|
+
if (appUrl) {
|
|
318
|
+
rpId = extractRpIdFromUrl(appUrl);
|
|
319
|
+
}
|
|
320
|
+
return { appUrl, baseUrl, rpId, warnings };
|
|
321
|
+
}
|
|
322
|
+
function validateConfig(config, fallbackSecrets, passkeyNormalization) {
|
|
197
323
|
const errors = [];
|
|
198
324
|
const warnings = [];
|
|
199
325
|
let secretSource = 'explicit';
|
|
@@ -236,15 +362,18 @@ function validateConfig(config, fallbackSecrets) {
|
|
|
236
362
|
}
|
|
237
363
|
}
|
|
238
364
|
}
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
365
|
+
if (passkeyNormalization?.trustedOrigins) {
|
|
366
|
+
for (const origin of passkeyNormalization.trustedOrigins) {
|
|
367
|
+
if (!isValidUrl(origin)) {
|
|
368
|
+
errors.push(`Invalid auto-detected trustedOrigin format: ${origin}`);
|
|
369
|
+
}
|
|
370
|
+
}
|
|
244
371
|
}
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
372
|
+
if (passkeyNormalization?.enabled && passkeyNormalization.normalizedConfig) {
|
|
373
|
+
const normalizedOrigin = passkeyNormalization.normalizedConfig.origin;
|
|
374
|
+
if (!isValidUrl(normalizedOrigin)) {
|
|
375
|
+
errors.push(`Invalid passkey origin format: ${normalizedOrigin}`);
|
|
376
|
+
}
|
|
248
377
|
}
|
|
249
378
|
if (config.socialProviders) {
|
|
250
379
|
for (const [name, provider] of Object.entries(config.socialProviders)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"better-auth.config.js","sourceRoot":"","sources":["../../../../src/core/modules/better-auth/better-auth.config.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"better-auth.config.js","sourceRoot":"","sources":["../../../../src/core/modules/better-auth/better-auth.config.ts"],"names":[],"mappings":";;AAqKA,4DAiFC;AAtPD,kDAA+C;AAC/C,2CAAwC;AACxC,6CAA2D;AAC3D,0DAA8D;AAC9D,iDAAqD;AACrD,iCAAiC;AAkBjC,SAAS,oBAAoB;IAC3B,OAAO,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AACnD,CAAC;AAMD,IAAI,yBAAyB,GAAkB,IAAI,CAAC;AAsIpD,SAAgB,wBAAwB,CAAC,OAAgC;IACvE,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,kBAAkB,CAAC,CAAC;IAC9C,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IAIhD,IAAI,MAAM,EAAE,OAAO,KAAK,KAAK,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC;IACd,CAAC;IAGD,MAAM,YAAY,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAG1C,KAAK,MAAM,OAAO,IAAI,YAAY,CAAC,QAAQ,EAAE,CAAC;QAC5C,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACtB,CAAC;IAKD,MAAM,oBAAoB,GAAG,sBAAsB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAG1E,KAAK,MAAM,OAAO,IAAI,oBAAoB,CAAC,QAAQ,EAAE,CAAC;QACpD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;IAGD,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,EAAE,eAAe,EAAE,oBAAoB,CAAC,CAAC;IAGjF,KAAK,MAAM,OAAO,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC;QAC1C,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;IAGD,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,qCAAqC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACvF,CAAC;IAGD,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IAC3D,MAAM,eAAe,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,mBAAmB,CAAC,MAAM,EAAE,oBAAoB,EAAE,YAAY,CAAC,CAAC;IACvF,MAAM,gBAAgB,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IAIjD,MAAM,gBAAgB,GAA4B;QAChD,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,MAAM;QACnC,OAAO,EAAE,YAAY,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,IAAI,uBAAuB;QAC1E,QAAQ,EAAE,IAAA,wBAAc,EAAC,EAAE,CAAC;QAG5B,gBAAgB,EAAE;YAChB,OAAO,EAAE,MAAM,CAAC,gBAAgB,EAAE,OAAO,KAAK,KAAK;SACpD;QACD,OAAO;QACP,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,eAAe;QACf,IAAI,EAAE;YACJ,gBAAgB;YAChB,SAAS,EAAE,OAAO;SACnB;KACF,CAAC;IAIF,IAAI,cAAc,EAAE,CAAC;QACnB,gBAAgB,CAAC,cAAc,GAAG,cAAc,CAAC;IACnD,CAAC;IAID,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,gBAAgB,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAKnG,OAAO,IAAA,wBAAU,EAAC,WAAkB,CAAC,CAAC;AACxC,CAAC;AAeD,SAAS,YAAY,CAAC,MAAmB,EAAE,oBAAgD;IACzF,MAAM,OAAO,GAAuB,EAAE,CAAC;IAIvC,MAAM,qBAAqB,GACzB,MAAM,CAAC,GAAG,KAAK,KAAK,IAAI,CAAC,OAAO,MAAM,CAAC,GAAG,KAAK,QAAQ,IAAI,MAAM,CAAC,GAAG,EAAE,OAAO,KAAK,KAAK,CAAC,CAAC;IAC5F,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC3B,MAAM,SAAS,GAAG,OAAO,MAAM,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACnE,OAAO,CAAC,IAAI,CACV,IAAA,aAAG,EAAC;YACF,GAAG,EAAE;gBACH,cAAc,EAAE,SAAS,CAAC,SAAS,IAAI,KAAK;aAC7C;SACF,CAAC,CACH,CAAC;IACJ,CAAC;IAID,MAAM,2BAA2B,GAC/B,MAAM,CAAC,SAAS,KAAK,KAAK,IAAI,CAAC,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,EAAE,OAAO,KAAK,KAAK,CAAC,CAAC;IAC9G,IAAI,CAAC,2BAA2B,EAAE,CAAC;QACjC,MAAM,eAAe,GAAG,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;QACrF,OAAO,CAAC,IAAI,CACV,IAAA,mBAAS,EAAC;YACR,MAAM,EAAE,eAAe,CAAC,OAAO,IAAI,aAAa;SACjD,CAAC,CACH,CAAC;IACJ,CAAC;IAID,IAAI,oBAAoB,CAAC,OAAO,IAAI,oBAAoB,CAAC,gBAAgB,EAAE,CAAC;QAC1E,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,gBAAgB,CAAC;QAGhE,MAAM,cAAc,GAA4B;YAC9C,MAAM,EAAE,iBAAiB,CAAC,MAAM;YAChC,IAAI,EAAE,iBAAiB,CAAC,IAAI;YAC5B,MAAM,EAAE,iBAAiB,CAAC,MAAM;SACjC,CAAC;QAGF,IAAI,iBAAiB,CAAC,uBAAuB,EAAE,CAAC;YAC9C,cAAc,CAAC,uBAAuB,GAAG,iBAAiB,CAAC,uBAAuB,CAAC;QACrF,CAAC;QACD,IAAI,iBAAiB,CAAC,WAAW,EAAE,CAAC;YAClC,cAAc,CAAC,WAAW,GAAG,iBAAiB,CAAC,WAAW,CAAC;QAC7D,CAAC;QACD,IAAI,iBAAiB,CAAC,gBAAgB,EAAE,CAAC;YACvC,cAAc,CAAC,gBAAgB,GAAG,iBAAiB,CAAC,gBAAgB,CAAC;QACvE,CAAC;QACD,IAAI,iBAAiB,CAAC,uBAAuB,EAAE,CAAC;YAC9C,cAAc,CAAC,uBAAuB,GAAG,iBAAiB,CAAC,uBAAuB,CAAC;QACrF,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,IAAA,iBAAO,EAAC,cAAc,CAAC,CAAC,CAAC;IACxC,CAAC;IAID,IAAI,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC,GAAI,MAAM,CAAC,OAA8B,CAAC,CAAC;IAC1D,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAOD,SAAS,oBAAoB,CAAC,MAAmB;IAC/C,MAAM,qBAAqB,GAAyC,EAAE,CAAC;IAKvE,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;QAC3B,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;YACtE,IAAI,QAAQ,EAAE,QAAQ,IAAI,QAAQ,EAAE,YAAY,IAAI,QAAQ,EAAE,OAAO,KAAK,KAAK,EAAE,CAAC;gBAChF,qBAAqB,CAAC,IAAI,CAAC,GAAG;oBAC5B,QAAQ,EAAE,QAAQ,CAAC,QAAQ;oBAC3B,YAAY,EAAE,QAAQ,CAAC,YAAY;iBACpC,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,qBAAqB,CAAC;AAC/B,CAAC;AAeD,SAAS,mBAAmB,CAC1B,MAAmB,EACnB,oBAAgD,EAChD,YAA0B;IAG1B,IAAI,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;QAClC,OAAO,MAAM,CAAC,cAAc,CAAC;IAC/B,CAAC;IAGD,IAAI,oBAAoB,CAAC,OAAO,IAAI,oBAAoB,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;QAChF,OAAO,oBAAoB,CAAC,cAAc,CAAC;IAC7C,CAAC;IAGD,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;QACxB,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAID,OAAO,SAAS,CAAC;AACnB,CAAC;AAOD,SAAS,eAAe,CAAC,MAAmB;IAE1C,MAAM,UAAU,GAAoC;QAClD,SAAS,EAAE;YACT,YAAY,EAAE,IAAI;YAClB,SAAS,EAAE,WAAW;YACtB,IAAI,EAAE,QAAQ;SACf;QACD,KAAK,EAAE;YACL,YAAY,EAAE,IAAI;YAClB,SAAS,EAAE,OAAO;YAClB,IAAI,EAAE,QAAQ;SACf;QACD,QAAQ,EAAE;YACR,YAAY,EAAE,IAAI;YAClB,SAAS,EAAE,UAAU;YACrB,IAAI,EAAE,QAAQ;SACf;QACD,KAAK,EAAE;YACL,YAAY,EAAE,EAAE;YAChB,SAAS,EAAE,OAAO;YAClB,IAAI,EAAE,UAAU;SACjB;QACD,gBAAgB,EAAE;YAChB,YAAY,EAAE,KAAK;YACnB,SAAS,EAAE,kBAAkB;YAC7B,IAAI,EAAE,SAAS;SAChB;QACD,QAAQ,EAAE;YACR,YAAY,EAAE,KAAK;YACnB,SAAS,EAAE,UAAU;YACrB,IAAI,EAAE,SAAS;SAChB;KACF,CAAC;IAIF,IAAI,MAAM,CAAC,oBAAoB,EAAE,CAAC;QAChC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE,CAAC;YACvE,UAAU,CAAC,GAAG,CAAC,GAAG;gBAChB,YAAY,EAAE,KAAK,CAAC,YAAY;gBAChC,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,GAAG;gBACjC,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,IAAI,EAAE,KAAK,CAAC,IAAI;aACjB,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAMD,SAAS,sBAAsB;IAC7B,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAC/B,yBAAyB,GAAG,oBAAoB,EAAE,CAAC;IACrD,CAAC;IACD,OAAO,yBAAyB,CAAC;AACnC,CAAC;AAKD,SAAS,mBAAmB,CAAC,MAAc;IACzC,OAAO,MAAM,IAAI,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;AACvC,CAAC;AAKD,SAAS,UAAU,CAAC,GAAW;IAC7B,IAAI,CAAC;QACH,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QACb,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAMD,MAAM,kBAAkB,GAAG;IACzB,OAAO,EAAE,uBAAuB;IAChC,OAAO,EAAE,uBAAuB;CACjC,CAAC;AAMF,MAAM,cAAc,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;AAiC9C,SAAS,uBAAuB,CAAC,OAAe;IAC9C,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7B,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;QAG9B,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAEhC,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YACrC,OAAO,GAAG,CAAC,MAAM,CAAC;QACpB,CAAC;QAGD,OAAO,GAAG,CAAC,MAAM,CAAC;IACpB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC;AAiBD,SAAS,kBAAkB,CAAC,GAAW;IACrC,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;QAGpC,IAAI,QAAQ,KAAK,WAAW,IAAI,QAAQ,KAAK,WAAW,EAAE,CAAC;YACzD,OAAO,WAAW,CAAC;QACrB,CAAC;QAID,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAGlC,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YACtB,OAAO,QAAQ,CAAC;QAClB,CAAC;QAID,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,WAAW,CAAC;IACrB,CAAC;AACH,CAAC;AAmBD,SAAS,sBAAsB,CAAC,MAAmB,EAAE,YAA0B;IAC7E,MAAM,QAAQ,GAAa,EAAE,CAAC;IAI9B,MAAM,oBAAoB,GACxB,MAAM,CAAC,OAAO,KAAK,KAAK,IAAI,CAAC,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,IAAI,MAAM,CAAC,OAAO,EAAE,OAAO,KAAK,KAAK,CAAC,CAAC;IAExG,IAAI,oBAAoB,EAAE,CAAC;QACzB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IACpF,CAAC;IAGD,MAAM,SAAS,GAAG,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IAG3E,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,IAAI,YAAY,CAAC,IAAI,CAAC;IACtD,MAAM,WAAW,GAAG,SAAS,CAAC,MAAM,IAAI,YAAY,CAAC,MAAM,CAAC;IAC5D,MAAM,mBAAmB,GAAG,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAG5I,MAAM,iBAAiB,GAAG,SAAS,IAAI,WAAW,IAAI,mBAAmB,EAAE,MAAM,CAAC;IAElF,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAEvB,MAAM,aAAa,GAAa,EAAE,CAAC;QACnC,IAAI,CAAC,SAAS;YAAE,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAI,CAAC,WAAW;YAAE,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC/C,IAAI,CAAC,mBAAmB,EAAE,MAAM;YAAE,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAEvE,QAAQ,CAAC,IAAI,CACX,4DAA4D,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK;YACvF,uFAAuF,CAC1F,CAAC;QACF,QAAQ,CAAC,IAAI,CACX,gBAAgB;YACd,mFAAmF;YACnF,uFAAuF;YACvF,8DAA8D,CACjE,CAAC;QAEF,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IACpF,CAAC;IAGD,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC;QACzC,QAAQ,CAAC,IAAI,CAAC,wBAAwB,SAAS,+BAA+B,CAAC,CAAC;IAClF,CAAC;IACD,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;QAC7C,QAAQ,CAAC,IAAI,CAAC,0BAA0B,WAAW,cAAc,CAAC,CAAC;IACrE,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,MAAM,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;QAC1D,QAAQ,CAAC,IAAI,CAAC,iCAAiC,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC;IACrG,CAAC;IAGD,MAAM,gBAAgB,GAA4B;QAChD,MAAM,EAAE,WAAW;QACnB,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,SAAS,CAAC,MAAM,IAAI,aAAa;KAC1C,CAAC;IAGF,IAAI,SAAS,CAAC,uBAAuB,EAAE,CAAC;QACtC,gBAAgB,CAAC,uBAAuB,GAAG,SAAS,CAAC,uBAAuB,CAAC;IAC/E,CAAC;IACD,IAAI,SAAS,CAAC,gBAAgB,EAAE,CAAC;QAC/B,gBAAgB,CAAC,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,CAAC;IACjE,CAAC;IACD,IAAI,SAAS,CAAC,mBAAmB,EAAE,CAAC;QAClC,gBAAgB,CAAC,mBAAmB,GAAG,SAAS,CAAC,mBAAmB,CAAC;IACvE,CAAC;IACD,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;QAC1B,gBAAgB,CAAC,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC;IACvD,CAAC;IACD,IAAI,SAAS,CAAC,gBAAgB,EAAE,CAAC;QAC/B,gBAAgB,CAAC,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,CAAC;IACjE,CAAC;IACD,IAAI,SAAS,CAAC,uBAAuB,EAAE,CAAC;QACtC,gBAAgB,CAAC,uBAAuB,GAAG,SAAS,CAAC,uBAAuB,CAAC;IAC/E,CAAC;IAED,OAAO;QACL,OAAO,EAAE,IAAI;QACb,gBAAgB;QAChB,cAAc,EAAE,mBAAmB;QACnC,QAAQ;KACT,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,OAAgC;IACnD,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IACnE,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,qBAAqB,GAAG,cAAc,CAAC,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IAIvE,IAAI,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,aAAa,CAAC;IAC9C,IAAI,CAAC,OAAO,IAAI,qBAAqB,EAAE,CAAC;QACtC,OAAO,GAAG,kBAAkB,CAAC,OAAO,CAAC;QACrC,QAAQ,CAAC,IAAI,CAAC,yCAAyC,OAAO,YAAY,SAAS,IAAI,CAAC,CAAC;IAC3F,CAAC;IAID,IAAI,MAAM,GAAG,YAAY,CAAC;IAI1B,MAAM,kBAAkB,GAAG,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;IACvG,IAAI,CAAC,MAAM,IAAI,qBAAqB,IAAI,kBAAkB,EAAE,CAAC;QAC3D,MAAM,GAAG,kBAAkB,CAAC,OAAO,CAAC;QACpC,QAAQ,CAAC,IAAI,CAAC,wCAAwC,MAAM,YAAY,SAAS,IAAI,CAAC,CAAC;IACzF,CAAC;IAGD,IAAI,CAAC,MAAM,IAAI,OAAO,EAAE,CAAC;QACvB,MAAM,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;YACvB,QAAQ,CAAC,IAAI,CAAC,6BAA6B,MAAM,mBAAmB,OAAO,GAAG,CAAC,CAAC;QAClF,CAAC;IACH,CAAC;IAID,IAAI,IAAwB,CAAC;IAC7B,IAAI,MAAM,EAAE,CAAC;QACX,IAAI,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;AAC7C,CAAC;AAeD,SAAS,cAAc,CACrB,MAAmB,EACnB,eAAwC,EACxC,oBAAiD;IAEjD,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,QAAQ,GAAa,EAAE,CAAC;IAG9B,IAAI,YAAY,GAA+C,UAAU,CAAC;IAG1E,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAElD,MAAM,aAAa,GAAG,eAAe,EAAE,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,IAAI,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;QAE/F,IAAI,aAAa,EAAE,CAAC;YAClB,MAAM,CAAC,MAAM,GAAG,aAAa,CAAC;YAC9B,YAAY,GAAG,UAAU,CAAC;QAC5B,CAAC;aAAM,CAAC;YAEN,MAAM,CAAC,MAAM,GAAG,sBAAsB,EAAE,CAAC;YACzC,YAAY,GAAG,gBAAgB,CAAC;QAClC,CAAC;IACH,CAAC;IAGD,MAAM,gBAAgB,GAAG,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACvD,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;QAC5B,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAQ,CAAC,CAAC;IACzC,CAAC;SAAM,IAAI,gBAAgB,CAAC,OAAO,EAAE,CAAC;QACpC,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAGD,QAAQ,YAAY,EAAE,CAAC;QACrB,KAAK,gBAAgB;YACnB,QAAQ,CAAC,IAAI,CAAC,kEAAkE,CAAC,CAAC;YAClF,QAAQ,CAAC,IAAI,CAAC,uEAAuE,CAAC,CAAC;YACvF,QAAQ,CAAC,IAAI,CACX,oGAAoG,CACrG,CAAC;YACF,QAAQ,CAAC,IAAI,CAAC,8FAA8F,CAAC,CAAC;YAC9G,MAAM;QACR,KAAK,UAAU;YACb,QAAQ,CAAC,IAAI,CACX,2GAA2G,CAC5G,CAAC;YACF,MAAM;IAEV,CAAC;IAGD,IAAI,MAAM,CAAC,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QAClD,MAAM,CAAC,IAAI,CAAC,2BAA2B,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IAC3D,CAAC;IAGD,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;QAC1B,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;YAC3C,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBACxB,MAAM,CAAC,IAAI,CAAC,iCAAiC,MAAM,EAAE,CAAC,CAAC;YACzD,CAAC;QACH,CAAC;IACH,CAAC;IAGD,IAAI,oBAAoB,EAAE,cAAc,EAAE,CAAC;QACzC,KAAK,MAAM,MAAM,IAAI,oBAAoB,CAAC,cAAc,EAAE,CAAC;YACzD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBACxB,MAAM,CAAC,IAAI,CAAC,+CAA+C,MAAM,EAAE,CAAC,CAAC;YACvE,CAAC;QACH,CAAC;IACH,CAAC;IAGD,IAAI,oBAAoB,EAAE,OAAO,IAAI,oBAAoB,CAAC,gBAAgB,EAAE,CAAC;QAC3E,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,gBAAgB,CAAC,MAAM,CAAC;QACtE,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAClC,MAAM,CAAC,IAAI,CAAC,kCAAkC,gBAAgB,EAAE,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;IAKD,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;QAC3B,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;YAEtE,IAAI,QAAQ,IAAI,QAAQ,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;gBAE3C,MAAM,WAAW,GAAG,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBACxC,MAAM,eAAe,GAAG,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC;gBAEhD,IAAI,WAAW,IAAI,eAAe,EAAE,CAAC;oBAEnC,SAAS;gBACX,CAAC;qBAAM,IAAI,WAAW,IAAI,eAAe,EAAE,CAAC;oBAE1C,IAAI,CAAC,WAAW,EAAE,CAAC;wBACjB,MAAM,CAAC,IAAI,CAAC,oBAAoB,IAAI,uBAAuB,CAAC,CAAC;oBAC/D,CAAC;oBACD,IAAI,CAAC,eAAe,EAAE,CAAC;wBACrB,MAAM,CAAC,IAAI,CAAC,oBAAoB,IAAI,2BAA2B,CAAC,CAAC;oBACnE,CAAC;gBACH,CAAC;qBAAM,CAAC;oBAGN,QAAQ,CAAC,IAAI,CACX,oBAAoB,IAAI,8DAA8D;wBACpF,qFAAqF,CACxF,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO;QACL,MAAM;QACN,KAAK,EAAE,MAAM,CAAC,MAAM,KAAK,CAAC;QAC1B,QAAQ;KACT,CAAC;AACJ,CAAC;AAMD,SAAS,cAAc,CAAC,MAAc;IACpC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;QAClC,OAAO,EAAE,OAAO,EAAE,4CAA4C,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IACjF,CAAC;IAGD,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1C,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,cAAc,GAAG,CAAC,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC;IAEnG,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO;YACL,OAAO,EAAE,qGAAqG;YAC9G,KAAK,EAAE,IAAI;SACZ,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACzB,CAAC"}
|
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
import { NestMiddleware } from '@nestjs/common';
|
|
2
2
|
import { NextFunction, Request, Response } from 'express';
|
|
3
|
+
import { CoreBetterAuthChallengeService } from './core-better-auth-challenge.service';
|
|
3
4
|
import { CoreBetterAuthService } from './core-better-auth.service';
|
|
4
5
|
export declare class CoreBetterAuthApiMiddleware implements NestMiddleware {
|
|
5
6
|
private readonly betterAuthService;
|
|
7
|
+
private readonly challengeService?;
|
|
6
8
|
private readonly logger;
|
|
7
9
|
private readonly isProd;
|
|
8
|
-
|
|
10
|
+
private loggedChallengeStorageMode;
|
|
11
|
+
constructor(betterAuthService: CoreBetterAuthService, challengeService?: CoreBetterAuthChallengeService);
|
|
12
|
+
private useDbChallengeStorage;
|
|
9
13
|
use(req: Request, res: Response, next: NextFunction): Promise<void>;
|
|
10
14
|
}
|