@steedos/accounts 3.0.0-beta.9 → 3.0.0-beta.90
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 +66 -26
- package/lib/core/index.js.map +1 -1
- package/lib/rest-express/endpoints/logout.js +79 -72
- package/lib/rest-express/endpoints/logout.js.map +1 -1
- package/lib/rest-express/endpoints/password/change-password.js +94 -89
- package/lib/rest-express/endpoints/password/change-password.js.map +1 -1
- package/lib/rest-express/endpoints/steedos/get-tenant.js +62 -39
- package/lib/rest-express/endpoints/steedos/get-tenant.js.map +1 -1
- package/lib/rest-express/endpoints/steedos/settings.js +119 -88
- package/lib/rest-express/endpoints/steedos/settings.js.map +1 -1
- package/lib/rest-express/user-loader.js +82 -67
- package/lib/rest-express/user-loader.js.map +1 -1
- package/package.json +5 -5
- package/src/core/index.ts +201 -141
- package/src/rest-express/endpoints/logout.ts +74 -72
- package/src/rest-express/endpoints/password/change-password.ts +92 -81
- package/src/rest-express/endpoints/steedos/get-tenant.ts +56 -38
- package/src/rest-express/endpoints/steedos/settings.ts +117 -88
- package/src/rest-express/user-loader.ts +68 -58
package/lib/core/index.js
CHANGED
|
@@ -6,7 +6,7 @@ var objectql_1 = require("@steedos/objectql");
|
|
|
6
6
|
var db_1 = require("../db");
|
|
7
7
|
var _ = require("lodash");
|
|
8
8
|
var chalk_1 = require("chalk");
|
|
9
|
-
var clone = require(
|
|
9
|
+
var clone = require("clone");
|
|
10
10
|
var config = (0, objectql_1.getSteedosConfig)();
|
|
11
11
|
var getSettings = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
12
12
|
var tenant, spaceDoc, steedosService, _tenant;
|
|
@@ -30,32 +30,49 @@ var getSettings = function () { return tslib_1.__awaiter(void 0, void 0, void 0,
|
|
|
30
30
|
_.assignIn(tenant, config.tenant);
|
|
31
31
|
}
|
|
32
32
|
if (!(config.tenant && config.tenant._id)) return [3, 2];
|
|
33
|
-
return [4, db_1.db.findOne("spaces", config.tenant._id, {
|
|
33
|
+
return [4, db_1.db.findOne("spaces", config.tenant._id, {
|
|
34
|
+
fields: [
|
|
35
|
+
"name",
|
|
36
|
+
"avatar",
|
|
37
|
+
"avatar_dark",
|
|
38
|
+
"background",
|
|
39
|
+
"enable_register",
|
|
40
|
+
],
|
|
41
|
+
})];
|
|
34
42
|
case 1:
|
|
35
43
|
spaceDoc = _a.sent();
|
|
36
44
|
steedosService = (0, exports.getSteedosService)();
|
|
37
45
|
if (steedosService && spaceDoc) {
|
|
38
46
|
_.assignIn(tenant, spaceDoc);
|
|
39
47
|
if (spaceDoc.avatar_dark) {
|
|
40
|
-
tenant.logo_url =
|
|
48
|
+
tenant.logo_url =
|
|
49
|
+
steedosService +
|
|
50
|
+
"api/v6/files/cfs.avatars.filerecord/" +
|
|
51
|
+
spaceDoc.avatar_dark;
|
|
41
52
|
}
|
|
42
53
|
else if (spaceDoc.avatar) {
|
|
43
|
-
tenant.logo_url =
|
|
54
|
+
tenant.logo_url =
|
|
55
|
+
steedosService +
|
|
56
|
+
"api/v6/files/cfs.avatars.filerecord/" +
|
|
57
|
+
spaceDoc.avatar;
|
|
44
58
|
}
|
|
45
59
|
if (spaceDoc.background) {
|
|
46
|
-
tenant.background_url =
|
|
60
|
+
tenant.background_url =
|
|
61
|
+
steedosService +
|
|
62
|
+
"api/v6/files/cfs.avatars.filerecord/" +
|
|
63
|
+
spaceDoc.background;
|
|
47
64
|
}
|
|
48
65
|
}
|
|
49
66
|
_a.label = 2;
|
|
50
67
|
case 2:
|
|
51
68
|
_tenant = clone(tenant);
|
|
52
|
-
delete _tenant[
|
|
53
|
-
delete _tenant[
|
|
54
|
-
delete _tenant[
|
|
69
|
+
delete _tenant["tokenSecret"];
|
|
70
|
+
delete _tenant["accessTokenExpiresIn"];
|
|
71
|
+
delete _tenant["refreshTokenExpiresIn"];
|
|
55
72
|
return [2, {
|
|
56
73
|
tenant: _tenant,
|
|
57
74
|
password: config.password ? config.password : {},
|
|
58
|
-
root_url: process.env.ROOT_URL
|
|
75
|
+
root_url: process.env.ROOT_URL,
|
|
59
76
|
}];
|
|
60
77
|
}
|
|
61
78
|
});
|
|
@@ -69,7 +86,9 @@ var getTenant = function (spaceId) { return tslib_1.__awaiter(void 0, void 0, vo
|
|
|
69
86
|
if (!spaceId) {
|
|
70
87
|
return [2, {}];
|
|
71
88
|
}
|
|
72
|
-
return [4, db_1.db.findOne("spaces", spaceId, {
|
|
89
|
+
return [4, db_1.db.findOne("spaces", spaceId, {
|
|
90
|
+
fields: ["name", "avatar", "avatar_dark", "background", "enable_register"],
|
|
91
|
+
})];
|
|
73
92
|
case 1:
|
|
74
93
|
spaceDoc = _a.sent();
|
|
75
94
|
if (!spaceDoc) {
|
|
@@ -78,13 +97,22 @@ var getTenant = function (spaceId) { return tslib_1.__awaiter(void 0, void 0, vo
|
|
|
78
97
|
steedosService = (0, exports.getSteedosService)();
|
|
79
98
|
if (steedosService) {
|
|
80
99
|
if (spaceDoc.avatar_dark) {
|
|
81
|
-
spaceDoc.logo_url =
|
|
100
|
+
spaceDoc.logo_url =
|
|
101
|
+
steedosService +
|
|
102
|
+
"api/v6/files/cfs.avatars.filerecord/" +
|
|
103
|
+
spaceDoc.avatar_dark;
|
|
82
104
|
}
|
|
83
105
|
else if (spaceDoc.avatar) {
|
|
84
|
-
spaceDoc.logo_url =
|
|
106
|
+
spaceDoc.logo_url =
|
|
107
|
+
steedosService +
|
|
108
|
+
"api/v6/files/cfs.avatars.filerecord/" +
|
|
109
|
+
spaceDoc.avatar;
|
|
85
110
|
}
|
|
86
111
|
if (spaceDoc.background) {
|
|
87
|
-
spaceDoc.background_url =
|
|
112
|
+
spaceDoc.background_url =
|
|
113
|
+
steedosService +
|
|
114
|
+
"api/v6/files/cfs.avatars.filerecord/" +
|
|
115
|
+
spaceDoc.background;
|
|
88
116
|
}
|
|
89
117
|
}
|
|
90
118
|
return [2, spaceDoc];
|
|
@@ -96,7 +124,9 @@ var spaceExists = function (spaceId) { return tslib_1.__awaiter(void 0, void 0,
|
|
|
96
124
|
var spaceDoc;
|
|
97
125
|
return tslib_1.__generator(this, function (_a) {
|
|
98
126
|
switch (_a.label) {
|
|
99
|
-
case 0: return [4, db_1.db.findOne("spaces", spaceId, {
|
|
127
|
+
case 0: return [4, db_1.db.findOne("spaces", spaceId, {
|
|
128
|
+
fields: ["name", "avatar", "avatar_dark", "background", "enable_register"],
|
|
129
|
+
})];
|
|
100
130
|
case 1:
|
|
101
131
|
spaceDoc = _a.sent();
|
|
102
132
|
if (spaceDoc) {
|
|
@@ -129,14 +159,17 @@ var canRegister = function (spaceId, action) { return tslib_1.__awaiter(void 0,
|
|
|
129
159
|
case 0: return [4, (0, exports.getMergedTenant)(spaceId)];
|
|
130
160
|
case 1:
|
|
131
161
|
tenant = _a.sent();
|
|
132
|
-
if (action ===
|
|
162
|
+
if (action === "emailSignupAccount" && !tenant.enable_email_code_login) {
|
|
133
163
|
return [2, false];
|
|
134
164
|
}
|
|
135
|
-
else if (action ===
|
|
165
|
+
else if (action === "mobileSignupAccount" &&
|
|
166
|
+
!tenant.enable_mobile_code_login) {
|
|
136
167
|
return [2, false];
|
|
137
168
|
}
|
|
138
|
-
else if (action ===
|
|
139
|
-
return [2, tenant.enable_register &&
|
|
169
|
+
else if (action === "withPassword") {
|
|
170
|
+
return [2, (tenant.enable_register &&
|
|
171
|
+
tenant.enable_password_login &&
|
|
172
|
+
tenant.disabled_account_register != true)];
|
|
140
173
|
}
|
|
141
174
|
return [2, tenant.enable_register && tenant.disabled_account_register != true];
|
|
142
175
|
}
|
|
@@ -176,7 +209,7 @@ function isEmpty(str) {
|
|
|
176
209
|
if (!str) {
|
|
177
210
|
return true;
|
|
178
211
|
}
|
|
179
|
-
if (str ===
|
|
212
|
+
if (str === "undefined") {
|
|
180
213
|
return true;
|
|
181
214
|
}
|
|
182
215
|
if (_.isString(str) && str.startsWith("${")) {
|
|
@@ -193,7 +226,11 @@ var canSendEmail = function () {
|
|
|
193
226
|
else if (isEmpty(config.from)) {
|
|
194
227
|
canSend = false;
|
|
195
228
|
}
|
|
196
|
-
else if (isEmpty(config.url) &&
|
|
229
|
+
else if (isEmpty(config.url) &&
|
|
230
|
+
(isEmpty(config.host) ||
|
|
231
|
+
isEmpty(config.port) ||
|
|
232
|
+
isEmpty(config.username) ||
|
|
233
|
+
isEmpty(config.password))) {
|
|
197
234
|
canSend = false;
|
|
198
235
|
}
|
|
199
236
|
return canSend;
|
|
@@ -205,7 +242,9 @@ var canSendSMS = function () {
|
|
|
205
242
|
if (!config) {
|
|
206
243
|
canSend = false;
|
|
207
244
|
}
|
|
208
|
-
else if (isEmpty(config.sdkappid) ||
|
|
245
|
+
else if (isEmpty(config.sdkappid) ||
|
|
246
|
+
isEmpty(config.appkey) ||
|
|
247
|
+
isEmpty(config.signname)) {
|
|
209
248
|
canSend = false;
|
|
210
249
|
}
|
|
211
250
|
return canSend;
|
|
@@ -213,12 +252,13 @@ var canSendSMS = function () {
|
|
|
213
252
|
exports.canSendSMS = canSendSMS;
|
|
214
253
|
var getRootUrlPathPrefix = function (rootUrl) {
|
|
215
254
|
if (rootUrl) {
|
|
216
|
-
var parsedUrl = require(
|
|
217
|
-
if (!parsedUrl.host ||
|
|
255
|
+
var parsedUrl = require("url").parse(rootUrl);
|
|
256
|
+
if (!parsedUrl.host ||
|
|
257
|
+
["http:", "https:"].indexOf(parsedUrl.protocol) === -1) {
|
|
218
258
|
throw Error("$ROOT_URL, if specified, must be an URL");
|
|
219
259
|
}
|
|
220
260
|
var pathPrefix = parsedUrl.pathname;
|
|
221
|
-
if (pathPrefix.slice(-1) ===
|
|
261
|
+
if (pathPrefix.slice(-1) === "/") {
|
|
222
262
|
pathPrefix = pathPrefix.slice(0, -1);
|
|
223
263
|
}
|
|
224
264
|
return pathPrefix;
|
|
@@ -256,7 +296,7 @@ var sendMail = function (mail) { return tslib_1.__awaiter(void 0, void 0, void 0
|
|
|
256
296
|
to: to,
|
|
257
297
|
from: config.from || "华炎魔方",
|
|
258
298
|
subject: subject,
|
|
259
|
-
html: html
|
|
299
|
+
html: html,
|
|
260
300
|
});
|
|
261
301
|
}
|
|
262
302
|
return [2];
|
|
@@ -276,7 +316,7 @@ var sendSMS = function (sms) { return tslib_1.__awaiter(void 0, void 0, void 0,
|
|
|
276
316
|
else {
|
|
277
317
|
SMSQueue.send({
|
|
278
318
|
RecNum: mobile,
|
|
279
|
-
msg: message
|
|
319
|
+
msg: message,
|
|
280
320
|
}, spaceId);
|
|
281
321
|
}
|
|
282
322
|
return [2];
|
package/lib/core/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";;;;AAAA,8CAAqD;AACrD,4BAA2B;AAC3B,0BAA4B;AAC5B,+BAA0B;AAC1B,IAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAK/B,IAAM,MAAM,GAAG,IAAA,2BAAgB,GAAE,CAAC;AAE3B,IAAM,WAAW,GAAG;;;;;gBACrB,MAAM,GAAG;oBACX,IAAI,EAAE,SAAS;oBACf,QAAQ,EAAE,SAAS;oBACnB,cAAc,EAAE,SAAS;oBACzB,oBAAoB,EAAE,IAAI;oBAC1B,eAAe,EAAE,IAAI;oBACrB,sBAAsB,EAAE,IAAI;oBAC5B,qBAAqB,EAAE,IAAI;oBAC3B,wBAAwB,EAAE,KAAK;oBAC/B,uBAAuB,EAAE,KAAK;oBAC9B,kBAAkB,EAAE,KAAK;oBACzB,iBAAiB,EAAE,KAAK;iBACzB,CAAC;gBAEF,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;oBAClB,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;gBACpC,CAAC;qBAEG,CAAA,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAA,EAAlC,cAAkC;gBACrB,WAAM,OAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE;wBAC3D,MAAM,EAAE;4BACN,MAAM;4BACN,QAAQ;4BACR,aAAa;4BACb,YAAY;4BACZ,iBAAiB;yBAClB;qBACF,CAAC,EAAA;;gBARE,QAAQ,GAAG,SAQb;gBACE,cAAc,GAAG,IAAA,yBAAiB,GAAE,CAAC;gBACzC,IAAI,cAAc,IAAI,QAAQ,EAAE,CAAC;oBAC/B,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;oBAC7B,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;wBACzB,MAAM,CAAC,QAAQ;4BACb,cAAc;gCACd,sCAAsC;gCACtC,QAAQ,CAAC,WAAW,CAAC;oBACzB,CAAC;yBAAM,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;wBAC3B,MAAM,CAAC,QAAQ;4BACb,cAAc;gCACd,sCAAsC;gCACtC,QAAQ,CAAC,MAAM,CAAC;oBACpB,CAAC;oBACD,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;wBACxB,MAAM,CAAC,cAAc;4BACnB,cAAc;gCACd,sCAAsC;gCACtC,QAAQ,CAAC,UAAU,CAAC;oBACxB,CAAC;gBACH,CAAC;;;gBAGG,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;gBAE9B,OAAO,OAAO,CAAC,aAAa,CAAC,CAAC;gBAC9B,OAAO,OAAO,CAAC,sBAAsB,CAAC,CAAC;gBACvC,OAAO,OAAO,CAAC,uBAAuB,CAAC,CAAC;gBAExC,WAAO;wBACL,MAAM,EAAE,OAAO;wBACf,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;wBAChD,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;qBAC/B,EAAC;;;KACH,CAAC;AA/DW,QAAA,WAAW,eA+DtB;AAEK,IAAM,SAAS,GAAG,UAAO,OAAO;;;;;gBACrC,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,WAAO,EAAE,EAAC;gBACZ,CAAC;gBAEgB,WAAM,OAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE;wBACnD,MAAM,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,iBAAiB,CAAC;qBAC3E,CAAC,EAAA;;gBAFI,QAAQ,GAAG,SAEf;gBAEF,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,WAAO,EAAE,EAAC;gBACZ,CAAC;gBACG,cAAc,GAAG,IAAA,yBAAiB,GAAE,CAAC;gBACzC,IAAI,cAAc,EAAE,CAAC;oBACnB,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;wBACzB,QAAQ,CAAC,QAAQ;4BACf,cAAc;gCACd,sCAAsC;gCACtC,QAAQ,CAAC,WAAW,CAAC;oBACzB,CAAC;yBAAM,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;wBAC3B,QAAQ,CAAC,QAAQ;4BACf,cAAc;gCACd,sCAAsC;gCACtC,QAAQ,CAAC,MAAM,CAAC;oBACpB,CAAC;oBACD,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;wBACxB,QAAQ,CAAC,cAAc;4BACrB,cAAc;gCACd,sCAAsC;gCACtC,QAAQ,CAAC,UAAU,CAAC;oBACxB,CAAC;gBACH,CAAC;gBAED,WAAO,QAAQ,EAAC;;;KACjB,CAAC;AAlCW,QAAA,SAAS,aAkCpB;AAEK,IAAM,WAAW,GAAG,UAAO,OAAO;;;;oBACtB,WAAM,OAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE;oBACnD,MAAM,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,iBAAiB,CAAC;iBAC3E,CAAC,EAAA;;gBAFI,QAAQ,GAAG,SAEf;gBACF,IAAI,QAAQ,EAAE,CAAC;oBACb,WAAO,IAAI,EAAC;gBACd,CAAC;gBACD,WAAO,KAAK,EAAC;;;KACd,CAAC;AARW,QAAA,WAAW,eAQtB;AAEK,IAAM,eAAe,GAAG,UAAO,OAAQ;;;;oBACtB,WAAM,IAAA,mBAAW,GAAE,EAAA;;gBAAnC,QAAQ,GAAQ,SAAmB;gBACrB,WAAM,IAAA,iBAAS,EAAC,OAAO,CAAC,EAAA;;gBAAtC,MAAM,GAAQ,SAAwB;gBAC5C,WAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,EAAC;;;KACnD,CAAC;AAJW,QAAA,eAAe,mBAI1B;AAEK,IAAM,WAAW,GAAG,UAAO,OAAO,EAAE,MAAM;;;;oBAC3B,WAAM,IAAA,uBAAe,EAAC,OAAO,CAAC,EAAA;;gBAA5C,MAAM,GAAQ,SAA8B;gBAClD,IAAI,MAAM,KAAK,oBAAoB,IAAI,CAAC,MAAM,CAAC,uBAAuB,EAAE,CAAC;oBACvE,WAAO,KAAK,EAAC;gBACf,CAAC;qBAAM,IACL,MAAM,KAAK,qBAAqB;oBAChC,CAAC,MAAM,CAAC,wBAAwB,EAChC,CAAC;oBACD,WAAO,KAAK,EAAC;gBACf,CAAC;qBAAM,IAAI,MAAM,KAAK,cAAc,EAAE,CAAC;oBACrC,WAAO,CACL,MAAM,CAAC,eAAe;4BACtB,MAAM,CAAC,qBAAqB;4BAC5B,MAAM,CAAC,yBAAyB,IAAI,IAAI,CACzC,EAAC;gBACJ,CAAC;gBACD,WAAO,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,yBAAyB,IAAI,IAAI,EAAC;;;KAC3E,CAAC;AAjBW,QAAA,WAAW,eAiBtB;AAEK,IAAM,aAAa,GAAG,UAAO,OAAO;;;;;gBACrC,aAAa,GAAG,KAAK,CAAC;gBACN,WAAM,IAAA,uBAAe,EAAC,OAAO,CAAC,EAAA;;gBAA5C,MAAM,GAAQ,SAA8B;gBAClD,IAAI,MAAM,CAAC,wBAAwB,IAAI,MAAM,CAAC,uBAAuB,EAAE,CAAC;oBACtE,aAAa,GAAG,IAAI,CAAC;gBACvB,CAAC;gBACD,WAAO,aAAa,EAAC;;;KACtB,CAAC;AAPW,QAAA,aAAa,iBAOxB;AAEK,IAAM,gBAAgB,GAAG;;;;oBACV,WAAM,IAAA,uBAAe,GAAE,EAAA;;gBAArC,MAAM,GAAQ,SAAuB;gBAC3C,WAAO,MAAM,CAAC,qBAAqB,EAAC;;;KACrC,CAAC;AAHW,QAAA,gBAAgB,oBAG3B;AAEF,SAAS,OAAO,CAAC,GAAG;IAClB,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,GAAG,KAAK,WAAW,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAEM,IAAM,YAAY,GAAG;IAC1B,IAAM,MAAM,GAAG,IAAA,2BAAgB,GAAE,CAAC,KAAK,IAAI,EAAE,CAAC;IAC9C,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,GAAG,KAAK,CAAC;IAClB,CAAC;SAAM,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAChC,OAAO,GAAG,KAAK,CAAC;IAClB,CAAC;SAAM,IACL,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC;QACnB,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YACnB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YACpB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;YACxB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAC3B,CAAC;QACD,OAAO,GAAG,KAAK,CAAC;IAClB,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAjBW,QAAA,YAAY,gBAiBvB;AAGK,IAAM,UAAU,GAAG;IACxB,IAAM,MAAM,GAAG,CAAC,IAAA,2BAAgB,GAAE,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC;IAC3D,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,GAAG,KAAK,CAAC;IAClB,CAAC;SAAM,IACL,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;QACxB,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;QACtB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EACxB,CAAC;QACD,OAAO,GAAG,KAAK,CAAC;IAClB,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAbW,QAAA,UAAU,cAarB;AAEK,IAAM,oBAAoB,GAAG,UAAC,OAAO;IAC1C,IAAI,OAAO,EAAE,CAAC;QACZ,IAAI,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC9C,IACE,CAAC,SAAS,CAAC,IAAI;YACf,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EACtD,CAAC;YACD,MAAM,KAAK,CAAC,yCAAyC,CAAC,CAAC;QACzD,CAAC;QACD,IAAI,UAAU,GAAG,SAAS,CAAC,QAAQ,CAAC;QACpC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YACjC,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;SAAM,CAAC;QACN,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC,CAAC;AAjBW,QAAA,oBAAoB,wBAiB/B;AAEK,IAAM,iBAAiB,GAAG;IAC/B,IAAI,cAAc,GAAG,IAAA,4BAAoB,EAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAChE,IAAI,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;QACrD,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;YAC3C,MAAM,CAAC,WAAW,CAAC,OAAO,IAAI,GAAG,CAAC;QACpC,cAAc,GAAG,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC;IAC9C,CAAC;IACD,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,cAAc,IAAI,GAAG,CAAC;IACzD,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AATW,QAAA,iBAAiB,qBAS5B;AAEK,IAAM,QAAQ,GAAG,UAAO,IAAS;;;QAC9B,EAAE,GAAoB,IAAI,GAAxB,EAAE,OAAO,GAAW,IAAI,QAAf,EAAE,IAAI,GAAK,IAAI,KAAT,CAAU;QAC7B,MAAM,GAAG,IAAA,2BAAgB,GAAE,CAAC,KAAK,IAAI,EAAE,CAAC;QAC1C,OAAO,GAAG,IAAA,oBAAY,GAAE,CAAC;QAE7B,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,gBAAS,EAAE,eAAK,OAAO,CAAE,CAAC,CAAC,CAAC;QACpD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,CAAC,GAAG,CACT,eAAK,CAAC,GAAG,CACP,mEAAmE,CACpE,CACF,CAAC;YACF,WAAO;QACT,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,IAAI,CAAC;gBACb,EAAE,EAAE,EAAE;gBACN,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,MAAM;gBAC3B,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,IAAI;aACX,CAAC,CAAC;QACL,CAAC;;;KACF,CAAC;AArBW,QAAA,QAAQ,YAqBnB;AAEK,IAAM,OAAO,GAAG,UAAO,GAAQ;;;QAC5B,MAAM,GAAuB,GAAG,OAA1B,EAAE,OAAO,GAAc,GAAG,QAAjB,EAAE,OAAO,GAAK,GAAG,QAAR,CAAS;QACrC,OAAO,GAAG,IAAA,kBAAU,GAAE,CAAC;QAC3B,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,eAAQ,MAAM,eAAK,OAAO,CAAE,CAAC,CAAC,CAAC;QACvD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,CAAC,GAAG,CACT,eAAK,CAAC,GAAG,CACP,gEAAgE,CACjE,CACF,CAAC;YACF,WAAO;QACT,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CACX;gBACE,MAAM,EAAE,MAAM;gBACd,GAAG,EAAE,OAAO;aACb,EACD,OAAO,CACR,CAAC;QACJ,CAAC;;;KACF,CAAC;AApBW,QAAA,OAAO,WAoBlB"}
|
|
@@ -9,79 +9,86 @@ var requestIp = require("request-ip");
|
|
|
9
9
|
var get_user_agent_1 = require("../utils/get-user-agent");
|
|
10
10
|
var ismobilejs_1 = require("ismobilejs");
|
|
11
11
|
var objectql_2 = require("@steedos/objectql");
|
|
12
|
-
var logout = function (accountsServer) {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
(0, lodash_1.get)(req.
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
12
|
+
var logout = function (accountsServer) {
|
|
13
|
+
return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
14
|
+
var authToken, session, err_1, userAgent, ip, status, message, is_phone, is_tablet, _a, phone, tablet, broker;
|
|
15
|
+
return tslib_1.__generator(this, function (_b) {
|
|
16
|
+
switch (_b.label) {
|
|
17
|
+
case 0:
|
|
18
|
+
authToken = (0, lodash_1.get)(req.cookies, "X-Auth-Token") ||
|
|
19
|
+
(0, lodash_1.get)(req.headers, "Authorization") ||
|
|
20
|
+
(0, lodash_1.get)(req.headers, "authorization");
|
|
21
|
+
authToken = authToken && authToken.replace("Bearer ", "token");
|
|
22
|
+
authToken =
|
|
23
|
+
authToken && authToken.split(",").length > 1
|
|
24
|
+
? authToken.split(",")[0]
|
|
25
|
+
: authToken;
|
|
26
|
+
(0, steedos_auth_1.clearAuthCookies)(req, res);
|
|
27
|
+
session = null;
|
|
28
|
+
_b.label = 1;
|
|
29
|
+
case 1:
|
|
30
|
+
_b.trys.push([1, 3, 4, 6]);
|
|
31
|
+
return [4, accountsServer.logout(authToken)];
|
|
32
|
+
case 2:
|
|
33
|
+
session = _b.sent();
|
|
34
|
+
return [3, 6];
|
|
35
|
+
case 3:
|
|
36
|
+
err_1 = _b.sent();
|
|
37
|
+
return [3, 6];
|
|
38
|
+
case 4:
|
|
39
|
+
userAgent = (0, get_user_agent_1.getUserAgent)(req) || "";
|
|
40
|
+
ip = requestIp.getClientIp(req);
|
|
41
|
+
status = "success";
|
|
42
|
+
message = "";
|
|
43
|
+
is_phone = false;
|
|
44
|
+
is_tablet = false;
|
|
45
|
+
if (userAgent) {
|
|
46
|
+
try {
|
|
47
|
+
_a = (0, ismobilejs_1.default)(userAgent), phone = _a.phone, tablet = _a.tablet;
|
|
48
|
+
is_phone = phone;
|
|
49
|
+
is_tablet = tablet;
|
|
50
|
+
}
|
|
51
|
+
catch (Exception) {
|
|
52
|
+
console.log("Exception", Exception);
|
|
53
|
+
}
|
|
49
54
|
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
55
|
+
return [4, (0, objectql_1.getObject)("operation_logs").insert({
|
|
56
|
+
name: "注销",
|
|
57
|
+
type: "logout",
|
|
58
|
+
remote_user: session === null || session === void 0 ? void 0 : session.userId,
|
|
59
|
+
remote_addr: ip,
|
|
60
|
+
http_user_agent: userAgent,
|
|
61
|
+
is_mobile: is_phone,
|
|
62
|
+
is_tablet: is_tablet,
|
|
63
|
+
object: "users",
|
|
64
|
+
status: status,
|
|
65
|
+
create: new Date(),
|
|
66
|
+
space: session === null || session === void 0 ? void 0 : session.space,
|
|
67
|
+
message: message,
|
|
68
|
+
data: JSON.stringify({
|
|
69
|
+
authToken: authToken,
|
|
70
|
+
session: session,
|
|
71
|
+
}),
|
|
72
|
+
related_to: {
|
|
73
|
+
o: "users",
|
|
74
|
+
ids: [session === null || session === void 0 ? void 0 : session.userId],
|
|
75
|
+
},
|
|
76
|
+
})];
|
|
77
|
+
case 5:
|
|
78
|
+
_b.sent();
|
|
79
|
+
if (authToken) {
|
|
80
|
+
broker = (0, objectql_2.getSteedosSchema)().broker;
|
|
81
|
+
broker.broadcast("$user.logout", {
|
|
65
82
|
authToken: authToken,
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
broker.broadcast("$user.logout", {
|
|
77
|
-
authToken: authToken
|
|
78
|
-
});
|
|
79
|
-
return [7];
|
|
80
|
-
case 6:
|
|
81
|
-
res.json(null);
|
|
82
|
-
return [2];
|
|
83
|
-
}
|
|
84
|
-
});
|
|
85
|
-
}); }; };
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
return [7];
|
|
86
|
+
case 6:
|
|
87
|
+
res.json(null);
|
|
88
|
+
return [2];
|
|
89
|
+
}
|
|
90
|
+
});
|
|
91
|
+
}); };
|
|
92
|
+
};
|
|
86
93
|
exports.logout = logout;
|
|
87
94
|
//# sourceMappingURL=logout.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/rest-express/endpoints/logout.ts"],"names":[],"mappings":";;;;AAQA,iCAA2C;AAG3C,sDAAyD;AACzD,8CAA8C;AAC9C,sCAAwC;AACxC,0DAAuD;AACvD,yCAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/rest-express/endpoints/logout.ts"],"names":[],"mappings":"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"}
|
|
@@ -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
|