@steedos/accounts 3.0.13-beta.21 → 3.0.13-beta.23

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.
Files changed (14) hide show
  1. package/lib/password/accounts-password.js +32 -0
  2. package/lib/password/accounts-password.js.map +1 -1
  3. package/lib/rest-express/endpoints/password/change-password.js +1 -1
  4. package/lib/rest-express/endpoints/password/change-password.js.map +1 -1
  5. package/lib/rest-express/endpoints/password/setSpaceUserPassword.js +4 -0
  6. package/lib/rest-express/endpoints/password/setSpaceUserPassword.js.map +1 -1
  7. package/lib/rest-express/endpoints/service-authenticate.js +0 -1
  8. package/lib/rest-express/endpoints/service-authenticate.js.map +1 -1
  9. package/package.json +5 -5
  10. package/src/password/accounts-password.ts +61 -0
  11. package/src/rest-express/endpoints/password/change-password.ts +1 -1
  12. package/src/rest-express/endpoints/password/setSpaceUserPassword.ts +5 -0
  13. package/src/rest-express/endpoints/service-authenticate.ts +2 -5
  14. package/src/types/types/user.ts +2 -0
package/lib/password/accounts-password.js CHANGED
@@ -218,6 +218,37 @@ class AccountsPassword {
218
218
  phone_login_expiration_in_days,
219
219
  });
220
220
  }
221
+ async checkPasswordExpiry(userId) {
222
+ const config = (0, objectql_1.getSteedosConfig)();
223
+ const tenant = config?.tenant;
224
+ if (!tenant || !tenant._id) {
225
+ return;
226
+ }
227
+ const spaceId = tenant._id;
228
+ const spaces = await (0, objectql_1.getObject)("spaces").find({
229
+ filters: [['_id', '=', spaceId]],
230
+ fields: ['password_expiry_days']
231
+ });
232
+ if (!spaces || spaces.length === 0) {
233
+ return;
234
+ }
235
+ const space = spaces[0];
236
+ const passwordExpiryDays = space.password_expiry_days;
237
+ if (!passwordExpiryDays || passwordExpiryDays <= 0) {
238
+ return;
239
+ }
240
+ const user = await this.db.findUserById(userId);
241
+ const passwordModifiedAt = user.password_modified_at;
242
+ if (!passwordModifiedAt) {
243
+ return;
244
+ }
245
+ const daysSinceModified = moment().diff(moment(passwordModifiedAt), 'days');
246
+ if (daysSinceModified >= passwordExpiryDays) {
247
+ await this.db.updateUser(userId, {
248
+ $set: { password_expired: true }
249
+ });
250
+ }
251
+ }
221
252
  async setPassword(userId, newPassword) {
222
253
  const password = await (0, utils_1.bcryptPassword)(newPassword);
223
254
  return this.db.setPassword(userId, password);
@@ -475,6 +506,7 @@ class AccountsPassword {
475
506
  $unset: { login_failed_lockout_time: 1 },
476
507
  });
477
508
  }
509
+ await this.checkPasswordExpiry(foundUser.id);
478
510
  return foundUser;
479
511
  }
480
512
  async codeAuthenticator(user, token, locale) {
package/lib/password/accounts-password.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"accounts-password.js","sourceRoot":"","sources":["../../src/password/accounts-password.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"accounts-password.js","sourceRoot":"","sources":["../../src/password/accounts-password.ts"],"names":[],"mappings":"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"}
package/lib/rest-express/endpoints/password/change-password.js CHANGED
@@ -18,7 +18,7 @@ const changePassword = (accountsServer) => async (req, res) => {
18
18
  const { oldPassword, newPassword } = req.body;
19
19
  const password = accountsServer.getServices().password;
20
20
  await password.changePassword(req.userId, oldPassword, newPassword);
21
- password.db.collection.updateOne({ _id: req.userId }, { $set: { password_expired: false } });
21
+ password.db.collection.updateOne({ _id: req.userId }, { $set: { password_expired: false, password_modified_at: new Date() } });
22
22
  try {
23
23
  await db_1.db.updateMany("space_users", [["user", "=", req.userId]], { password_expired: false });
24
24
  const userAgent = (0, get_user_agent_1.getUserAgent)(req);
package/lib/rest-express/endpoints/password/change-password.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"change-password.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/password/change-password.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"change-password.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/password/change-password.ts"],"names":[],"mappings":";;;AASA,uDAAmD;AACnD,gDAAgE;AAGhE,yDAAsD;AACtD,+DAA0D;AAC1D,2CAAkC;AAClC,oCAAiC;AAEjC,MAAM,MAAM,GAAG,IAAA,2BAAgB,GAAE,CAAC;AAG3B,MAAM,cAAc,GACzB,CAAC,cAA8B,EAAE,EAAE,CACnC,KAAK,EAAE,GAAoB,EAAE,GAAqB,EAAE,EAAE;IACpD,IAAI,CAAC;QACH,IAAI,CAAE,GAAW,CAAC,MAAM,EAAE,CAAC;YACzB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAChB,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;YACtC,OAAO;QACT,CAAC;QAED,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QAW9C,MAAM,QAAQ,GAAQ,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;QAE5D,MAAM,QAAQ,CAAC,cAAc,CAC1B,GAAW,CAAC,MAAM,EACnB,WAAW,EACX,WAAW,CACZ,CAAC;QACF,QAAQ,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAC9B,EAAE,GAAG,EAAG,GAAW,CAAC,MAAM,EAAE,EAC5B,EAAE,IAAI,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,oBAAoB,EAAE,IAAI,IAAI,EAAE,EAAE,EAAE,CACxE,CAAC;QACF,IAAI,CAAC;YACH,MAAM,OAAE,CAAC,UAAU,CACjB,aAAa,EACb,CAAC,CAAC,MAAM,EAAE,GAAG,EAAG,GAAW,CAAC,MAAM,CAAC,CAAC,EACpC,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAC5B,CAAC;YAEF,MAAM,SAAS,GAAG,IAAA,6BAAY,EAAC,GAAG,CAAC,CAAC;YACpC,MAAM,EAAE,GAAG,IAAA,yBAAW,EAAC,GAAG,CAAC,CAAC;YAC5B,IAAI,QAAQ,GAAG,KAAK,CAAC;YACrB,IAAI,SAAS,GAAG,KAAK,CAAC;YACtB,IAAI,SAAS,EAAE,CAAC;gBACd,IAAI,CAAC;oBACH,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAA,oBAAQ,EAAC,SAAS,CAAC,CAAC;oBAC9C,QAAQ,GAAG,KAAK,CAAC;oBACjB,SAAS,GAAG,MAAM,CAAC;gBACrB,CAAC;gBAAC,OAAO,SAAS,EAAE,CAAC;oBACnB,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;gBACtC,CAAC;YACH,CAAC;YAED,MAAM,UAAU,GAAG,MAAM,OAAE,CAAC,IAAI,CAAC,aAAa,EAAE;gBAC9C,OAAO,EAAE;oBACP,CAAC,MAAM,EAAE,GAAG,EAAG,GAAW,CAAC,MAAM,CAAC;oBAClC,CAAC,eAAe,EAAE,GAAG,EAAE,IAAI,CAAC;iBAC7B;gBACD,MAAM,EAAE,CAAC,OAAO,CAAC;aAClB,CAAC,CAAC;YAEH,IAAI,UAAU,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxC,KAAK,IAAI,SAAS,IAAI,UAAU,EAAE,CAAC;oBACjC,MAAM,MAAM,GAAI,GAAW,CAAC,MAAM,CAAC;oBACnC,MAAM,IAAA,oBAAS,EAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC;wBACvC,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,iBAAiB;wBACvB,WAAW,EAAE,MAAM;wBACnB,WAAW,EAAE,EAAE;wBACf,eAAe,EAAE,SAAS;wBAC1B,SAAS,EAAE,QAAQ;wBACnB,SAAS;wBACT,MAAM,EAAE,OAAO;wBACf,MAAM,EAAE,SAAS;wBACjB,MAAM,EAAE,IAAI,IAAI,EAAE;wBAClB,SAAS,EAAE,MAAM;wBACjB,WAAW,EAAE,MAAM;wBACnB,KAAK,EAAE,SAAS,CAAC,KAAK;wBACtB,UAAU,EAAE;4BACV,CAAC,EAAE,OAAO;4BACV,GAAG,EAAE,CAAC,MAAM,CAAC;yBACd;qBACF,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC9B,CAAC;QACD,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAG,GAAW,CAAC,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC,CAAC;IACrE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAA,sBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACtB,CAAC;AACH,CAAC,CAAC;AA5FS,QAAA,cAAc,kBA4FvB"}
package/lib/rest-express/endpoints/password/setSpaceUserPassword.js CHANGED
@@ -53,6 +53,10 @@ const setSpaceUserPassword = (accountsServer) => async (req, res) => {
53
53
  const bcryptedPassword = await (0, utils_1.bcryptPassword)(password);
54
54
  const servicePassword = accountsServer.getServices().password;
55
55
  await servicePassword.db.setPassword(user_id, bcryptedPassword);
56
+ await (0, objectql_1.getObject)("users").update(user_id, {
57
+ password_modified_at: new Date(),
58
+ password_expired: false
59
+ });
56
60
  const changedUserInfo = await (0, objectql_1.getObject)("users").findOne(user_id);
57
61
  if (changedUserInfo?.services?.password?.bcrypt) {
58
62
  await (0, objectql_1.getObject)("users").update(user_id, {
package/lib/rest-express/endpoints/password/setSpaceUserPassword.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"setSpaceUserPassword.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/password/setSpaceUserPassword.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"setSpaceUserPassword.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/password/setSpaceUserPassword.ts"],"names":[],"mappings":"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"}
package/lib/rest-express/endpoints/service-authenticate.js CHANGED
@@ -31,7 +31,6 @@ const serviceAuthenticate = (accountsServer) => async (req, res) => {
31
31
  userAgent,
32
32
  });
33
33
  }
34
- let user = await db.collection.findOne({ _id: session.userId }, { password_expired: 1 });
35
34
  let authToken = null;
36
35
  let stampedAuthToken = {
37
36
  token: session.token,
package/lib/rest-express/endpoints/service-authenticate.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"service-authenticate.js","sourceRoot":"","sources":["../../../src/rest-express/endpoints/service-authenticate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"service-authenticate.js","sourceRoot":"","sources":["../../../src/rest-express/endpoints/service-authenticate.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steedos/accounts",
3
- "version": "3.0.13-beta.21",
3
+ "version": "3.0.13-beta.23",
4
4
  "main": "lib/index.js",
5
5
  "files": [
6
6
  "/package.json",
@@ -25,9 +25,9 @@
25
25
  "dependencies": {
26
26
  "@accounts/types": "0.20.1",
27
27
  "@babel/runtime": "^7.12.18",
28
- "@steedos/auth": "3.0.13-beta.21",
29
- "@steedos/objectql": "3.0.13-beta.21",
30
- "@steedos/utils": "3.0.13-beta.21",
28
+ "@steedos/auth": "3.0.13-beta.23",
29
+ "@steedos/objectql": "3.0.13-beta.23",
30
+ "@steedos/utils": "3.0.13-beta.23",
31
31
  "app-root-path": "^2.2.1",
32
32
  "bcryptjs": "^3.0.3",
33
33
  "body-parser": "^2.2.1",
@@ -56,5 +56,5 @@
56
56
  "publishConfig": {
57
57
  "access": "public"
58
58
  },
59
- "gitHead": "2764a863470220194f4e2d1b74e46769b57f0cba"
59
+ "gitHead": "acb8a99b8df31ffc899623784b0e983b287b4f90"
60
60
  }
package/src/password/accounts-password.ts CHANGED
@@ -464,6 +464,63 @@ export default class AccountsPassword implements AuthenticationService {
464
464
  });
465
465
  }
466
466
 
467
+ /**
468
+ * @description Check if user's password has expired based on space configuration
469
+ * @param {string} userId - User id.
470
+ * @returns {Promise<void>} - Throws error if password expired.
471
+ */
472
+ public async checkPasswordExpiry(userId: string): Promise<void> {
473
+ const config = getSteedosConfig();
474
+ const tenant = config?.tenant;
475
+
476
+ // Safety check: if tenant is not configured, skip expiry check
477
+ if (!tenant || !tenant._id) {
478
+ return;
479
+ }
480
+
481
+ const spaceId = tenant._id;
482
+
483
+ // Get space configuration for password expiry
484
+ const spaces = await getObject("spaces").find({
485
+ filters: [['_id', '=', spaceId]],
486
+ fields: ['password_expiry_days']
487
+ });
488
+
489
+ if (!spaces || spaces.length === 0) {
490
+ return; // No space found, skip check
491
+ }
492
+
493
+ const space = spaces[0];
494
+ const passwordExpiryDays = space.password_expiry_days;
495
+
496
+ // If password_expiry_days is not set or is 0, skip expiry check
497
+ if (!passwordExpiryDays || passwordExpiryDays <= 0) {
498
+ return;
499
+ }
500
+
501
+ // Get user's password_modified_at timestamp
502
+ const user = await this.db.findUserById(userId);
503
+ const passwordModifiedAt = user.password_modified_at;
504
+
505
+ // If password_modified_at is not set, don't force expiry
506
+ // This allows existing users to continue using their passwords
507
+ // New users will have password_modified_at set on first password creation
508
+ if (!passwordModifiedAt) {
509
+ return; // Skip check for users without password_modified_at
510
+ }
511
+
512
+ // Calculate days since password was last modified
513
+ const daysSinceModified = moment().diff(moment(passwordModifiedAt), 'days');
514
+
515
+ // Check if password has expired
516
+ if (daysSinceModified >= passwordExpiryDays) {
517
+ await this.db.updateUser(userId, {
518
+ $set: { password_expired: true }
519
+ });
520
+ // Don't throw error here, let the validate endpoint handle it
521
+ }
522
+ }
523
+
467
524
  /**
468
525
  * @description Change the password for a user.
469
526
  * @param {string} userId - User id.
@@ -875,6 +932,10 @@ export default class AccountsPassword implements AuthenticationService {
875
932
  });
876
933
  }
877
934
 
935
+ // Check password expiry based on space configuration
936
+ // Only check for password-based authentication (not OIDC or other services)
937
+ await this.checkPasswordExpiry(foundUser.id);
938
+
878
939
  return foundUser;
879
940
  }
880
941
 
package/src/rest-express/endpoints/password/change-password.ts CHANGED
@@ -49,7 +49,7 @@ export const changePassword =
49
49
  );
50
50
  password.db.collection.updateOne(
51
51
  { _id: (req as any).userId },
52
- { $set: { password_expired: false } },
52
+ { $set: { password_expired: false, password_modified_at: new Date() } },
53
53
  );
54
54
  try {
55
55
  await db.updateMany(
package/src/rest-express/endpoints/password/setSpaceUserPassword.ts CHANGED
@@ -66,6 +66,11 @@ export const setSpaceUserPassword =
66
66
  const bcryptedPassword = await bcryptPassword(password);
67
67
  const servicePassword: any = accountsServer.getServices().password;
68
68
  await servicePassword.db.setPassword(user_id, bcryptedPassword);
69
+ // Update password_modified_at timestamp
70
+ await getObject("users").update(user_id, {
71
+ password_modified_at: new Date(),
72
+ password_expired: false
73
+ });
69
74
  const changedUserInfo = await getObject("users").findOne(user_id);
70
75
  if (changedUserInfo?.services?.password?.bcrypt) {
71
76
  await getObject("users").update(user_id, {
package/src/rest-express/endpoints/service-authenticate.ts CHANGED
@@ -48,11 +48,8 @@ export const serviceAuthenticate =
48
48
  });
49
49
  }
50
50
 
51
- //确认用户密码是否过期
52
- let user = await db.collection.findOne(
53
- { _id: session.userId },
54
- { password_expired: 1 },
55
- );
51
+ // OIDC/OAuth用户不检查密码过期，因此不需要获取password_expired
52
+ // Users authenticated via OIDC/OAuth don't need password expiry check
56
53
 
57
54
  //创建Meteor token
58
55
  let authToken = null;
package/src/types/types/user.ts CHANGED
@@ -11,4 +11,6 @@ export interface User {
11
11
  id: string;
12
12
  services?: object;
13
13
  deactivated: boolean;
14
+ password_expired?: boolean;
15
+ password_modified_at?: Date;
14
16
  }