@steedos/auth 3.0.13-beta.46 → 3.0.13-beta.48
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/endpoints/jwt.js +40 -10
- package/lib/endpoints/jwt.js.map +1 -1
- package/package.json +5 -5
package/lib/endpoints/jwt.js
CHANGED
|
@@ -41,26 +41,27 @@ var utils_1 = require("../utils");
|
|
|
41
41
|
var objectql_1 = require("@steedos/objectql");
|
|
42
42
|
function getTokenInfo(req) {
|
|
43
43
|
return __awaiter(this, void 0, void 0, function () {
|
|
44
|
-
var payload, data, userObj, user, userId, authToken, hashedToken, filters, stampedToken, hashedTokenObj;
|
|
45
|
-
|
|
46
|
-
|
|
44
|
+
var payload, data, userObj, user, userId, authToken, hashedToken, filters, stampedToken, hashedTokenObj, sessionObj;
|
|
45
|
+
var _a;
|
|
46
|
+
return __generator(this, function (_b) {
|
|
47
|
+
switch (_b.label) {
|
|
47
48
|
case 0:
|
|
48
49
|
payload = req.user;
|
|
49
50
|
data = { userId: '', authToken: '' };
|
|
50
51
|
userObj = (0, objectql_1.getSteedosSchema)().getObject('users');
|
|
51
52
|
return [4, userObj.find({ filters: "username eq '".concat(payload.username, "'"), fields: ['_id'] })];
|
|
52
53
|
case 1:
|
|
53
|
-
user = (
|
|
54
|
-
if (!user) return [3,
|
|
54
|
+
user = (_b.sent())[0];
|
|
55
|
+
if (!user) return [3, 7];
|
|
55
56
|
userId = user._id;
|
|
56
57
|
authToken = payload.sessionId ? "".concat(payload.iss, "-").concat(payload.username, "-").concat(payload.sessionId) : "".concat(payload.iss, "-").concat(payload.username);
|
|
57
58
|
hashedToken = (0, utils_1.hashLoginToken)(authToken).replace(/\//g, '%2F');
|
|
58
59
|
filters = "(services/resume/loginTokens/hashedToken eq '".concat(hashedToken, "')");
|
|
59
60
|
return [4, userObj.count({ filters: filters })];
|
|
60
61
|
case 2:
|
|
61
|
-
if (!
|
|
62
|
+
if (!_b.sent()) return [3, 3];
|
|
62
63
|
data = { userId: userId, authToken: authToken };
|
|
63
|
-
return [3,
|
|
64
|
+
return [3, 7];
|
|
64
65
|
case 3:
|
|
65
66
|
stampedToken = {
|
|
66
67
|
token: authToken,
|
|
@@ -69,10 +70,30 @@ function getTokenInfo(req) {
|
|
|
69
70
|
hashedTokenObj = (0, utils_1.hashStampedToken)(stampedToken);
|
|
70
71
|
return [4, (0, utils_1.insertHashedLoginToken)(userId, hashedTokenObj)];
|
|
71
72
|
case 4:
|
|
72
|
-
|
|
73
|
+
_b.sent();
|
|
74
|
+
_a = {};
|
|
75
|
+
return [4, (0, objectql_1.getSteedosSchema)().getObject("users")._makeNewID()];
|
|
76
|
+
case 5:
|
|
77
|
+
sessionObj = (_a._id = _b.sent(),
|
|
78
|
+
_a.userId = user._id,
|
|
79
|
+
_a.token = authToken,
|
|
80
|
+
_a.ip = null,
|
|
81
|
+
_a.userAgent = null,
|
|
82
|
+
_a.is_phone = false,
|
|
83
|
+
_a.is_tablet = false,
|
|
84
|
+
_a.login_expiration_in_days = null,
|
|
85
|
+
_a.user_provider = null,
|
|
86
|
+
_a.extraData = null,
|
|
87
|
+
_a.valid = true,
|
|
88
|
+
_a.created = new Date(),
|
|
89
|
+
_a.modified = new Date(),
|
|
90
|
+
_a);
|
|
91
|
+
return [4, (0, objectql_1.getSteedosSchema)().getObject("sessions").directInsert(sessionObj)];
|
|
92
|
+
case 6:
|
|
93
|
+
_b.sent();
|
|
73
94
|
data = { userId: userId, authToken: authToken };
|
|
74
|
-
|
|
75
|
-
case
|
|
95
|
+
_b.label = 7;
|
|
96
|
+
case 7: return [2, data];
|
|
76
97
|
}
|
|
77
98
|
});
|
|
78
99
|
});
|
|
@@ -113,6 +134,15 @@ var jwtSSO = function (req, res) { return __awaiter(void 0, void 0, void 0, func
|
|
|
113
134
|
data = _a.sent();
|
|
114
135
|
(0, utils_1.setAuthCookies)(req, res, data.userId, data.authToken, spaceId);
|
|
115
136
|
redirectUrl = verifiedPayload.redirect_url;
|
|
137
|
+
if (redirectUrl && (redirectUrl.startsWith('https://') || redirectUrl.startsWith('http%3A%2F%2F'))) {
|
|
138
|
+
redirectUrl = decodeURIComponent(redirectUrl);
|
|
139
|
+
}
|
|
140
|
+
if (redirectUrl) {
|
|
141
|
+
redirectUrl = "/home/".concat(spaceId, "?redirect_uri=").concat(redirectUrl);
|
|
142
|
+
}
|
|
143
|
+
else {
|
|
144
|
+
redirectUrl = "/home/".concat(spaceId);
|
|
145
|
+
}
|
|
116
146
|
res.redirect(302, redirectUrl);
|
|
117
147
|
return [3, 4];
|
|
118
148
|
case 3:
|
package/lib/endpoints/jwt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../src/endpoints/jwt.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,kCAAoG;AACpG,8CAAoD;AAcpD,SAAe,YAAY,CAAC,GAAG
|
|
1
|
+
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../src/endpoints/jwt.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/auth",
|
|
3
|
-
"version": "3.0.13-beta.
|
|
3
|
+
"version": "3.0.13-beta.48",
|
|
4
4
|
"main": "lib/index.js",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"watch": "tsc --watch",
|
|
@@ -12,9 +12,9 @@
|
|
|
12
12
|
"access": "public"
|
|
13
13
|
},
|
|
14
14
|
"dependencies": {
|
|
15
|
-
"@steedos/cachers": "3.0.13-beta.
|
|
16
|
-
"@steedos/objectql": "3.0.13-beta.
|
|
17
|
-
"@steedos/utils": "3.0.13-beta.
|
|
15
|
+
"@steedos/cachers": "3.0.13-beta.48",
|
|
16
|
+
"@steedos/objectql": "3.0.13-beta.48",
|
|
17
|
+
"@steedos/utils": "3.0.13-beta.48",
|
|
18
18
|
"bcryptjs": "^2.4.3",
|
|
19
19
|
"cookies": "^0.8.0",
|
|
20
20
|
"express": "^5.1.0",
|
|
@@ -26,5 +26,5 @@
|
|
|
26
26
|
"devDependencies": {
|
|
27
27
|
"typescript": "5.7.3"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "681d98e5938df1fe9ae4e1b5ba1358e34d8b8dc5"
|
|
30
30
|
}
|