@lenne.tech/nest-server 11.7.0 → 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/config.env.js +17 -1
- package/dist/config.env.js.map +1 -1
- package/dist/core/common/interfaces/server-options.interface.d.ts +35 -15
- package/dist/core/modules/auth/core-auth.controller.d.ts +1 -0
- package/dist/core/modules/auth/core-auth.controller.js +29 -3
- package/dist/core/modules/auth/core-auth.controller.js.map +1 -1
- package/dist/core/modules/auth/core-auth.module.js +14 -1
- package/dist/core/modules/auth/core-auth.module.js.map +1 -1
- package/dist/core/modules/auth/core-auth.resolver.d.ts +1 -0
- package/dist/core/modules/auth/core-auth.resolver.js +21 -3
- package/dist/core/modules/auth/core-auth.resolver.js.map +1 -1
- package/dist/core/modules/auth/exceptions/legacy-auth-disabled.exception.d.ts +4 -0
- package/dist/core/modules/auth/exceptions/legacy-auth-disabled.exception.js +17 -0
- package/dist/core/modules/auth/exceptions/legacy-auth-disabled.exception.js.map +1 -0
- package/dist/core/modules/auth/guards/legacy-auth-rate-limit.guard.d.ts +9 -0
- package/dist/core/modules/auth/guards/legacy-auth-rate-limit.guard.js +74 -0
- package/dist/core/modules/auth/guards/legacy-auth-rate-limit.guard.js.map +1 -0
- package/dist/core/modules/auth/interfaces/auth-provider.interface.d.ts +7 -0
- package/dist/core/modules/auth/interfaces/auth-provider.interface.js +5 -0
- package/dist/core/modules/auth/interfaces/auth-provider.interface.js.map +1 -0
- package/dist/core/modules/auth/interfaces/core-auth-user.interface.d.ts +1 -0
- package/dist/core/modules/auth/services/core-auth.service.d.ts +10 -1
- package/dist/core/modules/auth/services/core-auth.service.js +141 -9
- package/dist/core/modules/auth/services/core-auth.service.js.map +1 -1
- package/dist/core/modules/auth/services/legacy-auth-rate-limiter.service.d.ts +31 -0
- package/dist/core/modules/auth/services/legacy-auth-rate-limiter.service.js +153 -0
- package/dist/core/modules/auth/services/legacy-auth-rate-limiter.service.js.map +1 -0
- package/dist/core/modules/better-auth/better-auth-migration-status.model.d.ts +10 -0
- package/dist/core/modules/better-auth/better-auth-migration-status.model.js +57 -0
- package/dist/core/modules/better-auth/better-auth-migration-status.model.js.map +1 -0
- 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.d.ts +33 -0
- package/dist/core/modules/better-auth/better-auth-user.mapper.js +395 -0
- 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.controller.d.ts +1 -0
- package/dist/core/modules/better-auth/core-better-auth.controller.js +15 -2
- package/dist/core/modules/better-auth/core-better-auth.controller.js.map +1 -1
- package/dist/core/modules/better-auth/core-better-auth.resolver.d.ts +7 -0
- package/dist/core/modules/better-auth/core-better-auth.resolver.js +72 -12
- package/dist/core/modules/better-auth/core-better-auth.resolver.js.map +1 -1
- package/dist/core/modules/better-auth/index.d.ts +1 -0
- package/dist/core/modules/better-auth/index.js +1 -0
- package/dist/core/modules/better-auth/index.js.map +1 -1
- package/dist/core/modules/user/core-user.service.d.ts +7 -1
- package/dist/core/modules/user/core-user.service.js +57 -3
- package/dist/core/modules/user/core-user.service.js.map +1 -1
- package/dist/core/modules/user/interfaces/core-user-service-options.interface.d.ts +4 -0
- package/dist/core/modules/user/interfaces/core-user-service-options.interface.js +3 -0
- package/dist/core/modules/user/interfaces/core-user-service-options.interface.js.map +1 -0
- package/dist/core.module.d.ts +3 -0
- package/dist/core.module.js +136 -55
- package/dist/core.module.js.map +1 -1
- package/dist/index.d.ts +5 -0
- package/dist/index.js +5 -0
- package/dist/index.js.map +1 -1
- package/dist/server/modules/auth/auth.resolver.js +2 -0
- package/dist/server/modules/auth/auth.resolver.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 +5 -0
- package/dist/server/modules/better-auth/better-auth.resolver.js +27 -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/server/modules/user/user.service.d.ts +3 -1
- package/dist/server/modules/user/user.service.js +7 -3
- package/dist/server/modules/user/user.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/config.env.ts +32 -2
- package/src/core/common/interfaces/server-options.interface.ts +304 -58
- package/src/core/modules/auth/core-auth.controller.ts +94 -6
- package/src/core/modules/auth/core-auth.module.ts +15 -1
- package/src/core/modules/auth/core-auth.resolver.ts +71 -3
- package/src/core/modules/auth/exceptions/legacy-auth-disabled.exception.ts +35 -0
- package/src/core/modules/auth/guards/legacy-auth-rate-limit.guard.ts +109 -0
- package/src/core/modules/auth/interfaces/auth-provider.interface.ts +86 -0
- package/src/core/modules/auth/interfaces/core-auth-user.interface.ts +6 -0
- package/src/core/modules/auth/services/core-auth.service.ts +245 -6
- package/src/core/modules/auth/services/legacy-auth-rate-limiter.service.ts +283 -0
- package/src/core/modules/better-auth/INTEGRATION-CHECKLIST.md +255 -0
- package/src/core/modules/better-auth/README.md +565 -208
- package/src/core/modules/better-auth/better-auth-migration-status.model.ts +73 -0
- 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 +737 -0
- 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.controller.ts +44 -3
- package/src/core/modules/better-auth/core-better-auth.resolver.ts +136 -16
- package/src/core/modules/better-auth/index.ts +1 -0
- package/src/core/modules/user/core-user.service.ts +131 -4
- package/src/core/modules/user/interfaces/core-user-service-options.interface.ts +15 -0
- package/src/core.module.ts +264 -76
- package/src/index.ts +5 -0
- package/src/server/modules/auth/auth.resolver.ts +8 -0
- package/src/server/modules/better-auth/better-auth.module.ts +9 -3
- package/src/server/modules/better-auth/better-auth.resolver.ts +18 -11
- package/src/server/modules/user/user.controller.ts +1 -9
- package/src/server/modules/user/user.service.ts +4 -2
|
@@ -16,7 +16,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
16
16
|
exports.BetterAuthUserMapper = void 0;
|
|
17
17
|
const common_1 = require("@nestjs/common");
|
|
18
18
|
const mongoose_1 = require("@nestjs/mongoose");
|
|
19
|
+
const bcrypt = require("bcrypt");
|
|
20
|
+
const crypto_1 = require("crypto");
|
|
21
|
+
const js_sha256_1 = require("js-sha256");
|
|
22
|
+
const mongodb_1 = require("mongodb");
|
|
19
23
|
const mongoose_2 = require("mongoose");
|
|
24
|
+
const scryptPromise = (password, salt, keylen, options) => {
|
|
25
|
+
return new Promise((resolve, reject) => {
|
|
26
|
+
(0, crypto_1.scrypt)(password, salt, keylen, options, (err, derivedKey) => {
|
|
27
|
+
if (err)
|
|
28
|
+
reject(err);
|
|
29
|
+
else
|
|
30
|
+
resolve(derivedKey);
|
|
31
|
+
});
|
|
32
|
+
});
|
|
33
|
+
};
|
|
20
34
|
const role_enum_1 = require("../../common/enums/role.enum");
|
|
21
35
|
let BetterAuthUserMapper = BetterAuthUserMapper_1 = class BetterAuthUserMapper {
|
|
22
36
|
constructor(connection) {
|
|
@@ -100,6 +114,158 @@ let BetterAuthUserMapper = BetterAuthUserMapper_1 = class BetterAuthUserMapper {
|
|
|
100
114
|
roles,
|
|
101
115
|
};
|
|
102
116
|
}
|
|
117
|
+
async syncPasswordToLegacy(iamUserId, userEmail, plainPassword) {
|
|
118
|
+
if (!this.connection) {
|
|
119
|
+
this.logger.warn('No database connection available - cannot sync password to legacy');
|
|
120
|
+
return false;
|
|
121
|
+
}
|
|
122
|
+
if (!plainPassword) {
|
|
123
|
+
return false;
|
|
124
|
+
}
|
|
125
|
+
try {
|
|
126
|
+
const usersCollection = this.connection.collection('users');
|
|
127
|
+
const normalizedPassword = this.normalizePasswordForIam(plainPassword);
|
|
128
|
+
const saltRounds = 10;
|
|
129
|
+
const bcryptHash = await bcrypt.hash(normalizedPassword, saltRounds);
|
|
130
|
+
const result = await usersCollection.updateOne({ $or: [{ email: userEmail }, { iamId: iamUserId }] }, { $set: { password: bcryptHash, updatedAt: new Date() } });
|
|
131
|
+
return result.modifiedCount > 0;
|
|
132
|
+
}
|
|
133
|
+
catch (error) {
|
|
134
|
+
this.logger.error(`Error syncing password to legacy: ${error instanceof Error ? error.message : 'Unknown error'}`);
|
|
135
|
+
return false;
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
async syncPasswordChangeToIam(userEmail, plainPassword) {
|
|
139
|
+
if (!this.connection) {
|
|
140
|
+
this.logger.warn('No database connection available - cannot sync password to IAM');
|
|
141
|
+
return false;
|
|
142
|
+
}
|
|
143
|
+
if (!plainPassword) {
|
|
144
|
+
return false;
|
|
145
|
+
}
|
|
146
|
+
try {
|
|
147
|
+
const usersCollection = this.connection.collection('users');
|
|
148
|
+
const accountCollection = this.connection.collection('account');
|
|
149
|
+
const user = await usersCollection.findOne({ email: userEmail });
|
|
150
|
+
if (!user) {
|
|
151
|
+
return false;
|
|
152
|
+
}
|
|
153
|
+
const existingAccount = await accountCollection.findOne({
|
|
154
|
+
providerId: 'credential',
|
|
155
|
+
userId: user._id,
|
|
156
|
+
});
|
|
157
|
+
if (!existingAccount) {
|
|
158
|
+
return false;
|
|
159
|
+
}
|
|
160
|
+
const scryptHash = await this.hashPasswordForBetterAuth(plainPassword);
|
|
161
|
+
await accountCollection.updateOne({ _id: existingAccount._id }, {
|
|
162
|
+
$set: {
|
|
163
|
+
password: scryptHash,
|
|
164
|
+
updatedAt: new Date(),
|
|
165
|
+
},
|
|
166
|
+
});
|
|
167
|
+
return true;
|
|
168
|
+
}
|
|
169
|
+
catch (error) {
|
|
170
|
+
this.logger.error(`Error syncing password to IAM: ${error instanceof Error ? error.message : 'Unknown error'}`);
|
|
171
|
+
return false;
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
async migrateAccountToIam(userEmail, plainPassword) {
|
|
175
|
+
if (!this.connection) {
|
|
176
|
+
return false;
|
|
177
|
+
}
|
|
178
|
+
try {
|
|
179
|
+
const usersCollection = this.connection.collection('users');
|
|
180
|
+
const accountsCollection = this.connection.collection('account');
|
|
181
|
+
const legacyUser = await usersCollection.findOne({ email: userEmail });
|
|
182
|
+
if (!legacyUser?.password) {
|
|
183
|
+
return false;
|
|
184
|
+
}
|
|
185
|
+
if (plainPassword) {
|
|
186
|
+
const directMatch = await bcrypt.compare(plainPassword, legacyUser.password);
|
|
187
|
+
const sha256Match = await bcrypt.compare((0, js_sha256_1.sha256)(plainPassword), legacyUser.password);
|
|
188
|
+
if (!directMatch && !sha256Match) {
|
|
189
|
+
this.logger.warn(`Migration password verification failed for ${userEmail}`);
|
|
190
|
+
return false;
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
else {
|
|
194
|
+
return false;
|
|
195
|
+
}
|
|
196
|
+
const userMongoId = legacyUser._id;
|
|
197
|
+
const userIdHex = userMongoId.toHexString();
|
|
198
|
+
if (!legacyUser.iamId) {
|
|
199
|
+
const now = new Date();
|
|
200
|
+
const stringId = this.generateId();
|
|
201
|
+
await usersCollection.updateOne({ _id: legacyUser._id }, {
|
|
202
|
+
$set: {
|
|
203
|
+
emailVerified: legacyUser.verified === true,
|
|
204
|
+
iamId: stringId,
|
|
205
|
+
id: stringId,
|
|
206
|
+
name: [legacyUser.firstName, legacyUser.lastName].filter(Boolean).join(' ') || undefined,
|
|
207
|
+
updatedAt: now,
|
|
208
|
+
},
|
|
209
|
+
});
|
|
210
|
+
}
|
|
211
|
+
const existingAccount = await accountsCollection.findOne({
|
|
212
|
+
providerId: 'credential',
|
|
213
|
+
userId: userMongoId,
|
|
214
|
+
});
|
|
215
|
+
if (existingAccount) {
|
|
216
|
+
return true;
|
|
217
|
+
}
|
|
218
|
+
const passwordHash = await this.hashPasswordForBetterAuth(plainPassword);
|
|
219
|
+
const now = new Date();
|
|
220
|
+
await accountsCollection.insertOne({
|
|
221
|
+
accountId: userIdHex,
|
|
222
|
+
createdAt: now,
|
|
223
|
+
id: this.generateId(),
|
|
224
|
+
password: passwordHash,
|
|
225
|
+
providerId: 'credential',
|
|
226
|
+
updatedAt: now,
|
|
227
|
+
userId: userMongoId,
|
|
228
|
+
});
|
|
229
|
+
return true;
|
|
230
|
+
}
|
|
231
|
+
catch (error) {
|
|
232
|
+
this.logger.error(`Error migrating account to IAM: ${error instanceof Error ? error.message : 'Unknown error'}`);
|
|
233
|
+
return false;
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
generateId() {
|
|
237
|
+
const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
|
|
238
|
+
let result = '';
|
|
239
|
+
for (let i = 0; i < 21; i++) {
|
|
240
|
+
result += chars.charAt(Math.floor(Math.random() * chars.length));
|
|
241
|
+
}
|
|
242
|
+
return result;
|
|
243
|
+
}
|
|
244
|
+
normalizePasswordForIam(password) {
|
|
245
|
+
if (/^[a-f0-9]{64}$/i.test(password)) {
|
|
246
|
+
return password;
|
|
247
|
+
}
|
|
248
|
+
return (0, js_sha256_1.sha256)(password);
|
|
249
|
+
}
|
|
250
|
+
async hashPasswordForBetterAuth(password) {
|
|
251
|
+
const normalizedPassword = this.normalizePasswordForIam(password);
|
|
252
|
+
const saltBytes = (0, crypto_1.randomBytes)(16);
|
|
253
|
+
const salt = saltBytes.toString('hex');
|
|
254
|
+
const keyLength = 64;
|
|
255
|
+
const scryptOptions = {
|
|
256
|
+
maxmem: 128 * 16384 * 16 * 2,
|
|
257
|
+
N: 16384,
|
|
258
|
+
p: 1,
|
|
259
|
+
r: 16,
|
|
260
|
+
};
|
|
261
|
+
const key = await scryptPromise(normalizedPassword.normalize('NFKC'), salt, keyLength, scryptOptions);
|
|
262
|
+
return `${salt}:${key.toString('hex')}`;
|
|
263
|
+
}
|
|
264
|
+
bytesToHex(bytes) {
|
|
265
|
+
return Array.from(bytes)
|
|
266
|
+
.map((b) => b.toString(16).padStart(2, '0'))
|
|
267
|
+
.join('');
|
|
268
|
+
}
|
|
103
269
|
async linkOrCreateUser(sessionUser, additionalData) {
|
|
104
270
|
if (!sessionUser?.email) {
|
|
105
271
|
return null;
|
|
@@ -148,6 +314,235 @@ let BetterAuthUserMapper = BetterAuthUserMapper_1 = class BetterAuthUserMapper {
|
|
|
148
314
|
return null;
|
|
149
315
|
}
|
|
150
316
|
}
|
|
317
|
+
async syncEmailChangeFromLegacy(oldEmail, newEmail) {
|
|
318
|
+
if (!this.connection) {
|
|
319
|
+
this.logger.warn('No database connection available - cannot sync email change');
|
|
320
|
+
return false;
|
|
321
|
+
}
|
|
322
|
+
try {
|
|
323
|
+
const sessionCollection = this.connection.collection('session');
|
|
324
|
+
const usersCollection = this.connection.collection('users');
|
|
325
|
+
const user = await usersCollection.findOne({ email: newEmail });
|
|
326
|
+
if (!user) {
|
|
327
|
+
return false;
|
|
328
|
+
}
|
|
329
|
+
if (user._id) {
|
|
330
|
+
await sessionCollection.deleteMany({ userId: user._id });
|
|
331
|
+
}
|
|
332
|
+
return true;
|
|
333
|
+
}
|
|
334
|
+
catch (error) {
|
|
335
|
+
this.logger.error(`Error syncing email change from Legacy: ${error instanceof Error ? error.message : 'Unknown error'}`);
|
|
336
|
+
return false;
|
|
337
|
+
}
|
|
338
|
+
}
|
|
339
|
+
async syncEmailChangeFromIam(userId, newEmail) {
|
|
340
|
+
if (!this.connection) {
|
|
341
|
+
this.logger.warn('No database connection available - cannot sync email change');
|
|
342
|
+
return false;
|
|
343
|
+
}
|
|
344
|
+
try {
|
|
345
|
+
const usersCollection = this.connection.collection('users');
|
|
346
|
+
const result = await usersCollection.findOneAndUpdate({ $or: [{ iamId: userId }, { id: userId }] }, {
|
|
347
|
+
$set: {
|
|
348
|
+
email: newEmail,
|
|
349
|
+
refreshTokens: {},
|
|
350
|
+
updatedAt: new Date(),
|
|
351
|
+
},
|
|
352
|
+
}, { returnDocument: 'after' });
|
|
353
|
+
return !!result;
|
|
354
|
+
}
|
|
355
|
+
catch (error) {
|
|
356
|
+
this.logger.error(`Error syncing email change from IAM: ${error instanceof Error ? error.message : 'Unknown error'}`);
|
|
357
|
+
return false;
|
|
358
|
+
}
|
|
359
|
+
}
|
|
360
|
+
async deleteUserFromBothSystems(userIdentifier) {
|
|
361
|
+
if (!this.connection) {
|
|
362
|
+
this.logger.warn('No database connection available - cannot delete user');
|
|
363
|
+
return { accountsDeleted: 0, sessionsDeleted: 0, success: false, userDeleted: false };
|
|
364
|
+
}
|
|
365
|
+
try {
|
|
366
|
+
const usersCollection = this.connection.collection('users');
|
|
367
|
+
const accountCollection = this.connection.collection('account');
|
|
368
|
+
const sessionCollection = this.connection.collection('session');
|
|
369
|
+
let user = null;
|
|
370
|
+
user = await usersCollection.findOne({ email: userIdentifier });
|
|
371
|
+
if (!user) {
|
|
372
|
+
user = await usersCollection.findOne({ iamId: userIdentifier });
|
|
373
|
+
}
|
|
374
|
+
if (!user && mongodb_1.ObjectId.isValid(userIdentifier)) {
|
|
375
|
+
user = await usersCollection.findOne({ _id: new mongodb_1.ObjectId(userIdentifier) });
|
|
376
|
+
}
|
|
377
|
+
if (!user) {
|
|
378
|
+
return { accountsDeleted: 0, sessionsDeleted: 0, success: false, userDeleted: false };
|
|
379
|
+
}
|
|
380
|
+
const userId = user._id;
|
|
381
|
+
const sessionsResult = await sessionCollection.deleteMany({ userId });
|
|
382
|
+
const sessionsDeleted = sessionsResult.deletedCount;
|
|
383
|
+
const accountsResult = await accountCollection.deleteMany({ userId });
|
|
384
|
+
const accountsDeleted = accountsResult.deletedCount;
|
|
385
|
+
const userResult = await usersCollection.deleteOne({ _id: userId });
|
|
386
|
+
const userDeleted = userResult.deletedCount > 0;
|
|
387
|
+
this.logger.log(`Deleted user ${user.email}: user=${userDeleted}, accounts=${accountsDeleted}, sessions=${sessionsDeleted}`);
|
|
388
|
+
return {
|
|
389
|
+
accountsDeleted,
|
|
390
|
+
sessionsDeleted,
|
|
391
|
+
success: userDeleted,
|
|
392
|
+
userDeleted,
|
|
393
|
+
};
|
|
394
|
+
}
|
|
395
|
+
catch (error) {
|
|
396
|
+
this.logger.error(`Error deleting user: ${error instanceof Error ? error.message : 'Unknown error'}`);
|
|
397
|
+
return { accountsDeleted: 0, sessionsDeleted: 0, success: false, userDeleted: false };
|
|
398
|
+
}
|
|
399
|
+
}
|
|
400
|
+
async cleanupIamDataForDeletedUser(userId) {
|
|
401
|
+
if (!this.connection) {
|
|
402
|
+
this.logger.warn('No database connection available - cannot cleanup IAM data');
|
|
403
|
+
return { accountsDeleted: 0, sessionsDeleted: 0, success: false };
|
|
404
|
+
}
|
|
405
|
+
try {
|
|
406
|
+
const accountCollection = this.connection.collection('account');
|
|
407
|
+
const sessionCollection = this.connection.collection('session');
|
|
408
|
+
const userObjectId = typeof userId === 'string' ? new mongodb_1.ObjectId(userId) : userId;
|
|
409
|
+
const sessionsResult = await sessionCollection.deleteMany({ userId: userObjectId });
|
|
410
|
+
const sessionsDeleted = sessionsResult.deletedCount;
|
|
411
|
+
const accountsResult = await accountCollection.deleteMany({ userId: userObjectId });
|
|
412
|
+
const accountsDeleted = accountsResult.deletedCount;
|
|
413
|
+
return {
|
|
414
|
+
accountsDeleted,
|
|
415
|
+
sessionsDeleted,
|
|
416
|
+
success: true,
|
|
417
|
+
};
|
|
418
|
+
}
|
|
419
|
+
catch (error) {
|
|
420
|
+
this.logger.error(`Error cleaning up IAM data: ${error instanceof Error ? error.message : 'Unknown error'}`);
|
|
421
|
+
return { accountsDeleted: 0, sessionsDeleted: 0, success: false };
|
|
422
|
+
}
|
|
423
|
+
}
|
|
424
|
+
async cleanupLegacyDataForDeletedIamUser(iamUserId) {
|
|
425
|
+
if (!this.connection) {
|
|
426
|
+
this.logger.warn('No database connection available - cannot cleanup Legacy data');
|
|
427
|
+
return false;
|
|
428
|
+
}
|
|
429
|
+
try {
|
|
430
|
+
const usersCollection = this.connection.collection('users');
|
|
431
|
+
const result = await usersCollection.deleteOne({
|
|
432
|
+
$or: [{ iamId: iamUserId }, { id: iamUserId }],
|
|
433
|
+
});
|
|
434
|
+
return result.deletedCount > 0;
|
|
435
|
+
}
|
|
436
|
+
catch (error) {
|
|
437
|
+
this.logger.error(`Error cleaning up Legacy data: ${error instanceof Error ? error.message : 'Unknown error'}`);
|
|
438
|
+
return false;
|
|
439
|
+
}
|
|
440
|
+
}
|
|
441
|
+
async getMigrationStatus() {
|
|
442
|
+
if (!this.connection) {
|
|
443
|
+
this.logger.warn('No database connection available - cannot get migration status');
|
|
444
|
+
return {
|
|
445
|
+
canDisableLegacyAuth: false,
|
|
446
|
+
fullyMigratedUsers: 0,
|
|
447
|
+
migrationPercentage: 0,
|
|
448
|
+
pendingMigrationUsers: 0,
|
|
449
|
+
pendingUserEmails: [],
|
|
450
|
+
totalUsers: 0,
|
|
451
|
+
usersWithIamAccount: 0,
|
|
452
|
+
usersWithIamId: 0,
|
|
453
|
+
};
|
|
454
|
+
}
|
|
455
|
+
try {
|
|
456
|
+
const usersCollection = this.connection.collection('users');
|
|
457
|
+
const accountCollection = this.connection.collection('account');
|
|
458
|
+
const totalUsers = await usersCollection.countDocuments({});
|
|
459
|
+
const usersWithIamId = await usersCollection.countDocuments({
|
|
460
|
+
iamId: { $exists: true, $ne: null },
|
|
461
|
+
});
|
|
462
|
+
const credentialAccounts = await accountCollection
|
|
463
|
+
.aggregate([{ $match: { providerId: 'credential' } }, { $group: { _id: '$userId' } }])
|
|
464
|
+
.toArray();
|
|
465
|
+
const usersWithIamAccount = credentialAccounts.length;
|
|
466
|
+
const usersWithBoth = await usersCollection
|
|
467
|
+
.aggregate([
|
|
468
|
+
{
|
|
469
|
+
$match: {
|
|
470
|
+
iamId: { $exists: true, $ne: null },
|
|
471
|
+
},
|
|
472
|
+
},
|
|
473
|
+
{
|
|
474
|
+
$lookup: {
|
|
475
|
+
as: 'accounts',
|
|
476
|
+
foreignField: 'userId',
|
|
477
|
+
from: 'account',
|
|
478
|
+
localField: '_id',
|
|
479
|
+
},
|
|
480
|
+
},
|
|
481
|
+
{
|
|
482
|
+
$match: {
|
|
483
|
+
'accounts.providerId': 'credential',
|
|
484
|
+
},
|
|
485
|
+
},
|
|
486
|
+
{
|
|
487
|
+
$count: 'count',
|
|
488
|
+
},
|
|
489
|
+
])
|
|
490
|
+
.toArray();
|
|
491
|
+
const fullyMigratedUsers = usersWithBoth[0]?.count || 0;
|
|
492
|
+
const pendingMigrationUsers = totalUsers - fullyMigratedUsers;
|
|
493
|
+
const migrationPercentage = totalUsers > 0 ? Math.round((fullyMigratedUsers / totalUsers) * 100 * 100) / 100 : 0;
|
|
494
|
+
const pendingUsers = await usersCollection
|
|
495
|
+
.aggregate([
|
|
496
|
+
{
|
|
497
|
+
$lookup: {
|
|
498
|
+
as: 'accounts',
|
|
499
|
+
foreignField: 'userId',
|
|
500
|
+
from: 'account',
|
|
501
|
+
localField: '_id',
|
|
502
|
+
},
|
|
503
|
+
},
|
|
504
|
+
{
|
|
505
|
+
$match: {
|
|
506
|
+
$or: [
|
|
507
|
+
{ iamId: { $exists: false } },
|
|
508
|
+
{ iamId: null },
|
|
509
|
+
{
|
|
510
|
+
$and: [{ iamId: { $exists: true, $ne: null } }, { 'accounts.providerId': { $ne: 'credential' } }],
|
|
511
|
+
},
|
|
512
|
+
],
|
|
513
|
+
},
|
|
514
|
+
},
|
|
515
|
+
{ $limit: 100 },
|
|
516
|
+
{ $project: { email: 1 } },
|
|
517
|
+
])
|
|
518
|
+
.toArray();
|
|
519
|
+
const pendingUserEmails = pendingUsers.map((u) => u.email).filter(Boolean);
|
|
520
|
+
const canDisableLegacyAuth = totalUsers > 0 && fullyMigratedUsers === totalUsers;
|
|
521
|
+
return {
|
|
522
|
+
canDisableLegacyAuth,
|
|
523
|
+
fullyMigratedUsers,
|
|
524
|
+
migrationPercentage,
|
|
525
|
+
pendingMigrationUsers,
|
|
526
|
+
pendingUserEmails,
|
|
527
|
+
totalUsers,
|
|
528
|
+
usersWithIamAccount,
|
|
529
|
+
usersWithIamId,
|
|
530
|
+
};
|
|
531
|
+
}
|
|
532
|
+
catch (error) {
|
|
533
|
+
this.logger.error(`Error getting migration status: ${error instanceof Error ? error.message : 'Unknown error'}`);
|
|
534
|
+
return {
|
|
535
|
+
canDisableLegacyAuth: false,
|
|
536
|
+
fullyMigratedUsers: 0,
|
|
537
|
+
migrationPercentage: 0,
|
|
538
|
+
pendingMigrationUsers: 0,
|
|
539
|
+
pendingUserEmails: [],
|
|
540
|
+
totalUsers: 0,
|
|
541
|
+
usersWithIamAccount: 0,
|
|
542
|
+
usersWithIamId: 0,
|
|
543
|
+
};
|
|
544
|
+
}
|
|
545
|
+
}
|
|
151
546
|
};
|
|
152
547
|
exports.BetterAuthUserMapper = BetterAuthUserMapper;
|
|
153
548
|
exports.BetterAuthUserMapper = BetterAuthUserMapper = BetterAuthUserMapper_1 = __decorate([
|
|
@@ -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
|
}
|
|
@@ -34,7 +34,48 @@ let BetterAuthMiddleware = BetterAuthMiddleware_1 = class BetterAuthMiddleware {
|
|
|
34
34
|
req.betterAuthUser = session.user;
|
|
35
35
|
const mappedUser = await this.userMapper.mapSessionUser(session.user);
|
|
36
36
|
if (mappedUser) {
|
|
37
|
-
req.user = mappedUser;
|
|
37
|
+
req.user = { ...mappedUser, _authenticatedViaBetterAuth: true };
|
|
38
|
+
return next();
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
if (req.headers.authorization) {
|
|
42
|
+
const authHeader = req.headers.authorization;
|
|
43
|
+
const token = authHeader.startsWith('Bearer ') ? authHeader.substring(7) : authHeader;
|
|
44
|
+
const tokenParts = token.split('.').length;
|
|
45
|
+
if (tokenParts === 3) {
|
|
46
|
+
const isLegacyJwt = this.isLegacyJwt(token);
|
|
47
|
+
if (isLegacyJwt) {
|
|
48
|
+
return next();
|
|
49
|
+
}
|
|
50
|
+
if (this.betterAuthService.isJwtEnabled()) {
|
|
51
|
+
const jwtPayload = await this.betterAuthService.verifyJwtFromRequest(req);
|
|
52
|
+
if (jwtPayload?.sub) {
|
|
53
|
+
const sessionUser = {
|
|
54
|
+
email: jwtPayload.email || '',
|
|
55
|
+
emailVerified: jwtPayload.emailVerified,
|
|
56
|
+
id: jwtPayload.sub,
|
|
57
|
+
name: jwtPayload.name,
|
|
58
|
+
};
|
|
59
|
+
req.betterAuthUser = sessionUser;
|
|
60
|
+
const mappedUser = await this.userMapper.mapSessionUser(sessionUser);
|
|
61
|
+
if (mappedUser) {
|
|
62
|
+
req.user = { ...mappedUser, _authenticatedViaBetterAuth: true };
|
|
63
|
+
return next();
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
if (!req.user) {
|
|
69
|
+
const sessionResult = await this.betterAuthService.getSessionByToken(token);
|
|
70
|
+
if (sessionResult?.user) {
|
|
71
|
+
req.betterAuthSession = { session: sessionResult.session, user: sessionResult.user };
|
|
72
|
+
req.betterAuthUser = sessionResult.user;
|
|
73
|
+
const mappedUser = await this.userMapper.mapSessionUser(sessionResult.user);
|
|
74
|
+
if (mappedUser) {
|
|
75
|
+
req.user = { ...mappedUser, _authenticatedViaBetterAuth: true };
|
|
76
|
+
return next();
|
|
77
|
+
}
|
|
78
|
+
}
|
|
38
79
|
}
|
|
39
80
|
}
|
|
40
81
|
}
|
|
@@ -43,6 +84,19 @@ let BetterAuthMiddleware = BetterAuthMiddleware_1 = class BetterAuthMiddleware {
|
|
|
43
84
|
}
|
|
44
85
|
next();
|
|
45
86
|
}
|
|
87
|
+
isLegacyJwt(token) {
|
|
88
|
+
try {
|
|
89
|
+
const parts = token.split('.');
|
|
90
|
+
if (parts.length !== 3)
|
|
91
|
+
return false;
|
|
92
|
+
const payloadStr = Buffer.from(parts[1], 'base64url').toString('utf-8');
|
|
93
|
+
const payload = JSON.parse(payloadStr);
|
|
94
|
+
return payload.id !== undefined && payload.sub === undefined;
|
|
95
|
+
}
|
|
96
|
+
catch {
|
|
97
|
+
return false;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
46
100
|
async getSession(req) {
|
|
47
101
|
const api = this.betterAuthService.getApi();
|
|
48
102
|
if (!api) {
|