@steedos/accounts 2.2.25 → 2.2.28

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 (9) hide show
  1. package/lib/password/accounts-password.js +1 -1
  2. package/lib/password/accounts-password.js.map +1 -1
  3. package/lib/rest-express/endpoints/password/change-password.js.map +1 -1
  4. package/lib/rest-express/utils/steedos-auth.js +4 -8
  5. package/lib/rest-express/utils/steedos-auth.js.map +1 -1
  6. package/package.json +6 -6
  7. package/src/password/accounts-password.ts +2 -1
  8. package/src/rest-express/endpoints/password/change-password.ts +1 -0
  9. package/src/rest-express/utils/steedos-auth.ts +4 -8
package/lib/password/accounts-password.js CHANGED
@@ -721,7 +721,7 @@ var AccountsPassword = /** @class */ (function () {
721
721
  }
722
722
  }
723
723
  hashAlgorithm = this.options.passwordHashAlgorithm;
724
- pass = hashAlgorithm ? (0, utils_1.hashPassword)(password, hashAlgorithm) : password;
724
+ pass = password;
725
725
  return [4 /*yield*/, (0, utils_1.verifyPassword)(pass, hash)];
726
726
  case 10:
727
727
  isPasswordValid = _b.sent();
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.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"change-password.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/password/change-password.ts"],"names":[],"mappings":";;;;AAEA,qDAAmD;AACnD,8CAAoD;AACpD,iDAAuD;AAEvD,IAAM,MAAM,GAAG,IAAA,2BAAgB,GAAE,CAAC;AAG3B,IAAM,cAAc,GAAG,UAAC,cAA8B,IAAK,OAAA,UAChE,GAAoB,EACpB,GAAqB;;;;;;gBAGnB,IAAI,CAAE,GAAW,CAAC,MAAM,EAAE;oBACxB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBAChB,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;oBACtC,sBAAO;iBACR;gBACK,KAA+B,GAAG,CAAC,IAAI,EAArC,WAAW,iBAAA,EAAE,WAAW,iBAAA,CAAc;gBAE1C,aAAa,GAAG,CAAE,MAAc,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,CAAA;gBAE3D,IAAG,aAAa,EAAC;oBACf,IAAG,CAAC,CAAC,IAAI,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,EAAC;wBACpD,IAAA,sBAAS,EAAC,GAAG,EAAE,IAAI,KAAK,CAAE,MAAc,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;wBAChE,sBAAO;qBACV;iBACF;gBAEK,QAAQ,GAAQ,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBAE5D,qBAAM,QAAQ,CAAC,cAAc,CAAE,GAAW,CAAC,MAAM,EAAE,WAAW,EAAE,IAAA,oBAAY,EAAC,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,EAAA;;gBAAlI,SAAkI,CAAC;gBACnI,QAAQ,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAC,GAAG,EAAG,GAAW,CAAC,MAAM,EAAC,EAAE,EAAC,IAAI,EAAE,EAAC,gBAAgB,EAAE,KAAK,EAAC,EAAC,CAAC,CAAA;gBAC/F,IAAI;oBACF,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,EAAC,IAAI,EAAG,GAAW,CAAC,MAAM,EAAC,EAAE,EAAC,IAAI,EAAE,EAAC,gBAAgB,EAAE,KAAK,EAAC,EAAC,EAAE;wBAC1G,KAAK,EAAE,IAAI;qBACZ,CAAC,CAAA;iBACH;gBAAC,OAAO,KAAK,EAAE;oBACd,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;iBAC7B;gBACD,GAAG,CAAC,IAAI,CAAC,EAAC,MAAM,EAAG,GAAW,CAAC,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAC,CAAC,CAAC;;;;gBAEjE,IAAA,sBAAS,EAAC,GAAG,EAAE,KAAG,CAAC,CAAC;;;;;KAEvB,EApCiE,CAoCjE,CAAC;AApCW,QAAA,cAAc,kBAoCzB"}
1
+ {"version":3,"file":"change-password.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/password/change-password.ts"],"names":[],"mappings":";;;;AAEA,qDAAmD;AACnD,8CAAoD;AACpD,iDAAuD;AAEvD,IAAM,MAAM,GAAG,IAAA,2BAAgB,GAAE,CAAC;AAG3B,IAAM,cAAc,GAAG,UAAC,cAA8B,IAAK,OAAA,UAChE,GAAoB,EACpB,GAAqB;;;;;;gBAGnB,IAAI,CAAE,GAAW,CAAC,MAAM,EAAE;oBACxB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBAChB,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;oBACtC,sBAAO;iBACR;gBAEK,KAA+B,GAAG,CAAC,IAAI,EAArC,WAAW,iBAAA,EAAE,WAAW,iBAAA,CAAc;gBAE1C,aAAa,GAAG,CAAE,MAAc,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,CAAA;gBAE3D,IAAG,aAAa,EAAC;oBACf,IAAG,CAAC,CAAC,IAAI,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,EAAC;wBACpD,IAAA,sBAAS,EAAC,GAAG,EAAE,IAAI,KAAK,CAAE,MAAc,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;wBAChE,sBAAO;qBACV;iBACF;gBAEK,QAAQ,GAAQ,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBAE5D,qBAAM,QAAQ,CAAC,cAAc,CAAE,GAAW,CAAC,MAAM,EAAE,WAAW,EAAE,IAAA,oBAAY,EAAC,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,EAAA;;gBAAlI,SAAkI,CAAC;gBACnI,QAAQ,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAC,GAAG,EAAG,GAAW,CAAC,MAAM,EAAC,EAAE,EAAC,IAAI,EAAE,EAAC,gBAAgB,EAAE,KAAK,EAAC,EAAC,CAAC,CAAA;gBAC/F,IAAI;oBACF,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,EAAC,IAAI,EAAG,GAAW,CAAC,MAAM,EAAC,EAAE,EAAC,IAAI,EAAE,EAAC,gBAAgB,EAAE,KAAK,EAAC,EAAC,EAAE;wBAC1G,KAAK,EAAE,IAAI;qBACZ,CAAC,CAAA;iBACH;gBAAC,OAAO,KAAK,EAAE;oBACd,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;iBAC7B;gBACD,GAAG,CAAC,IAAI,CAAC,EAAC,MAAM,EAAG,GAAW,CAAC,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAC,CAAC,CAAC;;;;gBAEjE,IAAA,sBAAS,EAAC,GAAG,EAAE,KAAG,CAAC,CAAC;;;;;KAEvB,EArCiE,CAqCjE,CAAC;AArCW,QAAA,cAAc,kBAqCzB"}
package/lib/rest-express/utils/steedos-auth.js CHANGED
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.clearAuthCookies = exports.setAuthCookies = exports.getAuthTokenCookie = exports.hashStampedToken = exports.hashLoginToken = void 0;
4
4
  var tslib_1 = require("tslib");
5
5
  var crypto = require("crypto");
6
+ var auth = require('@steedos/auth');
6
7
  var Cookies = require('cookies');
7
8
  var hashLoginToken = function (loginToken) {
8
9
  var hash = crypto.createHash('sha256');
@@ -25,19 +26,14 @@ var getAuthTokenCookie = function (req, res) {
25
26
  };
26
27
  exports.getAuthTokenCookie = getAuthTokenCookie;
27
28
  var setAuthCookies = function (req, res, userId, authToken, accessToken, spaceId) {
29
+ auth.setAuthCookies(req, res, userId, authToken, spaceId);
28
30
  var cookies = new Cookies(req, res);
29
31
  var options = {
30
32
  maxAge: 90 * 60 * 60 * 24 * 1000,
31
- httpOnly: false,
33
+ httpOnly: true,
32
34
  overwrite: true,
33
35
  };
34
- cookies.set("X-User-Id", userId, options);
35
- cookies.set("X-Auth-Token", authToken, options);
36
36
  cookies.set("X-Access-Token", accessToken, options);
37
- if (spaceId) {
38
- cookies.set("X-Space-Id", spaceId, options);
39
- cookies.set("X-Space-Token", spaceId + ',' + authToken, options);
40
- }
41
37
  return;
42
38
  };
43
39
  exports.setAuthCookies = setAuthCookies;
@@ -45,7 +41,7 @@ var clearAuthCookies = function (req, res) {
45
41
  var cookies = new Cookies(req, res);
46
42
  var options = {
47
43
  maxAge: 0,
48
- httpOnly: false,
44
+ httpOnly: true,
49
45
  overwrite: true
50
46
  };
51
47
  cookies.set("X-User-Id", null, options);
package/lib/rest-express/utils/steedos-auth.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"steedos-auth.js","sourceRoot":"","sources":["../../../src/rest-express/utils/steedos-auth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"steedos-auth.js","sourceRoot":"","sources":["../../../src/rest-express/utils/steedos-auth.ts"],"names":[],"mappings":";;;;AAAA,+BAAkC;AAClC,IAAM,IAAI,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AACtC,IAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAE5B,IAAM,cAAc,GAAG,UAAU,UAAU;IAC9C,IAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACxB,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AACjC,CAAC,CAAA;AAJY,QAAA,cAAc,kBAI1B;AAEM,IAAM,gBAAgB,GAAG,UAAU,YAAY;IAClD,IAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,CACzD,UAAC,IAAI,EAAE,GAAG;;QAAK,OAAA,GAAG,KAAK,OAAO,CAAC,CAAC;YAC9B,IAAI,CAAC,CAAC,iDACD,IAAI,gBAAG,GAAG,IAAG,YAAY,CAAC,GAAG,CAAC,MAAE;IAFxB,CAEwB,EACvC,EAAE,CACH,CAAA;IACD,uDACK,kBAAkB,KACrB,WAAW,EAAE,IAAA,sBAAc,EAAC,YAAY,CAAC,KAAK,CAAC,IAC/C;AACN,CAAC,CAAA;AAXY,QAAA,gBAAgB,oBAW5B;AAEM,IAAM,kBAAkB,GAAG,UAAS,GAAG,EAAE,GAAG;IACjD,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpC,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;AACrC,CAAC,CAAA;AAHY,QAAA,kBAAkB,sBAG9B;AAEM,IAAM,cAAc,GAAG,UAAU,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,OAAQ;IACtF,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAC1D,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpC,IAAI,OAAO,GAAG;QACZ,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;QAChC,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,IAAI;KAChB,CAAA;IACD,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACpD,OAAO;AACX,CAAC,CAAA;AAVY,QAAA,cAAc,kBAU1B;AAEM,IAAM,gBAAgB,GAAG,UAAU,GAAG,EAAE,GAAG;IAChD,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpC,IAAI,OAAO,GAAG;QACZ,MAAM,EAAE,CAAC;QACT,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,IAAI;KAChB,CAAA;IACD,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACxC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3C,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC5C,OAAO;AACT,CAAC,CAAA;AAZY,QAAA,gBAAgB,oBAY5B"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@steedos/accounts",
3
3
  "private": false,
4
- "version": "2.2.25",
4
+ "version": "2.2.28",
5
5
  "main": "lib/index.js",
6
6
  "files": [
7
7
  "/package.json",
@@ -53,9 +53,9 @@
53
53
  "validator": "^13.6.0"
54
54
  },
55
55
  "devDependencies": {
56
- "@steedos/auth": "2.2.25",
57
- "@steedos/meteor-bundle-runner": "2.2.25",
58
- "@steedos/objectql": "2.2.25",
56
+ "@steedos/auth": "2.2.28",
57
+ "@steedos/meteor-bundle-runner": "2.2.28",
58
+ "@steedos/objectql": "2.2.28",
59
59
  "@steedos/steedos-plugin-workflow": "^2.0.4",
60
60
  "@types/dotenv-flow": "^3.0.0",
61
61
  "@types/node": "12.6.8",
@@ -63,12 +63,12 @@
63
63
  "dotenv": "^8.2.0",
64
64
  "dotenv-flow": "^3.1.0",
65
65
  "nodemon": "1.19.1",
66
- "steedos-server": "2.2.25",
66
+ "steedos-server": "2.2.28",
67
67
  "ts-node": "8.3.0",
68
68
  "typescript": "3.5.3"
69
69
  },
70
70
  "publishConfig": {
71
71
  "access": "public"
72
72
  },
73
- "gitHead": "e81092f007bce951b627a5c28e286032afbba1fb"
73
+ "gitHead": "1e8d08ae4d525950194e35984cd5851016a03219"
74
74
  }
package/src/password/accounts-password.ts CHANGED
@@ -730,7 +730,8 @@ export default class AccountsPassword implements AuthenticationService {
730
730
  }
731
731
  }
732
732
  const hashAlgorithm = this.options.passwordHashAlgorithm;
733
- const pass: any = hashAlgorithm ? hashPassword(password, hashAlgorithm) : password;
733
+ // const pass: any = hashAlgorithm ? hashPassword(password, hashAlgorithm) : password;
734
+ const pass: any = password;
734
735
  const isPasswordValid = await verifyPassword(pass, hash);
735
736
 
736
737
  if (!isPasswordValid) {
package/src/rest-express/endpoints/password/change-password.ts CHANGED
@@ -17,6 +17,7 @@ export const changePassword = (accountsServer: AccountsServer) => async (
17
17
  res.json({ message: 'Unauthorized' });
18
18
  return;
19
19
  }
20
+ // oldPassword 已经是 sha256之后的
20
21
  const { oldPassword, newPassword } = req.body;
21
22
 
22
23
  let passworPolicy = ((config as any).password || {}).policy
package/src/rest-express/utils/steedos-auth.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import crypto = require('crypto');
2
+ const auth = require('@steedos/auth');
2
3
  const Cookies = require('cookies');
3
4
 
4
5
  export const hashLoginToken = function (loginToken) {
@@ -26,19 +27,14 @@ export const getAuthTokenCookie = function(req, res){
26
27
  }
27
28
 
28
29
  export const setAuthCookies = function (req, res, userId, authToken, accessToken, spaceId?) {
30
+ auth.setAuthCookies(req, res, userId, authToken, spaceId);
29
31
  let cookies = new Cookies(req, res);
30
32
  let options = {
31
33
  maxAge: 90 * 60 * 60 * 24 * 1000,
32
- httpOnly: false,
34
+ httpOnly: true,
33
35
  overwrite: true,
34
36
  }
35
- cookies.set("X-User-Id", userId, options);
36
- cookies.set("X-Auth-Token", authToken, options);
37
37
  cookies.set("X-Access-Token", accessToken, options);
38
- if (spaceId) {
39
- cookies.set("X-Space-Id", spaceId, options);
40
- cookies.set("X-Space-Token", spaceId + ',' + authToken, options);
41
- }
42
38
  return;
43
39
  }
44
40
 
@@ -46,7 +42,7 @@ export const clearAuthCookies = function (req, res) {
46
42
  let cookies = new Cookies(req, res);
47
43
  let options = {
48
44
  maxAge: 0,
49
- httpOnly: false,
45
+ httpOnly: true,
50
46
  overwrite: true
51
47
  }
52
48
  cookies.set("X-User-Id", null, options);