@volcanicminds/typeorm 0.2.2 → 0.2.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/lib/entities/user.d.ts +1 -0
- package/dist/lib/entities/user.js.map +1 -1
- package/dist/lib/loader/userManager.d.ts +1 -0
- package/dist/lib/loader/userManager.js +28 -4
- package/dist/lib/loader/userManager.js.map +1 -1
- package/esm/lib/entities/user.d.ts +1 -0
- package/esm/lib/entities/user.js.map +1 -1
- package/esm/lib/loader/userManager.d.ts +1 -0
- package/esm/lib/loader/userManager.js +30 -3
- package/esm/lib/loader/userManager.js.map +1 -1
- package/package.json +1 -1
|
@@ -6,6 +6,7 @@ export declare abstract class User extends BaseEntity {
|
|
|
6
6
|
abstract password: string;
|
|
7
7
|
abstract confirmed: boolean;
|
|
8
8
|
abstract confirmedAt: Date;
|
|
9
|
+
abstract passwordChangedAt: Date;
|
|
9
10
|
abstract blocked: boolean;
|
|
10
11
|
abstract blockedReason: string;
|
|
11
12
|
abstract blockedAt: Date;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../lib/entities/user.ts"],"names":[],"mappings":";;;AAAA,qCAAoC;AAEpC,MAAsB,IAAK,SAAQ,oBAAU;
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../lib/entities/user.ts"],"names":[],"mappings":";;;AAAA,qCAAoC;AAEpC,MAAsB,IAAK,SAAQ,oBAAU;CAqB5C;AArBD,oBAqBC"}
|
|
@@ -16,6 +16,7 @@ export declare function resetPassword(user: typeof global.entity.User, password:
|
|
|
16
16
|
export declare function userConfirmation(user: typeof global.entity.User): Promise<any>;
|
|
17
17
|
export declare function blockUserById(id: string, reason: string): Promise<any>;
|
|
18
18
|
export declare function unblockUserById(id: string): Promise<any>;
|
|
19
|
+
export declare function isPasswordToBeChanged(user: typeof global.entity.User): Promise<boolean>;
|
|
19
20
|
export declare function countQuery(data: any): Promise<any>;
|
|
20
21
|
export declare function findQuery(data: any): Promise<{
|
|
21
22
|
records: any;
|
|
@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
32
32
|
});
|
|
33
33
|
};
|
|
34
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
-
exports.findQuery = exports.countQuery = exports.unblockUserById = exports.blockUserById = exports.userConfirmation = exports.resetPassword = exports.forgotPassword = exports.changePassword = exports.retrieveUserByPassword = exports.retrieveUserByExternalId = exports.retrieveUserByResetPasswordToken = exports.retrieveUserByConfirmationToken = exports.retrieveUserByUsername = exports.retrieveUserByEmail = exports.retrieveUserById = exports.updateUserById = exports.resetExternalId = exports.createUser = exports.isValidUser = exports.isImplemented = void 0;
|
|
35
|
+
exports.findQuery = exports.countQuery = exports.isPasswordToBeChanged = exports.unblockUserById = exports.blockUserById = exports.userConfirmation = exports.resetPassword = exports.forgotPassword = exports.changePassword = exports.retrieveUserByPassword = exports.retrieveUserByExternalId = exports.retrieveUserByResetPasswordToken = exports.retrieveUserByConfirmationToken = exports.retrieveUserByUsername = exports.retrieveUserByEmail = exports.retrieveUserById = exports.updateUserById = exports.resetExternalId = exports.createUser = exports.isValidUser = exports.isImplemented = void 0;
|
|
36
36
|
const bcrypt = __importStar(require("bcrypt"));
|
|
37
37
|
const Crypto = require('crypto');
|
|
38
38
|
const query_1 = require("../query");
|
|
@@ -60,7 +60,7 @@ function createUser(data) {
|
|
|
60
60
|
externalId = Crypto.randomUUID({ disableEntropyCache: true });
|
|
61
61
|
user = yield global.repository.users.findOneBy({ externalId: externalId });
|
|
62
62
|
} while (user != null);
|
|
63
|
-
user = yield global.entity.User.create(Object.assign(Object.assign({}, data), { confirmed: false, confirmationToken: Crypto.randomBytes(64).toString('hex'), blocked: false, blockedReason: null, externalId: externalId, email: email, username: username || email, password: hashedPassword }));
|
|
63
|
+
user = yield global.entity.User.create(Object.assign(Object.assign({}, data), { passwordChangedAt: new Date(), confirmed: false, confirmationToken: Crypto.randomBytes(64).toString('hex'), blocked: false, blockedReason: null, externalId: externalId, email: email, username: username || email, password: hashedPassword }));
|
|
64
64
|
return yield global.entity.User.save(user);
|
|
65
65
|
}
|
|
66
66
|
catch (error) {
|
|
@@ -227,7 +227,7 @@ function changePassword(email, password, oldPassword) {
|
|
|
227
227
|
if (match) {
|
|
228
228
|
const salt = yield bcrypt.genSalt(12);
|
|
229
229
|
const hashedPassword = yield bcrypt.hash(password, salt);
|
|
230
|
-
return yield global.entity.User.save(Object.assign(Object.assign({}, user), { password: hashedPassword }));
|
|
230
|
+
return yield global.entity.User.save(Object.assign(Object.assign({}, user), { passwordChangedAt: new Date(), password: hashedPassword }));
|
|
231
231
|
}
|
|
232
232
|
return null;
|
|
233
233
|
}
|
|
@@ -263,7 +263,7 @@ function resetPassword(user, password) {
|
|
|
263
263
|
try {
|
|
264
264
|
const salt = yield bcrypt.genSalt(12);
|
|
265
265
|
const hashedPassword = yield bcrypt.hash(password, salt);
|
|
266
|
-
return yield global.entity.User.save(Object.assign(Object.assign({}, user), { confirmed: true, confirmedAt: new Date(), resetPasswordToken: null, password: hashedPassword }));
|
|
266
|
+
return yield global.entity.User.save(Object.assign(Object.assign({}, user), { passwordChangedAt: new Date(), confirmed: true, confirmedAt: new Date(), resetPasswordToken: null, password: hashedPassword }));
|
|
267
267
|
}
|
|
268
268
|
catch (error) {
|
|
269
269
|
throw error;
|
|
@@ -297,6 +297,30 @@ function unblockUserById(id) {
|
|
|
297
297
|
});
|
|
298
298
|
}
|
|
299
299
|
exports.unblockUserById = unblockUserById;
|
|
300
|
+
function isPasswordToBeChanged(user) {
|
|
301
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
302
|
+
if (process.env.PASSWORD_EXPIRATION_DAYS != null) {
|
|
303
|
+
let passwordExpirationDays = -1;
|
|
304
|
+
try {
|
|
305
|
+
passwordExpirationDays = Number(process.env.PASSWORD_EXPIRATION_DAYS);
|
|
306
|
+
if (passwordExpirationDays <= 0) {
|
|
307
|
+
throw new Error('PASSWORD_EXPIRATION_DAYS_ENV_INVALID');
|
|
308
|
+
}
|
|
309
|
+
}
|
|
310
|
+
catch (e) {
|
|
311
|
+
throw new Error(e);
|
|
312
|
+
}
|
|
313
|
+
const { passwordChangedAt } = user;
|
|
314
|
+
const date1 = new Date(passwordChangedAt);
|
|
315
|
+
const date2 = new Date();
|
|
316
|
+
const differenceInTime = date2.getTime() - date1.getTime();
|
|
317
|
+
const differenceInDays = differenceInTime / (1000 * 3600 * 24);
|
|
318
|
+
return differenceInDays >= passwordExpirationDays;
|
|
319
|
+
}
|
|
320
|
+
return false;
|
|
321
|
+
});
|
|
322
|
+
}
|
|
323
|
+
exports.isPasswordToBeChanged = isPasswordToBeChanged;
|
|
300
324
|
function countQuery(data) {
|
|
301
325
|
return __awaiter(this, void 0, void 0, function* () {
|
|
302
326
|
return yield (0, query_1.executeCountQuery)(global.repository.users, data);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userManager.js","sourceRoot":"","sources":["../../../lib/loader/userManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgC;AAChC,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAChC,oCAA8D;AAE9D,SAAgB,aAAa;IAC3B,OAAO,IAAI,CAAA;AACb,CAAC;AAFD,sCAEC;AAED,SAAsB,WAAW,CAAC,IAA+B;;QAC/D,OAAO,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAA;IACpG,CAAC;CAAA;AAFD,kCAEC;AAED,SAAsB,UAAU,CAAC,IAA+B;;QAC9D,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;QAE1C,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ,EAAE;YACvB,OAAO,IAAI,CAAA;SACZ;QAED,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QACrC,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;QAExD,IAAI;YACF,IAAI,UAAU,EAAE,IAAI,CAAA;YACpB,GAAG;gBACD,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,CAAA;gBAE7D,IAAI,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAA;aAC3E,QAAQ,IAAI,IAAI,IAAI,EAAC;YAEtB,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,gCAClC,IAAI,KACP,SAAS,EAAE,KAAK,EAChB,iBAAiB,EAAE,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EACzD,OAAO,EAAE,KAAK,EACd,aAAa,EAAE,IAAI,EACnB,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,IAAI,KAAK,EAC3B,QAAQ,EAAE,cAAc,GACI,CAAC,CAAA;YAE/B,OAAO,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SAC3C;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,KAAI,KAAK,EAAE;gBACxB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;aACxD;YACD,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CAAA;
|
|
1
|
+
{"version":3,"file":"userManager.js","sourceRoot":"","sources":["../../../lib/loader/userManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export declare abstract class User extends BaseEntity {
|
|
|
6
6
|
abstract password: string;
|
|
7
7
|
abstract confirmed: boolean;
|
|
8
8
|
abstract confirmedAt: Date;
|
|
9
|
+
abstract passwordChangedAt: Date;
|
|
9
10
|
abstract blocked: boolean;
|
|
10
11
|
abstract blockedReason: string;
|
|
11
12
|
abstract blockedAt: Date;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../lib/entities/user.ts"],"names":[],"mappings":";;;AAAA,qCAAoC;AAEpC,MAAsB,IAAK,SAAQ,oBAAU;
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../lib/entities/user.ts"],"names":[],"mappings":";;;AAAA,qCAAoC;AAEpC,MAAsB,IAAK,SAAQ,oBAAU;CAqB5C;AArBD,oBAqBC"}
|
|
@@ -16,6 +16,7 @@ export declare function resetPassword(user: typeof global.entity.User, password:
|
|
|
16
16
|
export declare function userConfirmation(user: typeof global.entity.User): Promise<any>;
|
|
17
17
|
export declare function blockUserById(id: string, reason: string): Promise<any>;
|
|
18
18
|
export declare function unblockUserById(id: string): Promise<any>;
|
|
19
|
+
export declare function isPasswordToBeChanged(user: typeof global.entity.User): Promise<boolean>;
|
|
19
20
|
export declare function countQuery(data: any): Promise<any>;
|
|
20
21
|
export declare function findQuery(data: any): Promise<{
|
|
21
22
|
records: any;
|
|
@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.findQuery = exports.countQuery = exports.unblockUserById = exports.blockUserById = exports.userConfirmation = exports.resetPassword = exports.forgotPassword = exports.changePassword = exports.retrieveUserByPassword = exports.retrieveUserByExternalId = exports.retrieveUserByResetPasswordToken = exports.retrieveUserByConfirmationToken = exports.retrieveUserByUsername = exports.retrieveUserByEmail = exports.retrieveUserById = exports.updateUserById = exports.resetExternalId = exports.createUser = exports.isValidUser = exports.isImplemented = void 0;
|
|
26
|
+
exports.findQuery = exports.countQuery = exports.isPasswordToBeChanged = exports.unblockUserById = exports.blockUserById = exports.userConfirmation = exports.resetPassword = exports.forgotPassword = exports.changePassword = exports.retrieveUserByPassword = exports.retrieveUserByExternalId = exports.retrieveUserByResetPasswordToken = exports.retrieveUserByConfirmationToken = exports.retrieveUserByUsername = exports.retrieveUserByEmail = exports.retrieveUserById = exports.updateUserById = exports.resetExternalId = exports.createUser = exports.isValidUser = exports.isImplemented = void 0;
|
|
27
27
|
const bcrypt = __importStar(require("bcrypt"));
|
|
28
28
|
const Crypto = require('crypto');
|
|
29
29
|
const query_1 = require("../query");
|
|
@@ -50,6 +50,7 @@ async function createUser(data) {
|
|
|
50
50
|
} while (user != null);
|
|
51
51
|
user = await global.entity.User.create({
|
|
52
52
|
...data,
|
|
53
|
+
passwordChangedAt: new Date(),
|
|
53
54
|
confirmed: false,
|
|
54
55
|
confirmationToken: Crypto.randomBytes(64).toString('hex'),
|
|
55
56
|
blocked: false,
|
|
@@ -205,7 +206,7 @@ async function changePassword(email, password, oldPassword) {
|
|
|
205
206
|
if (match) {
|
|
206
207
|
const salt = await bcrypt.genSalt(12);
|
|
207
208
|
const hashedPassword = await bcrypt.hash(password, salt);
|
|
208
|
-
return await global.entity.User.save({ ...user, password: hashedPassword });
|
|
209
|
+
return await global.entity.User.save({ ...user, passwordChangedAt: new Date(), password: hashedPassword });
|
|
209
210
|
}
|
|
210
211
|
return null;
|
|
211
212
|
}
|
|
@@ -221,7 +222,10 @@ async function forgotPassword(email) {
|
|
|
221
222
|
try {
|
|
222
223
|
const user = await global.repository.users.findOneBy({ email: email });
|
|
223
224
|
if (user) {
|
|
224
|
-
return await global.entity.User.save({
|
|
225
|
+
return await global.entity.User.save({
|
|
226
|
+
...user,
|
|
227
|
+
resetPasswordToken: Crypto.randomBytes(64).toString('hex')
|
|
228
|
+
});
|
|
225
229
|
}
|
|
226
230
|
return null;
|
|
227
231
|
}
|
|
@@ -239,6 +243,7 @@ async function resetPassword(user, password) {
|
|
|
239
243
|
const hashedPassword = await bcrypt.hash(password, salt);
|
|
240
244
|
return await global.entity.User.save({
|
|
241
245
|
...user,
|
|
246
|
+
passwordChangedAt: new Date(),
|
|
242
247
|
confirmed: true,
|
|
243
248
|
confirmedAt: new Date(),
|
|
244
249
|
resetPasswordToken: null,
|
|
@@ -270,6 +275,28 @@ async function unblockUserById(id) {
|
|
|
270
275
|
return updateUserById(id, { blocked: false, blockedAt: new Date(), blockedReason: null });
|
|
271
276
|
}
|
|
272
277
|
exports.unblockUserById = unblockUserById;
|
|
278
|
+
async function isPasswordToBeChanged(user) {
|
|
279
|
+
if (process.env.PASSWORD_EXPIRATION_DAYS != null) {
|
|
280
|
+
let passwordExpirationDays = -1;
|
|
281
|
+
try {
|
|
282
|
+
passwordExpirationDays = Number(process.env.PASSWORD_EXPIRATION_DAYS);
|
|
283
|
+
if (passwordExpirationDays <= 0) {
|
|
284
|
+
throw new Error('PASSWORD_EXPIRATION_DAYS_ENV_INVALID');
|
|
285
|
+
}
|
|
286
|
+
}
|
|
287
|
+
catch (e) {
|
|
288
|
+
throw new Error(e);
|
|
289
|
+
}
|
|
290
|
+
const { passwordChangedAt } = user;
|
|
291
|
+
const date1 = new Date(passwordChangedAt);
|
|
292
|
+
const date2 = new Date();
|
|
293
|
+
const differenceInTime = date2.getTime() - date1.getTime();
|
|
294
|
+
const differenceInDays = differenceInTime / (1000 * 3600 * 24);
|
|
295
|
+
return differenceInDays >= passwordExpirationDays;
|
|
296
|
+
}
|
|
297
|
+
return false;
|
|
298
|
+
}
|
|
299
|
+
exports.isPasswordToBeChanged = isPasswordToBeChanged;
|
|
273
300
|
async function countQuery(data) {
|
|
274
301
|
return await (0, query_1.executeCountQuery)(global.repository.users, data);
|
|
275
302
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userManager.js","sourceRoot":"","sources":["../../../lib/loader/userManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgC;AAChC,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAChC,oCAA8D;AAE9D,SAAgB,aAAa;IAC3B,OAAO,IAAI,CAAA;AACb,CAAC;AAFD,sCAEC;AAEM,KAAK,UAAU,WAAW,CAAC,IAA+B;IAC/D,OAAO,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAA;AACpG,CAAC;AAFD,kCAEC;AAEM,KAAK,UAAU,UAAU,CAAC,IAA+B;IAC9D,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IAE1C,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ,EAAE;QACvB,OAAO,IAAI,CAAA;KACZ;IAED,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IACrC,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IAExD,IAAI;QACF,IAAI,UAAU,EAAE,IAAI,CAAA;QACpB,GAAG;YACD,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,CAAA;YAE7D,IAAI,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAA;SAC3E,QAAQ,IAAI,IAAI,IAAI,EAAC;QAEtB,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;YACrC,GAAG,IAAI;YACP,SAAS,EAAE,KAAK;YAChB,iBAAiB,EAAE,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;YACzD,OAAO,EAAE,KAAK;YACd,aAAa,EAAE,IAAI;YACnB,UAAU,EAAE,UAAU;YACtB,KAAK,EAAE,KAAK;YACZ,QAAQ,EAAE,QAAQ,IAAI,KAAK;YAC3B,QAAQ,EAAE,cAAc;SACI,CAAC,CAAA;QAE/B,OAAO,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;KAC3C;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,KAAI,KAAK,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;SACxD;QACD,MAAM,KAAK,CAAA;KACZ;AACH,CAAC;
|
|
1
|
+
{"version":3,"file":"userManager.js","sourceRoot":"","sources":["../../../lib/loader/userManager.ts"],"names":[],"mappings":"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"}
|