@steedos/accounts 2.2.38 → 2.2.39
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/lib/rest-express/endpoints/password/change-password.js +2 -10
- package/lib/rest-express/endpoints/password/change-password.js.map +1 -1
- package/lib/rest-express/endpoints/steedos/settings.js +7 -6
- package/lib/rest-express/endpoints/steedos/settings.js.map +1 -1
- package/package.json +6 -6
- package/src/rest-express/endpoints/password/change-password.ts +16 -9
- package/src/rest-express/endpoints/steedos/settings.ts +1 -1
|
@@ -4,10 +4,9 @@ exports.changePassword = void 0;
|
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var send_error_1 = require("../../utils/send-error");
|
|
6
6
|
var objectql_1 = require("@steedos/objectql");
|
|
7
|
-
var utils_1 = require("../../../password/utils");
|
|
8
7
|
var config = (0, objectql_1.getSteedosConfig)();
|
|
9
8
|
var changePassword = function (accountsServer) { return function (req, res) { return (0, tslib_1.__awaiter)(void 0, void 0, void 0, function () {
|
|
10
|
-
var _a, oldPassword, newPassword,
|
|
9
|
+
var _a, oldPassword, newPassword, password, err_1;
|
|
11
10
|
return (0, tslib_1.__generator)(this, function (_b) {
|
|
12
11
|
switch (_b.label) {
|
|
13
12
|
case 0:
|
|
@@ -18,15 +17,8 @@ var changePassword = function (accountsServer) { return function (req, res) { re
|
|
|
18
17
|
return [2 /*return*/];
|
|
19
18
|
}
|
|
20
19
|
_a = req.body, oldPassword = _a.oldPassword, newPassword = _a.newPassword;
|
|
21
|
-
passworPolicy = (config.password || {}).policy;
|
|
22
|
-
if (passworPolicy) {
|
|
23
|
-
if (!(new RegExp(passworPolicy)).test(newPassword || '')) {
|
|
24
|
-
(0, send_error_1.sendError)(res, new Error(config.password.policyError));
|
|
25
|
-
return [2 /*return*/];
|
|
26
|
-
}
|
|
27
|
-
}
|
|
28
20
|
password = accountsServer.getServices().password;
|
|
29
|
-
return [4 /*yield*/, password.changePassword(req.userId, oldPassword,
|
|
21
|
+
return [4 /*yield*/, password.changePassword(req.userId, oldPassword, newPassword)];
|
|
30
22
|
case 1:
|
|
31
23
|
_b.sent();
|
|
32
24
|
password.db.collection.updateOne({ _id: req.userId }, { $set: { password_expired: false } });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-password.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/password/change-password.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"change-password.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/password/change-password.ts"],"names":[],"mappings":";;;;AASA,qDAAmD;AACnD,8CAAoD;AAGpD,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;gBAWxC,QAAQ,GAAQ,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBAE5D,qBAAM,QAAQ,CAAC,cAAc,CAAE,GAAW,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,EAAA;;gBAA5E,SAA4E,CAAC;gBAC7E,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"}
|
|
@@ -9,8 +9,9 @@ var core_1 = require("../../../core");
|
|
|
9
9
|
var config = (0, objectql_1.getSteedosConfig)();
|
|
10
10
|
var getSettings = function (accountsServer) { return function (req, res) { return (0, tslib_1.__awaiter)(void 0, void 0, void 0, function () {
|
|
11
11
|
var tenant, spaceDoc, steedosService, already_mail_service, already_sms_service, broker, serverInitInfo;
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
var _a, _b;
|
|
13
|
+
return (0, tslib_1.__generator)(this, function (_c) {
|
|
14
|
+
switch (_c.label) {
|
|
14
15
|
case 0:
|
|
15
16
|
tenant = {
|
|
16
17
|
name: "Steedos",
|
|
@@ -34,7 +35,7 @@ var getSettings = function (accountsServer) { return function (req, res) { retur
|
|
|
34
35
|
if (!tenant._id) return [3 /*break*/, 2];
|
|
35
36
|
return [4 /*yield*/, db_1.db.findOne("spaces", tenant._id, { fields: ["name", "avatar", "avatar_dark", "background", "enable_register", "account_logo"] })];
|
|
36
37
|
case 1:
|
|
37
|
-
spaceDoc =
|
|
38
|
+
spaceDoc = _c.sent();
|
|
38
39
|
steedosService = (0, core_1.getSteedosService)();
|
|
39
40
|
if (steedosService && spaceDoc) {
|
|
40
41
|
_.assignIn(tenant, spaceDoc);
|
|
@@ -51,17 +52,17 @@ var getSettings = function (accountsServer) { return function (req, res) { retur
|
|
|
51
52
|
tenant.background_url = steedosService + "api/files/avatars/" + spaceDoc.background;
|
|
52
53
|
}
|
|
53
54
|
}
|
|
54
|
-
|
|
55
|
+
_c.label = 2;
|
|
55
56
|
case 2:
|
|
56
57
|
already_mail_service = (0, core_1.canSendEmail)();
|
|
57
58
|
already_sms_service = true || (0, core_1.canSendSMS)();
|
|
58
59
|
broker = (0, objectql_1.getSteedosSchema)().broker;
|
|
59
60
|
return [4 /*yield*/, broker.call("@steedos/service-cloud-init.serverInitInfo", {})];
|
|
60
61
|
case 3:
|
|
61
|
-
serverInitInfo =
|
|
62
|
+
serverInitInfo = _c.sent();
|
|
62
63
|
res.json({
|
|
63
64
|
tenant: tenant,
|
|
64
|
-
password: config.password ? config.password : {},
|
|
65
|
+
password: config.password ? config.password : (((_a = config.public) === null || _a === void 0 ? void 0 : _a.password) ? (_b = config.public) === null || _b === void 0 ? void 0 : _b.password : {}),
|
|
65
66
|
root_url: process.env.ROOT_URL,
|
|
66
67
|
already_mail_service: already_mail_service,
|
|
67
68
|
already_sms_service: already_sms_service,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/steedos/settings.ts"],"names":[],"mappings":";;;;AACA,0BAA4B;AAE5B,8CAAsE;AACtE,kCAAiC;AACjC,sCAA4E;AAE5E,IAAM,MAAM,GAAG,IAAA,2BAAgB,GAAE,CAAC;AAE3B,IAAM,WAAW,GAAG,UAAC,cAA8B,IAAK,OAAA,UAC3D,GAAoB,EACpB,GAAqB
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/steedos/settings.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/accounts",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "2.2.
|
|
4
|
+
"version": "2.2.39",
|
|
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.
|
|
57
|
-
"@steedos/meteor-bundle-runner": "2.2.
|
|
58
|
-
"@steedos/objectql": "2.2.
|
|
56
|
+
"@steedos/auth": "2.2.39",
|
|
57
|
+
"@steedos/meteor-bundle-runner": "2.2.39",
|
|
58
|
+
"@steedos/objectql": "2.2.39",
|
|
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.
|
|
66
|
+
"steedos-server": "2.2.39",
|
|
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": "
|
|
73
|
+
"gitHead": "9b26b926ccd65fc82b12bf2b8fec070f222f3c7a"
|
|
74
74
|
}
|
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* @Author: baozhoutao@steedos.com
|
|
3
|
+
* @Date: 2022-05-19 11:38:30
|
|
4
|
+
* @LastEditors: baozhoutao@steedos.com
|
|
5
|
+
* @LastEditTime: 2022-06-06 12:01:19
|
|
6
|
+
* @Description:
|
|
7
|
+
*/
|
|
1
8
|
import * as express from 'express';
|
|
2
9
|
import { AccountsServer } from '../../../server';
|
|
3
10
|
import { sendError } from '../../utils/send-error';
|
|
@@ -17,21 +24,21 @@ export const changePassword = (accountsServer: AccountsServer) => async (
|
|
|
17
24
|
res.json({ message: 'Unauthorized' });
|
|
18
25
|
return;
|
|
19
26
|
}
|
|
20
|
-
// oldPassword 已经是 sha256之后的
|
|
27
|
+
// oldPassword 、newPassword 已经是 sha256之后的
|
|
21
28
|
const { oldPassword, newPassword } = req.body;
|
|
22
29
|
|
|
23
|
-
let passworPolicy = ((config as any).password || {}).policy
|
|
30
|
+
// let passworPolicy = ((config as any).password || {}).policy
|
|
24
31
|
|
|
25
|
-
if(passworPolicy){
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
}
|
|
32
|
+
// if(passworPolicy){
|
|
33
|
+
// if(!(new RegExp(passworPolicy)).test(newPassword || '')){
|
|
34
|
+
// sendError(res, new Error((config as any).password.policyError));
|
|
35
|
+
// return;
|
|
36
|
+
// }
|
|
37
|
+
// }
|
|
31
38
|
|
|
32
39
|
const password: any = accountsServer.getServices().password;
|
|
33
40
|
|
|
34
|
-
await password.changePassword((req as any).userId, oldPassword,
|
|
41
|
+
await password.changePassword((req as any).userId, oldPassword, newPassword);
|
|
35
42
|
password.db.collection.updateOne({_id: (req as any).userId}, {$set: {password_expired: false}})
|
|
36
43
|
try {
|
|
37
44
|
Creator.getCollection('space_users').update({user: (req as any).userId}, {$set: {password_expired: false}}, {
|
|
@@ -62,7 +62,7 @@ export const getSettings = (accountsServer: AccountsServer) => async (
|
|
|
62
62
|
|
|
63
63
|
res.json({
|
|
64
64
|
tenant: tenant,
|
|
65
|
-
password: config.password?config.password:{},
|
|
65
|
+
password: config.password ? config.password : ( config.public?.password ? config.public?.password : {} ),
|
|
66
66
|
root_url: process.env.ROOT_URL,
|
|
67
67
|
already_mail_service: already_mail_service,
|
|
68
68
|
already_sms_service: already_sms_service,
|