@lenne.tech/nest-server 11.7.1 → 11.7.2
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/core/common/interfaces/server-options.interface.d.ts +18 -15
- package/dist/core/modules/auth/core-auth.controller.js +2 -2
- package/dist/core/modules/auth/core-auth.controller.js.map +1 -1
- package/dist/core/modules/auth/core-auth.resolver.js +2 -2
- package/dist/core/modules/auth/core-auth.resolver.js.map +1 -1
- package/dist/core/modules/auth/services/legacy-auth-rate-limiter.service.js +1 -1
- package/dist/core/modules/auth/services/legacy-auth-rate-limiter.service.js.map +1 -1
- package/dist/core/modules/better-auth/better-auth-rate-limiter.service.js +1 -1
- package/dist/core/modules/better-auth/better-auth-rate-limiter.service.js.map +1 -1
- package/dist/core/modules/better-auth/better-auth-user.mapper.js +7 -55
- package/dist/core/modules/better-auth/better-auth-user.mapper.js.map +1 -1
- package/dist/core/modules/better-auth/better-auth.config.js +29 -10
- package/dist/core/modules/better-auth/better-auth.config.js.map +1 -1
- package/dist/core/modules/better-auth/better-auth.middleware.d.ts +1 -0
- package/dist/core/modules/better-auth/better-auth.middleware.js +55 -1
- package/dist/core/modules/better-auth/better-auth.middleware.js.map +1 -1
- package/dist/core/modules/better-auth/better-auth.module.d.ts +1 -1
- package/dist/core/modules/better-auth/better-auth.module.js +46 -18
- package/dist/core/modules/better-auth/better-auth.module.js.map +1 -1
- package/dist/core/modules/better-auth/better-auth.resolver.js +0 -11
- package/dist/core/modules/better-auth/better-auth.resolver.js.map +1 -1
- package/dist/core/modules/better-auth/better-auth.service.d.ts +22 -1
- package/dist/core/modules/better-auth/better-auth.service.js +209 -8
- package/dist/core/modules/better-auth/better-auth.service.js.map +1 -1
- package/dist/core/modules/better-auth/better-auth.types.d.ts +2 -0
- package/dist/core/modules/better-auth/better-auth.types.js.map +1 -1
- package/dist/core/modules/better-auth/core-better-auth.resolver.d.ts +5 -0
- package/dist/core/modules/better-auth/core-better-auth.resolver.js +58 -12
- package/dist/core/modules/better-auth/core-better-auth.resolver.js.map +1 -1
- package/dist/core.module.js +6 -3
- package/dist/core.module.js.map +1 -1
- package/dist/server/modules/better-auth/better-auth.module.d.ts +1 -1
- package/dist/server/modules/better-auth/better-auth.module.js +2 -1
- package/dist/server/modules/better-auth/better-auth.module.js.map +1 -1
- package/dist/server/modules/better-auth/better-auth.resolver.d.ts +3 -0
- package/dist/server/modules/better-auth/better-auth.resolver.js +14 -11
- package/dist/server/modules/better-auth/better-auth.resolver.js.map +1 -1
- package/dist/server/modules/user/user.controller.js +0 -8
- package/dist/server/modules/user/user.controller.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/core/common/interfaces/server-options.interface.ts +129 -58
- package/src/core/modules/auth/core-auth.controller.ts +2 -2
- package/src/core/modules/auth/core-auth.resolver.ts +2 -2
- package/src/core/modules/auth/services/legacy-auth-rate-limiter.service.ts +1 -1
- package/src/core/modules/better-auth/INTEGRATION-CHECKLIST.md +12 -11
- package/src/core/modules/better-auth/README.md +82 -43
- package/src/core/modules/better-auth/better-auth-rate-limiter.service.ts +1 -1
- package/src/core/modules/better-auth/better-auth-user.mapper.ts +9 -77
- package/src/core/modules/better-auth/better-auth.config.ts +45 -15
- package/src/core/modules/better-auth/better-auth.middleware.ts +85 -2
- package/src/core/modules/better-auth/better-auth.module.ts +83 -27
- package/src/core/modules/better-auth/better-auth.resolver.ts +0 -11
- package/src/core/modules/better-auth/better-auth.service.ts +367 -12
- package/src/core/modules/better-auth/better-auth.types.ts +16 -0
- package/src/core/modules/better-auth/core-better-auth.resolver.ts +111 -16
- package/src/core.module.ts +9 -3
- package/src/server/modules/better-auth/better-auth.module.ts +9 -3
- package/src/server/modules/better-auth/better-auth.resolver.ts +9 -11
- package/src/server/modules/user/user.controller.ts +1 -9
|
@@ -40,26 +40,25 @@ export interface IBetterAuth {
|
|
|
40
40
|
enabled?: boolean;
|
|
41
41
|
};
|
|
42
42
|
enabled?: boolean;
|
|
43
|
-
jwt?:
|
|
44
|
-
enabled?: boolean;
|
|
45
|
-
expiresIn?: string;
|
|
46
|
-
};
|
|
43
|
+
jwt?: boolean | IBetterAuthJwtConfig;
|
|
47
44
|
options?: Record<string, unknown>;
|
|
48
|
-
passkey?:
|
|
49
|
-
enabled?: boolean;
|
|
50
|
-
origin?: string;
|
|
51
|
-
rpId?: string;
|
|
52
|
-
rpName?: string;
|
|
53
|
-
};
|
|
45
|
+
passkey?: boolean | IBetterAuthPasskeyConfig;
|
|
54
46
|
plugins?: unknown[];
|
|
55
47
|
rateLimit?: IBetterAuthRateLimit;
|
|
56
48
|
secret?: string;
|
|
57
49
|
socialProviders?: Record<string, IBetterAuthSocialProvider>;
|
|
58
50
|
trustedOrigins?: string[];
|
|
59
|
-
twoFactor?:
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
51
|
+
twoFactor?: boolean | IBetterAuthTwoFactorConfig;
|
|
52
|
+
}
|
|
53
|
+
export interface IBetterAuthJwtConfig {
|
|
54
|
+
enabled?: boolean;
|
|
55
|
+
expiresIn?: string;
|
|
56
|
+
}
|
|
57
|
+
export interface IBetterAuthPasskeyConfig {
|
|
58
|
+
enabled?: boolean;
|
|
59
|
+
origin?: string;
|
|
60
|
+
rpId?: string;
|
|
61
|
+
rpName?: string;
|
|
63
62
|
}
|
|
64
63
|
export interface IBetterAuthRateLimit {
|
|
65
64
|
enabled?: boolean;
|
|
@@ -74,6 +73,10 @@ export interface IBetterAuthSocialProvider {
|
|
|
74
73
|
clientSecret: string;
|
|
75
74
|
enabled?: boolean;
|
|
76
75
|
}
|
|
76
|
+
export interface IBetterAuthTwoFactorConfig {
|
|
77
|
+
appName?: string;
|
|
78
|
+
enabled?: boolean;
|
|
79
|
+
}
|
|
77
80
|
export interface IBetterAuthUserField {
|
|
78
81
|
defaultValue?: unknown;
|
|
79
82
|
fieldName?: string;
|
|
@@ -91,7 +94,7 @@ export interface IJwt {
|
|
|
91
94
|
export interface IServerOptions {
|
|
92
95
|
auth?: IAuth;
|
|
93
96
|
automaticObjectIdFiltering?: boolean;
|
|
94
|
-
betterAuth?: IBetterAuth;
|
|
97
|
+
betterAuth?: boolean | IBetterAuth;
|
|
95
98
|
brevo?: {
|
|
96
99
|
apiKey: string;
|
|
97
100
|
exclude?: RegExp;
|
|
@@ -91,8 +91,8 @@ __decorate([
|
|
|
91
91
|
(0, swagger_1.ApiQuery)({ description: 'If all devices should be logged out,', name: 'allDevices', required: false, type: Boolean }),
|
|
92
92
|
(0, swagger_1.ApiTooManyRequestsResponse)({ description: 'Rate limit exceeded' }),
|
|
93
93
|
(0, common_1.Get)('logout'),
|
|
94
|
-
(0, roles_decorator_1.Roles)(role_enum_1.RoleEnum.
|
|
95
|
-
(0, common_1.UseGuards)(legacy_auth_rate_limit_guard_1.LegacyAuthRateLimitGuard
|
|
94
|
+
(0, roles_decorator_1.Roles)(role_enum_1.RoleEnum.S_USER),
|
|
95
|
+
(0, common_1.UseGuards)(legacy_auth_rate_limit_guard_1.LegacyAuthRateLimitGuard),
|
|
96
96
|
__param(0, (0, current_user_decorator_1.CurrentUser)()),
|
|
97
97
|
__param(1, (0, tokens_decorator_1.Tokens)('token')),
|
|
98
98
|
__param(2, (0, common_1.Res)({ passthrough: true })),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-auth.controller.js","sourceRoot":"","sources":["../../../../src/core/modules/auth/core-auth.controller.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"core-auth.controller.js","sourceRoot":"","sources":["../../../../src/core/modules/auth/core-auth.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,8 +86,8 @@ let CoreAuthResolver = class CoreAuthResolver {
|
|
|
86
86
|
exports.CoreAuthResolver = CoreAuthResolver;
|
|
87
87
|
__decorate([
|
|
88
88
|
(0, graphql_1.Mutation)(() => Boolean, { description: 'Logout user (from specific device)' }),
|
|
89
|
-
(0, roles_decorator_1.Roles)(role_enum_1.RoleEnum.
|
|
90
|
-
(0, common_1.UseGuards)(legacy_auth_rate_limit_guard_1.LegacyAuthRateLimitGuard
|
|
89
|
+
(0, roles_decorator_1.Roles)(role_enum_1.RoleEnum.S_USER),
|
|
90
|
+
(0, common_1.UseGuards)(legacy_auth_rate_limit_guard_1.LegacyAuthRateLimitGuard),
|
|
91
91
|
__param(0, (0, current_user_decorator_1.CurrentUser)()),
|
|
92
92
|
__param(1, (0, graphql_1.Context)()),
|
|
93
93
|
__param(2, (0, tokens_decorator_1.Tokens)('token')),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-auth.resolver.js","sourceRoot":"","sources":["../../../../src/core/modules/auth/core-auth.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA2C;AAC3C,6CAAoE;AAGpE,2FAA6E;AAC7E,iHAAkG;AAClG,6EAAgE;AAChE,4DAAwD;AAExD,yEAAqE;AACrE,yEAA+D;AAC/D,uDAAkD;AAClD,gGAA0F;AAC1F,oDAAgD;AAChD,wFAAiF;AACjF,8EAAuE;AACvE,8EAAuE;AAEvE,oEAA+D;AAC/D,yDAA4C;AA2BrC,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAI3B,YACqB,WAA4B,EAC5B,aAA4B;QAD5B,gBAAW,GAAX,WAAW,CAAiB;QAC5B,kBAAa,GAAb,aAAa,CAAe;IAC9C,CAAC;IAeM,yBAAyB,CAAC,YAAoB;QACtD,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACjE,MAAM,YAAY,GAAG,UAAU,EAAE,eAAe,CAAC;QAGjD,IAAI,YAAY,EAAE,OAAO,KAAK,KAAK,EAAE,CAAC;YACpC,MAAM,IAAI,4DAA2B,CAAC,YAAY,CAAC,CAAC;QACtD,CAAC;QAGD,IAAI,YAAY,EAAE,OAAO,KAAK,KAAK,EAAE,CAAC;YACpC,MAAM,IAAI,4DAA2B,CAAC,YAAY,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IAeK,AAAN,KAAK,CAAC,MAAM,CACK,WAA0B,EAC9B,GAA0B,EACpB,KAAa,EACU,UAAoB;QAE5D,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC;QACjF,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IAWK,AAAN,KAAK,CAAC,YAAY,CACD,IAAmB,EACV,YAAoB,EACjC,GAA0B;QAErC,IAAI,CAAC,yBAAyB,CAAC,cAAc,CAAC,CAAC;QAC/C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IAaK,AAAN,KAAK,CAAC,MAAM,CACyC,cAA8B,EACtE,GAA0B,EACtB,KAA0B;QAEzC,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QACpE,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IAWK,AAAN,KAAK,CAAC,MAAM,CACyC,cAA8B,EACtE,GAA0B,EACtB,KAA0B;QAEzC,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QACpE,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IASS,cAAc,CAAC,GAA0B,EAAE,MAAW;QAE9D,IAAI,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE,CAAC;YAErD,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAC1C,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChD,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;gBACvD,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;YACjE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,YAAY,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;YAG/E,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;gBACjB,OAAO,MAAM,CAAC,KAAK,CAAC;YACtB,CAAC;YACD,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;gBACxB,OAAO,MAAM,CAAC,YAAY,CAAC;YAC7B,CAAC;QACH,CAAC;QAGD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AAvJY,4CAAgB;AAkDrB;IAHL,IAAA,kBAAQ,EAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,oCAAoC,EAAE,CAAC;IAC9E,IAAA,uBAAK,EAAC,oBAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"core-auth.resolver.js","sourceRoot":"","sources":["../../../../src/core/modules/auth/core-auth.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,7 @@ let LegacyAuthRateLimiter = LegacyAuthRateLimiter_1 = class LegacyAuthRateLimite
|
|
|
44
44
|
enabled,
|
|
45
45
|
};
|
|
46
46
|
if (this.config.enabled) {
|
|
47
|
-
this.logger.
|
|
47
|
+
this.logger.debug(`Legacy Auth rate limiting enabled: ${this.config.max} requests per ${this.config.windowSeconds}s`);
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
50
|
check(ip, endpoint) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"legacy-auth-rate-limiter.service.js","sourceRoot":"","sources":["../../../../../src/core/modules/auth/services/legacy-auth-rate-limiter.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAkE;AAGlE,4EAAwE;AAgCxE,MAAM,cAAc,GAA6B;IAC/C,OAAO,EAAE,KAAK;IACd,GAAG,EAAE,EAAE;IACP,OAAO,EAAE,4CAA4C;IACrD,aAAa,EAAE,EAAE;CAClB,CAAC;AA6BK,IAAM,qBAAqB,6BAA3B,MAAM,qBAAqB;IAMhC;QALiB,WAAM,GAAG,IAAI,eAAM,CAAC,uBAAqB,CAAC,IAAI,CAAC,CAAC;QAChD,UAAK,GAAG,IAAI,GAAG,EAA0B,CAAC;QACnD,WAAM,GAA6B,cAAc,CAAC;QAClD,oBAAe,GAA0B,IAAI,CAAC;QAIpD,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAKD,YAAY;QACV,MAAM,eAAe,GAAG,8BAAa,CAAC,kBAAkB,CAAiB,gBAAgB,CAAC,CAAC;QAC3F,IAAI,eAAe,EAAE,CAAC;YACpB,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAYD,SAAS,CAAC,MAAyC;QAEjD,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YAC5C,OAAO;QACT,CAAC;QAGD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,KAAK,KAAK,CAAC;QAEzC,IAAI,CAAC,MAAM,GAAG;YACZ,GAAG,cAAc;YACjB,GAAG,MAAM;YACT,OAAO;SACR,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"legacy-auth-rate-limiter.service.js","sourceRoot":"","sources":["../../../../../src/core/modules/auth/services/legacy-auth-rate-limiter.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,7 @@ let BetterAuthRateLimiter = BetterAuthRateLimiter_1 = class BetterAuthRateLimite
|
|
|
36
36
|
strictEndpoints: config?.strictEndpoints ?? DEFAULT_CONFIG.strictEndpoints,
|
|
37
37
|
};
|
|
38
38
|
if (this.config.enabled) {
|
|
39
|
-
this.logger.
|
|
39
|
+
this.logger.debug(`Rate limiting enabled: ${this.config.max} requests per ${this.config.windowSeconds}s`);
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
check(ip, path) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"better-auth-rate-limiter.service.js","sourceRoot":"","sources":["../../../../src/core/modules/better-auth/better-auth-rate-limiter.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AA6CpD,MAAM,cAAc,GAAmC;IACrD,OAAO,EAAE,KAAK;IACd,GAAG,EAAE,EAAE;IACP,OAAO,EAAE,4CAA4C;IACrD,aAAa,EAAE,CAAC,UAAU,EAAE,WAAW,CAAC;IACxC,eAAe,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,kBAAkB,EAAE,iBAAiB,CAAC;IAChF,aAAa,EAAE,EAAE;CAClB,CAAC;AAwBK,IAAM,qBAAqB,6BAA3B,MAAM,qBAAqB;IAMhC;QALiB,WAAM,GAAG,IAAI,eAAM,CAAC,uBAAqB,CAAC,IAAI,CAAC,CAAC;QAChD,UAAK,GAAG,IAAI,GAAG,EAA0B,CAAC;QACnD,WAAM,GAAmC,cAAc,CAAC;QACxD,oBAAe,GAA0B,IAAI,CAAC;QAIpD,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAOD,SAAS,CAAC,MAAwC;QAChD,IAAI,CAAC,MAAM,GAAG;YACZ,GAAG,cAAc;YACjB,GAAG,MAAM;YAET,aAAa,EAAE,MAAM,EAAE,aAAa,IAAI,cAAc,CAAC,aAAa;YACpE,eAAe,EAAE,MAAM,EAAE,eAAe,IAAI,cAAc,CAAC,eAAe;SAC3E,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"better-auth-rate-limiter.service.js","sourceRoot":"","sources":["../../../../src/core/modules/better-auth/better-auth-rate-limiter.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -120,7 +120,6 @@ let BetterAuthUserMapper = BetterAuthUserMapper_1 = class BetterAuthUserMapper {
|
|
|
120
120
|
return false;
|
|
121
121
|
}
|
|
122
122
|
if (!plainPassword) {
|
|
123
|
-
this.logger.debug('No plain password provided - cannot create bcrypt hash for legacy');
|
|
124
123
|
return false;
|
|
125
124
|
}
|
|
126
125
|
try {
|
|
@@ -129,12 +128,7 @@ let BetterAuthUserMapper = BetterAuthUserMapper_1 = class BetterAuthUserMapper {
|
|
|
129
128
|
const saltRounds = 10;
|
|
130
129
|
const bcryptHash = await bcrypt.hash(normalizedPassword, saltRounds);
|
|
131
130
|
const result = await usersCollection.updateOne({ $or: [{ email: userEmail }, { iamId: iamUserId }] }, { $set: { password: bcryptHash, updatedAt: new Date() } });
|
|
132
|
-
|
|
133
|
-
this.logger.debug(`Created bcrypt hash for legacy auth for user ${userEmail}`);
|
|
134
|
-
return true;
|
|
135
|
-
}
|
|
136
|
-
this.logger.debug(`No user found to sync password for ${userEmail}`);
|
|
137
|
-
return false;
|
|
131
|
+
return result.modifiedCount > 0;
|
|
138
132
|
}
|
|
139
133
|
catch (error) {
|
|
140
134
|
this.logger.error(`Error syncing password to legacy: ${error instanceof Error ? error.message : 'Unknown error'}`);
|
|
@@ -147,7 +141,6 @@ let BetterAuthUserMapper = BetterAuthUserMapper_1 = class BetterAuthUserMapper {
|
|
|
147
141
|
return false;
|
|
148
142
|
}
|
|
149
143
|
if (!plainPassword) {
|
|
150
|
-
this.logger.debug('No plain password provided - cannot sync to IAM');
|
|
151
144
|
return false;
|
|
152
145
|
}
|
|
153
146
|
try {
|
|
@@ -155,7 +148,6 @@ let BetterAuthUserMapper = BetterAuthUserMapper_1 = class BetterAuthUserMapper {
|
|
|
155
148
|
const accountCollection = this.connection.collection('account');
|
|
156
149
|
const user = await usersCollection.findOne({ email: userEmail });
|
|
157
150
|
if (!user) {
|
|
158
|
-
this.logger.debug(`No user found with email ${userEmail} - cannot sync password to IAM`);
|
|
159
151
|
return false;
|
|
160
152
|
}
|
|
161
153
|
const existingAccount = await accountCollection.findOne({
|
|
@@ -163,21 +155,15 @@ let BetterAuthUserMapper = BetterAuthUserMapper_1 = class BetterAuthUserMapper {
|
|
|
163
155
|
userId: user._id,
|
|
164
156
|
});
|
|
165
157
|
if (!existingAccount) {
|
|
166
|
-
this.logger.debug(`No IAM credential account found for ${userEmail} - sync not needed`);
|
|
167
158
|
return false;
|
|
168
159
|
}
|
|
169
160
|
const scryptHash = await this.hashPasswordForBetterAuth(plainPassword);
|
|
170
|
-
|
|
161
|
+
await accountCollection.updateOne({ _id: existingAccount._id }, {
|
|
171
162
|
$set: {
|
|
172
163
|
password: scryptHash,
|
|
173
164
|
updatedAt: new Date(),
|
|
174
165
|
},
|
|
175
166
|
});
|
|
176
|
-
if (result.modifiedCount > 0) {
|
|
177
|
-
this.logger.debug(`Synced password change to IAM for user ${userEmail}`);
|
|
178
|
-
return true;
|
|
179
|
-
}
|
|
180
|
-
this.logger.debug(`Password already up to date in IAM for ${userEmail}`);
|
|
181
167
|
return true;
|
|
182
168
|
}
|
|
183
169
|
catch (error) {
|
|
@@ -187,7 +173,6 @@ let BetterAuthUserMapper = BetterAuthUserMapper_1 = class BetterAuthUserMapper {
|
|
|
187
173
|
}
|
|
188
174
|
async migrateAccountToIam(userEmail, plainPassword) {
|
|
189
175
|
if (!this.connection) {
|
|
190
|
-
this.logger.warn('No database connection available - cannot migrate account to IAM');
|
|
191
176
|
return false;
|
|
192
177
|
}
|
|
193
178
|
try {
|
|
@@ -195,19 +180,17 @@ let BetterAuthUserMapper = BetterAuthUserMapper_1 = class BetterAuthUserMapper {
|
|
|
195
180
|
const accountsCollection = this.connection.collection('account');
|
|
196
181
|
const legacyUser = await usersCollection.findOne({ email: userEmail });
|
|
197
182
|
if (!legacyUser?.password) {
|
|
198
|
-
this.logger.debug(`No legacy user with password found for ${userEmail}`);
|
|
199
183
|
return false;
|
|
200
184
|
}
|
|
201
185
|
if (plainPassword) {
|
|
202
186
|
const directMatch = await bcrypt.compare(plainPassword, legacyUser.password);
|
|
203
187
|
const sha256Match = await bcrypt.compare((0, js_sha256_1.sha256)(plainPassword), legacyUser.password);
|
|
204
188
|
if (!directMatch && !sha256Match) {
|
|
205
|
-
this.logger.warn(`
|
|
189
|
+
this.logger.warn(`Migration password verification failed for ${userEmail}`);
|
|
206
190
|
return false;
|
|
207
191
|
}
|
|
208
192
|
}
|
|
209
193
|
else {
|
|
210
|
-
this.logger.debug(`No password provided for ${userEmail} - migration skipped`);
|
|
211
194
|
return false;
|
|
212
195
|
}
|
|
213
196
|
const userMongoId = legacyUser._id;
|
|
@@ -224,25 +207,15 @@ let BetterAuthUserMapper = BetterAuthUserMapper_1 = class BetterAuthUserMapper {
|
|
|
224
207
|
updatedAt: now,
|
|
225
208
|
},
|
|
226
209
|
});
|
|
227
|
-
this.logger.debug(`Added Better-Auth id ${stringId} to legacy user ${userEmail}`);
|
|
228
210
|
}
|
|
229
211
|
const existingAccount = await accountsCollection.findOne({
|
|
230
212
|
providerId: 'credential',
|
|
231
213
|
userId: userMongoId,
|
|
232
214
|
});
|
|
233
215
|
if (existingAccount) {
|
|
234
|
-
this.logger.debug(`Credential account already exists for ${userEmail}`);
|
|
235
216
|
return true;
|
|
236
217
|
}
|
|
237
|
-
|
|
238
|
-
if (plainPassword) {
|
|
239
|
-
passwordHash = await this.hashPasswordForBetterAuth(plainPassword);
|
|
240
|
-
this.logger.debug(`Created Better-Auth compatible scrypt hash for ${userEmail}`);
|
|
241
|
-
}
|
|
242
|
-
else {
|
|
243
|
-
this.logger.warn(`Cannot migrate ${userEmail} without plain password - hash formats are incompatible`);
|
|
244
|
-
return false;
|
|
245
|
-
}
|
|
218
|
+
const passwordHash = await this.hashPasswordForBetterAuth(plainPassword);
|
|
246
219
|
const now = new Date();
|
|
247
220
|
await accountsCollection.insertOne({
|
|
248
221
|
accountId: userIdHex,
|
|
@@ -253,7 +226,6 @@ let BetterAuthUserMapper = BetterAuthUserMapper_1 = class BetterAuthUserMapper {
|
|
|
253
226
|
updatedAt: now,
|
|
254
227
|
userId: userMongoId,
|
|
255
228
|
});
|
|
256
|
-
this.logger.debug(`Created IAM credential account for legacy user ${userEmail}`);
|
|
257
229
|
return true;
|
|
258
230
|
}
|
|
259
231
|
catch (error) {
|
|
@@ -352,16 +324,11 @@ let BetterAuthUserMapper = BetterAuthUserMapper_1 = class BetterAuthUserMapper {
|
|
|
352
324
|
const usersCollection = this.connection.collection('users');
|
|
353
325
|
const user = await usersCollection.findOne({ email: newEmail });
|
|
354
326
|
if (!user) {
|
|
355
|
-
this.logger.debug(`No user found with new email ${newEmail}`);
|
|
356
327
|
return false;
|
|
357
328
|
}
|
|
358
329
|
if (user._id) {
|
|
359
|
-
|
|
360
|
-
if (deleteResult.deletedCount > 0) {
|
|
361
|
-
this.logger.debug(`Invalidated ${deleteResult.deletedCount} sessions after email change for user ${newEmail}`);
|
|
362
|
-
}
|
|
330
|
+
await sessionCollection.deleteMany({ userId: user._id });
|
|
363
331
|
}
|
|
364
|
-
this.logger.debug(`Email change synced from Legacy to IAM: ${oldEmail} → ${newEmail}`);
|
|
365
332
|
return true;
|
|
366
333
|
}
|
|
367
334
|
catch (error) {
|
|
@@ -383,12 +350,7 @@ let BetterAuthUserMapper = BetterAuthUserMapper_1 = class BetterAuthUserMapper {
|
|
|
383
350
|
updatedAt: new Date(),
|
|
384
351
|
},
|
|
385
352
|
}, { returnDocument: 'after' });
|
|
386
|
-
|
|
387
|
-
this.logger.debug(`No user found with iamId ${userId}`);
|
|
388
|
-
return false;
|
|
389
|
-
}
|
|
390
|
-
this.logger.debug(`Email change synced from IAM to Legacy for user ${userId}: → ${newEmail}`);
|
|
391
|
-
return true;
|
|
353
|
+
return !!result;
|
|
392
354
|
}
|
|
393
355
|
catch (error) {
|
|
394
356
|
this.logger.error(`Error syncing email change from IAM: ${error instanceof Error ? error.message : 'Unknown error'}`);
|
|
@@ -413,7 +375,6 @@ let BetterAuthUserMapper = BetterAuthUserMapper_1 = class BetterAuthUserMapper {
|
|
|
413
375
|
user = await usersCollection.findOne({ _id: new mongodb_1.ObjectId(userIdentifier) });
|
|
414
376
|
}
|
|
415
377
|
if (!user) {
|
|
416
|
-
this.logger.debug(`No user found with identifier ${userIdentifier}`);
|
|
417
378
|
return { accountsDeleted: 0, sessionsDeleted: 0, success: false, userDeleted: false };
|
|
418
379
|
}
|
|
419
380
|
const userId = user._id;
|
|
@@ -449,9 +410,6 @@ let BetterAuthUserMapper = BetterAuthUserMapper_1 = class BetterAuthUserMapper {
|
|
|
449
410
|
const sessionsDeleted = sessionsResult.deletedCount;
|
|
450
411
|
const accountsResult = await accountCollection.deleteMany({ userId: userObjectId });
|
|
451
412
|
const accountsDeleted = accountsResult.deletedCount;
|
|
452
|
-
if (sessionsDeleted > 0 || accountsDeleted > 0) {
|
|
453
|
-
this.logger.debug(`Cleaned up IAM data for user ${userId}: accounts=${accountsDeleted}, sessions=${sessionsDeleted}`);
|
|
454
|
-
}
|
|
455
413
|
return {
|
|
456
414
|
accountsDeleted,
|
|
457
415
|
sessionsDeleted,
|
|
@@ -473,12 +431,7 @@ let BetterAuthUserMapper = BetterAuthUserMapper_1 = class BetterAuthUserMapper {
|
|
|
473
431
|
const result = await usersCollection.deleteOne({
|
|
474
432
|
$or: [{ iamId: iamUserId }, { id: iamUserId }],
|
|
475
433
|
});
|
|
476
|
-
|
|
477
|
-
this.logger.debug(`Cleaned up Legacy user for IAM user ${iamUserId}`);
|
|
478
|
-
return true;
|
|
479
|
-
}
|
|
480
|
-
this.logger.debug(`No Legacy user found for IAM user ${iamUserId}`);
|
|
481
|
-
return false;
|
|
434
|
+
return result.deletedCount > 0;
|
|
482
435
|
}
|
|
483
436
|
catch (error) {
|
|
484
437
|
this.logger.error(`Error cleaning up Legacy data: ${error instanceof Error ? error.message : 'Unknown error'}`);
|
|
@@ -565,7 +518,6 @@ let BetterAuthUserMapper = BetterAuthUserMapper_1 = class BetterAuthUserMapper {
|
|
|
565
518
|
.toArray();
|
|
566
519
|
const pendingUserEmails = pendingUsers.map((u) => u.email).filter(Boolean);
|
|
567
520
|
const canDisableLegacyAuth = totalUsers > 0 && fullyMigratedUsers === totalUsers;
|
|
568
|
-
this.logger.debug(`Migration status: ${fullyMigratedUsers}/${totalUsers} users migrated (${migrationPercentage}%)`);
|
|
569
521
|
return {
|
|
570
522
|
canDisableLegacyAuth,
|
|
571
523
|
fullyMigratedUsers,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"better-auth-user.mapper.js","sourceRoot":"","sources":["../../../../src/core/modules/better-auth/better-auth-user.mapper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"better-auth-user.mapper.js","sourceRoot":"","sources":["../../../../src/core/modules/better-auth/better-auth-user.mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,23 +49,27 @@ function createBetterAuthInstance(options) {
|
|
|
49
49
|
}
|
|
50
50
|
function buildPlugins(config) {
|
|
51
51
|
const plugins = [];
|
|
52
|
-
|
|
52
|
+
const jwtExplicitlyDisabled = config.jwt === false || (typeof config.jwt === 'object' && config.jwt?.enabled === false);
|
|
53
|
+
if (!jwtExplicitlyDisabled) {
|
|
54
|
+
const jwtConfig = typeof config.jwt === 'object' ? config.jwt : {};
|
|
53
55
|
plugins.push((0, plugins_1.jwt)({
|
|
54
56
|
jwt: {
|
|
55
|
-
expirationTime:
|
|
57
|
+
expirationTime: jwtConfig.expiresIn || '15m',
|
|
56
58
|
},
|
|
57
59
|
}));
|
|
58
60
|
}
|
|
59
|
-
|
|
61
|
+
const twoFactorConfig = getPluginConfig(config.twoFactor);
|
|
62
|
+
if (twoFactorConfig) {
|
|
60
63
|
plugins.push((0, plugins_1.twoFactor)({
|
|
61
|
-
issuer:
|
|
64
|
+
issuer: twoFactorConfig.appName || 'Nest Server',
|
|
62
65
|
}));
|
|
63
66
|
}
|
|
64
|
-
|
|
67
|
+
const passkeyConfig = getPluginConfig(config.passkey);
|
|
68
|
+
if (passkeyConfig) {
|
|
65
69
|
plugins.push((0, passkey_1.passkey)({
|
|
66
|
-
origin:
|
|
67
|
-
rpID:
|
|
68
|
-
rpName:
|
|
70
|
+
origin: passkeyConfig.origin || 'http://localhost:3000',
|
|
71
|
+
rpID: passkeyConfig.rpId || 'localhost',
|
|
72
|
+
rpName: passkeyConfig.rpName || 'Nest Server',
|
|
69
73
|
}));
|
|
70
74
|
}
|
|
71
75
|
if (config.plugins?.length) {
|
|
@@ -147,6 +151,20 @@ function getAutoGeneratedSecret() {
|
|
|
147
151
|
}
|
|
148
152
|
return cachedAutoGeneratedSecret;
|
|
149
153
|
}
|
|
154
|
+
function getPluginConfig(config) {
|
|
155
|
+
if (!isPluginEnabled(config))
|
|
156
|
+
return undefined;
|
|
157
|
+
if (typeof config === 'boolean')
|
|
158
|
+
return {};
|
|
159
|
+
return config;
|
|
160
|
+
}
|
|
161
|
+
function isPluginEnabled(config) {
|
|
162
|
+
if (config === undefined)
|
|
163
|
+
return false;
|
|
164
|
+
if (typeof config === 'boolean')
|
|
165
|
+
return config;
|
|
166
|
+
return config.enabled !== false;
|
|
167
|
+
}
|
|
150
168
|
function isValidSecretLength(secret) {
|
|
151
169
|
return secret && secret.length >= 32;
|
|
152
170
|
}
|
|
@@ -202,8 +220,9 @@ function validateConfig(config, fallbackSecrets) {
|
|
|
202
220
|
}
|
|
203
221
|
}
|
|
204
222
|
}
|
|
205
|
-
|
|
206
|
-
|
|
223
|
+
const passkeyConfig = typeof config.passkey === 'object' ? config.passkey : null;
|
|
224
|
+
if (passkeyConfig?.enabled && passkeyConfig.origin && !isValidUrl(passkeyConfig.origin)) {
|
|
225
|
+
errors.push(`Invalid passkey origin format: ${passkeyConfig.origin}`);
|
|
207
226
|
}
|
|
208
227
|
if (config.socialProviders) {
|
|
209
228
|
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":";;AA2GA,4DAyDC;AApKD,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;AA4EpD,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,UAAU,GAAG,cAAc,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAG3D,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,CAAC,CAAC;IACrC,MAAM,eAAe,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACnD,MAAM,gBAAgB,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IAGjD,MAAM,gBAAgB,GAAG;QACvB,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,MAAM;QACnC,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,uBAAuB;QAClD,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,cAAc;QACd,IAAI,EAAE;YACJ,gBAAgB;YAChB,SAAS,EAAE,OAAO;SACnB;KACF,CAAC;IAIF,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;
|
|
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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"}
|
|
@@ -16,5 +16,6 @@ export declare class BetterAuthMiddleware implements NestMiddleware {
|
|
|
16
16
|
private readonly logger;
|
|
17
17
|
constructor(betterAuthService: BetterAuthService, userMapper: BetterAuthUserMapper);
|
|
18
18
|
use(req: BetterAuthRequest, _res: Response, next: NextFunction): Promise<void>;
|
|
19
|
+
private isLegacyJwt;
|
|
19
20
|
private getSession;
|
|
20
21
|
}
|