@steedos/auth 2.2.55-beta.7 → 2.3.0-beta.3
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/apikey.js +12 -12
- package/lib/apikey.js.map +1 -1
- package/lib/auth-middleware.js +2 -2
- package/lib/auth-middleware.js.map +1 -1
- package/lib/endpoints/jwt.js +12 -23
- package/lib/endpoints/jwt.js.map +1 -1
- package/lib/endpoints/login.js +6 -8
- package/lib/endpoints/login.js.map +1 -1
- package/lib/endpoints/logout.js +1 -1
- package/lib/endpoints/logout.js.map +1 -1
- package/lib/endpoints/validate.js +12 -12
- package/lib/endpoints/validate.js.map +1 -1
- package/lib/express-middleware.js +0 -1
- package/lib/express-middleware.js.map +1 -1
- package/lib/session.js +22 -31
- package/lib/session.js.map +1 -1
- package/lib/spaceUserSession.js +36 -60
- package/lib/spaceUserSession.js.map +1 -1
- package/lib/tokenMap.js +7 -7
- package/lib/tokenMap.js.map +1 -1
- package/lib/userSession.js +7 -18
- package/lib/userSession.js.map +1 -1
- package/lib/utils/index.js +3 -3
- package/lib/utils/index.js.map +1 -1
- package/lib/utils/random.js +6 -72
- package/lib/utils/random.js.map +1 -1
- package/package.json +4 -4
package/lib/spaceUserSession.js
CHANGED
|
@@ -46,7 +46,6 @@ var _ = require("underscore");
|
|
|
46
46
|
var sessionCacheInMinutes = 10;
|
|
47
47
|
var SPACEUSERCACHENAME = 'space_users_cache';
|
|
48
48
|
var internalProfiles = ['admin', 'user', 'supplier', 'customer'];
|
|
49
|
-
// 使用@steedos/cacher缓存工作区信息
|
|
50
49
|
var SPACES_CACHER_NAME = 'lru.spaces';
|
|
51
50
|
function getSpaceUserProfile(userId, spaceId) {
|
|
52
51
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -55,13 +54,13 @@ function getSpaceUserProfile(userId, spaceId) {
|
|
|
55
54
|
switch (_a.label) {
|
|
56
55
|
case 0:
|
|
57
56
|
filters = "(space eq '".concat(spaceId, "') and (user eq '").concat(userId, "')");
|
|
58
|
-
return [4
|
|
57
|
+
return [4, (0, objectql_1.getSteedosSchema)().getObject('space_users').find({ filters: filters, fields: ['profile'] })];
|
|
59
58
|
case 1:
|
|
60
59
|
spaceUser = _a.sent();
|
|
61
60
|
if (spaceUser && spaceUser.length > 0) {
|
|
62
|
-
return [2
|
|
61
|
+
return [2, spaceUser[0].profile];
|
|
63
62
|
}
|
|
64
|
-
return [2
|
|
63
|
+
return [2];
|
|
65
64
|
}
|
|
66
65
|
});
|
|
67
66
|
});
|
|
@@ -73,20 +72,20 @@ function getUserRoles(userId, spaceId) {
|
|
|
73
72
|
switch (_a.label) {
|
|
74
73
|
case 0:
|
|
75
74
|
roles = ['user'];
|
|
76
|
-
return [4
|
|
75
|
+
return [4, (0, objectql_1.getSteedosSchema)().getObject('spaces').findOne(spaceId, { fields: ['admins'] })];
|
|
77
76
|
case 1:
|
|
78
77
|
space = _a.sent();
|
|
79
78
|
if (space && space.admins.includes(userId)) {
|
|
80
79
|
roles = ['admin'];
|
|
81
80
|
}
|
|
82
|
-
return [4
|
|
81
|
+
return [4, getSpaceUserProfile(userId, spaceId)];
|
|
83
82
|
case 2:
|
|
84
83
|
profile = _a.sent();
|
|
85
84
|
if (profile) {
|
|
86
85
|
roles = [profile];
|
|
87
86
|
}
|
|
88
87
|
filters = "(space eq '".concat(spaceId, "') and (users eq '").concat(userId, "')");
|
|
89
|
-
return [4
|
|
88
|
+
return [4, (0, objectql_1.getSteedosSchema)().getObject('permission_set').directFind({ filters: filters, fields: ['name'] })];
|
|
90
89
|
case 3:
|
|
91
90
|
permission_sets = _a.sent();
|
|
92
91
|
permission_sets.forEach(function (p) {
|
|
@@ -94,7 +93,7 @@ function getUserRoles(userId, spaceId) {
|
|
|
94
93
|
roles.push(p.name);
|
|
95
94
|
}
|
|
96
95
|
});
|
|
97
|
-
return [2
|
|
96
|
+
return [2, roles];
|
|
98
97
|
}
|
|
99
98
|
});
|
|
100
99
|
});
|
|
@@ -106,7 +105,7 @@ function getObjectDataByIds(objectName, ids, fields) {
|
|
|
106
105
|
switch (_a.label) {
|
|
107
106
|
case 0:
|
|
108
107
|
if (!ids || ids.length === 0) {
|
|
109
|
-
return [2
|
|
108
|
+
return [2, []];
|
|
110
109
|
}
|
|
111
110
|
filters = _.map(ids, function (id) {
|
|
112
111
|
if (!id) {
|
|
@@ -115,14 +114,14 @@ function getObjectDataByIds(objectName, ids, fields) {
|
|
|
115
114
|
return "(_id eq '".concat(id, "')");
|
|
116
115
|
}).join(' or ');
|
|
117
116
|
if (!filters) {
|
|
118
|
-
return [2
|
|
117
|
+
return [2, []];
|
|
119
118
|
}
|
|
120
119
|
query = { filters: filters };
|
|
121
120
|
if (fields && fields.length > 0) {
|
|
122
121
|
query['fields'] = fields;
|
|
123
122
|
}
|
|
124
|
-
return [4
|
|
125
|
-
case 1: return [2
|
|
123
|
+
return [4, (0, objectql_1.getSteedosSchema)().getObject(objectName).directFind(query)];
|
|
124
|
+
case 1: return [2, _a.sent()];
|
|
126
125
|
}
|
|
127
126
|
});
|
|
128
127
|
});
|
|
@@ -138,8 +137,8 @@ function getUserPermissionShares(spaceUser) {
|
|
|
138
137
|
userFilters.push("(organizations eq '".concat(orgId, "')"));
|
|
139
138
|
});
|
|
140
139
|
filters = "((".concat(userFilters.join(' or '), ") and space eq '").concat(spaceUser.space, "')");
|
|
141
|
-
return [4
|
|
142
|
-
case 1: return [2
|
|
140
|
+
return [4, (0, objectql_1.getSteedosSchema)().getObject('permission_shares').find({ filters: filters, fields: ['_id', 'object_name'] })];
|
|
141
|
+
case 1: return [2, _a.sent()];
|
|
143
142
|
}
|
|
144
143
|
});
|
|
145
144
|
});
|
|
@@ -161,11 +160,6 @@ function addSpaceSessionToCache(spaceId, userId, spaceUserSession) {
|
|
|
161
160
|
(0, objectql_1.addConfig)(SPACEUSERCACHENAME, spaceUserSession);
|
|
162
161
|
}
|
|
163
162
|
exports.addSpaceSessionToCache = addSpaceSessionToCache;
|
|
164
|
-
/**
|
|
165
|
-
* 清除缓存
|
|
166
|
-
* @param spaceId
|
|
167
|
-
* @param userId
|
|
168
|
-
*/
|
|
169
163
|
function removeSpaceUserSessionFromCache(spaceId, userId) {
|
|
170
164
|
(0, objectql_1.removeConfig)(SPACEUSERCACHENAME, { _id: "".concat(spaceId, "-").concat(userId) });
|
|
171
165
|
}
|
|
@@ -177,11 +171,11 @@ function getSpaceUserSession(spaceId, userId) {
|
|
|
177
171
|
switch (_e.label) {
|
|
178
172
|
case 0:
|
|
179
173
|
spaceSession = getSpaceSessionFromCache(spaceId, userId);
|
|
180
|
-
if (!!spaceSession) return [3
|
|
174
|
+
if (!!spaceSession) return [3, 9];
|
|
181
175
|
expiredAt = new Date().getTime() + sessionCacheInMinutes * 60 * 1000;
|
|
182
176
|
su_1 = null;
|
|
183
177
|
suFields = ['_id', 'space', 'company_id', 'company_ids', 'organization', 'organizations', 'organizations_parents', 'user'];
|
|
184
|
-
return [4
|
|
178
|
+
return [4, (0, objectql_1.getSteedosSchema)().getObject('space_users').directFind({ filters: "(user eq '".concat(userId, "') and (user_accepted eq true)"), fields: suFields })];
|
|
185
179
|
case 1:
|
|
186
180
|
spaceUsers = _e.sent();
|
|
187
181
|
findSpaceUser = _.find(spaceUsers, function (spaceUser) { return spaceUser.space === spaceId; });
|
|
@@ -191,29 +185,29 @@ function getSpaceUserSession(spaceId, userId) {
|
|
|
191
185
|
else {
|
|
192
186
|
su_1 = spaceUsers[0];
|
|
193
187
|
}
|
|
194
|
-
if (!su_1) return [3
|
|
188
|
+
if (!su_1) return [3, 8];
|
|
195
189
|
userSpaceId_1 = su_1.space;
|
|
196
190
|
userSpaceIds = _.pluck(spaceUsers, 'space');
|
|
197
|
-
return [4
|
|
191
|
+
return [4, getUserRoles(userId, userSpaceId_1)];
|
|
198
192
|
case 2:
|
|
199
193
|
roles = _e.sent();
|
|
200
|
-
return [4
|
|
194
|
+
return [4, getSpaceUserProfile(userId, userSpaceId_1)];
|
|
201
195
|
case 3:
|
|
202
196
|
profile = _e.sent();
|
|
203
197
|
spaceSession = { roles: roles, profile: profile, expiredAt: expiredAt };
|
|
204
198
|
spaceSession.spaceId = userSpaceId_1;
|
|
205
199
|
_a = spaceSession;
|
|
206
|
-
return [4
|
|
200
|
+
return [4, getSpaces(userSpaceIds)];
|
|
207
201
|
case 4:
|
|
208
202
|
_a.spaces = _e.sent();
|
|
209
203
|
spaceSession.space = _.find(spaceSession.spaces, function (record) { return record._id === userSpaceId_1; });
|
|
210
204
|
_b = spaceSession;
|
|
211
|
-
return [4
|
|
205
|
+
return [4, getObjectDataByIds('company', su_1.company_ids, ['name', 'organization'])];
|
|
212
206
|
case 5:
|
|
213
207
|
_b.companies = _e.sent();
|
|
214
208
|
spaceSession.company = _.find(spaceSession.companies, function (record) { return record._id === su_1.company_id; });
|
|
215
209
|
_c = spaceSession;
|
|
216
|
-
return [4
|
|
210
|
+
return [4, getObjectDataByIds('organizations', su_1.organizations, ['name', 'fullname', 'company_id'])];
|
|
217
211
|
case 6:
|
|
218
212
|
_c.organizations = _e.sent();
|
|
219
213
|
spaceSession.organization = _.find(spaceSession.organizations, function (record) { return record._id === su_1.organization; });
|
|
@@ -224,11 +218,11 @@ function getSpaceUserSession(spaceId, userId) {
|
|
|
224
218
|
spaceSession.company_ids = spaceSession.companies.map(function (company) { return company._id; });
|
|
225
219
|
}
|
|
226
220
|
_d = spaceSession;
|
|
227
|
-
return [4
|
|
221
|
+
return [4, getUserPermissionShares(su_1)];
|
|
228
222
|
case 7:
|
|
229
223
|
_d.permission_shares = _e.sent();
|
|
230
224
|
addSpaceSessionToCache(spaceId, userId, spaceSession);
|
|
231
|
-
return [3
|
|
225
|
+
return [3, 9];
|
|
232
226
|
case 8:
|
|
233
227
|
spaceSession = { roles: ['guest'], expiredAt: expiredAt };
|
|
234
228
|
_e.label = 9;
|
|
@@ -236,7 +230,7 @@ function getSpaceUserSession(spaceId, userId) {
|
|
|
236
230
|
if (spaceSession.space && spaceSession.space.admins) {
|
|
237
231
|
spaceSession.is_space_admin = spaceSession.space.admins.indexOf(userId) > -1;
|
|
238
232
|
}
|
|
239
|
-
return [2
|
|
233
|
+
return [2, spaceSession];
|
|
240
234
|
}
|
|
241
235
|
});
|
|
242
236
|
});
|
|
@@ -249,23 +243,18 @@ function updateSpaceUserSessionRolesCache(spaceId, userId) {
|
|
|
249
243
|
switch (_b.label) {
|
|
250
244
|
case 0:
|
|
251
245
|
spaceSession = getSpaceSessionFromCache(spaceId, userId);
|
|
252
|
-
if (!spaceSession) return [3
|
|
246
|
+
if (!spaceSession) return [3, 2];
|
|
253
247
|
_a = spaceSession;
|
|
254
|
-
return [4
|
|
248
|
+
return [4, getUserRoles(userId, spaceId)];
|
|
255
249
|
case 1:
|
|
256
250
|
_a.roles = _b.sent();
|
|
257
|
-
return [2
|
|
258
|
-
case 2: return [2
|
|
251
|
+
return [2, true];
|
|
252
|
+
case 2: return [2, false];
|
|
259
253
|
}
|
|
260
254
|
});
|
|
261
255
|
});
|
|
262
256
|
}
|
|
263
257
|
exports.updateSpaceUserSessionRolesCache = updateSpaceUserSessionRolesCache;
|
|
264
|
-
/**
|
|
265
|
-
* 获取用户所属工作区记录，优先从缓存获取
|
|
266
|
-
* @param userSpaceIds
|
|
267
|
-
* @returns 工作区记录
|
|
268
|
-
*/
|
|
269
258
|
function getSpaces(userSpaceIds) {
|
|
270
259
|
return __awaiter(this, void 0, void 0, function () {
|
|
271
260
|
var cacher, spaces, _i, userSpaceIds_1, sId, cacheDoc;
|
|
@@ -277,11 +266,11 @@ function getSpaces(userSpaceIds) {
|
|
|
277
266
|
_i = 0, userSpaceIds_1 = userSpaceIds;
|
|
278
267
|
_a.label = 1;
|
|
279
268
|
case 1:
|
|
280
|
-
if (!(_i < userSpaceIds_1.length)) return [3
|
|
269
|
+
if (!(_i < userSpaceIds_1.length)) return [3, 5];
|
|
281
270
|
sId = userSpaceIds_1[_i];
|
|
282
271
|
cacheDoc = cacher.get(sId);
|
|
283
|
-
if (!!cacheDoc) return [3
|
|
284
|
-
return [4
|
|
272
|
+
if (!!cacheDoc) return [3, 3];
|
|
273
|
+
return [4, (0, objectql_1.getObject)('spaces').directFind({ filters: [['_id', '=', sId]], fields: ['_id', 'name', 'admins'] })];
|
|
285
274
|
case 2:
|
|
286
275
|
cacheDoc = (_a.sent())[0];
|
|
287
276
|
cacher.set(sId, cacheDoc);
|
|
@@ -291,42 +280,35 @@ function getSpaces(userSpaceIds) {
|
|
|
291
280
|
_a.label = 4;
|
|
292
281
|
case 4:
|
|
293
282
|
_i++;
|
|
294
|
-
return [3
|
|
283
|
+
return [3, 1];
|
|
295
284
|
case 5:
|
|
296
285
|
if (_.isEmpty(spaces)) {
|
|
297
286
|
console.log(userSpaceIds);
|
|
298
287
|
}
|
|
299
|
-
return [2
|
|
288
|
+
return [2, spaces];
|
|
300
289
|
}
|
|
301
290
|
});
|
|
302
291
|
});
|
|
303
292
|
}
|
|
304
|
-
/**
|
|
305
|
-
* userSession支持实时更新
|
|
306
|
-
* 当space_users属性发生变更后清除userSession缓存
|
|
307
|
-
*/
|
|
308
293
|
function deleteSpaceUserSessionCacheByChangedProp(newDoc, oldDoc) {
|
|
309
294
|
var spaceId = oldDoc.space, userId = oldDoc.user;
|
|
310
|
-
// 由于space_users和users是单独缓存，故这里分别判断清除
|
|
311
|
-
// space_users session
|
|
312
295
|
var suProps = [
|
|
313
296
|
'company_id',
|
|
314
297
|
'company_ids',
|
|
315
298
|
'organization',
|
|
316
299
|
'organizations',
|
|
317
|
-
'profile',
|
|
300
|
+
'profile',
|
|
318
301
|
];
|
|
319
302
|
var suChanged = (0, session_1.isPropValueChanged)(newDoc, oldDoc, suProps);
|
|
320
303
|
if (suChanged) {
|
|
321
304
|
removeSpaceUserSessionFromCache(spaceId, userId);
|
|
322
305
|
}
|
|
323
|
-
// user session
|
|
324
306
|
var uProps = [
|
|
325
307
|
'locale',
|
|
326
308
|
'mobile',
|
|
327
309
|
'name',
|
|
328
310
|
'username',
|
|
329
|
-
'email'
|
|
311
|
+
'email'
|
|
330
312
|
];
|
|
331
313
|
var uChanged = (0, session_1.isPropValueChanged)(newDoc, oldDoc, uProps);
|
|
332
314
|
if (uChanged) {
|
|
@@ -334,22 +316,16 @@ function deleteSpaceUserSessionCacheByChangedProp(newDoc, oldDoc) {
|
|
|
334
316
|
}
|
|
335
317
|
}
|
|
336
318
|
exports.deleteSpaceUserSessionCacheByChangedProp = deleteSpaceUserSessionCacheByChangedProp;
|
|
337
|
-
/**
|
|
338
|
-
* userSession支持实时更新
|
|
339
|
-
* 当spaces属性发生变更后清除spaces缓存
|
|
340
|
-
*/
|
|
341
319
|
function deleteSpaceCacheByChangedProp(newDoc, oldDoc) {
|
|
342
320
|
var spaceId = oldDoc._id;
|
|
343
321
|
var props = [
|
|
344
322
|
'name',
|
|
345
|
-
'admins',
|
|
323
|
+
'admins',
|
|
346
324
|
];
|
|
347
325
|
var changed = (0, session_1.isPropValueChanged)(newDoc, oldDoc, props);
|
|
348
326
|
if (changed) {
|
|
349
|
-
// 清除spaces缓存
|
|
350
327
|
var cacher = (0, cachers_1.getCacher)(SPACES_CACHER_NAME);
|
|
351
328
|
cacher["delete"](spaceId);
|
|
352
|
-
// 如果admins发生了变化，则需要清除变化的人员的缓存
|
|
353
329
|
var changeAdmins = _.difference(newDoc.admins, oldDoc.admins).concat(_.difference(oldDoc.admins, newDoc.admins));
|
|
354
330
|
for (var _i = 0, changeAdmins_1 = changeAdmins; _i < changeAdmins_1.length; _i++) {
|
|
355
331
|
var userId = changeAdmins_1[_i];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spaceUserSession.js","sourceRoot":"","sources":["../src/spaceUserSession.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAoG;AACpG,iCAAmC;AACnC,4CAA4C;AAC5C,qCAA+C;AAC/C,6CAA2D;AAC3D,8BAAiC;AACjC,IAAM,qBAAqB,GAAG,EAAE,CAAC;AACjC,IAAM,kBAAkB,GAAG,mBAAmB,CAAC;AAE/C,IAAM,gBAAgB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"spaceUserSession.js","sourceRoot":"","sources":["../src/spaceUserSession.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAoG;AACpG,iCAAmC;AACnC,4CAA4C;AAC5C,qCAA+C;AAC/C,6CAA2D;AAC3D,8BAAiC;AACjC,IAAM,qBAAqB,GAAG,EAAE,CAAC;AACjC,IAAM,kBAAkB,GAAG,mBAAmB,CAAC;AAE/C,IAAM,gBAAgB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,CAAA;AAGlE,IAAM,kBAAkB,GAAG,YAAY,CAAA;AAEvC,SAAe,mBAAmB,CAAC,MAAc,EAAE,OAAe;;;;;;oBAC1D,OAAO,GAAG,qBAAc,OAAO,8BAAoB,MAAM,OAAI,CAAC;oBAClD,WAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,EAAA;;oBAA7G,SAAS,GAAG,SAAiG;oBACjH,IAAI,SAAS,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;wBACnC,WAAO,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,EAAA;qBAC9B;;;;;CACJ;AAED,SAAe,YAAY,CAAC,MAAc,EAAE,OAAe;;;;;;oBACnD,KAAK,GAAG,CAAC,MAAM,CAAC,CAAC;oBACT,WAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAA;;oBAA7F,KAAK,GAAG,SAAqF;oBACjG,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;wBACxC,KAAK,GAAG,CAAC,OAAO,CAAC,CAAC;qBACrB;oBAEa,WAAM,mBAAmB,CAAC,MAAM,EAAE,OAAO,CAAC,EAAA;;oBAApD,OAAO,GAAG,SAA0C;oBAExD,IAAI,OAAO,EAAE;wBACT,KAAK,GAAG,CAAC,OAAO,CAAC,CAAA;qBACpB;oBAEG,OAAO,GAAG,qBAAc,OAAO,+BAAqB,MAAM,OAAI,CAAC;oBAC7C,WAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAA;;oBAAzH,eAAe,GAAG,SAAuG;oBAC7H,eAAe,CAAC,OAAO,CAAC,UAAA,CAAC;wBACrB,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE;4BACtC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;yBACtB;oBACL,CAAC,CAAC,CAAC;oBACH,WAAO,KAAK,EAAC;;;;CAChB;AAED,SAAe,kBAAkB,CAAC,UAAkB,EAAE,GAAa,EAAE,MAAiB;;;;;;oBAClF,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;wBAC1B,WAAO,EAAE,EAAA;qBACZ;oBAEG,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE;wBACjC,IAAI,CAAC,EAAE,EAAE;4BACL,OAAO,EAAE,CAAA;yBACZ;wBACD,OAAO,mBAAY,EAAE,OAAI,CAAA;oBAC7B,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBAEhB,IAAI,CAAC,OAAO,EAAE;wBACV,WAAO,EAAE,EAAA;qBACZ;oBAEG,KAAK,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;oBACjC,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;wBAC7B,KAAK,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;qBAC5B;oBAEM,WAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,EAAA;wBAAvE,WAAO,SAAgE,EAAA;;;;CAC1E;AAED,SAAe,uBAAuB,CAAC,SAAS;;;;;;oBACxC,WAAW,GAAG,CAAC,qBAAc,SAAS,CAAC,IAAI,OAAI,CAAC,CAAC;oBACrD,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE,UAAC,KAAK;wBAC1C,WAAW,CAAC,IAAI,CAAC,6BAAsB,KAAK,OAAI,CAAC,CAAC;oBACtD,CAAC,CAAC,CAAA;oBACE,OAAO,GAAG,YAAK,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,6BAAmB,SAAS,CAAC,KAAK,OAAI,CAAA;oBAC1E,WAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,aAAa,CAAC,EAAE,CAAC,EAAA;wBAAzH,WAAO,SAAkH,EAAC;;;;CAC7H;AAED,SAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM;IACpD,IAAI,gBAAgB,GAAG,IAAA,oBAAS,EAAC,kBAAkB,EAAE,UAAG,OAAO,cAAI,MAAM,CAAE,CAAC,CAAA;IAC5E,IAAI,CAAC,gBAAgB,EAAE;QACnB,OAAO,IAAI,CAAC;KACf;IACD,IAAI,IAAA,iBAAS,EAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE;QACvC,IAAA,uBAAY,EAAC,kBAAkB,EAAE,gBAAgB,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC;KACf;IACD,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AAVD,4DAUC;AAED,SAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,gBAAgB;IACpE,gBAAgB,CAAC,GAAG,GAAG,UAAG,OAAO,cAAI,MAAM,CAAE,CAAA;IAC7C,IAAA,oBAAS,EAAC,kBAAkB,EAAE,gBAAgB,CAAC,CAAC;AACpD,CAAC;AAHD,wDAGC;AAOD,SAAgB,+BAA+B,CAAC,OAAe,EAAE,MAAc;IAC3E,IAAA,uBAAY,EAAC,kBAAkB,EAAE,EAAE,GAAG,EAAE,UAAG,OAAO,cAAI,MAAM,CAAE,EAAE,CAAC,CAAA;AACrE,CAAC;AAFD,0EAEC;AAED,SAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM;;;;;;oBACjD,YAAY,GAAQ,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;yBAC9D,CAAC,YAAY,EAAb,cAAa;oBACT,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,qBAAqB,GAAG,EAAE,GAAG,IAAI,CAAC;oBACrE,OAAK,IAAI,CAAC;oBACV,QAAQ,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,CAAC,CAAC;oBAG9G,WAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,oBAAa,MAAM,mCAAgC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAA;;oBAA7J,UAAU,GAAG,SAAgJ;oBAC3J,aAAa,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,UAAC,SAAS,IAAK,OAAO,SAAS,CAAC,KAAK,KAAK,OAAO,CAAA,CAAC,CAAC,CAAC,CAAA;oBAC7F,IAAG,aAAa,EAAC;wBACb,IAAE,GAAG,aAAa,CAAC;qBACtB;yBAAI;wBACD,IAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;qBACtB;yBAEG,IAAE,EAAF,cAAE;oBACE,gBAAc,IAAE,CAAC,KAAK,CAAC;oBACvB,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;oBACpC,WAAM,YAAY,CAAC,MAAM,EAAE,aAAW,CAAC,EAAA;;oBAA/C,KAAK,GAAG,SAAuC;oBACrC,WAAM,mBAAmB,CAAC,MAAM,EAAE,aAAW,CAAC,EAAA;;oBAAxD,OAAO,GAAG,SAA8C;oBAC5D,YAAY,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAC,SAAS,EAAE,SAAS,EAAE,CAAC;oBACvE,YAAY,CAAC,OAAO,GAAG,aAAW,CAAC;oBACnC,KAAA,YAAY,CAAA;oBAAU,WAAM,SAAS,CAAC,YAAY,CAAC,EAAA;;oBAAnD,GAAa,MAAM,GAAG,SAA6B,CAAA;oBACnD,YAAY,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,UAAC,MAAM,IAAK,OAAO,MAAM,CAAC,GAAG,KAAK,aAAW,CAAA,CAAC,CAAC,CAAC,CAAC;oBAElG,KAAA,YAAY,CAAA;oBAAa,WAAM,kBAAkB,CAAC,SAAS,EAAE,IAAE,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,EAAA;;oBAAtG,GAAa,SAAS,GAAG,SAA6E,CAAC;oBACvG,YAAY,CAAC,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,UAAC,MAAM,IAAK,OAAO,MAAM,CAAC,GAAG,KAAK,IAAE,CAAC,UAAU,CAAA,CAAC,CAAC,CAAC,CAAC;oBAEzG,KAAA,YAAY,CAAA;oBAAiB,WAAM,kBAAkB,CAAC,eAAe,EAAE,IAAE,CAAC,aAAa,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC,EAAA;;oBAA5H,GAAa,aAAa,GAAG,SAA+F,CAAC;oBAC7H,YAAY,CAAC,YAAY,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,UAAC,MAAM,IAAK,OAAO,MAAM,CAAC,GAAG,KAAK,IAAE,CAAC,YAAY,CAAA,CAAC,CAAC,CAAC,CAAC;oBAEpH,IAAI,YAAY,CAAC,OAAO,EAAE;wBACtB,YAAY,CAAC,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC;qBACtD;oBACD,IAAI,YAAY,CAAC,SAAS,EAAE;wBACxB,YAAY,CAAC,WAAW,GAAG,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,OAAY,IAAI,OAAO,OAAO,CAAC,GAAG,CAAA,CAAC,CAAC,CAAC,CAAC;qBACzG;oBACD,KAAA,YAAY,CAAA;oBAAqB,WAAM,uBAAuB,CAAC,IAAE,CAAC,EAAA;;oBAAlE,GAAa,iBAAiB,GAAG,SAAiC,CAAC;oBACnE,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;;;oBAEtD,YAAY,GAAG,EAAE,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;;;oBAGlE,IAAI,YAAY,CAAC,KAAK,IAAI,YAAY,CAAC,KAAK,CAAC,MAAM,EAAE;wBACjD,YAAY,CAAC,cAAc,GAAG,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;qBAChF;oBACD,WAAO,YAAY,EAAC;;;;CACvB;AAhDD,kDAgDC;AAED,SAAsB,gCAAgC,CAAC,OAAO,EAAE,MAAM;;;;;;oBAC9D,YAAY,GAAQ,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;yBAC9D,YAAY,EAAZ,cAAY;oBACZ,KAAA,YAAY,CAAA;oBAAS,WAAM,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,EAAA;;oBAAxD,GAAa,KAAK,GAAG,SAAmC,CAAC;oBACzD,WAAO,IAAI,EAAC;wBAEhB,WAAO,KAAK,EAAC;;;;CAChB;AAPD,4EAOC;AAOD,SAAe,SAAS,CAAC,YAAsB;;;;;;oBACrC,MAAM,GAAG,IAAA,mBAAS,EAAC,kBAAkB,CAAC,CAAA;oBACtC,MAAM,GAAG,EAAE,CAAA;0BAEa,EAAZ,6BAAY;;;yBAAZ,CAAA,0BAAY,CAAA;oBAAnB,GAAG;oBACN,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;yBAC1B,CAAC,QAAQ,EAAT,cAAS;oBACG,WAAM,IAAA,oBAAS,EAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,CAAE,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAE,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,EAAA;;oBAAvH,QAAQ,GAAG,CAAC,SAA2G,CAAC,CAAC,CAAC,CAAC,CAAA;oBAC3H,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;;;oBAE7B,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;;;oBANP,IAAY,CAAA;;;oBAQ9B,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;wBACnB,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;qBAC5B;oBACD,WAAO,MAAM,EAAA;;;;CAChB;AAMD,SAAgB,wCAAwC,CAAE,MAAW,EAAE,MAAW;IACtE,IAAO,OAAO,GAAmB,MAAM,MAAzB,EAAQ,MAAM,GAAK,MAAM,KAAX,CAAW;IAG/C,IAAM,OAAO,GAAG;QACZ,YAAY;QACZ,aAAa;QACb,cAAc;QACd,eAAe;QACf,SAAS;KACZ,CAAA;IACD,IAAM,SAAS,GAAG,IAAA,4BAAkB,EAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7D,IAAI,SAAS,EAAE;QACX,+BAA+B,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;KACnD;IAED,IAAM,MAAM,GAAG;QACX,QAAQ;QACR,QAAQ;QACR,MAAM;QACN,UAAU;QACV,OAAO;KACV,CAAA;IACD,IAAM,QAAQ,GAAG,IAAA,4BAAkB,EAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;IAC3D,IAAI,QAAQ,EAAE;QACV,IAAA,wCAA0B,EAAC,MAAM,CAAC,CAAA;KACrC;AACL,CAAC;AA3BD,4FA2BC;AAMA,SAAgB,6BAA6B,CAAE,MAAW,EAAE,MAAW;IAC5D,IAAK,OAAO,GAAK,MAAM,IAAX,CAAW;IAC/B,IAAM,KAAK,GAAG;QACV,MAAM;QACN,QAAQ;KACX,CAAA;IACD,IAAM,OAAO,GAAG,IAAA,4BAAkB,EAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;IACzD,IAAI,OAAO,EAAE;QAET,IAAM,MAAM,GAAG,IAAA,mBAAS,EAAC,kBAAkB,CAAC,CAAA;QAC5C,MAAM,CAAC,QAAM,CAAA,CAAC,OAAO,CAAC,CAAA;QAEtB,IAAM,YAAY,GAAc,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;QAC7H,KAAqB,UAAY,EAAZ,6BAAY,EAAZ,0BAAY,EAAZ,IAAY,EAAE;YAA9B,IAAM,MAAM,qBAAA;YACb,+BAA+B,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;SACnD;KACJ;AACL,CAAC;AAjBA,sEAiBA"}
|
package/lib/tokenMap.js
CHANGED
|
@@ -60,12 +60,12 @@ function getUser(token) {
|
|
|
60
60
|
case 0:
|
|
61
61
|
hashedToken = _hashLoginToken(token).replace(/\//g, "%2F");
|
|
62
62
|
filters = "(services/resume/loginTokens/hashedToken eq '".concat(hashedToken, "')");
|
|
63
|
-
return [4
|
|
63
|
+
return [4, (0, objectql_1.getSteedosSchema)()
|
|
64
64
|
.getObject("users")
|
|
65
65
|
.find({ filters: filters, fields: ["_id"] })];
|
|
66
66
|
case 1:
|
|
67
67
|
users = _a.sent();
|
|
68
|
-
return [2
|
|
68
|
+
return [2, users[0]];
|
|
69
69
|
}
|
|
70
70
|
});
|
|
71
71
|
});
|
|
@@ -78,20 +78,20 @@ function getUserIdByToken(token, clientInfos) {
|
|
|
78
78
|
switch (_a.label) {
|
|
79
79
|
case 0:
|
|
80
80
|
tokenMap = getTokenMapCache(token);
|
|
81
|
-
if (!!tokenMap) return [3
|
|
82
|
-
return [4
|
|
81
|
+
if (!!tokenMap) return [3, 2];
|
|
82
|
+
return [4, getUser(token)];
|
|
83
83
|
case 1:
|
|
84
84
|
user = _a.sent();
|
|
85
85
|
if (user) {
|
|
86
86
|
userId = user._id;
|
|
87
87
|
setTokenMapCache(token, Object.assign({}, clientInfos, { userId: userId }));
|
|
88
|
-
return [2
|
|
88
|
+
return [2, userId];
|
|
89
89
|
}
|
|
90
90
|
else {
|
|
91
|
-
return [2
|
|
91
|
+
return [2];
|
|
92
92
|
}
|
|
93
93
|
_a.label = 2;
|
|
94
|
-
case 2: return [2
|
|
94
|
+
case 2: return [2, tokenMap.userId];
|
|
95
95
|
}
|
|
96
96
|
});
|
|
97
97
|
});
|
package/lib/tokenMap.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenMap.js","sourceRoot":"","sources":["../src/tokenMap.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAAkC;AAClC,8CAK2B;AAC3B,IAAM,iBAAiB,GAAG,iBAAiB,CAAC;AAE5C,SAAS,gBAAgB,CAAC,KAAK;IAC7B,OAAO,IAAA,oBAAS,EAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;AAC7C,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAK,EAAE,QAAQ;IACvC,QAAQ,CAAC,GAAG,GAAG,KAAK,CAAC;IACrB,IAAA,oBAAS,EAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,eAAe,CAAC,KAAa;IACpC,IAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnB,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAC/B,CAAC;AAED,SAAe,OAAO,CAAC,KAAa;;;;;;oBAC9B,WAAW,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;oBAC3D,OAAO,GAAG,uDAAgD,WAAW,OAAI,CAAC;oBAClE,
|
|
1
|
+
{"version":3,"file":"tokenMap.js","sourceRoot":"","sources":["../src/tokenMap.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAAkC;AAClC,8CAK2B;AAC3B,IAAM,iBAAiB,GAAG,iBAAiB,CAAC;AAE5C,SAAS,gBAAgB,CAAC,KAAK;IAC7B,OAAO,IAAA,oBAAS,EAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;AAC7C,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAK,EAAE,QAAQ;IACvC,QAAQ,CAAC,GAAG,GAAG,KAAK,CAAC;IACrB,IAAA,oBAAS,EAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,eAAe,CAAC,KAAa;IACpC,IAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnB,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAC/B,CAAC;AAED,SAAe,OAAO,CAAC,KAAa;;;;;;oBAC9B,WAAW,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;oBAC3D,OAAO,GAAG,uDAAgD,WAAW,OAAI,CAAC;oBAClE,WAAM,IAAA,2BAAgB,GAAE;6BACjC,SAAS,CAAC,OAAO,CAAC;6BAClB,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,EAAA;;oBAF1C,KAAK,GAAG,SAEkC;oBAC9C,WAAO,KAAK,CAAC,CAAC,CAAC,EAAC;;;;CACjB;AAED,SAAsB,gBAAgB,CAAC,KAAK,EAAE,WAAgB;IAAhB,4BAAA,EAAA,gBAAgB;;;;;;oBACxD,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;yBACnC,CAAC,QAAQ,EAAT,cAAS;oBACA,WAAM,OAAO,CAAC,KAAK,CAAC,EAAA;;oBAA3B,IAAI,GAAG,SAAoB;oBAC/B,IAAI,IAAI,EAAE;wBACJ,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC;wBACtB,gBAAgB,CACd,KAAK,EACL,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CACnD,CAAC;wBACF,WAAO,MAAM,EAAC;qBACf;yBAAM;wBACL,WAAO;qBACR;;wBAEH,WAAO,QAAQ,CAAC,MAAM,EAAC;;;;CACxB;AAhBD,4CAgBC;AAED,SAAgB,gBAAgB,CAAC,MAAM,EAAE,QAAQ;IAC/C,IAAA,4BAAiB,EAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,UAAA,EAAE,CAAC,CAAC;AACrE,CAAC;AAFD,4CAEC"}
|
package/lib/userSession.js
CHANGED
|
@@ -37,13 +37,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
37
37
|
};
|
|
38
38
|
exports.__esModule = true;
|
|
39
39
|
exports.getUserSession = exports.removeUserSessionFromCache = exports.addSessionToCache = exports.getSessionFromCache = void 0;
|
|
40
|
-
/*
|
|
41
|
-
* @Author: sunhaolin@hotoa.com
|
|
42
|
-
* @Date: 2021-06-03 15:11:52
|
|
43
|
-
* @LastEditors: sunhaolin@hotoa.com
|
|
44
|
-
* @LastEditTime: 2022-07-07 10:19:52
|
|
45
|
-
* @Description:
|
|
46
|
-
*/
|
|
47
40
|
var objectql_1 = require("@steedos/objectql");
|
|
48
41
|
var utils_1 = require("./utils");
|
|
49
42
|
var sessionCacheInMinutes = 10;
|
|
@@ -65,10 +58,6 @@ function addSessionToCache(userId, userSession) {
|
|
|
65
58
|
(0, objectql_1.addConfig)(USERCACHENAME, userSession);
|
|
66
59
|
}
|
|
67
60
|
exports.addSessionToCache = addSessionToCache;
|
|
68
|
-
/**
|
|
69
|
-
* 清除缓存
|
|
70
|
-
* @param userId
|
|
71
|
-
*/
|
|
72
61
|
function removeUserSessionFromCache(userId) {
|
|
73
62
|
(0, objectql_1.removeConfig)(USERCACHENAME, { _id: userId });
|
|
74
63
|
}
|
|
@@ -78,10 +67,10 @@ function getUser(userId) {
|
|
|
78
67
|
var user;
|
|
79
68
|
return __generator(this, function (_a) {
|
|
80
69
|
switch (_a.label) {
|
|
81
|
-
case 0: return [4
|
|
70
|
+
case 0: return [4, (0, objectql_1.getSteedosSchema)().getObject('users').findOne(userId, { fields: ['name', 'username', 'mobile', 'email', 'utcOffset', 'steedos_id', 'locale'] })];
|
|
82
71
|
case 1:
|
|
83
72
|
user = _a.sent();
|
|
84
|
-
return [2
|
|
73
|
+
return [2, user];
|
|
85
74
|
}
|
|
86
75
|
});
|
|
87
76
|
});
|
|
@@ -94,8 +83,8 @@ function getUserSession(userId) {
|
|
|
94
83
|
case 0:
|
|
95
84
|
expiredAt = new Date().getTime() + sessionCacheInMinutes * 60 * 1000;
|
|
96
85
|
session = getSessionFromCache(userId);
|
|
97
|
-
if (!!session) return [3
|
|
98
|
-
return [4
|
|
86
|
+
if (!!session) return [3, 2];
|
|
87
|
+
return [4, getUser(userId)];
|
|
99
88
|
case 1:
|
|
100
89
|
user = _a.sent();
|
|
101
90
|
if (user) {
|
|
@@ -119,13 +108,13 @@ function getUserSession(userId) {
|
|
|
119
108
|
}
|
|
120
109
|
session.expiredAt = expiredAt;
|
|
121
110
|
addSessionToCache(userId, session);
|
|
122
|
-
return [2
|
|
111
|
+
return [2, session];
|
|
123
112
|
}
|
|
124
113
|
else {
|
|
125
|
-
return [2
|
|
114
|
+
return [2];
|
|
126
115
|
}
|
|
127
116
|
_a.label = 2;
|
|
128
|
-
case 2: return [2
|
|
117
|
+
case 2: return [2, session];
|
|
129
118
|
}
|
|
130
119
|
});
|
|
131
120
|
});
|
package/lib/userSession.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userSession.js","sourceRoot":"","sources":["../src/userSession.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"userSession.js","sourceRoot":"","sources":["../src/userSession.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/index.js
CHANGED
|
@@ -81,7 +81,7 @@ var insertHashedLoginToken = function (userId, hashedToken) {
|
|
|
81
81
|
switch (_a.label) {
|
|
82
82
|
case 0:
|
|
83
83
|
userObject = (0, objectql_1.getSteedosSchema)().getObject('users');
|
|
84
|
-
return [4
|
|
84
|
+
return [4, userObject.findOne(userId, { fields: ['services'] })];
|
|
85
85
|
case 1:
|
|
86
86
|
user = _a.sent();
|
|
87
87
|
if (!user['services']) {
|
|
@@ -92,8 +92,8 @@ var insertHashedLoginToken = function (userId, hashedToken) {
|
|
|
92
92
|
}
|
|
93
93
|
user['services']['resume']['loginTokens'].push(hashedToken);
|
|
94
94
|
data = { services: user['services'] };
|
|
95
|
-
return [4
|
|
96
|
-
case 2: return [2
|
|
95
|
+
return [4, userObject.update(userId, data)];
|
|
96
|
+
case 2: return [2, _a.sent()];
|
|
97
97
|
}
|
|
98
98
|
});
|
|
99
99
|
});
|
package/lib/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAAkC;AAClC,mCAA6C;AAC7C,8CAAqD;AACrD,IAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAE5B,IAAM,cAAc,GAAG,UAAU,UAAU;IAChD,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;AAC/B,CAAC,CAAA;AAJY,QAAA,cAAc,kBAI1B;AAEM,IAAM,yBAAyB,GAAG;IACvC,OAAO;QACL,KAAK,EAAE,mBAAM,CAAC,MAAM,EAAE;QACtB,IAAI,EAAE,IAAI,IAAI;KACf,CAAC;AACJ,CAAC,CAAA;AALY,QAAA,yBAAyB,6BAKrC;AAEM,IAAM,gBAAgB,GAAG,UAAU,YAAY;IACpD,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,uBACD,IAAI,gBAAG,GAAG,IAAG,YAAY,CAAC,GAAG,CAAC,MAAE;IAFxB,CAEwB,EACvC,EAAE,CACH,CAAA;IACD,6BACK,kBAAkB,KACrB,WAAW,EAAE,IAAA,sBAAc,EAAC,YAAY,CAAC,KAAK,CAAC,IAC/C;AACJ,CAAC,CAAA;AAXY,QAAA,gBAAgB,oBAW5B;AAEM,IAAM,sBAAsB,GAAG,UAAgB,MAAM,EAAE,WAAW;;;;;;oBACnE,UAAU,GAAG,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;oBAC3C,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}
|