@steedos/accounts 3.0.13-beta.9 → 3.0.13
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/core/index.js +177 -249
- package/lib/core/index.js.map +1 -1
- package/lib/database-mongo/index.js +1 -1
- package/lib/database-mongo/index.js.map +1 -1
- package/lib/database-mongo/mongo.js +760 -1278
- package/lib/database-mongo/mongo.js.map +1 -1
- package/lib/db.js +2 -2
- package/lib/db.js.map +1 -1
- package/lib/index.js +107 -143
- package/lib/index.js.map +1 -1
- package/lib/mail.js +36 -47
- package/lib/mail.js.map +1 -1
- package/lib/password/accounts-password.js +505 -763
- package/lib/password/accounts-password.js.map +1 -1
- package/lib/password/index.js +2 -2
- package/lib/password/index.js.map +1 -1
- package/lib/password/utils/encryption.js +10 -22
- package/lib/password/utils/encryption.js.map +1 -1
- package/lib/password/utils/is-email.js +2 -2
- package/lib/password/utils/is-email.js.map +1 -1
- package/lib/password/utils/user.js +3 -3
- package/lib/password/utils/user.js.map +1 -1
- package/lib/rest-express/endpoints/authorize.js +47 -54
- package/lib/rest-express/endpoints/authorize.js.map +1 -1
- package/lib/rest-express/endpoints/geetestV3/geetest-init.js +85 -131
- package/lib/rest-express/endpoints/geetestV3/geetest-init.js.map +1 -1
- package/lib/rest-express/endpoints/geetestV3/sdk/geetest_config.js +1 -1
- package/lib/rest-express/endpoints/geetestV3/sdk/geetest_config.js.map +1 -1
- package/lib/rest-express/endpoints/geetestV3/sdk/geetest_lib.js +112 -160
- package/lib/rest-express/endpoints/geetestV3/sdk/geetest_lib.js.map +1 -1
- package/lib/rest-express/endpoints/geetestV3/sdk/geetest_lib_result.js +8 -9
- package/lib/rest-express/endpoints/geetestV3/sdk/geetest_lib_result.js.map +1 -1
- package/lib/rest-express/endpoints/get-user.js +7 -12
- package/lib/rest-express/endpoints/get-user.js.map +1 -1
- package/lib/rest-express/endpoints/impersonate.js +14 -27
- package/lib/rest-express/endpoints/impersonate.js.map +1 -1
- package/lib/rest-express/endpoints/initServer.js +9 -13
- package/lib/rest-express/endpoints/initServer.js.map +1 -1
- package/lib/rest-express/endpoints/login.js +82 -104
- package/lib/rest-express/endpoints/login.js.map +1 -1
- package/lib/rest-express/endpoints/logout.js +68 -86
- package/lib/rest-express/endpoints/logout.js.map +1 -1
- package/lib/rest-express/endpoints/oauth/provider-callback.js +29 -37
- package/lib/rest-express/endpoints/oauth/provider-callback.js.map +1 -1
- package/lib/rest-express/endpoints/password/change-password.js +73 -102
- package/lib/rest-express/endpoints/password/change-password.js.map +1 -1
- package/lib/rest-express/endpoints/password/register.js +63 -95
- package/lib/rest-express/endpoints/password/register.js.map +1 -1
- package/lib/rest-express/endpoints/password/reset.js +27 -48
- package/lib/rest-express/endpoints/password/reset.js.map +1 -1
- package/lib/rest-express/endpoints/password/setSpaceUserPassword.js +112 -144
- package/lib/rest-express/endpoints/password/setSpaceUserPassword.js.map +1 -1
- package/lib/rest-express/endpoints/password/two-factor.js +39 -70
- package/lib/rest-express/endpoints/password/two-factor.js.map +1 -1
- package/lib/rest-express/endpoints/password/verify-email.js +34 -65
- package/lib/rest-express/endpoints/password/verify-email.js.map +1 -1
- package/lib/rest-express/endpoints/password/verify.js +45 -74
- package/lib/rest-express/endpoints/password/verify.js.map +1 -1
- package/lib/rest-express/endpoints/put-user-name.js +19 -32
- package/lib/rest-express/endpoints/put-user-name.js.map +1 -1
- package/lib/rest-express/endpoints/refresh-access-token.js +14 -27
- package/lib/rest-express/endpoints/refresh-access-token.js.map +1 -1
- package/lib/rest-express/endpoints/service-authenticate.js +55 -79
- package/lib/rest-express/endpoints/service-authenticate.js.map +1 -1
- package/lib/rest-express/endpoints/spaces.js +13 -30
- package/lib/rest-express/endpoints/spaces.js.map +1 -1
- package/lib/rest-express/endpoints/steedos/accept_invitation.js +28 -42
- package/lib/rest-express/endpoints/steedos/accept_invitation.js.map +1 -1
- package/lib/rest-express/endpoints/steedos/create-tenant.js +81 -102
- package/lib/rest-express/endpoints/steedos/create-tenant.js.map +1 -1
- package/lib/rest-express/endpoints/steedos/decline_invitation.js +28 -42
- package/lib/rest-express/endpoints/steedos/decline_invitation.js.map +1 -1
- package/lib/rest-express/endpoints/steedos/get-tenant.js +54 -67
- package/lib/rest-express/endpoints/steedos/get-tenant.js.map +1 -1
- package/lib/rest-express/endpoints/steedos/settings.js +110 -127
- package/lib/rest-express/endpoints/steedos/settings.js.map +1 -1
- package/lib/rest-express/endpoints/update-session.js +33 -48
- package/lib/rest-express/endpoints/update-session.js.map +1 -1
- package/lib/rest-express/express-middleware.js +57 -59
- package/lib/rest-express/express-middleware.js.map +1 -1
- package/lib/rest-express/index.js +1 -1
- package/lib/rest-express/index.js.map +1 -1
- package/lib/rest-express/user-loader.js +67 -86
- package/lib/rest-express/user-loader.js.map +1 -1
- package/lib/rest-express/utils/get-user-agent.js +2 -2
- package/lib/rest-express/utils/get-user-agent.js.map +1 -1
- package/lib/rest-express/utils/getClientIp.js +3 -3
- package/lib/rest-express/utils/getClientIp.js.map +1 -1
- package/lib/rest-express/utils/send-error.js +5 -7
- package/lib/rest-express/utils/send-error.js.map +1 -1
- package/lib/rest-express/utils/steedos-auth.js +21 -21
- package/lib/rest-express/utils/steedos-auth.js.map +1 -1
- package/lib/rest-express/utils/users.js +17 -30
- package/lib/rest-express/utils/users.js.map +1 -1
- package/lib/server/accounts-server.js +413 -574
- package/lib/server/accounts-server.js.map +1 -1
- package/lib/server/index.js +1 -1
- package/lib/server/index.js.map +1 -1
- package/lib/server/utils/email.js +19 -35
- package/lib/server/utils/email.js.map +1 -1
- package/lib/server/utils/get-first-user-email.js +3 -3
- package/lib/server/utils/get-first-user-email.js.map +1 -1
- package/lib/server/utils/tokens.js +14 -24
- package/lib/server/utils/tokens.js.map +1 -1
- package/lib/types/index.js +1 -1
- package/package.json +5 -5
- package/src/database-mongo/mongo.ts +6 -2
- package/src/password/accounts-password.ts +61 -0
- package/src/rest-express/endpoints/password/change-password.ts +1 -1
- package/src/rest-express/endpoints/password/setSpaceUserPassword.ts +5 -0
- package/src/rest-express/endpoints/service-authenticate.ts +2 -5
- package/src/types/types/user.ts +2 -0
|
@@ -1,152 +1,120 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.setSpaceUserPassword = void 0;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
case 4:
|
|
39
|
-
companyIds = spaceUser.company_ids;
|
|
40
|
-
if (!(!canEdit && companyIds && companyIds.length)) return [3, 6];
|
|
41
|
-
return [4, (0, objectql_1.getObject)("company").find({
|
|
42
|
-
filters: [
|
|
43
|
-
["_id", "in", companyIds],
|
|
44
|
-
["space", "=", space_id],
|
|
45
|
-
],
|
|
46
|
-
fields: ["admins"],
|
|
47
|
-
})];
|
|
48
|
-
case 5:
|
|
49
|
-
companys = _e.sent();
|
|
50
|
-
if (companys && companys.length) {
|
|
51
|
-
canEdit = _.some(companys, function (item) {
|
|
52
|
-
return item.admins && item.admins.indexOf(userId_1) > -1;
|
|
53
|
-
});
|
|
54
|
-
}
|
|
55
|
-
_e.label = 6;
|
|
56
|
-
case 6:
|
|
57
|
-
if (!canEdit) {
|
|
58
|
-
throw new Error("您没有权限修改该用户密码");
|
|
59
|
-
}
|
|
60
|
-
user_id = spaceUser.user;
|
|
61
|
-
return [4, (0, objectql_1.getObject)("users").findOne(user_id)];
|
|
62
|
-
case 7:
|
|
63
|
-
userCP = _e.sent();
|
|
64
|
-
if (spaceUser.invite_state === "pending" ||
|
|
65
|
-
spaceUser.invite_state === "refused") {
|
|
66
|
-
throw new Error("该用户尚未同意加入该工作区,无法修改密码");
|
|
67
|
-
}
|
|
68
|
-
logout = true;
|
|
69
|
-
if (userSession.userId === user_id) {
|
|
70
|
-
logout = false;
|
|
71
|
-
}
|
|
72
|
-
return [4, (0, utils_1.bcryptPassword)(password)];
|
|
73
|
-
case 8:
|
|
74
|
-
bcryptedPassword = _e.sent();
|
|
75
|
-
servicePassword = accountsServer.getServices().password;
|
|
76
|
-
return [4, servicePassword.db.setPassword(user_id, bcryptedPassword)];
|
|
77
|
-
case 9:
|
|
78
|
-
_e.sent();
|
|
79
|
-
return [4, (0, objectql_1.getObject)("users").findOne(user_id)];
|
|
80
|
-
case 10:
|
|
81
|
-
changedUserInfo = _e.sent();
|
|
82
|
-
if (!((_d = (_c = changedUserInfo === null || changedUserInfo === void 0 ? void 0 : changedUserInfo.services) === null || _c === void 0 ? void 0 : _c.password) === null || _d === void 0 ? void 0 : _d.bcrypt)) return [3, 12];
|
|
83
|
-
return [4, (0, objectql_1.getObject)("users").update(user_id, {
|
|
84
|
-
$push: {
|
|
85
|
-
"services.password_history": changedUserInfo.services.password.bcrypt,
|
|
86
|
-
},
|
|
87
|
-
})];
|
|
88
|
-
case 11:
|
|
89
|
-
_e.sent();
|
|
90
|
-
_e.label = 12;
|
|
91
|
-
case 12:
|
|
92
|
-
if (userCP.mobile && userCP.mobile_verified) {
|
|
93
|
-
lang = "en";
|
|
94
|
-
if (userCP.locale === "zh-cn") {
|
|
95
|
-
lang = "zh-CN";
|
|
96
|
-
}
|
|
97
|
-
SMSQueue.send({
|
|
98
|
-
Format: "JSON",
|
|
99
|
-
Action: "SingleSendSms",
|
|
100
|
-
ParamString: "",
|
|
101
|
-
RecNum: userCP.mobile,
|
|
102
|
-
SignName: "华炎办公",
|
|
103
|
-
TemplateCode: "SMS_67200967",
|
|
104
|
-
msg: (0, i18n_1.t)("sms.change_password.template", {}, lang),
|
|
105
|
-
});
|
|
106
|
-
}
|
|
107
|
-
_e.label = 13;
|
|
108
|
-
case 13:
|
|
109
|
-
_e.trys.push([13, 15, , 16]);
|
|
110
|
-
return [4, (0, objectql_1.getObject)("operation_logs").insert({
|
|
111
|
-
name: "修改密码",
|
|
112
|
-
type: "change_password",
|
|
113
|
-
remote_user: userId_1,
|
|
114
|
-
status: "success",
|
|
115
|
-
space: space_id,
|
|
116
|
-
message: "[系统管理员]修改了用户[" +
|
|
117
|
-
(changedUserInfo != null ? changedUserInfo.name : void 0) +
|
|
118
|
-
"]的密码",
|
|
119
|
-
data: JSON.stringify({
|
|
120
|
-
changeUser: user_id,
|
|
121
|
-
}),
|
|
122
|
-
related_to: {
|
|
123
|
-
o: "users",
|
|
124
|
-
ids: [user_id],
|
|
125
|
-
},
|
|
126
|
-
})];
|
|
127
|
-
case 14:
|
|
128
|
-
_e.sent();
|
|
129
|
-
return [3, 16];
|
|
130
|
-
case 15:
|
|
131
|
-
e_1 = _e.sent();
|
|
132
|
-
console.error(e_1);
|
|
133
|
-
return [3, 16];
|
|
134
|
-
case 16: return [2, res.json({
|
|
135
|
-
status: 0,
|
|
136
|
-
msg: "",
|
|
137
|
-
data: {},
|
|
138
|
-
})];
|
|
139
|
-
case 17:
|
|
140
|
-
e_2 = _e.sent();
|
|
141
|
-
return [2, res.json({
|
|
142
|
-
status: -1,
|
|
143
|
-
msg: e_2.message,
|
|
144
|
-
data: {},
|
|
145
|
-
})];
|
|
146
|
-
case 18: return [2];
|
|
4
|
+
const i18n_1 = require("@steedos/i18n");
|
|
5
|
+
const objectql_1 = require("@steedos/objectql");
|
|
6
|
+
const _ = require("lodash");
|
|
7
|
+
const utils_1 = require("../../../password/utils");
|
|
8
|
+
const setSpaceUserPassword = (accountsServer) => async (req, res) => {
|
|
9
|
+
const userSession = req.user;
|
|
10
|
+
let { space_user_id, space_id, password } = req.body;
|
|
11
|
+
try {
|
|
12
|
+
if (!userSession) {
|
|
13
|
+
res.status(401);
|
|
14
|
+
res.json({ message: "Unauthorized" });
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
17
|
+
const spaceUser = await (0, objectql_1.getObject)("space_users").findOne(space_user_id);
|
|
18
|
+
const userId = userSession.userId;
|
|
19
|
+
let canEdit = spaceUser.user === userId;
|
|
20
|
+
if (!canEdit) {
|
|
21
|
+
const space = await (0, objectql_1.getObject)("spaces").findOne(space_id);
|
|
22
|
+
const isSpaceAdmin = space?.admins?.includes(userSession.userId);
|
|
23
|
+
canEdit = isSpaceAdmin;
|
|
24
|
+
}
|
|
25
|
+
const companyIds = spaceUser.company_ids;
|
|
26
|
+
if (!canEdit && companyIds && companyIds.length) {
|
|
27
|
+
const companys = await (0, objectql_1.getObject)("company").find({
|
|
28
|
+
filters: [
|
|
29
|
+
["_id", "in", companyIds],
|
|
30
|
+
["space", "=", space_id],
|
|
31
|
+
],
|
|
32
|
+
fields: ["admins"],
|
|
33
|
+
});
|
|
34
|
+
if (companys && companys.length) {
|
|
35
|
+
canEdit = _.some(companys, function (item) {
|
|
36
|
+
return item.admins && item.admins.indexOf(userId) > -1;
|
|
37
|
+
});
|
|
147
38
|
}
|
|
39
|
+
}
|
|
40
|
+
if (!canEdit) {
|
|
41
|
+
throw new Error("您没有权限修改该用户密码");
|
|
42
|
+
}
|
|
43
|
+
const user_id = spaceUser.user;
|
|
44
|
+
const userCP = await (0, objectql_1.getObject)("users").findOne(user_id);
|
|
45
|
+
if (spaceUser.invite_state === "pending" ||
|
|
46
|
+
spaceUser.invite_state === "refused") {
|
|
47
|
+
throw new Error("该用户尚未同意加入该工作区,无法修改密码");
|
|
48
|
+
}
|
|
49
|
+
let logout = true;
|
|
50
|
+
if (userSession.userId === user_id) {
|
|
51
|
+
logout = false;
|
|
52
|
+
}
|
|
53
|
+
const bcryptedPassword = await (0, utils_1.bcryptPassword)(password);
|
|
54
|
+
const servicePassword = accountsServer.getServices().password;
|
|
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
|
|
148
59
|
});
|
|
149
|
-
|
|
60
|
+
const changedUserInfo = await (0, objectql_1.getObject)("users").findOne(user_id);
|
|
61
|
+
if (changedUserInfo?.services?.password?.bcrypt) {
|
|
62
|
+
await (0, objectql_1.getObject)("users").update(user_id, {
|
|
63
|
+
$push: {
|
|
64
|
+
"services.password_history": changedUserInfo.services.password.bcrypt,
|
|
65
|
+
},
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
if (userCP.mobile && userCP.mobile_verified) {
|
|
69
|
+
let lang = "en";
|
|
70
|
+
if (userCP.locale === "zh-cn") {
|
|
71
|
+
lang = "zh-CN";
|
|
72
|
+
}
|
|
73
|
+
SMSQueue.send({
|
|
74
|
+
Format: "JSON",
|
|
75
|
+
Action: "SingleSendSms",
|
|
76
|
+
ParamString: "",
|
|
77
|
+
RecNum: userCP.mobile,
|
|
78
|
+
SignName: "华炎办公",
|
|
79
|
+
TemplateCode: "SMS_67200967",
|
|
80
|
+
msg: (0, i18n_1.t)("sms.change_password.template", {}, lang),
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
try {
|
|
84
|
+
await (0, objectql_1.getObject)("operation_logs").insert({
|
|
85
|
+
name: "修改密码",
|
|
86
|
+
type: "change_password",
|
|
87
|
+
remote_user: userId,
|
|
88
|
+
status: "success",
|
|
89
|
+
space: space_id,
|
|
90
|
+
message: "[系统管理员]修改了用户[" +
|
|
91
|
+
(changedUserInfo != null ? changedUserInfo.name : void 0) +
|
|
92
|
+
"]的密码",
|
|
93
|
+
data: JSON.stringify({
|
|
94
|
+
changeUser: user_id,
|
|
95
|
+
}),
|
|
96
|
+
related_to: {
|
|
97
|
+
o: "users",
|
|
98
|
+
ids: [user_id],
|
|
99
|
+
},
|
|
100
|
+
});
|
|
101
|
+
}
|
|
102
|
+
catch (e) {
|
|
103
|
+
console.error(e);
|
|
104
|
+
}
|
|
105
|
+
return res.json({
|
|
106
|
+
status: 0,
|
|
107
|
+
msg: "",
|
|
108
|
+
data: {},
|
|
109
|
+
});
|
|
110
|
+
}
|
|
111
|
+
catch (e) {
|
|
112
|
+
return res.json({
|
|
113
|
+
status: -1,
|
|
114
|
+
msg: e.message,
|
|
115
|
+
data: {},
|
|
116
|
+
});
|
|
117
|
+
}
|
|
150
118
|
};
|
|
151
119
|
exports.setSpaceUserPassword = setSpaceUserPassword;
|
|
152
120
|
//# sourceMappingURL=setSpaceUserPassword.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setSpaceUserPassword.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/password/setSpaceUserPassword.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setSpaceUserPassword.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/password/setSpaceUserPassword.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,79 +1,48 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.twoFactorUnset = exports.twoFactorSet = exports.twoFactorSecret = void 0;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
secret = _a.sent();
|
|
16
|
-
res.json({ secret: secret });
|
|
17
|
-
return [3, 3];
|
|
18
|
-
case 2:
|
|
19
|
-
err_1 = _a.sent();
|
|
20
|
-
(0, send_error_1.sendError)(res, err_1);
|
|
21
|
-
return [3, 3];
|
|
22
|
-
case 3: return [2];
|
|
23
|
-
}
|
|
24
|
-
});
|
|
25
|
-
}); }; };
|
|
4
|
+
const send_error_1 = require("../../utils/send-error");
|
|
5
|
+
const twoFactorSecret = (accountsServer) => async (req, res) => {
|
|
6
|
+
try {
|
|
7
|
+
const password = accountsServer.getServices().password;
|
|
8
|
+
const secret = await password.twoFactor.getNewAuthSecret();
|
|
9
|
+
res.json({ secret });
|
|
10
|
+
}
|
|
11
|
+
catch (err) {
|
|
12
|
+
(0, send_error_1.sendError)(res, err);
|
|
13
|
+
}
|
|
14
|
+
};
|
|
26
15
|
exports.twoFactorSecret = twoFactorSecret;
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
if (!req.userId) {
|
|
34
|
-
res.status(401);
|
|
35
|
-
res.json({ message: 'Unauthorized' });
|
|
36
|
-
return [2];
|
|
37
|
-
}
|
|
38
|
-
password = accountsServer.getServices().password;
|
|
39
|
-
return [4, password.twoFactor.set(req.userId, req.body.secret, req.body.code)];
|
|
40
|
-
case 1:
|
|
41
|
-
_a.sent();
|
|
42
|
-
res.json({});
|
|
43
|
-
return [3, 3];
|
|
44
|
-
case 2:
|
|
45
|
-
err_2 = _a.sent();
|
|
46
|
-
(0, send_error_1.sendError)(res, err_2);
|
|
47
|
-
return [3, 3];
|
|
48
|
-
case 3: return [2];
|
|
16
|
+
const twoFactorSet = (accountsServer) => async (req, res) => {
|
|
17
|
+
try {
|
|
18
|
+
if (!req.userId) {
|
|
19
|
+
res.status(401);
|
|
20
|
+
res.json({ message: 'Unauthorized' });
|
|
21
|
+
return;
|
|
49
22
|
}
|
|
50
|
-
|
|
51
|
-
|
|
23
|
+
const password = accountsServer.getServices().password;
|
|
24
|
+
await password.twoFactor.set(req.userId, req.body.secret, req.body.code);
|
|
25
|
+
res.json({});
|
|
26
|
+
}
|
|
27
|
+
catch (err) {
|
|
28
|
+
(0, send_error_1.sendError)(res, err);
|
|
29
|
+
}
|
|
30
|
+
};
|
|
52
31
|
exports.twoFactorSet = twoFactorSet;
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
if (!req.userId) {
|
|
60
|
-
res.status(401);
|
|
61
|
-
res.json({ message: 'Unauthorized' });
|
|
62
|
-
return [2];
|
|
63
|
-
}
|
|
64
|
-
password = accountsServer.getServices().password;
|
|
65
|
-
return [4, password.twoFactor.unset(req.userId, req.body.code)];
|
|
66
|
-
case 1:
|
|
67
|
-
_a.sent();
|
|
68
|
-
res.json({});
|
|
69
|
-
return [3, 3];
|
|
70
|
-
case 2:
|
|
71
|
-
err_3 = _a.sent();
|
|
72
|
-
(0, send_error_1.sendError)(res, err_3);
|
|
73
|
-
return [3, 3];
|
|
74
|
-
case 3: return [2];
|
|
32
|
+
const twoFactorUnset = (accountsServer) => async (req, res) => {
|
|
33
|
+
try {
|
|
34
|
+
if (!req.userId) {
|
|
35
|
+
res.status(401);
|
|
36
|
+
res.json({ message: 'Unauthorized' });
|
|
37
|
+
return;
|
|
75
38
|
}
|
|
76
|
-
|
|
77
|
-
|
|
39
|
+
const password = accountsServer.getServices().password;
|
|
40
|
+
await password.twoFactor.unset(req.userId, req.body.code);
|
|
41
|
+
res.json({});
|
|
42
|
+
}
|
|
43
|
+
catch (err) {
|
|
44
|
+
(0, send_error_1.sendError)(res, err);
|
|
45
|
+
}
|
|
46
|
+
};
|
|
78
47
|
exports.twoFactorUnset = twoFactorUnset;
|
|
79
48
|
//# sourceMappingURL=two-factor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"two-factor.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/password/two-factor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"two-factor.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/password/two-factor.ts"],"names":[],"mappings":";;;AAEA,uDAAmD;AAE5C,MAAM,eAAe,GAAG,CAAC,cAA8B,EAAE,EAAE,CAAC,KAAK,EACtE,GAAoB,EACpB,GAAqB,EACrB,EAAE;IACF,IAAI,CAAC;QACH,MAAM,QAAQ,GAAQ,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;QAC5D,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,gBAAgB,EAAE,CAAC;QAC3D,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACvB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAA,sBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACtB,CAAC;AACH,CAAC,CAAC;AAXW,QAAA,eAAe,mBAW1B;AAEK,MAAM,YAAY,GAAG,CAAC,cAA8B,EAAE,EAAE,CAAC,KAAK,EACnE,GAAoB,EACpB,GAAqB,EACrB,EAAE;IACF,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;QACD,MAAM,QAAQ,GAAQ,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;QAC5D,MAAM,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAE,GAAW,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClF,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAA,sBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACtB,CAAC;AACH,CAAC,CAAC;AAhBW,QAAA,YAAY,gBAgBvB;AAEK,MAAM,cAAc,GAAG,CAAC,cAA8B,EAAE,EAAE,CAAC,KAAK,EACrE,GAAoB,EACpB,GAAqB,EACrB,EAAE;IACF,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;QACD,MAAM,QAAQ,GAAQ,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;QAC5D,MAAM,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAE,GAAW,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAA,sBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACtB,CAAC;AACH,CAAC,CAAC;AAhBW,QAAA,cAAc,kBAgBzB"}
|
|
@@ -1,72 +1,41 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.sendVerificationCode = exports.sendVerificationEmail = exports.verifyEmail = void 0;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
_a.sent();
|
|
17
|
-
res.json(null);
|
|
18
|
-
return [3, 3];
|
|
19
|
-
case 2:
|
|
20
|
-
err_1 = _a.sent();
|
|
21
|
-
(0, send_error_1.sendError)(res, err_1);
|
|
22
|
-
return [3, 3];
|
|
23
|
-
case 3: return [2];
|
|
24
|
-
}
|
|
25
|
-
});
|
|
26
|
-
}); }; };
|
|
4
|
+
const send_error_1 = require("../../utils/send-error");
|
|
5
|
+
const verifyEmail = (accountsServer) => async (req, res) => {
|
|
6
|
+
try {
|
|
7
|
+
const { token } = req.body;
|
|
8
|
+
const password = accountsServer.getServices().password;
|
|
9
|
+
await password.verifyEmail(token);
|
|
10
|
+
res.json(null);
|
|
11
|
+
}
|
|
12
|
+
catch (err) {
|
|
13
|
+
(0, send_error_1.sendError)(res, err);
|
|
14
|
+
}
|
|
15
|
+
};
|
|
27
16
|
exports.verifyEmail = verifyEmail;
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
res.json(null);
|
|
40
|
-
return [3, 3];
|
|
41
|
-
case 2:
|
|
42
|
-
err_2 = _a.sent();
|
|
43
|
-
(0, send_error_1.sendError)(res, err_2);
|
|
44
|
-
return [3, 3];
|
|
45
|
-
case 3: return [2];
|
|
46
|
-
}
|
|
47
|
-
});
|
|
48
|
-
}); }; };
|
|
17
|
+
const sendVerificationEmail = (accountsServer) => async (req, res) => {
|
|
18
|
+
try {
|
|
19
|
+
const { email } = req.body;
|
|
20
|
+
const password = accountsServer.getServices().password;
|
|
21
|
+
await password.sendVerificationEmail(email);
|
|
22
|
+
res.json(null);
|
|
23
|
+
}
|
|
24
|
+
catch (err) {
|
|
25
|
+
(0, send_error_1.sendError)(res, err);
|
|
26
|
+
}
|
|
27
|
+
};
|
|
49
28
|
exports.sendVerificationEmail = sendVerificationEmail;
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
res.json(userId);
|
|
62
|
-
return [3, 3];
|
|
63
|
-
case 2:
|
|
64
|
-
err_3 = _a.sent();
|
|
65
|
-
(0, send_error_1.sendError)(res, err_3);
|
|
66
|
-
return [3, 3];
|
|
67
|
-
case 3: return [2];
|
|
68
|
-
}
|
|
69
|
-
});
|
|
70
|
-
}); }; };
|
|
29
|
+
const sendVerificationCode = (accountsServer) => async (req, res) => {
|
|
30
|
+
try {
|
|
31
|
+
const { user } = req.body;
|
|
32
|
+
const password = accountsServer.getServices().password;
|
|
33
|
+
const userId = await password.sendVerificationCode(user);
|
|
34
|
+
res.json(userId);
|
|
35
|
+
}
|
|
36
|
+
catch (err) {
|
|
37
|
+
(0, send_error_1.sendError)(res, err);
|
|
38
|
+
}
|
|
39
|
+
};
|
|
71
40
|
exports.sendVerificationCode = sendVerificationCode;
|
|
72
41
|
//# sourceMappingURL=verify-email.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verify-email.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/password/verify-email.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"verify-email.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/password/verify-email.ts"],"names":[],"mappings":";;;AAEA,uDAAmD;AAE5C,MAAM,WAAW,GAAG,CAAC,cAA8B,EAAE,EAAE,CAAC,KAAK,EAClE,GAAoB,EACpB,GAAqB,EACrB,EAAE;IACF,IAAI,CAAC;QACH,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QAC3B,MAAM,QAAQ,GAAQ,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;QAC5D,MAAM,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAClC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAA,sBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACtB,CAAC;AACH,CAAC,CAAC;AAZW,QAAA,WAAW,eAYtB;AAEK,MAAM,qBAAqB,GAAG,CAAC,cAA8B,EAAE,EAAE,CAAC,KAAK,EAC5E,GAAoB,EACpB,GAAqB,EACrB,EAAE;IACF,IAAI,CAAC;QACH,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QAC3B,MAAM,QAAQ,GAAQ,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;QAC5D,MAAM,QAAQ,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAC5C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAA,sBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACtB,CAAC;AACH,CAAC,CAAC;AAZW,QAAA,qBAAqB,yBAYhC;AAEK,MAAM,oBAAoB,GAAG,CAAC,cAA8B,EAAE,EAAE,CAAC,KAAK,EAC3E,GAAoB,EACpB,GAAqB,EACrB,EAAE;IACF,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAC,GAAG,GAAG,CAAC,IAAI,CAAC;QACzB,MAAM,QAAQ,GAAQ,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;QAC5D,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QACzD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAA,sBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACtB,CAAC;AACH,CAAC,CAAC;AAZW,QAAA,oBAAoB,wBAY/B"}
|