@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
|
@@ -8,11 +8,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
11
14
|
var CoreBetterAuthApiMiddleware_1;
|
|
12
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
16
|
exports.CoreBetterAuthApiMiddleware = void 0;
|
|
14
17
|
const common_1 = require("@nestjs/common");
|
|
15
18
|
const logging_helper_1 = require("../../common/helpers/logging.helper");
|
|
19
|
+
const core_better_auth_challenge_service_1 = require("./core-better-auth-challenge.service");
|
|
16
20
|
const core_better_auth_web_helper_1 = require("./core-better-auth-web.helper");
|
|
17
21
|
const core_better_auth_service_1 = require("./core-better-auth.service");
|
|
18
22
|
const CONTROLLER_HANDLED_PATHS = [
|
|
@@ -21,21 +25,40 @@ const CONTROLLER_HANDLED_PATHS = [
|
|
|
21
25
|
'/sign-out',
|
|
22
26
|
'/session',
|
|
23
27
|
];
|
|
28
|
+
const PASSKEY_GENERATE_PATHS = [
|
|
29
|
+
'/passkey/generate-register-options',
|
|
30
|
+
'/passkey/generate-authenticate-options',
|
|
31
|
+
];
|
|
32
|
+
const PASSKEY_VERIFY_PATHS = [
|
|
33
|
+
'/passkey/verify-registration',
|
|
34
|
+
'/passkey/verify-authentication',
|
|
35
|
+
];
|
|
24
36
|
let CoreBetterAuthApiMiddleware = CoreBetterAuthApiMiddleware_1 = class CoreBetterAuthApiMiddleware {
|
|
25
|
-
constructor(betterAuthService) {
|
|
37
|
+
constructor(betterAuthService, challengeService) {
|
|
26
38
|
this.betterAuthService = betterAuthService;
|
|
39
|
+
this.challengeService = challengeService;
|
|
27
40
|
this.logger = new common_1.Logger(CoreBetterAuthApiMiddleware_1.name);
|
|
28
41
|
this.isProd = (0, logging_helper_1.isProduction)();
|
|
42
|
+
this.loggedChallengeStorageMode = false;
|
|
43
|
+
}
|
|
44
|
+
useDbChallengeStorage() {
|
|
45
|
+
const enabled = this.challengeService?.isEnabled() ?? false;
|
|
46
|
+
if (enabled && !this.loggedChallengeStorageMode) {
|
|
47
|
+
this.logger.log('Passkey challenge storage: database (JWT mode compatible)');
|
|
48
|
+
this.loggedChallengeStorageMode = true;
|
|
49
|
+
}
|
|
50
|
+
return enabled;
|
|
29
51
|
}
|
|
30
52
|
async use(req, res, next) {
|
|
31
53
|
if (!this.betterAuthService.isEnabled()) {
|
|
32
54
|
return next();
|
|
33
55
|
}
|
|
34
56
|
const basePath = this.betterAuthService.getBasePath();
|
|
35
|
-
const requestPath = req.path;
|
|
57
|
+
const requestPath = req.originalUrl?.split('?')[0] || req.path;
|
|
36
58
|
if (!requestPath.startsWith(basePath)) {
|
|
37
59
|
return next();
|
|
38
60
|
}
|
|
61
|
+
this.logger.debug(`API Middleware handling: ${req.method} ${requestPath}`);
|
|
39
62
|
const relativePath = requestPath.slice(basePath.length);
|
|
40
63
|
if (CONTROLLER_HANDLED_PATHS.some((path) => relativePath === path || relativePath.startsWith(`${path}/`))) {
|
|
41
64
|
return next();
|
|
@@ -45,12 +68,34 @@ let CoreBetterAuthApiMiddleware = CoreBetterAuthApiMiddleware_1 = class CoreBett
|
|
|
45
68
|
this.logger.warn('Better Auth instance not available');
|
|
46
69
|
return next();
|
|
47
70
|
}
|
|
48
|
-
|
|
49
|
-
this.logger.debug(`Forwarding to Better Auth handler: ${req.method} ${requestPath}`);
|
|
50
|
-
}
|
|
71
|
+
this.logger.debug(`Forwarding to Better Auth handler: ${req.method} ${requestPath}`);
|
|
51
72
|
try {
|
|
73
|
+
const useDbStorage = this.useDbChallengeStorage();
|
|
74
|
+
const isPasskeyGenerate = useDbStorage && PASSKEY_GENERATE_PATHS.some((p) => relativePath === p);
|
|
75
|
+
const isPasskeyVerify = useDbStorage && PASSKEY_VERIFY_PATHS.some((p) => relativePath === p);
|
|
52
76
|
const sessionToken = (0, core_better_auth_web_helper_1.extractSessionToken)(req, basePath);
|
|
53
77
|
const config = this.betterAuthService.getConfig();
|
|
78
|
+
const cookieName = this.challengeService?.getCookieName() || 'better-auth.better-auth-passkey';
|
|
79
|
+
let challengeIdToDelete;
|
|
80
|
+
if (isPasskeyVerify && this.challengeService) {
|
|
81
|
+
const challengeId = req.body?.challengeId;
|
|
82
|
+
this.logger.debug(`Passkey verify: challengeId=${challengeId ? `${challengeId.substring(0, 8)}...` : 'MISSING'}, body keys=${Object.keys(req.body || {}).join(', ')}`);
|
|
83
|
+
if (challengeId) {
|
|
84
|
+
const verificationToken = await this.challengeService.getVerificationToken(challengeId);
|
|
85
|
+
if (verificationToken) {
|
|
86
|
+
const signedToken = (0, core_better_auth_web_helper_1.signCookieValue)(verificationToken, config.secret || '');
|
|
87
|
+
const existingCookies = req.headers.cookie || '';
|
|
88
|
+
req.headers.cookie = existingCookies
|
|
89
|
+
? `${existingCookies}; ${cookieName}=${signedToken}`
|
|
90
|
+
: `${cookieName}=${signedToken}`;
|
|
91
|
+
challengeIdToDelete = challengeId;
|
|
92
|
+
this.logger.debug(`Injected verificationToken for passkey verification`);
|
|
93
|
+
}
|
|
94
|
+
else {
|
|
95
|
+
this.logger.debug(`Challenge mapping not found: ${challengeId.substring(0, 8)}...`);
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
}
|
|
54
99
|
const webRequest = await (0, core_better_auth_web_helper_1.toWebRequest)(req, {
|
|
55
100
|
basePath,
|
|
56
101
|
baseUrl: this.betterAuthService.getBaseUrl(),
|
|
@@ -59,8 +104,54 @@ let CoreBetterAuthApiMiddleware = CoreBetterAuthApiMiddleware_1 = class CoreBett
|
|
|
59
104
|
sessionToken,
|
|
60
105
|
});
|
|
61
106
|
const response = await authInstance.handler(webRequest);
|
|
62
|
-
|
|
63
|
-
|
|
107
|
+
this.logger.debug(`Better Auth handler response: ${response.status}`);
|
|
108
|
+
if (isPasskeyGenerate && response.ok && this.challengeService) {
|
|
109
|
+
const setCookieHeaders = response.headers.getSetCookie?.() || [];
|
|
110
|
+
let verificationToken = null;
|
|
111
|
+
for (const cookieHeader of setCookieHeaders) {
|
|
112
|
+
if (cookieHeader.startsWith(`${cookieName}=`)) {
|
|
113
|
+
const cookieValue = cookieHeader.split(';')[0].split('=')[1];
|
|
114
|
+
const decodedValue = decodeURIComponent(cookieValue);
|
|
115
|
+
verificationToken = decodedValue.split('.')[0];
|
|
116
|
+
break;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
if (verificationToken) {
|
|
120
|
+
const responseClone = response.clone();
|
|
121
|
+
const responseBody = await responseClone.json();
|
|
122
|
+
const userId = responseBody?.user?.id || sessionToken || 'anonymous';
|
|
123
|
+
const type = relativePath.includes('register') ? 'registration' : 'authentication';
|
|
124
|
+
const challengeId = await this.challengeService.storeChallengeMapping(verificationToken, userId, type);
|
|
125
|
+
const enhancedBody = {
|
|
126
|
+
...responseBody,
|
|
127
|
+
challengeId,
|
|
128
|
+
};
|
|
129
|
+
const newHeaders = new Headers();
|
|
130
|
+
response.headers.forEach((value, key) => {
|
|
131
|
+
if (key.toLowerCase() !== 'set-cookie') {
|
|
132
|
+
newHeaders.set(key, value);
|
|
133
|
+
}
|
|
134
|
+
});
|
|
135
|
+
for (const cookieHeader of setCookieHeaders) {
|
|
136
|
+
if (!cookieHeader.startsWith(`${cookieName}=`)) {
|
|
137
|
+
newHeaders.append('Set-Cookie', cookieHeader);
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
const enhancedResponse = new Response(JSON.stringify(enhancedBody), {
|
|
141
|
+
headers: newHeaders,
|
|
142
|
+
status: response.status,
|
|
143
|
+
statusText: response.statusText,
|
|
144
|
+
});
|
|
145
|
+
this.logger.debug(`Stored challenge mapping with ID: ${challengeId.substring(0, 8)}...`);
|
|
146
|
+
await (0, core_better_auth_web_helper_1.sendWebResponse)(res, enhancedResponse);
|
|
147
|
+
return;
|
|
148
|
+
}
|
|
149
|
+
else {
|
|
150
|
+
this.logger.warn('Could not extract verificationToken from Set-Cookie header');
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
if (challengeIdToDelete && this.challengeService) {
|
|
154
|
+
await this.challengeService.deleteChallengeMapping(challengeIdToDelete);
|
|
64
155
|
}
|
|
65
156
|
await (0, core_better_auth_web_helper_1.sendWebResponse)(res, response);
|
|
66
157
|
}
|
|
@@ -86,6 +177,8 @@ let CoreBetterAuthApiMiddleware = CoreBetterAuthApiMiddleware_1 = class CoreBett
|
|
|
86
177
|
exports.CoreBetterAuthApiMiddleware = CoreBetterAuthApiMiddleware;
|
|
87
178
|
exports.CoreBetterAuthApiMiddleware = CoreBetterAuthApiMiddleware = CoreBetterAuthApiMiddleware_1 = __decorate([
|
|
88
179
|
(0, common_1.Injectable)(),
|
|
89
|
-
|
|
180
|
+
__param(1, (0, common_1.Optional)()),
|
|
181
|
+
__metadata("design:paramtypes", [core_better_auth_service_1.CoreBetterAuthService,
|
|
182
|
+
core_better_auth_challenge_service_1.CoreBetterAuthChallengeService])
|
|
90
183
|
], CoreBetterAuthApiMiddleware);
|
|
91
184
|
//# sourceMappingURL=core-better-auth-api.middleware.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-better-auth-api.middleware.js","sourceRoot":"","sources":["../../../../src/core/modules/better-auth/core-better-auth-api.middleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"core-better-auth-api.middleware.js","sourceRoot":"","sources":["../../../../src/core/modules/better-auth/core-better-auth-api.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA8E;AAG9E,wEAAmE;AACnE,6FAAsF;AACtF,+EAAoH;AACpH,yEAAmE;AAenE,MAAM,wBAAwB,GAAG;IAC/B,gBAAgB;IAChB,gBAAgB;IAChB,WAAW;IACX,UAAU;CACX,CAAC;AAKF,MAAM,sBAAsB,GAAG;IAC7B,oCAAoC;IACpC,wCAAwC;CACzC,CAAC;AAKF,MAAM,oBAAoB,GAAG;IAC3B,8BAA8B;IAC9B,gCAAgC;CACjC,CAAC;AAmBK,IAAM,2BAA2B,mCAAjC,MAAM,2BAA2B;IAKtC,YACmB,iBAAwC,EAC7C,gBAAkE;QAD7D,sBAAiB,GAAjB,iBAAiB,CAAuB;QAC5B,qBAAgB,GAAhB,gBAAgB,CAAiC;QAN/D,WAAM,GAAG,IAAI,eAAM,CAAC,6BAA2B,CAAC,IAAI,CAAC,CAAC;QACtD,WAAM,GAAG,IAAA,6BAAY,GAAE,CAAC;QACjC,+BAA0B,GAAG,KAAK,CAAC;IAKxC,CAAC;IAMI,qBAAqB;QAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,EAAE,SAAS,EAAE,IAAI,KAAK,CAAC;QAC5D,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,0BAA0B,EAAE,CAAC;YAChD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,2DAA2D,CAAC,CAAC;YAC7E,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC;QACzC,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QAEvD,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,EAAE,CAAC;YACxC,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,CAAC;QAGtD,MAAM,WAAW,GAAG,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC;QAG/D,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtC,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,GAAG,CAAC,MAAM,IAAI,WAAW,EAAE,CAAC,CAAC;QAG3E,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAGxD,IAAI,wBAAwB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,KAAK,IAAI,IAAI,YAAY,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC;YAC1G,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QAGD,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,CAAC;QAC1D,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;YACvD,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,GAAG,CAAC,MAAM,IAAI,WAAW,EAAE,CAAC,CAAC;QAErF,IAAI,CAAC;YAEH,MAAM,YAAY,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAClD,MAAM,iBAAiB,GAAG,YAAY,IAAI,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC;YACjG,MAAM,eAAe,GAAG,YAAY,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC;YAG7F,MAAM,YAAY,GAAG,IAAA,iDAAmB,EAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAGxD,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,CAAC;YAClD,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,EAAE,aAAa,EAAE,IAAI,iCAAiC,CAAC;YAG/F,IAAI,mBAAuC,CAAC;YAC5C,IAAI,eAAe,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAC7C,MAAM,WAAW,GAAG,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC;gBAC1C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,WAAW,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,eAAe,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACvK,IAAI,WAAW,EAAE,CAAC;oBAChB,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;oBACxF,IAAI,iBAAiB,EAAE,CAAC;wBAEtB,MAAM,WAAW,GAAG,IAAA,6CAAe,EAAC,iBAAiB,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;wBAG5E,MAAM,eAAe,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC;wBACjD,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,eAAe;4BAClC,CAAC,CAAC,GAAG,eAAe,KAAK,UAAU,IAAI,WAAW,EAAE;4BACpD,CAAC,CAAC,GAAG,UAAU,IAAI,WAAW,EAAE,CAAC;wBAEnC,mBAAmB,GAAG,WAAW,CAAC;wBAElC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC;oBAC3E,CAAC;yBAAM,CAAC;wBAEN,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;oBACtF,CAAC;gBACH,CAAC;YACH,CAAC;YAGD,MAAM,UAAU,GAAG,MAAM,IAAA,0CAAY,EAAC,GAAG,EAAE;gBACzC,QAAQ;gBACR,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE;gBAC5C,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,YAAY;aACb,CAAC,CAAC;YAGH,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAExD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;YAGtE,IAAI,iBAAiB,IAAI,QAAQ,CAAC,EAAE,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAE9D,MAAM,gBAAgB,GAAG,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,CAAC;gBACjE,IAAI,iBAAiB,GAAkB,IAAI,CAAC;gBAE5C,KAAK,MAAM,YAAY,IAAI,gBAAgB,EAAE,CAAC;oBAC5C,IAAI,YAAY,CAAC,UAAU,CAAC,GAAG,UAAU,GAAG,CAAC,EAAE,CAAC;wBAE9C,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;wBAE7D,MAAM,YAAY,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;wBAErD,iBAAiB,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC/C,MAAM;oBACR,CAAC;gBACH,CAAC;gBAED,IAAI,iBAAiB,EAAE,CAAC;oBAEtB,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC;oBACvC,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;oBAGhD,MAAM,MAAM,GAAG,YAAY,EAAE,IAAI,EAAE,EAAE,IAAI,YAAY,IAAI,WAAW,CAAC;oBACrE,MAAM,IAAI,GAAG,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,gBAAgB,CAAC;oBAGnF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CACnE,iBAAiB,EACjB,MAAM,EACN,IAAyC,CAC1C,CAAC;oBAGF,MAAM,YAAY,GAAG;wBACnB,GAAG,YAAY;wBACf,WAAW;qBACZ,CAAC;oBAIF,MAAM,UAAU,GAAG,IAAI,OAAO,EAAE,CAAC;oBACjC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;wBACtC,IAAI,GAAG,CAAC,WAAW,EAAE,KAAK,YAAY,EAAE,CAAC;4BACvC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;wBAC7B,CAAC;oBACH,CAAC,CAAC,CAAC;oBAEH,KAAK,MAAM,YAAY,IAAI,gBAAgB,EAAE,CAAC;wBAC5C,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,UAAU,GAAG,CAAC,EAAE,CAAC;4BAC/C,UAAU,CAAC,MAAM,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;wBAChD,CAAC;oBACH,CAAC;oBAGD,MAAM,gBAAgB,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE;wBAClE,OAAO,EAAE,UAAU;wBACnB,MAAM,EAAE,QAAQ,CAAC,MAAM;wBACvB,UAAU,EAAE,QAAQ,CAAC,UAAU;qBAChC,CAAC,CAAC;oBAEH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;oBAGzF,MAAM,IAAA,6CAAe,EAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;oBAE7C,OAAO;gBACT,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC;gBACjF,CAAC;YACH,CAAC;YAGD,IAAI,mBAAmB,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACjD,MAAM,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,mBAAmB,CAAC,CAAC;YAC1E,CAAC;YAGD,MAAM,IAAA,6CAAe,EAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAEf,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;YACjD,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC;YAC9G,CAAC;YAGD,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;gBACrB,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM;oBACzB,CAAC,CAAC,sBAAsB;oBACxB,CAAC,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;gBAC/D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACnB,KAAK,EAAE,8BAA8B;oBACrC,OAAO;iBACR,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;CACF,CAAA;AApNY,kEAA2B;sCAA3B,2BAA2B;IADvC,IAAA,mBAAU,GAAE;IAQR,WAAA,IAAA,iBAAQ,GAAE,CAAA;qCADyB,gDAAqB;QACT,mEAA8B;GAPrE,2BAA2B,CAoNvC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { OnModuleInit } from '@nestjs/common';
|
|
2
|
+
import { Connection } from 'mongoose';
|
|
3
|
+
import { ConfigService } from '../../common/services/config.service';
|
|
4
|
+
export declare class CoreBetterAuthChallengeService implements OnModuleInit {
|
|
5
|
+
private readonly connection;
|
|
6
|
+
private readonly configService?;
|
|
7
|
+
private readonly logger;
|
|
8
|
+
private collection;
|
|
9
|
+
private ttlSeconds;
|
|
10
|
+
private enabled;
|
|
11
|
+
constructor(connection: Connection, configService?: ConfigService);
|
|
12
|
+
onModuleInit(): Promise<void>;
|
|
13
|
+
isEnabled(): boolean;
|
|
14
|
+
storeChallengeMapping(verificationToken: string, userId: string, type: 'authentication' | 'registration'): Promise<string>;
|
|
15
|
+
getVerificationToken(challengeId: string): Promise<null | string>;
|
|
16
|
+
deleteChallengeMapping(challengeId: string): Promise<void>;
|
|
17
|
+
deleteUserChallengeMappings(userId: string): Promise<void>;
|
|
18
|
+
getTtlSeconds(): number;
|
|
19
|
+
getCookieName(): string;
|
|
20
|
+
}
|
|
@@ -0,0 +1,142 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
14
|
+
var CoreBetterAuthChallengeService_1;
|
|
15
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
+
exports.CoreBetterAuthChallengeService = void 0;
|
|
17
|
+
const common_1 = require("@nestjs/common");
|
|
18
|
+
const mongoose_1 = require("@nestjs/mongoose");
|
|
19
|
+
const crypto = require("crypto");
|
|
20
|
+
const mongoose_2 = require("mongoose");
|
|
21
|
+
const config_service_1 = require("../../common/services/config.service");
|
|
22
|
+
let CoreBetterAuthChallengeService = CoreBetterAuthChallengeService_1 = class CoreBetterAuthChallengeService {
|
|
23
|
+
constructor(connection, configService) {
|
|
24
|
+
this.connection = connection;
|
|
25
|
+
this.configService = configService;
|
|
26
|
+
this.logger = new common_1.Logger(CoreBetterAuthChallengeService_1.name);
|
|
27
|
+
this.collection = null;
|
|
28
|
+
this.ttlSeconds = 300;
|
|
29
|
+
this.enabled = false;
|
|
30
|
+
}
|
|
31
|
+
async onModuleInit() {
|
|
32
|
+
if (!this.configService) {
|
|
33
|
+
return;
|
|
34
|
+
}
|
|
35
|
+
const config = this.configService.get('betterAuth') || {};
|
|
36
|
+
const passkeyConfig = typeof config.passkey === 'object' ? config.passkey : null;
|
|
37
|
+
const isPasskeyDisabled = config.passkey === false || passkeyConfig?.enabled === false;
|
|
38
|
+
const useCookieStorage = passkeyConfig?.challengeStorage === 'cookie';
|
|
39
|
+
this.enabled = !isPasskeyDisabled && !useCookieStorage;
|
|
40
|
+
if (useCookieStorage) {
|
|
41
|
+
this.logger.log('Using cookie-based challenge storage (explicitly configured)');
|
|
42
|
+
}
|
|
43
|
+
this.ttlSeconds = passkeyConfig?.challengeTtlSeconds || 300;
|
|
44
|
+
if (!this.enabled) {
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
try {
|
|
48
|
+
if (!this.connection) {
|
|
49
|
+
this.logger.warn('MongoDB connection not available, challenge storage disabled');
|
|
50
|
+
this.enabled = false;
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
const db = this.connection.db;
|
|
54
|
+
if (!db) {
|
|
55
|
+
this.logger.warn('Database not available, challenge storage disabled');
|
|
56
|
+
this.enabled = false;
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
this.collection = db.collection('webauthn_challenge_mappings');
|
|
60
|
+
await this.collection.createIndex({ expiresAt: 1 }, { expireAfterSeconds: 0 });
|
|
61
|
+
await this.collection.createIndex({ challengeId: 1 }, { unique: true });
|
|
62
|
+
await this.collection.createIndex({ verificationToken: 1 });
|
|
63
|
+
this.logger.log('WebAuthn challenge storage initialized (database mode)');
|
|
64
|
+
}
|
|
65
|
+
catch (error) {
|
|
66
|
+
this.logger.error(`Failed to initialize challenge storage: ${error instanceof Error ? error.message : 'Unknown error'}`);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
isEnabled() {
|
|
70
|
+
return this.enabled && this.collection !== null;
|
|
71
|
+
}
|
|
72
|
+
async storeChallengeMapping(verificationToken, userId, type) {
|
|
73
|
+
if (!this.collection) {
|
|
74
|
+
throw new Error('Challenge storage not initialized');
|
|
75
|
+
}
|
|
76
|
+
const challengeId = crypto.randomBytes(32).toString('base64url');
|
|
77
|
+
const now = new Date();
|
|
78
|
+
const expiresAt = new Date(now.getTime() + this.ttlSeconds * 1000);
|
|
79
|
+
await this.collection.insertOne({
|
|
80
|
+
challengeId,
|
|
81
|
+
createdAt: now,
|
|
82
|
+
expiresAt,
|
|
83
|
+
type,
|
|
84
|
+
userId,
|
|
85
|
+
verificationToken,
|
|
86
|
+
});
|
|
87
|
+
this.logger.debug(`Stored ${type} challenge mapping for user ${userId.substring(0, 8)}...`);
|
|
88
|
+
return challengeId;
|
|
89
|
+
}
|
|
90
|
+
async getVerificationToken(challengeId) {
|
|
91
|
+
if (!this.collection) {
|
|
92
|
+
return null;
|
|
93
|
+
}
|
|
94
|
+
const doc = await this.collection.findOne({ challengeId });
|
|
95
|
+
if (!doc) {
|
|
96
|
+
this.logger.debug(`Challenge mapping not found: ${challengeId.substring(0, 8)}...`);
|
|
97
|
+
return null;
|
|
98
|
+
}
|
|
99
|
+
if (doc.expiresAt < new Date()) {
|
|
100
|
+
this.logger.debug(`Challenge mapping expired: ${challengeId.substring(0, 8)}...`);
|
|
101
|
+
return null;
|
|
102
|
+
}
|
|
103
|
+
return doc.verificationToken;
|
|
104
|
+
}
|
|
105
|
+
async deleteChallengeMapping(challengeId) {
|
|
106
|
+
if (!this.collection) {
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
109
|
+
await this.collection.deleteOne({ challengeId });
|
|
110
|
+
this.logger.debug(`Deleted challenge mapping: ${challengeId.substring(0, 8)}...`);
|
|
111
|
+
}
|
|
112
|
+
async deleteUserChallengeMappings(userId) {
|
|
113
|
+
if (!this.collection) {
|
|
114
|
+
return;
|
|
115
|
+
}
|
|
116
|
+
const result = await this.collection.deleteMany({ userId });
|
|
117
|
+
if (result.deletedCount > 0) {
|
|
118
|
+
this.logger.debug(`Deleted ${result.deletedCount} challenge mappings for user ${userId.substring(0, 8)}...`);
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
getTtlSeconds() {
|
|
122
|
+
return this.ttlSeconds;
|
|
123
|
+
}
|
|
124
|
+
getCookieName() {
|
|
125
|
+
if (!this.configService) {
|
|
126
|
+
return 'better-auth.better-auth-passkey';
|
|
127
|
+
}
|
|
128
|
+
const config = this.configService.get('betterAuth') || {};
|
|
129
|
+
const passkeyConfig = typeof config.passkey === 'object' ? config.passkey : null;
|
|
130
|
+
return passkeyConfig?.webAuthnChallengeCookie || 'better-auth.better-auth-passkey';
|
|
131
|
+
}
|
|
132
|
+
};
|
|
133
|
+
exports.CoreBetterAuthChallengeService = CoreBetterAuthChallengeService;
|
|
134
|
+
exports.CoreBetterAuthChallengeService = CoreBetterAuthChallengeService = CoreBetterAuthChallengeService_1 = __decorate([
|
|
135
|
+
(0, common_1.Injectable)(),
|
|
136
|
+
__param(0, (0, common_1.Optional)()),
|
|
137
|
+
__param(0, (0, mongoose_1.InjectConnection)()),
|
|
138
|
+
__param(1, (0, common_1.Optional)()),
|
|
139
|
+
__metadata("design:paramtypes", [mongoose_2.Connection,
|
|
140
|
+
config_service_1.ConfigService])
|
|
141
|
+
], CoreBetterAuthChallengeService);
|
|
142
|
+
//# sourceMappingURL=core-better-auth-challenge.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"core-better-auth-challenge.service.js","sourceRoot":"","sources":["../../../../src/core/modules/better-auth/core-better-auth-challenge.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,7 +74,7 @@ let CoreBetterAuthUserMapper = CoreBetterAuthUserMapper_1 = class CoreBetterAuth
|
|
|
74
74
|
verified,
|
|
75
75
|
});
|
|
76
76
|
}
|
|
77
|
-
this.logger.debug(`Better-Auth user ${sessionUser.email} not found in users collection`);
|
|
77
|
+
this.logger.debug(`Better-Auth user ${(0, logging_helper_1.maskEmail)(sessionUser.email)} not found in users collection`);
|
|
78
78
|
return this.createMappedUser({
|
|
79
79
|
email: sessionUser.email,
|
|
80
80
|
emailVerified: sessionUser.emailVerified,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-better-auth-user.mapper.js","sourceRoot":"","sources":["../../../../src/core/modules/better-auth/core-better-auth-user.mapper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA8D;AAC9D,+CAAoD;AACpD,iCAAiC;AACjC,mCAA4D;AAC5D,yCAAmC;AACnC,qCAAmC;AACnC,uCAAsC;AAGtC,MAAM,aAAa,GAAG,CAAC,QAAgB,EAAE,IAAY,EAAE,MAAc,EAAE,OAAsB,EAAmB,EAAE;IAChH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAA,eAAM,EAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE;YAC1D,IAAI,GAAG;gBAAE,MAAM,CAAC,GAAG,CAAC,CAAC;;gBAChB,OAAO,CAAC,UAAU,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,4DAAwD;AACxD,wEAAgE;AAiFzD,IAAM,wBAAwB,gCAA9B,MAAM,wBAAwB;IAGnC,YAA4C,UAAwC;QAAvB,eAAU,GAAV,UAAU,CAAa;QAFnE,WAAM,GAAG,IAAI,eAAM,CAAC,0BAAwB,CAAC,IAAI,CAAC,CAAC;IAEmB,CAAC;IAaxF,KAAK,CAAC,cAAc,CAAC,WAAkC;QACrD,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC;YAC5C,OAAO,IAAI,CAAC;QACd,CAAC;QAGD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC;YAClF,OAAO,IAAI,CAAC,gBAAgB,CAAC;gBAC3B,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,aAAa,EAAE,WAAW,CAAC,aAAa;gBACxC,KAAK,EAAE,WAAW,CAAC,EAAE;gBACrB,EAAE,EAAE,WAAW,CAAC,EAAE;gBAClB,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,KAAK,EAAE,EAAE;gBACT,QAAQ,EAAE,WAAW,CAAC,aAAa;aACpC,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC;YAGH,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC3D,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC;gBAC1C,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC;aAC/D,CAAC,CAAC;YAEH,IAAI,MAAM,EAAE,CAAC;gBAEX,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;gBAE9D,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,KAAK,IAAI,IAAI,WAAW,CAAC,aAAa,KAAK,IAAI,CAAC;gBAEhF,OAAO,IAAI,CAAC,gBAAgB,CAAC;oBAC3B,KAAK,EAAE,WAAW,CAAC,KAAK;oBACxB,aAAa,EAAE,WAAW,CAAC,aAAa;oBACxC,KAAK,EAAE,WAAW,CAAC,EAAE;oBACrB,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE;oBACzB,KAAK,EAAE,WAAW,CAAC,KAAK;oBACxB,IAAI,EAAE,WAAW,CAAC,IAAI;oBACtB,KAAK;oBACL,QAAQ;iBACT,CAAC,CAAC;YACL,CAAC;YAKD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,WAAW,CAAC,KAAK,gCAAgC,CAAC,CAAC;YAEzF,OAAO,IAAI,CAAC,gBAAgB,CAAC;gBAC3B,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,aAAa,EAAE,WAAW,CAAC,aAAa;gBACxC,KAAK,EAAE,WAAW,CAAC,EAAE;gBACrB,EAAE,EAAE,WAAW,CAAC,EAAE;gBAClB,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,KAAK,EAAE,EAAE;gBACT,QAAQ,EAAE,WAAW,CAAC,aAAa;aACpC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC;YACjH,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAKO,gBAAgB,CAAC,QAAqE;QAC5F,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC;QAEnC,OAAO;YACL,GAAG,QAAQ;YACX,2BAA2B,EAAE,IAAI;YACjC,OAAO,EAAE,CAAC,UAA6B,EAAW,EAAE;gBAClD,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;gBAG3E,IAAI,YAAY,CAAC,QAAQ,CAAC,oBAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC/C,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,IAAI,YAAY,CAAC,QAAQ,CAAC,oBAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC3C,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,IAAI,YAAY,CAAC,QAAQ,CAAC,oBAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC7C,OAAO,KAAK,CAAC;gBACf,CAAC;gBAGD,IAAI,YAAY,CAAC,QAAQ,CAAC,oBAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC/C,OAAO,QAAQ,CAAC,QAAQ,KAAK,IAAI,CAAC;gBACpC,CAAC;gBAGD,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;YAC3D,CAAC;YACD,KAAK;SACN,CAAC;IACJ,CAAC;IAqBD,KAAK,CAAC,oBAAoB,CAAC,SAAiB,EAAE,SAAiB,EAAE,aAAsB;QACrF,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mEAAmE,CAAC,CAAC;YACtF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAQ5D,MAAM,kBAAkB,GAAG,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC;YACvE,MAAM,UAAU,GAAG,EAAE,CAAC;YACtB,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC;YAGrE,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,SAAS,CAC5C,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,EAAE,EACrD,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,EAAE,EAAE,CAC1D,CAAC;YAEF,OAAO,MAAM,CAAC,aAAa,GAAG,CAAC,CAAC;QAClC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,qCAAqC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,EAAE,CAChG,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAkBD,KAAK,CAAC,uBAAuB,CAAC,SAAiB,EAAE,aAAqB;QACpE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gEAAgE,CAAC,CAAC;YACnF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC5D,MAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAGhE,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YACjE,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,OAAO,KAAK,CAAC;YACf,CAAC;YAGD,MAAM,eAAe,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC;gBACtD,UAAU,EAAE,YAAY;gBACxB,MAAM,EAAE,IAAI,CAAC,GAAG;aACjB,CAAC,CAAC;YAEH,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,OAAO,KAAK,CAAC;YACf,CAAC;YAGD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,aAAa,CAAC,CAAC;YAGvE,MAAM,iBAAiB,CAAC,SAAS,CAC/B,EAAE,GAAG,EAAE,eAAe,CAAC,GAAG,EAAE,EAC5B;gBACE,IAAI,EAAE;oBACJ,QAAQ,EAAE,UAAU;oBACpB,SAAS,EAAE,IAAI,IAAI,EAAE;iBACtB;aACF,CACF,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC;YAChH,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAcD,KAAK,CAAC,mBAAmB,CAAC,SAAiB,EAAE,aAAsB;QACjE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC5D,MAAM,kBAAkB,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAGjE,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YAEvE,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,CAAC;gBAC1B,OAAO,KAAK,CAAC;YACf,CAAC;YAOD,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;gBAC7E,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,IAAA,kBAAM,EAAC,aAAa,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;gBACrF,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,EAAE,CAAC;oBAEjC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8CAA8C,IAAA,0BAAS,EAAC,SAAS,CAAC,EAAE,CAAC,CAAC;oBACvF,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;iBAAM,CAAC;gBAEN,OAAO,KAAK,CAAC;YACf,CAAC;YAID,MAAM,WAAW,GAAG,UAAU,CAAC,GAAe,CAAC;YAC/C,MAAM,SAAS,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC;YAG5C,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;gBACtB,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;gBAEvB,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;gBAEnC,MAAM,eAAe,CAAC,SAAS,CAC7B,EAAE,GAAG,EAAE,UAAU,CAAC,GAAG,EAAE,EACvB;oBACE,IAAI,EAAE;wBACJ,aAAa,EAAE,UAAU,CAAC,QAAQ,KAAK,IAAI;wBAC3C,KAAK,EAAE,QAAQ;wBACf,EAAE,EAAE,QAAQ;wBACZ,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,SAAS;wBACxF,SAAS,EAAE,GAAG;qBACf;iBACF,CACF,CAAC;YACJ,CAAC;YAID,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC;gBACvD,UAAU,EAAE,YAAY;gBACxB,MAAM,EAAE,WAAW;aACpB,CAAC,CAAC;YAEH,IAAI,eAAe,EAAE,CAAC;gBACpB,OAAO,IAAI,CAAC;YACd,CAAC;YAGD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,aAAa,CAAC,CAAC;YAEzE,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;YAIvB,MAAM,kBAAkB,CAAC,SAAS,CAAC;gBACjC,SAAS,EAAE,SAAS;gBACpB,SAAS,EAAE,GAAG;gBACd,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE;gBACrB,QAAQ,EAAE,YAAY;gBACtB,UAAU,EAAE,YAAY;gBACxB,SAAS,EAAE,GAAG;gBACd,MAAM,EAAE,WAAW;aACpB,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC;YACjH,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAMO,UAAU;QAChB,MAAM,KAAK,GAAG,gEAAgE,CAAC;QAC/E,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;QACnE,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAiBD,uBAAuB,CAAC,QAAgB;QAEtC,IAAI,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrC,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,OAAO,IAAA,kBAAM,EAAC,QAAQ,CAAC,CAAC;IAC1B,CAAC;IAgBO,KAAK,CAAC,yBAAyB,CAAC,QAAgB;QAEtD,MAAM,kBAAkB,GAAG,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;QAGlE,MAAM,SAAS,GAAG,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAKvC,MAAM,SAAS,GAAG,EAAE,CAAC;QACrB,MAAM,aAAa,GAAG;YACpB,MAAM,EAAE,GAAG,GAAG,KAAK,GAAG,EAAE,GAAG,CAAC;YAC5B,CAAC,EAAE,KAAK;YACR,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,EAAE;SACN,CAAC;QAGF,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC,kBAAkB,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;QAGtG,OAAO,GAAG,IAAI,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;IAC1C,CAAC;IAKO,UAAU,CAAC,KAAiB;QAClC,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;aACrB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;aAC3C,IAAI,CAAC,EAAE,CAAC,CAAC;IACd,CAAC;IAiBD,KAAK,CAAC,gBAAgB,CACpB,WAAkC,EAClC,cAAoC;QAEpC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC;QACd,CAAC;QAGD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;YACxE,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC;YACH,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAG3D,MAAM,YAAY,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC;gBAChD,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC;aAC/D,CAAC,CAAC;YAEH,MAAM,UAAU,GAAwB;gBACtC,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,GAAG,CAAC,WAAW,CAAC,IAAI,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACtE,GAAG,CAAC,WAAW,CAAC,IAAI;oBAClB,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI;oBAChC,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;iBACzD,CAAC;gBACJ,GAAG,CAAC,WAAW,CAAC,aAAa,KAAK,SAAS,IAAI,EAAE,QAAQ,EAAE,WAAW,CAAC,aAAa,EAAE,CAAC;gBACvF,GAAG,CAAC,WAAW,CAAC,KAAK,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,KAAK,EAAE,CAAC;gBACvD,KAAK,EAAE,WAAW,CAAC,EAAE;gBACrB,SAAS,EAAE,IAAI,IAAI,EAAE;gBACrB,GAAG,cAAc;aAClB,CAAC;YAGF,MAAM,WAAW,GAAwB;gBACvC,IAAI,EAAE,UAAU;aACjB,CAAC;YAGF,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,WAAW,CAAC,YAAY,GAAG;oBACzB,SAAS,EAAE,IAAI,IAAI,EAAE;oBACrB,KAAK,EAAE,EAAE;iBACV,CAAC;YACJ,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,gBAAgB,CAClD;gBACE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC;aAC/D,EACD,WAAW,EACX;gBACE,cAAc,EAAE,OAAO;gBACvB,MAAM,EAAE,IAAI;aACb,CACF,CAAC;YAEF,OAAO,MAAmC,CAAC;QAC7C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC;YACjH,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAoBD,KAAK,CAAC,yBAAyB,CAAC,QAAgB,EAAE,QAAgB;QAChE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAC;YAChF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC;YACH,MAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAGhE,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC5D,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;YAEhE,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,OAAO,KAAK,CAAC;YACf,CAAC;YAID,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;gBACb,MAAM,iBAAiB,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YAC3D,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,2CAA2C,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,EAAE,CACtG,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAaD,KAAK,CAAC,sBAAsB,CAAC,MAAc,EAAE,QAAgB;QAC3D,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAC;YAChF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAG5D,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,gBAAgB,CACnD,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,EAC5C;gBACE,IAAI,EAAE;oBACJ,KAAK,EAAE,QAAQ;oBAEf,aAAa,EAAE,EAAE;oBACjB,SAAS,EAAE,IAAI,IAAI,EAAE;iBACtB;aACF,EACD,EAAE,cAAc,EAAE,OAAO,EAAE,CAC5B,CAAC;YAEF,OAAO,CAAC,CAAC,MAAM,CAAC;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,wCAAwC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,EAAE,CACnG,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAiBD,KAAK,CAAC,yBAAyB,CAAC,cAAsB;QAMpD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;YAC1E,OAAO,EAAE,eAAe,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;QACxF,CAAC;QAED,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC5D,MAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAChE,MAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAGhE,IAAI,IAAI,GAAQ,IAAI,CAAC;YAGrB,IAAI,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;YAGhE,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,IAAI,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;YAClE,CAAC;YAGD,IAAI,CAAC,IAAI,IAAI,kBAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC9C,IAAI,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,kBAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;YAC9E,CAAC;YAED,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,OAAO,EAAE,eAAe,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;YACxF,CAAC;YAED,MAAM,MAAM,GAAG,IAAI,CAAC,GAAe,CAAC;YAGpC,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YACtE,MAAM,eAAe,GAAG,cAAc,CAAC,YAAY,CAAC;YAGpD,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YACtE,MAAM,eAAe,GAAG,cAAc,CAAC,YAAY,CAAC;YAGpD,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;YACpE,MAAM,WAAW,GAAG,UAAU,CAAC,YAAY,GAAG,CAAC,CAAC;YAEhD,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,gBAAgB,IAAI,CAAC,KAAK,UAAU,WAAW,cAAc,eAAe,cAAc,eAAe,EAAE,CAC5G,CAAC;YAEF,OAAO;gBACL,eAAe;gBACf,eAAe;gBACf,OAAO,EAAE,WAAW;gBACpB,WAAW;aACZ,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC;YACtG,OAAO,EAAE,eAAe,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;QACxF,CAAC;IACH,CAAC;IAWD,KAAK,CAAC,4BAA4B,CAAC,MAAyB;QAK1D,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC;YAC/E,OAAO,EAAE,eAAe,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACpE,CAAC;QAED,IAAI,CAAC;YACH,MAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAChE,MAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAEhE,MAAM,YAAY,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,kBAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAGhF,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;YACpF,MAAM,eAAe,GAAG,cAAc,CAAC,YAAY,CAAC;YAGpD,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;YACpF,MAAM,eAAe,GAAG,cAAc,CAAC,YAAY,CAAC;YAEpD,OAAO;gBACL,eAAe;gBACf,eAAe;gBACf,OAAO,EAAE,IAAI;aACd,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC;YAC7G,OAAO,EAAE,eAAe,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACpE,CAAC;IACH,CAAC;IAWD,KAAK,CAAC,kCAAkC,CAAC,SAAiB;QACxD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC;YAClF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAG5D,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,SAAS,CAAC;gBAC7C,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC;aAC/C,CAAC,CAAC;YAEH,OAAO,MAAM,CAAC,YAAY,GAAG,CAAC,CAAC;QACjC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC;YAChH,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAmBD,KAAK,CAAC,kBAAkB;QACtB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gEAAgE,CAAC,CAAC;YACnF,OAAO;gBACL,oBAAoB,EAAE,KAAK;gBAC3B,kBAAkB,EAAE,CAAC;gBACrB,mBAAmB,EAAE,CAAC;gBACtB,qBAAqB,EAAE,CAAC;gBACxB,iBAAiB,EAAE,EAAE;gBACrB,UAAU,EAAE,CAAC;gBACb,mBAAmB,EAAE,CAAC;gBACtB,cAAc,EAAE,CAAC;aAClB,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC5D,MAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAGhE,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;YAG5D,MAAM,cAAc,GAAG,MAAM,eAAe,CAAC,cAAc,CAAC;gBAC1D,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE;aACpC,CAAC,CAAC;YAGH,MAAM,kBAAkB,GAAG,MAAM,iBAAiB;iBAC/C,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;iBACrF,OAAO,EAAE,CAAC;YACb,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,MAAM,CAAC;YAItD,MAAM,aAAa,GAAG,MAAM,eAAe;iBACxC,SAAS,CAAC;gBACT;oBACE,MAAM,EAAE;wBACN,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE;qBACpC;iBACF;gBACD;oBACE,OAAO,EAAE;wBACP,EAAE,EAAE,UAAU;wBACd,YAAY,EAAE,QAAQ;wBACtB,IAAI,EAAE,SAAS;wBACf,UAAU,EAAE,KAAK;qBAClB;iBACF;gBACD;oBACE,MAAM,EAAE;wBACN,qBAAqB,EAAE,YAAY;qBACpC;iBACF;gBACD;oBACE,MAAM,EAAE,OAAO;iBAChB;aACF,CAAC;iBACD,OAAO,EAAE,CAAC;YACb,MAAM,kBAAkB,GAAG,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC;YAGxD,MAAM,qBAAqB,GAAG,UAAU,GAAG,kBAAkB,CAAC;YAG9D,MAAM,mBAAmB,GAAG,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,kBAAkB,GAAG,UAAU,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAGjH,MAAM,YAAY,GAAG,MAAM,eAAe;iBACvC,SAAS,CAAC;gBACT;oBACE,OAAO,EAAE;wBACP,EAAE,EAAE,UAAU;wBACd,YAAY,EAAE,QAAQ;wBACtB,IAAI,EAAE,SAAS;wBACf,UAAU,EAAE,KAAK;qBAClB;iBACF;gBACD;oBACE,MAAM,EAAE;wBACN,GAAG,EAAE;4BACH,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;4BAC7B,EAAE,KAAK,EAAE,IAAI,EAAE;4BACf;gCACE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,qBAAqB,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,EAAE,CAAC;6BAClG;yBACF;qBACF;iBACF;gBACD,EAAE,MAAM,EAAE,GAAG,EAAE;gBACf,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;aAC3B,CAAC;iBACD,OAAO,EAAE,CAAC;YACb,MAAM,iBAAiB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAG3E,MAAM,oBAAoB,GAAG,UAAU,GAAG,CAAC,IAAI,kBAAkB,KAAK,UAAU,CAAC;YAEjF,OAAO;gBACL,oBAAoB;gBACpB,kBAAkB;gBAClB,mBAAmB;gBACnB,qBAAqB;gBACrB,iBAAiB;gBACjB,UAAU;gBACV,mBAAmB;gBACnB,cAAc;aACf,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC;YACjH,OAAO;gBACL,oBAAoB,EAAE,KAAK;gBAC3B,kBAAkB,EAAE,CAAC;gBACrB,mBAAmB,EAAE,CAAC;gBACtB,qBAAqB,EAAE,CAAC;gBACxB,iBAAiB,EAAE,EAAE;gBACrB,UAAU,EAAE,CAAC;gBACb,mBAAmB,EAAE,CAAC;gBACtB,cAAc,EAAE,CAAC;aAClB,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAA;AA14BY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,mBAAU,GAAE;IAIE,WAAA,IAAA,iBAAQ,GAAE,CAAA;IAAE,WAAA,IAAA,2BAAgB,GAAE,CAAA;qCAA+B,qBAAU;GAHzE,wBAAwB,CA04BpC"}
|
|
1
|
+
{"version":3,"file":"core-better-auth-user.mapper.js","sourceRoot":"","sources":["../../../../src/core/modules/better-auth/core-better-auth-user.mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,9 @@ export interface ToWebRequestOptions {
|
|
|
13
13
|
sessionToken?: null | string;
|
|
14
14
|
}
|
|
15
15
|
export declare function extractSessionToken(req: Request, basePath?: string): null | string;
|
|
16
|
+
export declare function isAlreadySigned(value: string): boolean;
|
|
16
17
|
export declare function parseCookieHeader(cookieHeader: string | undefined): Record<string, string>;
|
|
17
18
|
export declare function sendWebResponse(res: Response, webResponse: globalThis.Response): Promise<void>;
|
|
18
19
|
export declare function signCookieValue(value: string, secret: string): string;
|
|
20
|
+
export declare function signCookieValueIfNeeded(value: string, secret: string, logger?: Logger): string;
|
|
19
21
|
export declare function toWebRequest(req: Request, options: ToWebRequestOptions): Promise<globalThis.Request>;
|
|
@@ -2,9 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.MAX_BODY_SIZE = exports.BETTER_AUTH_COOKIE_NAMES = void 0;
|
|
4
4
|
exports.extractSessionToken = extractSessionToken;
|
|
5
|
+
exports.isAlreadySigned = isAlreadySigned;
|
|
5
6
|
exports.parseCookieHeader = parseCookieHeader;
|
|
6
7
|
exports.sendWebResponse = sendWebResponse;
|
|
7
8
|
exports.signCookieValue = signCookieValue;
|
|
9
|
+
exports.signCookieValueIfNeeded = signCookieValueIfNeeded;
|
|
8
10
|
exports.toWebRequest = toWebRequest;
|
|
9
11
|
const crypto = require("crypto");
|
|
10
12
|
exports.BETTER_AUTH_COOKIE_NAMES = {
|
|
@@ -32,6 +34,25 @@ function extractSessionToken(req, basePath = 'iam') {
|
|
|
32
34
|
}
|
|
33
35
|
return null;
|
|
34
36
|
}
|
|
37
|
+
function isAlreadySigned(value) {
|
|
38
|
+
if (!value) {
|
|
39
|
+
return false;
|
|
40
|
+
}
|
|
41
|
+
let decodedValue = value;
|
|
42
|
+
try {
|
|
43
|
+
decodedValue = decodeURIComponent(value);
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
}
|
|
47
|
+
const dotCount = (decodedValue.match(/\./g) || []).length;
|
|
48
|
+
if (dotCount !== 1) {
|
|
49
|
+
return false;
|
|
50
|
+
}
|
|
51
|
+
const lastDotIndex = decodedValue.lastIndexOf('.');
|
|
52
|
+
const potentialSignature = decodedValue.substring(lastDotIndex + 1);
|
|
53
|
+
const base64Regex = /^[A-Za-z0-9+/]+=*$/;
|
|
54
|
+
return potentialSignature.length >= 20 && base64Regex.test(potentialSignature);
|
|
55
|
+
}
|
|
35
56
|
function parseCookieHeader(cookieHeader) {
|
|
36
57
|
if (!cookieHeader) {
|
|
37
58
|
return {};
|
|
@@ -82,6 +103,13 @@ function signCookieValue(value, secret) {
|
|
|
82
103
|
const signedValue = `${value}.${signature}`;
|
|
83
104
|
return encodeURIComponent(signedValue);
|
|
84
105
|
}
|
|
106
|
+
function signCookieValueIfNeeded(value, secret, logger) {
|
|
107
|
+
if (isAlreadySigned(value)) {
|
|
108
|
+
logger?.debug?.('Cookie value appears to be already signed, skipping signing');
|
|
109
|
+
return value.includes('%') ? value : encodeURIComponent(value);
|
|
110
|
+
}
|
|
111
|
+
return signCookieValue(value, secret);
|
|
112
|
+
}
|
|
85
113
|
async function toWebRequest(req, options) {
|
|
86
114
|
const { basePath, baseUrl, logger, secret, sessionToken } = options;
|
|
87
115
|
const url = new URL(req.originalUrl || req.url, baseUrl);
|
|
@@ -100,7 +128,7 @@ async function toWebRequest(req, options) {
|
|
|
100
128
|
const existingCookieString = headers.get('cookie') || '';
|
|
101
129
|
let signedToken;
|
|
102
130
|
if (secret) {
|
|
103
|
-
signedToken =
|
|
131
|
+
signedToken = signCookieValueIfNeeded(sessionToken, secret, logger);
|
|
104
132
|
}
|
|
105
133
|
else {
|
|
106
134
|
logger?.warn('No Better Auth secret configured - cookies will not be signed');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-better-auth-web.helper.js","sourceRoot":"","sources":["../../../../src/core/modules/better-auth/core-better-auth-web.helper.ts"],"names":[],"mappings":";;;AAiDA,kDA4BC;AAQD,8CAgBC;AAWD,0CA6BC;AAaD,0CAWC;AAaD,
|
|
1
|
+
{"version":3,"file":"core-better-auth-web.helper.js","sourceRoot":"","sources":["../../../../src/core/modules/better-auth/core-better-auth-web.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -127,7 +127,7 @@ let CoreBetterAuthController = CoreBetterAuthController_1 = class CoreBetterAuth
|
|
|
127
127
|
try {
|
|
128
128
|
const migrated = await this.userMapper.migrateAccountToIam(input.email, input.password);
|
|
129
129
|
if (migrated) {
|
|
130
|
-
this.logger.debug(`Migrated legacy user ${input.email} to IAM`);
|
|
130
|
+
this.logger.debug(`Migrated legacy user ${(0, logging_helper_1.maskEmail)(input.email)} to IAM`);
|
|
131
131
|
}
|
|
132
132
|
}
|
|
133
133
|
catch (error) {
|
|
@@ -145,9 +145,7 @@ let CoreBetterAuthController = CoreBetterAuthController_1 = class CoreBetterAuth
|
|
|
145
145
|
throw new common_1.UnauthorizedException('Invalid credentials');
|
|
146
146
|
}
|
|
147
147
|
if ((0, better_auth_types_1.requires2FA)(response)) {
|
|
148
|
-
|
|
149
|
-
this.logger.debug(`2FA required for ${input.email}, forwarding to native handler for cookie handling`);
|
|
150
|
-
}
|
|
148
|
+
this.logger.debug(`2FA required for ${(0, logging_helper_1.maskEmail)(input.email)}, forwarding to native handler for cookie handling`);
|
|
151
149
|
const authInstance = this.betterAuthService.getInstance();
|
|
152
150
|
if (!authInstance) {
|
|
153
151
|
throw new common_1.InternalServerErrorException('Better-Auth not initialized');
|
|
@@ -375,14 +373,10 @@ let CoreBetterAuthController = CoreBetterAuthController_1 = class CoreBetterAuth
|
|
|
375
373
|
if (!authInstance) {
|
|
376
374
|
throw new common_1.InternalServerErrorException('Better-Auth not initialized');
|
|
377
375
|
}
|
|
378
|
-
|
|
379
|
-
this.logger.debug(`Forwarding to Better Auth: ${req.method} ${req.path}`);
|
|
380
|
-
}
|
|
376
|
+
this.logger.debug(`Forwarding to Better Auth: ${req.method} ${req.path}`);
|
|
381
377
|
try {
|
|
382
378
|
const sessionToken = this.getSessionTokenFromRequest(req);
|
|
383
|
-
|
|
384
|
-
this.logger.debug(`Session token for forwarding: ${(0, logging_helper_1.maskToken)(sessionToken)}`);
|
|
385
|
-
}
|
|
379
|
+
this.logger.debug(`Session token for forwarding: ${(0, logging_helper_1.maskToken)(sessionToken)}`);
|
|
386
380
|
const config = this.betterAuthService.getConfig();
|
|
387
381
|
const webRequest = await (0, core_better_auth_web_helper_1.toWebRequest)(req, {
|
|
388
382
|
basePath: this.betterAuthService.getBasePath(),
|
|
@@ -392,9 +386,7 @@ let CoreBetterAuthController = CoreBetterAuthController_1 = class CoreBetterAuth
|
|
|
392
386
|
sessionToken,
|
|
393
387
|
});
|
|
394
388
|
const response = await authInstance.handler(webRequest);
|
|
395
|
-
|
|
396
|
-
this.logger.debug(`Better Auth handler response status: ${response.status}`);
|
|
397
|
-
}
|
|
389
|
+
this.logger.debug(`Better Auth handler response status: ${response.status}`);
|
|
398
390
|
await (0, core_better_auth_web_helper_1.sendWebResponse)(res, response);
|
|
399
391
|
}
|
|
400
392
|
catch (error) {
|