@steedos/auth 3.0.0-beta.74 → 3.0.0-beta.76
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/userSession.js +19 -2
- package/lib/userSession.js.map +1 -1
- package/package.json +5 -5
package/lib/userSession.js
CHANGED
|
@@ -44,7 +44,7 @@ var objectql_1 = require("@steedos/objectql");
|
|
|
44
44
|
var metadata_registrar_1 = require("@steedos/metadata-registrar");
|
|
45
45
|
var utils_1 = require("./utils");
|
|
46
46
|
var sessionCacheInMinutes = 10;
|
|
47
|
-
var USERCACHENAME =
|
|
47
|
+
var USERCACHENAME = "users_cache";
|
|
48
48
|
function getSessionFromCache(userId) {
|
|
49
49
|
var userSession = (0, metadata_registrar_1.getConfig)(USERCACHENAME, userId);
|
|
50
50
|
if (!userSession) {
|
|
@@ -68,7 +68,19 @@ function getUser(userId) {
|
|
|
68
68
|
var user;
|
|
69
69
|
return __generator(this, function (_a) {
|
|
70
70
|
switch (_a.label) {
|
|
71
|
-
case 0: return [4, (0, objectql_1.getSteedosSchema)()
|
|
71
|
+
case 0: return [4, (0, objectql_1.getSteedosSchema)()
|
|
72
|
+
.getObject("users")
|
|
73
|
+
.findOne(userId, {
|
|
74
|
+
fields: [
|
|
75
|
+
"name",
|
|
76
|
+
"username",
|
|
77
|
+
"mobile",
|
|
78
|
+
"email",
|
|
79
|
+
"utcOffset",
|
|
80
|
+
"steedos_id",
|
|
81
|
+
"locale",
|
|
82
|
+
],
|
|
83
|
+
})];
|
|
72
84
|
case 1:
|
|
73
85
|
user = _a.sent();
|
|
74
86
|
return [2, user];
|
|
@@ -107,6 +119,11 @@ function getUserSession(userId) {
|
|
|
107
119
|
else {
|
|
108
120
|
session.language = user.locale;
|
|
109
121
|
}
|
|
122
|
+
if (!session.language) {
|
|
123
|
+
session.language = process.env.STEEDOS_DEFAULT_LANGUAGE
|
|
124
|
+
? process.env.STEEDOS_DEFAULT_LANGUAGE
|
|
125
|
+
: "zh-CN";
|
|
126
|
+
}
|
|
110
127
|
session.expiredAt = expiredAt;
|
|
111
128
|
addSessionToCache(userId, session);
|
|
112
129
|
return [2, session];
|
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/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/auth",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "3.0.0-beta.
|
|
4
|
+
"version": "3.0.0-beta.76",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"watch": "tsc --watch",
|
|
@@ -13,9 +13,9 @@
|
|
|
13
13
|
"access": "public"
|
|
14
14
|
},
|
|
15
15
|
"dependencies": {
|
|
16
|
-
"@steedos/cachers": "3.0.0-beta.
|
|
17
|
-
"@steedos/objectql": "3.0.0-beta.
|
|
18
|
-
"@steedos/utils": "3.0.0-beta.
|
|
16
|
+
"@steedos/cachers": "3.0.0-beta.76",
|
|
17
|
+
"@steedos/objectql": "3.0.0-beta.76",
|
|
18
|
+
"@steedos/utils": "3.0.0-beta.76",
|
|
19
19
|
"bcryptjs": "^2.4.3",
|
|
20
20
|
"cookies": "^0.8.0",
|
|
21
21
|
"express": "^4.16.4",
|
|
@@ -27,5 +27,5 @@
|
|
|
27
27
|
"devDependencies": {
|
|
28
28
|
"typescript": "5.7.3"
|
|
29
29
|
},
|
|
30
|
-
"gitHead": "
|
|
30
|
+
"gitHead": "afd8185759265f86d40b46ca496895b3dc598e52"
|
|
31
31
|
}
|