@steedos/auth 3.0.0-beta.124 → 3.0.0-beta.126
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/utils/index.js +17 -15
- package/lib/utils/index.js.map +1 -1
- package/package.json +5 -5
package/lib/utils/index.js
CHANGED
|
@@ -54,23 +54,22 @@ var random_1 = require("./random");
|
|
|
54
54
|
var objectql_1 = require("@steedos/objectql");
|
|
55
55
|
var utils_1 = require("@steedos/utils");
|
|
56
56
|
var hashLoginToken = function (loginToken) {
|
|
57
|
-
var hash = crypto.createHash(
|
|
57
|
+
var hash = crypto.createHash("sha256");
|
|
58
58
|
hash.update(loginToken);
|
|
59
|
-
return hash.digest(
|
|
59
|
+
return hash.digest("base64");
|
|
60
60
|
};
|
|
61
61
|
exports.hashLoginToken = hashLoginToken;
|
|
62
62
|
var generateStampedLoginToken = function () {
|
|
63
63
|
return {
|
|
64
64
|
token: random_1.default.secret(),
|
|
65
|
-
when: new Date
|
|
65
|
+
when: new Date(),
|
|
66
66
|
};
|
|
67
67
|
};
|
|
68
68
|
exports.generateStampedLoginToken = generateStampedLoginToken;
|
|
69
69
|
var hashStampedToken = function (stampedToken) {
|
|
70
70
|
var hashedStampedToken = Object.keys(stampedToken).reduce(function (prev, key) {
|
|
71
71
|
var _a;
|
|
72
|
-
return key ===
|
|
73
|
-
prev : __assign(__assign({}, prev), (_a = {}, _a[key] = stampedToken[key], _a));
|
|
72
|
+
return key === "token" ? prev : __assign(__assign({}, prev), (_a = {}, _a[key] = stampedToken[key], _a));
|
|
74
73
|
}, {});
|
|
75
74
|
return __assign(__assign({}, hashedStampedToken), { hashedToken: (0, exports.hashLoginToken)(stampedToken.token) });
|
|
76
75
|
};
|
|
@@ -81,18 +80,21 @@ var insertHashedLoginToken = function (userId, hashedToken) {
|
|
|
81
80
|
return __generator(this, function (_a) {
|
|
82
81
|
switch (_a.label) {
|
|
83
82
|
case 0:
|
|
84
|
-
userObject = (0, objectql_1.getSteedosSchema)().getObject(
|
|
85
|
-
return [4, userObject.findOne(userId, { fields: [
|
|
83
|
+
userObject = (0, objectql_1.getSteedosSchema)().getObject("users");
|
|
84
|
+
return [4, userObject.findOne(userId, { fields: ["services"] })];
|
|
86
85
|
case 1:
|
|
87
86
|
user = _a.sent();
|
|
88
|
-
if (!user[
|
|
89
|
-
user[
|
|
87
|
+
if (!user["services"]) {
|
|
88
|
+
user["services"] = {};
|
|
90
89
|
}
|
|
91
|
-
if (!user[
|
|
92
|
-
user[
|
|
90
|
+
if (!user["services"]["resume"]) {
|
|
91
|
+
user["services"]["resume"] = { loginTokens: [] };
|
|
93
92
|
}
|
|
94
|
-
user[
|
|
95
|
-
|
|
93
|
+
if (!user["services"]["resume"]["loginTokens"]) {
|
|
94
|
+
user["services"]["resume"]["loginTokens"] = [];
|
|
95
|
+
}
|
|
96
|
+
user["services"]["resume"]["loginTokens"].push(hashedToken);
|
|
97
|
+
data = { services: user["services"] };
|
|
96
98
|
return [4, userObject.update(userId, data)];
|
|
97
99
|
case 2: return [2, _a.sent()];
|
|
98
100
|
}
|
|
@@ -104,7 +106,7 @@ var setAuthCookies = function (req, res, userId, authToken, spaceId) {
|
|
|
104
106
|
var options = {
|
|
105
107
|
maxAge: 90 * 60 * 60 * 24 * 1000,
|
|
106
108
|
httpOnly: true,
|
|
107
|
-
overwrite: true
|
|
109
|
+
overwrite: true,
|
|
108
110
|
};
|
|
109
111
|
(0, utils_1.setCookie)(req, res, "X-User-Id", userId, options);
|
|
110
112
|
(0, utils_1.setCookie)(req, res, "X-Auth-Token", authToken, options);
|
|
@@ -118,7 +120,7 @@ var clearAuthCookies = function (req, res) {
|
|
|
118
120
|
var options = {
|
|
119
121
|
maxAge: 0,
|
|
120
122
|
httpOnly: true,
|
|
121
|
-
overwrite: true
|
|
123
|
+
overwrite: true,
|
|
122
124
|
};
|
|
123
125
|
(0, utils_1.clearCookie)(req, res, "X-User-Id", options);
|
|
124
126
|
(0, utils_1.clearCookie)(req, res, "X-Auth-Token", options);
|
package/lib/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.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.0-beta.
|
|
3
|
+
"version": "3.0.0-beta.126",
|
|
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.0-beta.
|
|
16
|
-
"@steedos/objectql": "3.0.0-beta.
|
|
17
|
-
"@steedos/utils": "3.0.0-beta.
|
|
15
|
+
"@steedos/cachers": "3.0.0-beta.126",
|
|
16
|
+
"@steedos/objectql": "3.0.0-beta.126",
|
|
17
|
+
"@steedos/utils": "3.0.0-beta.126",
|
|
18
18
|
"bcryptjs": "^2.4.3",
|
|
19
19
|
"cookies": "^0.8.0",
|
|
20
20
|
"express": "^4.16.4",
|
|
@@ -26,5 +26,5 @@
|
|
|
26
26
|
"devDependencies": {
|
|
27
27
|
"typescript": "5.7.3"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "1e2ca759f9ea0d865ca505fafbafbea919163721"
|
|
30
30
|
}
|