@steedos/auth 2.2.52 → 2.2.53-beta.4
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 +95 -27
- package/lib/apikey.js.map +1 -1
- package/lib/auth-middleware.js +53 -10
- package/lib/auth-middleware.js.map +1 -1
- package/lib/endpoints/jwt.js +122 -61
- package/lib/endpoints/jwt.js.map +1 -1
- package/lib/endpoints/login.js +80 -32
- package/lib/endpoints/login.js.map +1 -1
- package/lib/endpoints/logout.js +44 -6
- package/lib/endpoints/logout.js.map +1 -1
- package/lib/endpoints/validate.js +78 -29
- package/lib/endpoints/validate.js.map +1 -1
- package/lib/express-middleware.js +6 -6
- package/lib/express-middleware.js.map +1 -1
- package/lib/index.js +10 -10
- package/lib/index.js.map +1 -1
- package/lib/session.js +198 -97
- package/lib/session.js.map +1 -1
- package/lib/spaceUserSession.js +330 -106
- package/lib/spaceUserSession.js.map +1 -1
- package/lib/tokenMap.js +84 -27
- package/lib/tokenMap.js.map +1 -1
- package/lib/userSession.js +111 -41
- package/lib/userSession.js.map +1 -1
- package/lib/utils/index.js +92 -35
- package/lib/utils/index.js.map +1 -1
- package/lib/utils/random.js +4 -4
- package/lib/utils/random.js.map +1 -1
- package/package.json +5 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../src/endpoints/logout.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../src/endpoints/logout.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,kCAA4C;AAErC,IAAM,MAAM,GAAG,UAAO,GAAY,EAAE,GAAa;;QACpD,IAAA,wBAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC3B,sBAAO,GAAG,CAAC,GAAG,EAAE,EAAC;;KACpB,CAAA;AAHY,QAAA,MAAM,UAGlB"}
|
|
@@ -1,37 +1,86 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
13
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
+
function step(op) {
|
|
16
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
+
while (_) try {
|
|
18
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
+
switch (op[0]) {
|
|
21
|
+
case 0: case 1: t = op; break;
|
|
22
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
+
default:
|
|
26
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
+
if (t[2]) _.ops.pop();
|
|
31
|
+
_.trys.pop(); continue;
|
|
32
|
+
}
|
|
33
|
+
op = body.call(thisArg, _);
|
|
34
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
exports.__esModule = true;
|
|
3
39
|
exports.validate = void 0;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
40
|
+
var session_1 = require("../session");
|
|
41
|
+
var utils_1 = require("../utils");
|
|
42
|
+
var objectql_1 = require("@steedos/objectql");
|
|
43
|
+
var validate = function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
|
|
44
|
+
var utcOffset, userSession, spaceUser, user;
|
|
45
|
+
return __generator(this, function (_a) {
|
|
46
|
+
switch (_a.label) {
|
|
47
|
+
case 0:
|
|
48
|
+
utcOffset = req.body.utcOffset;
|
|
49
|
+
return [4 /*yield*/, (0, session_1.auth)(req, res)];
|
|
50
|
+
case 1:
|
|
51
|
+
userSession = _a.sent();
|
|
52
|
+
return [4 /*yield*/, (0, objectql_1.getSteedosSchema)().getObject('space_users').find({ filters: [['space', '=', userSession.spaceId], ['user', '=', userSession.userId], ['user_accepted', '=', true]] })];
|
|
53
|
+
case 2:
|
|
54
|
+
spaceUser = _a.sent();
|
|
55
|
+
if (!userSession.userId) return [3 /*break*/, 9];
|
|
56
|
+
if (!(spaceUser.length > 0)) return [3 /*break*/, 8];
|
|
57
|
+
return [4 /*yield*/, (0, objectql_1.getSteedosSchema)().getObject('users').findOne(userSession.userId, { fields: ['utcOffset', 'password_expired', 'lockout'] })];
|
|
58
|
+
case 3:
|
|
59
|
+
user = _a.sent();
|
|
60
|
+
if (!user.lockout) return [3 /*break*/, 4];
|
|
15
61
|
(0, utils_1.clearAuthCookies)(req, res);
|
|
16
|
-
|
|
17
|
-
|
|
62
|
+
return [3 /*break*/, 7];
|
|
63
|
+
case 4:
|
|
18
64
|
(0, utils_1.setAuthCookies)(req, res, userSession.userId, userSession.authToken, userSession.spaceId);
|
|
19
|
-
if (
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
65
|
+
if (!!user.hasOwnProperty('utcOffset')) return [3 /*break*/, 6];
|
|
66
|
+
return [4 /*yield*/, (0, objectql_1.getSteedosSchema)().getObject('users').update(userSession.userId, { 'utcOffset': utcOffset })];
|
|
67
|
+
case 5:
|
|
68
|
+
_a.sent();
|
|
69
|
+
_a.label = 6;
|
|
70
|
+
case 6: return [2 /*return*/, res.send(Object.assign({}, userSession, { password_expired: user.password_expired }))];
|
|
71
|
+
case 7: return [3 /*break*/, 9];
|
|
72
|
+
case 8:
|
|
73
|
+
(0, utils_1.clearAuthCookies)(req, res);
|
|
74
|
+
_a.label = 9;
|
|
75
|
+
case 9:
|
|
76
|
+
(0, utils_1.clearAuthCookies)(req, res);
|
|
77
|
+
return [2 /*return*/, res.status(401).send({
|
|
78
|
+
"error": "Validate Request -- Missing X-Auth-Token",
|
|
79
|
+
"instance": "1329598861",
|
|
80
|
+
"success": false
|
|
81
|
+
})];
|
|
27
82
|
}
|
|
28
|
-
}
|
|
29
|
-
(0, utils_1.clearAuthCookies)(req, res);
|
|
30
|
-
return res.status(401).send({
|
|
31
|
-
"error": "Validate Request -- Missing X-Auth-Token",
|
|
32
|
-
"instance": "1329598861",
|
|
33
|
-
"success": false
|
|
34
83
|
});
|
|
35
|
-
};
|
|
84
|
+
}); };
|
|
36
85
|
exports.validate = validate;
|
|
37
86
|
//# sourceMappingURL=validate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/endpoints/validate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/endpoints/validate.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,sCAAkC;AAClC,kCAA4D;AAC5D,8CAAqD;AAE9C,IAAM,QAAQ,GAAG,UAAO,GAAY,EAAE,GAAa;;;;;gBAClD,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;gBACjB,qBAAM,IAAA,cAAI,EAAC,GAAG,EAAE,GAAG,CAAC,EAAA;;gBAAlC,WAAW,GAAG,SAAoB;gBACtB,qBAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,EAAC,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,GAAG,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,EAAC,CAAC,EAAA;;gBAArL,SAAS,GAAG,SAAyK;qBACrL,WAAW,CAAC,MAAM,EAAlB,wBAAkB;qBACf,CAAA,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA,EAApB,wBAAoB;gBACR,qBAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,WAAW,EAAC,kBAAkB,EAAC,SAAS,CAAC,EAAE,CAAC,EAAA;;gBAAtI,IAAI,GAAG,SAA+H;qBACvI,IAAI,CAAC,OAAO,EAAZ,wBAAY;gBACX,IAAA,wBAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAA;;;gBAE1B,IAAA,sBAAc,EAAC,GAAG,EAAE,GAAG,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;qBACrF,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAAjC,wBAAiC;gBACjC,qBAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,EAAA;;gBAAlG,SAAkG,CAAA;;oBAEtG,sBAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,EAAE,EAAC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAC,CAAC,CAAC,EAAC;;;gBAG/F,IAAA,wBAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAA;;;gBAGlC,IAAA,wBAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBAC3B,sBAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBACxB,OAAO,EAAE,0CAA0C;wBACnD,UAAU,EAAE,YAAY;wBACxB,SAAS,EAAE,KAAK;qBACnB,CAAC,EAAA;;;KACL,CAAA;AA1BY,QAAA,QAAQ,YA0BpB"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
2
|
+
exports.__esModule = true;
|
|
3
3
|
exports.authExpress = void 0;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
4
|
+
var express = require('express');
|
|
5
|
+
var login_1 = require("./endpoints/login");
|
|
6
|
+
var logout_1 = require("./endpoints/logout");
|
|
7
|
+
var validate_1 = require("./endpoints/validate");
|
|
8
|
+
var jwt_1 = require("./endpoints/jwt");
|
|
9
9
|
exports.authExpress = express.Router();
|
|
10
10
|
exports.authExpress.post('/api/v4/users/login', login_1.login);
|
|
11
11
|
exports.authExpress.post('/api/v4/users/logout', logout_1.logout);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express-middleware.js","sourceRoot":"","sources":["../src/express-middleware.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"express-middleware.js","sourceRoot":"","sources":["../src/express-middleware.ts"],"names":[],"mappings":";;;AAAA,IAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAEnC,2CAA0C;AAC1C,6CAA4C;AAC5C,iDAAgD;AAChD,uCAAyC;AAE5B,QAAA,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;AAE5C,mBAAW,CAAC,IAAI,CAAC,qBAAqB,EAAE,aAAK,CAAC,CAAC;AAC/C,mBAAW,CAAC,IAAI,CAAC,sBAAsB,EAAE,eAAM,CAAC,CAAC;AACjD,mBAAW,CAAC,IAAI,CAAC,wBAAwB,EAAE,mBAAQ,CAAC,CAAA;AAEpD,YAAY;AACZ,mBAAW,CAAC,IAAI,CAAC,kBAAkB,EAAE,aAAK,CAAC,CAAC;AAC5C,mBAAW,CAAC,IAAI,CAAC,mBAAmB,EAAE,eAAM,CAAC,CAAA;AAC7C,mBAAW,CAAC,IAAI,CAAC,qBAAqB,EAAE,mBAAQ,CAAC,CAAA;AAEjD,mBAAW,CAAC,GAAG,CAAC,UAAU,EAAE,YAAM,CAAC,CAAC"}
|
package/lib/index.js
CHANGED
|
@@ -13,23 +13,23 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
|
|
|
13
13
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
|
-
|
|
16
|
+
exports.__esModule = true;
|
|
17
17
|
exports.requireAuthentication = exports.getAPIKeyAuthHeader = exports.authExpress = exports.removeUserSessionsCacheByUserId = exports.getSessionByUserIdSync = exports.getSessionByUserId = exports.setRequestUser = exports.auth = exports.getSession = void 0;
|
|
18
18
|
var session_1 = require("./session");
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
19
|
+
__createBinding(exports, session_1, "getSession");
|
|
20
|
+
__createBinding(exports, session_1, "auth");
|
|
21
|
+
__createBinding(exports, session_1, "setRequestUser");
|
|
22
|
+
__createBinding(exports, session_1, "getSessionByUserId");
|
|
23
|
+
__createBinding(exports, session_1, "getSessionByUserIdSync");
|
|
24
|
+
__createBinding(exports, session_1, "removeUserSessionsCacheByUserId");
|
|
25
25
|
__exportStar(require("./utils"), exports);
|
|
26
26
|
__exportStar(require("./tokenMap"), exports);
|
|
27
27
|
__exportStar(require("./userSession"), exports);
|
|
28
28
|
__exportStar(require("./spaceUserSession"), exports);
|
|
29
29
|
var express_middleware_1 = require("./express-middleware");
|
|
30
|
-
|
|
30
|
+
__createBinding(exports, express_middleware_1, "authExpress");
|
|
31
31
|
var apikey_1 = require("./apikey");
|
|
32
|
-
|
|
32
|
+
__createBinding(exports, apikey_1, "getAPIKeyAuthHeader");
|
|
33
33
|
var auth_middleware_1 = require("./auth-middleware");
|
|
34
|
-
|
|
34
|
+
__createBinding(exports, auth_middleware_1, "requireAuthentication");
|
|
35
35
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qCAA0I;AAAjI,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qCAA0I;AAAjI,kDAAU;AAAE,4CAAI;AAAE,sDAAc;AAAE,0DAAkB;AAAE,8DAAsB;AAAE,uEAA+B;AACtH,0CAAwB;AACxB,6CAA2B;AAC3B,gDAA8B;AAC9B,qDAAmC;AACnC,2DAAmD;AAA1C,8DAAW;AACpB,mCAA+C;AAAtC,0DAAmB;AAC5B,qDAA0D;AAAjD,qEAAqB"}
|
package/lib/session.js
CHANGED
|
@@ -1,15 +1,51 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
13
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
+
function step(op) {
|
|
16
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
+
while (_) try {
|
|
18
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
+
switch (op[0]) {
|
|
21
|
+
case 0: case 1: t = op; break;
|
|
22
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
+
default:
|
|
26
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
+
if (t[2]) _.ops.pop();
|
|
31
|
+
_.trys.pop(); continue;
|
|
32
|
+
}
|
|
33
|
+
op = body.call(thisArg, _);
|
|
34
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
exports.__esModule = true;
|
|
39
|
+
exports.isPropValueChanged = exports.removeUserSessionsCacheByUserId = exports.setRequestUser = exports.auth = exports.getLoginDevice = exports.getUserAgent = exports.getSession = exports.getSessionByUserIdSync = exports.getSessionByUserId = void 0;
|
|
40
|
+
var objectql_1 = require("@steedos/objectql");
|
|
41
|
+
var tokenMap_1 = require("./tokenMap");
|
|
42
|
+
var userSession_1 = require("./userSession");
|
|
43
|
+
var spaceUserSession_1 = require("./spaceUserSession");
|
|
44
|
+
var apikey_1 = require("./apikey");
|
|
45
|
+
var ismobilejs_1 = require("ismobilejs");
|
|
46
|
+
var Cookies = require("cookies");
|
|
11
47
|
function assignSession(spaceId, userSession, spaceSession) {
|
|
12
|
-
|
|
48
|
+
var result = Object.assign({ spaceId: spaceId }, userSession, spaceSession);
|
|
13
49
|
return reviseSession(result);
|
|
14
50
|
}
|
|
15
51
|
function reviseSession(session) {
|
|
@@ -19,56 +55,84 @@ function reviseSession(session) {
|
|
|
19
55
|
}
|
|
20
56
|
return session;
|
|
21
57
|
}
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
58
|
+
function getSessionByUserId(userId, spaceId) {
|
|
59
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
60
|
+
var userSession, spaceUserSession;
|
|
61
|
+
return __generator(this, function (_a) {
|
|
62
|
+
switch (_a.label) {
|
|
63
|
+
case 0:
|
|
64
|
+
if (!userId) {
|
|
65
|
+
return [2 /*return*/];
|
|
66
|
+
}
|
|
67
|
+
return [4 /*yield*/, (0, userSession_1.getUserSession)(userId)];
|
|
68
|
+
case 1:
|
|
69
|
+
userSession = _a.sent();
|
|
70
|
+
if (!userSession) {
|
|
71
|
+
return [2 /*return*/];
|
|
72
|
+
}
|
|
73
|
+
spaceUserSession = {};
|
|
74
|
+
if (!spaceId) return [3 /*break*/, 3];
|
|
75
|
+
return [4 /*yield*/, (0, spaceUserSession_1.getSpaceUserSession)(spaceId, userId)];
|
|
76
|
+
case 2:
|
|
77
|
+
spaceUserSession = _a.sent();
|
|
78
|
+
_a.label = 3;
|
|
79
|
+
case 3: return [2 /*return*/, assignSession(spaceId, userSession, spaceUserSession)];
|
|
80
|
+
}
|
|
81
|
+
});
|
|
82
|
+
});
|
|
35
83
|
}
|
|
36
84
|
exports.getSessionByUserId = getSessionByUserId;
|
|
37
85
|
function getSessionByUserIdSync(userId, spaceId) {
|
|
38
|
-
|
|
86
|
+
var getSessionFn = function () {
|
|
39
87
|
return getSessionByUserId(userId, spaceId);
|
|
40
88
|
};
|
|
41
89
|
return (0, objectql_1.wrapAsync)(getSessionFn, {});
|
|
42
90
|
}
|
|
43
91
|
exports.getSessionByUserIdSync = getSessionByUserIdSync;
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
92
|
+
function getSession(token, spaceId, clientInfos) {
|
|
93
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
94
|
+
var userId, apiKeyInfo, userSession, spaceUserSession;
|
|
95
|
+
return __generator(this, function (_a) {
|
|
96
|
+
switch (_a.label) {
|
|
97
|
+
case 0:
|
|
98
|
+
if (!token) {
|
|
99
|
+
return [2 /*return*/];
|
|
100
|
+
}
|
|
101
|
+
userId = null;
|
|
102
|
+
if (!(0, apikey_1.isAPIKey)(token)) return [3 /*break*/, 2];
|
|
103
|
+
return [4 /*yield*/, (0, apikey_1.verifyAPIKey)(token)];
|
|
104
|
+
case 1:
|
|
105
|
+
apiKeyInfo = _a.sent();
|
|
106
|
+
if (apiKeyInfo) {
|
|
107
|
+
userId = apiKeyInfo.userId;
|
|
108
|
+
spaceId = apiKeyInfo.spaceId;
|
|
109
|
+
}
|
|
110
|
+
return [3 /*break*/, 4];
|
|
111
|
+
case 2: return [4 /*yield*/, (0, tokenMap_1.getUserIdByToken)(token, clientInfos)];
|
|
112
|
+
case 3:
|
|
113
|
+
userId = _a.sent();
|
|
114
|
+
_a.label = 4;
|
|
115
|
+
case 4:
|
|
116
|
+
if (!userId) {
|
|
117
|
+
return [2 /*return*/];
|
|
118
|
+
}
|
|
119
|
+
return [4 /*yield*/, (0, userSession_1.getUserSession)(userId)];
|
|
120
|
+
case 5:
|
|
121
|
+
userSession = _a.sent();
|
|
122
|
+
if (!userSession) {
|
|
123
|
+
return [2 /*return*/];
|
|
124
|
+
}
|
|
125
|
+
return [4 /*yield*/, (0, spaceUserSession_1.getSpaceUserSession)(spaceId, userId)];
|
|
126
|
+
case 6:
|
|
127
|
+
spaceUserSession = _a.sent();
|
|
128
|
+
return [2 /*return*/, assignSession(spaceId, userSession, spaceUserSession)];
|
|
129
|
+
}
|
|
130
|
+
});
|
|
131
|
+
});
|
|
68
132
|
}
|
|
69
133
|
exports.getSession = getSession;
|
|
70
134
|
function getUserAgent(req) {
|
|
71
|
-
|
|
135
|
+
var userAgent = req.headers["user-agent"] || "";
|
|
72
136
|
if (req.headers["x-ucbrowser-ua"]) {
|
|
73
137
|
// special case of UC Browser
|
|
74
138
|
userAgent = req.headers["x-ucbrowser-ua"];
|
|
@@ -77,74 +141,111 @@ function getUserAgent(req) {
|
|
|
77
141
|
}
|
|
78
142
|
exports.getUserAgent = getUserAgent;
|
|
79
143
|
function getLoginDevice(userAgent) {
|
|
80
|
-
|
|
81
|
-
|
|
144
|
+
var is_phone = false;
|
|
145
|
+
var is_tablet = false;
|
|
82
146
|
if (userAgent) {
|
|
83
147
|
try {
|
|
84
|
-
|
|
148
|
+
var _a = (0, ismobilejs_1["default"])(userAgent), phone = _a.phone, tablet = _a.tablet;
|
|
85
149
|
is_phone = phone;
|
|
86
150
|
is_tablet = tablet;
|
|
87
151
|
}
|
|
88
152
|
catch (Exception) {
|
|
89
|
-
console.log(
|
|
153
|
+
console.log("Exception", Exception);
|
|
90
154
|
}
|
|
91
155
|
}
|
|
92
|
-
return { is_phone, is_tablet };
|
|
156
|
+
return { is_phone: is_phone, is_tablet: is_tablet };
|
|
93
157
|
}
|
|
94
158
|
exports.getLoginDevice = getLoginDevice;
|
|
95
159
|
// 解析Request对象，返回SteedosUserSession类型
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
160
|
+
function auth(request, response) {
|
|
161
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
162
|
+
var cookies, authToken, spaceToken, authorization, spaceId, spaceAuthToken, userAgent, loginDevice, user;
|
|
163
|
+
return __generator(this, function (_a) {
|
|
164
|
+
switch (_a.label) {
|
|
165
|
+
case 0:
|
|
166
|
+
cookies = new Cookies(request, response);
|
|
167
|
+
authToken = request.headers["x-auth-token"] || (cookies.get("X-Auth-Token") || "").replace(/"/g, "");
|
|
168
|
+
spaceToken = (cookies.get("X-Space-Token") || "").replace(/"/g, "");
|
|
169
|
+
authorization = request.headers.authorization;
|
|
170
|
+
spaceId = (request.params ? request.params.spaceId : null) ||
|
|
171
|
+
(request.query ? request.query.space_id : null) ||
|
|
172
|
+
request.headers["x-space-id"];
|
|
173
|
+
if (authorization && authorization.split(" ")[0] == "Bearer") {
|
|
174
|
+
spaceAuthToken = authorization.split(" ")[1];
|
|
175
|
+
if ((0, apikey_1.isAPIKey)(spaceAuthToken)) {
|
|
176
|
+
authToken = spaceAuthToken;
|
|
177
|
+
}
|
|
178
|
+
else {
|
|
179
|
+
if (!spaceId) {
|
|
180
|
+
spaceId = spaceAuthToken.split(",")[0];
|
|
181
|
+
}
|
|
182
|
+
authToken = spaceAuthToken.split(",")[1];
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
if (spaceToken) {
|
|
186
|
+
if (!spaceId) {
|
|
187
|
+
spaceId = spaceToken.split(",")[0];
|
|
188
|
+
}
|
|
189
|
+
if (!authToken) {
|
|
190
|
+
authToken = spaceToken.split(",")[1];
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
userAgent = getUserAgent(request) || "";
|
|
194
|
+
loginDevice = getLoginDevice(userAgent);
|
|
195
|
+
return [4 /*yield*/, getSession(authToken, spaceId, loginDevice)];
|
|
196
|
+
case 1:
|
|
197
|
+
user = _a.sent();
|
|
198
|
+
if ((0, objectql_1.isTemplateSpace)(spaceId)) {
|
|
199
|
+
return [2 /*return*/, Object.assign({ authToken: authToken }, user, loginDevice, {
|
|
200
|
+
spaceId: spaceId
|
|
201
|
+
})];
|
|
202
|
+
}
|
|
203
|
+
else {
|
|
204
|
+
return [2 /*return*/, Object.assign({ authToken: authToken }, user, loginDevice)];
|
|
205
|
+
}
|
|
206
|
+
return [2 /*return*/];
|
|
112
207
|
}
|
|
113
|
-
authToken = spaceAuthToken.split(",")[1];
|
|
114
|
-
}
|
|
115
|
-
}
|
|
116
|
-
if (spaceToken) {
|
|
117
|
-
if (!spaceId) {
|
|
118
|
-
spaceId = spaceToken.split(",")[0];
|
|
119
|
-
}
|
|
120
|
-
if (!authToken) {
|
|
121
|
-
authToken = spaceToken.split(",")[1];
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
let userAgent = getUserAgent(request) || "";
|
|
125
|
-
const loginDevice = getLoginDevice(userAgent);
|
|
126
|
-
let user = await getSession(authToken, spaceId, loginDevice);
|
|
127
|
-
if ((0, objectql_1.isTemplateSpace)(spaceId)) {
|
|
128
|
-
return Object.assign({ authToken: authToken }, user, loginDevice, {
|
|
129
|
-
spaceId: spaceId,
|
|
130
208
|
});
|
|
131
|
-
}
|
|
132
|
-
else {
|
|
133
|
-
return Object.assign({ authToken: authToken }, user, loginDevice);
|
|
134
|
-
}
|
|
209
|
+
});
|
|
135
210
|
}
|
|
136
211
|
exports.auth = auth;
|
|
137
212
|
// 给Request对象添加user属性，值为SteedosUserSession类型
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
213
|
+
function setRequestUser(request, response, next) {
|
|
214
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
215
|
+
var user;
|
|
216
|
+
return __generator(this, function (_a) {
|
|
217
|
+
switch (_a.label) {
|
|
218
|
+
case 0: return [4 /*yield*/, auth(request, response)];
|
|
219
|
+
case 1:
|
|
220
|
+
user = _a.sent();
|
|
221
|
+
if (user.userId) {
|
|
222
|
+
request.user = user;
|
|
223
|
+
}
|
|
224
|
+
next();
|
|
225
|
+
return [2 /*return*/];
|
|
226
|
+
}
|
|
227
|
+
});
|
|
228
|
+
});
|
|
144
229
|
}
|
|
145
230
|
exports.setRequestUser = setRequestUser;
|
|
146
231
|
function removeUserSessionsCacheByUserId(userId, is_phone) {
|
|
147
232
|
return (0, tokenMap_1.removeUserTokens)(userId, is_phone);
|
|
148
233
|
}
|
|
149
234
|
exports.removeUserSessionsCacheByUserId = removeUserSessionsCacheByUserId;
|
|
235
|
+
/**
|
|
236
|
+
* 判断属性值是否已变更，转字符串比对
|
|
237
|
+
* @param newDoc
|
|
238
|
+
* @param oldDoc
|
|
239
|
+
* @returns true/false
|
|
240
|
+
*/
|
|
241
|
+
function isPropValueChanged(newDoc, oldDoc, props) {
|
|
242
|
+
for (var _i = 0, props_1 = props; _i < props_1.length; _i++) {
|
|
243
|
+
var key = props_1[_i];
|
|
244
|
+
if ((newDoc[key] + '') !== (oldDoc[key] + '')) {
|
|
245
|
+
return true;
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
return false;
|
|
249
|
+
}
|
|
250
|
+
exports.isPropValueChanged = isPropValueChanged;
|
|
150
251
|
//# sourceMappingURL=session.js.map
|
package/lib/session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"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"}
|