@steedos/accounts 3.0.0-beta.71 → 3.0.0-beta.72
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.
|
@@ -9,96 +9,101 @@ var get_user_agent_1 = require("../../utils/get-user-agent");
|
|
|
9
9
|
var ismobilejs_1 = require("ismobilejs");
|
|
10
10
|
var db_1 = require("../../../db");
|
|
11
11
|
var config = (0, objectql_1.getSteedosConfig)();
|
|
12
|
-
var changePassword = function (accountsServer) {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
_a = req.body, oldPassword = _a.oldPassword, newPassword = _a.newPassword;
|
|
24
|
-
password = accountsServer.getServices().password;
|
|
25
|
-
return [4, password.changePassword(req.userId, oldPassword, newPassword)];
|
|
26
|
-
case 1:
|
|
27
|
-
_c.sent();
|
|
28
|
-
password.db.collection.updateOne({ _id: req.userId }, { $set: { password_expired: false } });
|
|
29
|
-
_c.label = 2;
|
|
30
|
-
case 2:
|
|
31
|
-
_c.trys.push([2, 8, , 9]);
|
|
32
|
-
Creator.getCollection('space_users').update({ user: req.userId }, { $set: { password_expired: false } }, {
|
|
33
|
-
multi: true
|
|
34
|
-
});
|
|
35
|
-
userAgent = (0, get_user_agent_1.getUserAgent)(req);
|
|
36
|
-
ip = requestIp.getClientIp(req);
|
|
37
|
-
is_phone = false;
|
|
38
|
-
is_tablet = false;
|
|
39
|
-
if (userAgent) {
|
|
40
|
-
try {
|
|
41
|
-
_b = (0, ismobilejs_1.default)(userAgent), phone = _b.phone, tablet = _b.tablet;
|
|
42
|
-
is_phone = phone;
|
|
43
|
-
is_tablet = tablet;
|
|
12
|
+
var changePassword = function (accountsServer) {
|
|
13
|
+
return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
14
|
+
var _a, oldPassword, newPassword, password, userAgent, ip, is_phone, is_tablet, _b, phone, tablet, userSpaces, _i, userSpaces_1, userSpace, userId, error_1, err_1;
|
|
15
|
+
return tslib_1.__generator(this, function (_c) {
|
|
16
|
+
switch (_c.label) {
|
|
17
|
+
case 0:
|
|
18
|
+
_c.trys.push([0, 11, , 12]);
|
|
19
|
+
if (!req.userId) {
|
|
20
|
+
res.status(401);
|
|
21
|
+
res.json({ message: "Unauthorized" });
|
|
22
|
+
return [2];
|
|
44
23
|
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
is_tablet: is_tablet,
|
|
70
|
-
object: 'users',
|
|
71
|
-
status: 'success',
|
|
72
|
-
create: new Date(),
|
|
73
|
-
create_by: userId,
|
|
74
|
-
modified_by: userId,
|
|
75
|
-
space: userSpace.space,
|
|
76
|
-
related_to: {
|
|
77
|
-
o: "users",
|
|
78
|
-
ids: [userId]
|
|
24
|
+
_a = req.body, oldPassword = _a.oldPassword, newPassword = _a.newPassword;
|
|
25
|
+
password = accountsServer.getServices().password;
|
|
26
|
+
return [4, password.changePassword(req.userId, oldPassword, newPassword)];
|
|
27
|
+
case 1:
|
|
28
|
+
_c.sent();
|
|
29
|
+
password.db.collection.updateOne({ _id: req.userId }, { $set: { password_expired: false } });
|
|
30
|
+
_c.label = 2;
|
|
31
|
+
case 2:
|
|
32
|
+
_c.trys.push([2, 9, , 10]);
|
|
33
|
+
return [4, db_1.db.updateMany("space_users", [["user", "=", req.userId]], { password_expired: false })];
|
|
34
|
+
case 3:
|
|
35
|
+
_c.sent();
|
|
36
|
+
userAgent = (0, get_user_agent_1.getUserAgent)(req);
|
|
37
|
+
ip = requestIp.getClientIp(req);
|
|
38
|
+
is_phone = false;
|
|
39
|
+
is_tablet = false;
|
|
40
|
+
if (userAgent) {
|
|
41
|
+
try {
|
|
42
|
+
_b = (0, ismobilejs_1.default)(userAgent), phone = _b.phone, tablet = _b.tablet;
|
|
43
|
+
is_phone = phone;
|
|
44
|
+
is_tablet = tablet;
|
|
45
|
+
}
|
|
46
|
+
catch (Exception) {
|
|
47
|
+
console.log("Exception", Exception);
|
|
79
48
|
}
|
|
80
|
-
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
49
|
+
}
|
|
50
|
+
return [4, db_1.db.find("space_users", {
|
|
51
|
+
filters: [
|
|
52
|
+
["user", "=", req.userId],
|
|
53
|
+
["user_accepted", "=", true],
|
|
54
|
+
],
|
|
55
|
+
fields: ["space"],
|
|
56
|
+
})];
|
|
57
|
+
case 4:
|
|
58
|
+
userSpaces = _c.sent();
|
|
59
|
+
if (!(userSpaces && userSpaces.length > 0)) return [3, 8];
|
|
60
|
+
_i = 0, userSpaces_1 = userSpaces;
|
|
61
|
+
_c.label = 5;
|
|
62
|
+
case 5:
|
|
63
|
+
if (!(_i < userSpaces_1.length)) return [3, 8];
|
|
64
|
+
userSpace = userSpaces_1[_i];
|
|
65
|
+
userId = req.userId;
|
|
66
|
+
return [4, (0, objectql_1.getObject)("operation_logs").insert({
|
|
67
|
+
name: "修改密码",
|
|
68
|
+
type: "change_password",
|
|
69
|
+
remote_user: userId,
|
|
70
|
+
remote_addr: ip,
|
|
71
|
+
http_user_agent: userAgent,
|
|
72
|
+
is_mobile: is_phone,
|
|
73
|
+
is_tablet: is_tablet,
|
|
74
|
+
object: "users",
|
|
75
|
+
status: "success",
|
|
76
|
+
create: new Date(),
|
|
77
|
+
create_by: userId,
|
|
78
|
+
modified_by: userId,
|
|
79
|
+
space: userSpace.space,
|
|
80
|
+
related_to: {
|
|
81
|
+
o: "users",
|
|
82
|
+
ids: [userId],
|
|
83
|
+
},
|
|
84
|
+
})];
|
|
85
|
+
case 6:
|
|
86
|
+
_c.sent();
|
|
87
|
+
_c.label = 7;
|
|
88
|
+
case 7:
|
|
89
|
+
_i++;
|
|
90
|
+
return [3, 5];
|
|
91
|
+
case 8: return [3, 10];
|
|
92
|
+
case 9:
|
|
93
|
+
error_1 = _c.sent();
|
|
94
|
+
console.log("error", error_1);
|
|
95
|
+
return [3, 10];
|
|
96
|
+
case 10:
|
|
97
|
+
res.json({ userId: req.userId, password_expired: false });
|
|
98
|
+
return [3, 12];
|
|
99
|
+
case 11:
|
|
100
|
+
err_1 = _c.sent();
|
|
101
|
+
(0, send_error_1.sendError)(res, err_1);
|
|
102
|
+
return [3, 12];
|
|
103
|
+
case 12: return [2];
|
|
104
|
+
}
|
|
105
|
+
});
|
|
106
|
+
}); };
|
|
107
|
+
};
|
|
103
108
|
exports.changePassword = changePassword;
|
|
104
109
|
//# sourceMappingURL=change-password.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-password.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/password/change-password.ts"],"names":[],"mappings":";;;;AASA,qDAAmD;AACnD,
|
|
1
|
+
{"version":3,"file":"change-password.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/password/change-password.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": "3.0.0-beta.
|
|
4
|
+
"version": "3.0.0-beta.72",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"files": [
|
|
7
7
|
"/package.json",
|
|
@@ -29,9 +29,9 @@
|
|
|
29
29
|
"@accounts/two-factor": "^0.20.1",
|
|
30
30
|
"@accounts/types": "0.20.1",
|
|
31
31
|
"@babel/runtime": "^7.12.18",
|
|
32
|
-
"@steedos/auth": "3.0.0-beta.
|
|
33
|
-
"@steedos/objectql": "3.0.0-beta.
|
|
34
|
-
"@steedos/utils": "3.0.0-beta.
|
|
32
|
+
"@steedos/auth": "3.0.0-beta.72",
|
|
33
|
+
"@steedos/objectql": "3.0.0-beta.72",
|
|
34
|
+
"@steedos/utils": "3.0.0-beta.72",
|
|
35
35
|
"app-root-path": "^2.2.1",
|
|
36
36
|
"bcryptjs": "^2.4.3",
|
|
37
37
|
"body-parser": "1.19.0",
|
|
@@ -60,5 +60,5 @@
|
|
|
60
60
|
"publishConfig": {
|
|
61
61
|
"access": "public"
|
|
62
62
|
},
|
|
63
|
-
"gitHead": "
|
|
63
|
+
"gitHead": "18b81ddcdafac5d7690c29bfdb1ee0bd8cf8bc48"
|
|
64
64
|
}
|
|
@@ -3,101 +3,112 @@
|
|
|
3
3
|
* @Date: 2022-05-19 11:38:30
|
|
4
4
|
* @LastEditors: baozhoutao@steedos.com
|
|
5
5
|
* @LastEditTime: 2023-09-18 17:58:22
|
|
6
|
-
* @Description:
|
|
6
|
+
* @Description:
|
|
7
7
|
*/
|
|
8
|
-
import * as express from
|
|
9
|
-
import { AccountsServer } from
|
|
10
|
-
import { sendError } from
|
|
11
|
-
import { getSteedosConfig, getObject } from
|
|
12
|
-
import { hashPassword } from
|
|
8
|
+
import * as express from "express";
|
|
9
|
+
import { AccountsServer } from "../../../server";
|
|
10
|
+
import { sendError } from "../../utils/send-error";
|
|
11
|
+
import { getSteedosConfig, getObject } from "@steedos/objectql";
|
|
12
|
+
import { hashPassword } from "../../../password/utils";
|
|
13
13
|
|
|
14
|
-
import * as requestIp from
|
|
15
|
-
import { getUserAgent } from
|
|
14
|
+
import * as requestIp from "request-ip";
|
|
15
|
+
import { getUserAgent } from "../../utils/get-user-agent";
|
|
16
16
|
import isMobile from "ismobilejs";
|
|
17
|
-
import { db } from
|
|
17
|
+
import { db } from "../../../db";
|
|
18
18
|
|
|
19
19
|
const config = getSteedosConfig();
|
|
20
20
|
declare var Creator;
|
|
21
21
|
|
|
22
|
-
export const changePassword =
|
|
23
|
-
|
|
24
|
-
res: express.Response
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
const { oldPassword, newPassword } = req.body;
|
|
22
|
+
export const changePassword =
|
|
23
|
+
(accountsServer: AccountsServer) =>
|
|
24
|
+
async (req: express.Request, res: express.Response) => {
|
|
25
|
+
try {
|
|
26
|
+
if (!(req as any).userId) {
|
|
27
|
+
res.status(401);
|
|
28
|
+
res.json({ message: "Unauthorized" });
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
// oldPassword 、newPassword 已经是 sha256之后的
|
|
32
|
+
const { oldPassword, newPassword } = req.body;
|
|
34
33
|
|
|
35
|
-
|
|
34
|
+
// let passworPolicy = ((config as any).password || {}).policy
|
|
36
35
|
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
const password: any = accountsServer.getServices().password;
|
|
36
|
+
// if(passworPolicy){
|
|
37
|
+
// if(!(new RegExp(passworPolicy)).test(newPassword || '')){
|
|
38
|
+
// sendError(res, new Error((config as any).password.policyError));
|
|
39
|
+
// return;
|
|
40
|
+
// }
|
|
41
|
+
// }
|
|
45
42
|
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
43
|
+
const password: any = accountsServer.getServices().password;
|
|
44
|
+
|
|
45
|
+
await password.changePassword(
|
|
46
|
+
(req as any).userId,
|
|
47
|
+
oldPassword,
|
|
48
|
+
newPassword,
|
|
49
|
+
);
|
|
50
|
+
password.db.collection.updateOne(
|
|
51
|
+
{ _id: (req as any).userId },
|
|
52
|
+
{ $set: { password_expired: false } },
|
|
53
|
+
);
|
|
54
|
+
try {
|
|
55
|
+
await db.updateMany(
|
|
56
|
+
"space_users",
|
|
57
|
+
[["user", "=", (req as any).userId]],
|
|
58
|
+
{ password_expired: false },
|
|
59
|
+
);
|
|
52
60
|
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
61
|
+
const userAgent = getUserAgent(req);
|
|
62
|
+
const ip = requestIp.getClientIp(req);
|
|
63
|
+
let is_phone = false;
|
|
64
|
+
let is_tablet = false;
|
|
65
|
+
if (userAgent) {
|
|
66
|
+
try {
|
|
67
|
+
const { phone, tablet } = isMobile(userAgent);
|
|
68
|
+
is_phone = phone;
|
|
69
|
+
is_tablet = tablet;
|
|
70
|
+
} catch (Exception) {
|
|
71
|
+
console.log(`Exception`, Exception);
|
|
72
|
+
}
|
|
64
73
|
}
|
|
65
|
-
}
|
|
66
74
|
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
75
|
+
const userSpaces = await db.find("space_users", {
|
|
76
|
+
filters: [
|
|
77
|
+
["user", "=", (req as any).userId],
|
|
78
|
+
["user_accepted", "=", true],
|
|
79
|
+
],
|
|
80
|
+
fields: ["space"],
|
|
81
|
+
});
|
|
71
82
|
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
83
|
+
if (userSpaces && userSpaces.length > 0) {
|
|
84
|
+
for (let userSpace of userSpaces) {
|
|
85
|
+
const userId = (req as any).userId;
|
|
86
|
+
await getObject("operation_logs").insert({
|
|
87
|
+
name: "修改密码",
|
|
88
|
+
type: "change_password",
|
|
89
|
+
remote_user: userId,
|
|
90
|
+
remote_addr: ip,
|
|
91
|
+
http_user_agent: userAgent,
|
|
92
|
+
is_mobile: is_phone,
|
|
93
|
+
is_tablet,
|
|
94
|
+
object: "users",
|
|
95
|
+
status: "success",
|
|
96
|
+
create: new Date(),
|
|
97
|
+
create_by: userId,
|
|
98
|
+
modified_by: userId,
|
|
99
|
+
space: userSpace.space,
|
|
100
|
+
related_to: {
|
|
101
|
+
o: "users",
|
|
102
|
+
ids: [userId],
|
|
103
|
+
},
|
|
104
|
+
});
|
|
105
|
+
}
|
|
94
106
|
}
|
|
107
|
+
} catch (error) {
|
|
108
|
+
console.log("error", error);
|
|
95
109
|
}
|
|
96
|
-
|
|
97
|
-
|
|
110
|
+
res.json({ userId: (req as any).userId, password_expired: false });
|
|
111
|
+
} catch (err) {
|
|
112
|
+
sendError(res, err);
|
|
98
113
|
}
|
|
99
|
-
|
|
100
|
-
} catch (err) {
|
|
101
|
-
sendError(res, err);
|
|
102
|
-
}
|
|
103
|
-
};
|
|
114
|
+
};
|