@steedos/auth 2.2.55-beta.9 → 2.3.0-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 +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/apikey.js
CHANGED
|
@@ -50,18 +50,18 @@ function verifyAPIKey(token) {
|
|
|
50
50
|
return __generator(this, function (_a) {
|
|
51
51
|
switch (_a.label) {
|
|
52
52
|
case 0:
|
|
53
|
-
if (!isAPIKey(token)) return [3
|
|
53
|
+
if (!isAPIKey(token)) return [3, 3];
|
|
54
54
|
apikey = token.replace('apikey,', '');
|
|
55
|
-
return [4
|
|
55
|
+
return [4, (0, objectql_1.getObject)('api_keys').find({ filters: [['api_key', '=', apikey], ['active', '=', true]] })];
|
|
56
56
|
case 1:
|
|
57
57
|
records = _a.sent();
|
|
58
|
-
if (!(records.length > 0)) return [3
|
|
58
|
+
if (!(records.length > 0)) return [3, 3];
|
|
59
59
|
record = records[0];
|
|
60
|
-
return [4
|
|
60
|
+
return [4, (0, objectql_1.getObject)('api_keys').update(record._id, { last_use_time: new Date() })];
|
|
61
61
|
case 2:
|
|
62
62
|
_a.sent();
|
|
63
|
-
return [2
|
|
64
|
-
case 3: return [2
|
|
63
|
+
return [2, { userId: record.owner, spaceId: record.space }];
|
|
64
|
+
case 3: return [2];
|
|
65
65
|
}
|
|
66
66
|
});
|
|
67
67
|
});
|
|
@@ -72,13 +72,13 @@ function getAPIKey(spaceId) {
|
|
|
72
72
|
var space;
|
|
73
73
|
return __generator(this, function (_a) {
|
|
74
74
|
switch (_a.label) {
|
|
75
|
-
case 0: return [4
|
|
75
|
+
case 0: return [4, (0, objectql_1.getObject)('spaces').findOne(spaceId, {})];
|
|
76
76
|
case 1:
|
|
77
77
|
space = _a.sent();
|
|
78
78
|
if (space) {
|
|
79
|
-
return [2
|
|
79
|
+
return [2, space.api_key];
|
|
80
80
|
}
|
|
81
|
-
return [2
|
|
81
|
+
return [2];
|
|
82
82
|
}
|
|
83
83
|
});
|
|
84
84
|
});
|
|
@@ -90,16 +90,16 @@ function getAPIKeyAuthHeader(spaceId) {
|
|
|
90
90
|
var _a;
|
|
91
91
|
return __generator(this, function (_b) {
|
|
92
92
|
switch (_b.label) {
|
|
93
|
-
case 0: return [4
|
|
93
|
+
case 0: return [4, getAPIKey(spaceId)];
|
|
94
94
|
case 1:
|
|
95
95
|
api_key = _b.sent();
|
|
96
96
|
if (!api_key) {
|
|
97
97
|
throw new objectql_1.SteedosError('space_apikey_notfind');
|
|
98
98
|
}
|
|
99
99
|
else {
|
|
100
|
-
return [2
|
|
100
|
+
return [2, (_a = {}, _a[HEADER_AUTH] = "".concat(AUTH_TYPE, " apikey,").concat(api_key), _a)];
|
|
101
101
|
}
|
|
102
|
-
return [2
|
|
102
|
+
return [2];
|
|
103
103
|
}
|
|
104
104
|
});
|
|
105
105
|
});
|
package/lib/apikey.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apikey.js","sourceRoot":"","sources":["../src/apikey.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAA4D;AAE5D,IAAM,WAAW,GAAG,eAAe,CAAC;AACpC,IAAM,SAAS,GAAG,QAAQ,CAAC;AAE3B,SAAgB,QAAQ,CAAC,KAAK;IAC1B,OAAO,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;AACtC,CAAC;AAFD,4BAEC;AAED,SAAsB,YAAY,CAAC,KAAK;;;;;;yBAChC,QAAQ,CAAC,KAAK,CAAC,EAAf,
|
|
1
|
+
{"version":3,"file":"apikey.js","sourceRoot":"","sources":["../src/apikey.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAA4D;AAE5D,IAAM,WAAW,GAAG,eAAe,CAAC;AACpC,IAAM,SAAS,GAAG,QAAQ,CAAC;AAE3B,SAAgB,QAAQ,CAAC,KAAK;IAC1B,OAAO,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;AACtC,CAAC;AAFD,4BAEC;AAED,SAAsB,YAAY,CAAC,KAAK;;;;;;yBAChC,QAAQ,CAAC,KAAK,CAAC,EAAf,cAAe;oBACT,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;oBAC5B,WAAM,IAAA,oBAAS,EAAC,UAAU,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,EAAA;;oBAA1G,OAAO,GAAG,SAAgG;yBAC5G,CAAA,OAAO,CAAC,MAAM,GAAG,CAAC,CAAA,EAAlB,cAAkB;oBACZ,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;oBAC1B,WAAM,IAAA,oBAAS,EAAC,UAAU,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,EAAA;;oBAA7E,SAA6E,CAAC;oBAC9E,WAAO,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,EAAE,EAAC;;;;;CAGlE;AAVD,oCAUC;AAED,SAAsB,SAAS,CAAC,OAAO;;;;;wBACrB,WAAM,IAAA,oBAAS,EAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,EAAA;;oBAAtD,KAAK,GAAG,SAA8C;oBAC5D,IAAI,KAAK,EAAE;wBACP,WAAO,KAAK,CAAC,OAAO,EAAC;qBACxB;;;;;CACJ;AALD,8BAKC;AAED,SAAsB,mBAAmB,CAAC,OAAO;;;;;;wBAC7B,WAAM,SAAS,CAAC,OAAO,CAAC,EAAA;;oBAAlC,OAAO,GAAG,SAAwB;oBACxC,IAAI,CAAC,OAAO,EAAE;wBACV,MAAM,IAAI,uBAAY,CAAC,sBAAsB,CAAC,CAAC;qBAClD;yBAAI;wBACD,qBAAQ,GAAC,WAAW,IAAG,UAAG,SAAS,qBAAW,OAAO,CAAE,OAAE;qBAC5D;;;;;CACJ;AAPD,kDAOC"}
|
package/lib/auth-middleware.js
CHANGED
|
@@ -41,7 +41,7 @@ var session_1 = require("./session");
|
|
|
41
41
|
var requireAuthentication = function (req, res, next) { return __awaiter(void 0, void 0, void 0, function () {
|
|
42
42
|
return __generator(this, function (_a) {
|
|
43
43
|
switch (_a.label) {
|
|
44
|
-
case 0: return [4
|
|
44
|
+
case 0: return [4, (0, session_1.setRequestUser)(req, res, function () {
|
|
45
45
|
if (req.user) {
|
|
46
46
|
next();
|
|
47
47
|
}
|
|
@@ -51,7 +51,7 @@ var requireAuthentication = function (req, res, next) { return __awaiter(void 0,
|
|
|
51
51
|
})];
|
|
52
52
|
case 1:
|
|
53
53
|
_a.sent();
|
|
54
|
-
return [2
|
|
54
|
+
return [2];
|
|
55
55
|
}
|
|
56
56
|
});
|
|
57
57
|
}); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-middleware.js","sourceRoot":"","sources":["../src/auth-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAA2C;AAOpC,IAAM,qBAAqB,GAAG,UAAO,GAAY,EAAE,GAAa,EAAE,IAAgB;;;oBACrF,
|
|
1
|
+
{"version":3,"file":"auth-middleware.js","sourceRoot":"","sources":["../src/auth-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAA2C;AAOpC,IAAM,qBAAqB,GAAG,UAAO,GAAY,EAAE,GAAa,EAAE,IAAgB;;;oBACrF,WAAM,IAAA,wBAAc,EAAC,GAAG,EAAE,GAAG,EAAE;oBAC3B,IAAI,GAAG,CAAC,IAAI,EAAE;wBACV,IAAI,EAAE,CAAC;qBACV;yBACI;wBACD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,mCAAmC,EAAE,CAAC,CAAC;qBAC3F;gBACL,CAAC,CAAC,EAAA;;gBAPF,SAOE,CAAC;;;;KAEN,CAAA;AAVY,QAAA,qBAAqB,yBAUjC"}
|
package/lib/endpoints/jwt.js
CHANGED
|
@@ -39,17 +39,6 @@ exports.__esModule = true;
|
|
|
39
39
|
exports.jwtSSO = void 0;
|
|
40
40
|
var utils_1 = require("../utils");
|
|
41
41
|
var objectql_1 = require("@steedos/objectql");
|
|
42
|
-
// function secretCallback(req, payload, done) {
|
|
43
|
-
// let issuer = payload.iss
|
|
44
|
-
// let collection = getSteedosSchema().getObject('OAuth2Clients')
|
|
45
|
-
// collection.find({ filters: `clientId eq '${issuer}'` }).then(function (resolve) {
|
|
46
|
-
// let clientInfo = resolve[0]
|
|
47
|
-
// let clientSecret = clientInfo ? clientInfo.clientSecret : ''
|
|
48
|
-
// done(null, clientSecret)
|
|
49
|
-
// }).catch(function (reject) {
|
|
50
|
-
// done(reject, '')
|
|
51
|
-
// })
|
|
52
|
-
// }
|
|
53
42
|
function getTokenInfo(req) {
|
|
54
43
|
return __awaiter(this, void 0, void 0, function () {
|
|
55
44
|
var payload, data, userObj, user, userId, authToken, hashedToken, filters, stampedToken, hashedTokenObj;
|
|
@@ -59,31 +48,31 @@ function getTokenInfo(req) {
|
|
|
59
48
|
payload = req.user;
|
|
60
49
|
data = { userId: '', authToken: '' };
|
|
61
50
|
userObj = (0, objectql_1.getSteedosSchema)().getObject('users');
|
|
62
|
-
return [4
|
|
51
|
+
return [4, userObj.find({ filters: "username eq '".concat(payload.username, "'"), fields: ['_id'] })];
|
|
63
52
|
case 1:
|
|
64
53
|
user = (_a.sent())[0];
|
|
65
|
-
if (!user) return [3
|
|
54
|
+
if (!user) return [3, 5];
|
|
66
55
|
userId = user._id;
|
|
67
56
|
authToken = payload.sessionId ? "".concat(payload.iss, "-").concat(payload.username, "-").concat(payload.sessionId) : "".concat(payload.iss, "-").concat(payload.username);
|
|
68
57
|
hashedToken = (0, utils_1.hashLoginToken)(authToken).replace(/\//g, '%2F');
|
|
69
58
|
filters = "(services/resume/loginTokens/hashedToken eq '".concat(hashedToken, "')");
|
|
70
|
-
return [4
|
|
59
|
+
return [4, userObj.count({ filters: filters })];
|
|
71
60
|
case 2:
|
|
72
|
-
if (!_a.sent()) return [3
|
|
61
|
+
if (!_a.sent()) return [3, 3];
|
|
73
62
|
data = { userId: userId, authToken: authToken };
|
|
74
|
-
return [3
|
|
63
|
+
return [3, 5];
|
|
75
64
|
case 3:
|
|
76
65
|
stampedToken = {
|
|
77
66
|
token: authToken,
|
|
78
67
|
when: new Date
|
|
79
68
|
};
|
|
80
69
|
hashedTokenObj = (0, utils_1.hashStampedToken)(stampedToken);
|
|
81
|
-
return [4
|
|
70
|
+
return [4, (0, utils_1.insertHashedLoginToken)(userId, hashedTokenObj)];
|
|
82
71
|
case 4:
|
|
83
72
|
_a.sent();
|
|
84
73
|
data = { userId: userId, authToken: authToken };
|
|
85
74
|
_a.label = 5;
|
|
86
|
-
case 5: return [2
|
|
75
|
+
case 5: return [2, data];
|
|
87
76
|
}
|
|
88
77
|
});
|
|
89
78
|
});
|
|
@@ -106,7 +95,7 @@ var jwtSSO = function (req, res) { return __awaiter(void 0, void 0, void 0, func
|
|
|
106
95
|
throw new Error('issuer is needed!');
|
|
107
96
|
}
|
|
108
97
|
collection = (0, objectql_1.getSteedosSchema)().getObject('OAuth2Clients');
|
|
109
|
-
return [4
|
|
98
|
+
return [4, collection.find({ filters: "clientId eq '".concat(issuer, "'") })];
|
|
110
99
|
case 1:
|
|
111
100
|
clients = _a.sent();
|
|
112
101
|
clientInfo = clients[0];
|
|
@@ -119,19 +108,19 @@ var jwtSSO = function (req, res) { return __awaiter(void 0, void 0, void 0, func
|
|
|
119
108
|
throw new Error('spaceId is needed!');
|
|
120
109
|
}
|
|
121
110
|
verifiedPayload = jwt.verify(token, secret);
|
|
122
|
-
return [4
|
|
111
|
+
return [4, getTokenInfo({ user: verifiedPayload })];
|
|
123
112
|
case 2:
|
|
124
113
|
data = _a.sent();
|
|
125
114
|
(0, utils_1.setAuthCookies)(req, res, data.userId, data.authToken, spaceId);
|
|
126
115
|
redirectUrl = verifiedPayload.redirect_url;
|
|
127
116
|
res.redirect(302, redirectUrl);
|
|
128
|
-
return [3
|
|
117
|
+
return [3, 4];
|
|
129
118
|
case 3:
|
|
130
119
|
error_1 = _a.sent();
|
|
131
120
|
console.error(error_1);
|
|
132
121
|
res.status(500).send(error_1.messenger);
|
|
133
|
-
return [3
|
|
134
|
-
case 4: return [2
|
|
122
|
+
return [3, 4];
|
|
123
|
+
case 4: return [2];
|
|
135
124
|
}
|
|
136
125
|
});
|
|
137
126
|
}); };
|
package/lib/endpoints/jwt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../src/endpoints/jwt.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kCAAoG;AACpG,8CAAoD;
|
|
1
|
+
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../src/endpoints/jwt.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kCAAoG;AACpG,8CAAoD;AAcpD,SAAe,YAAY,CAAC,GAAG;;;;;;oBACzB,OAAO,GAAG,GAAG,CAAC,IAAI,CAAA;oBAClB,IAAI,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAA;oBACpC,OAAO,GAAG,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;oBACvC,WAAM,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,uBAAgB,OAAO,CAAC,QAAQ,MAAG,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,EAAA;;oBAA7F,IAAI,GAAG,CAAC,SAAqF,CAAC,CAAC,CAAC,CAAC;yBACjG,IAAI,EAAJ,cAAI;oBACF,MAAM,GAAG,IAAI,CAAC,GAAG,CAAA;oBACjB,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,UAAG,OAAO,CAAC,GAAG,cAAI,OAAO,CAAC,QAAQ,cAAI,OAAO,CAAC,SAAS,CAAE,CAAC,CAAC,CAAC,UAAG,OAAO,CAAC,GAAG,cAAI,OAAO,CAAC,QAAQ,CAAE,CAAA;oBAChI,WAAW,GAAG,IAAA,sBAAc,EAAC,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;oBAC9D,OAAO,GAAG,uDAAgD,WAAW,OAAI,CAAC;oBAC1E,WAAM,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAA;;yBAAzC,SAAyC,EAAzC,cAAyC;oBAC3C,IAAI,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,CAAA;;;oBAE3C,YAAY,GAAG;wBACjB,KAAK,EAAE,SAAS;wBAChB,IAAI,EAAE,IAAI,IAAI;qBACf,CAAA;oBACG,cAAc,GAAG,IAAA,wBAAgB,EAAC,YAAY,CAAC,CAAA;oBACnD,WAAM,IAAA,8BAAsB,EAAC,MAAM,EAAE,cAAc,CAAC,EAAA;;oBAApD,SAAoD,CAAA;oBAEpD,IAAI,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,CAAA;;wBAInD,WAAO,IAAI,EAAC;;;;CACb;AAEM,IAAM,MAAM,GAAG,UAAO,GAAG,EAAE,GAAG;;;;;;gBAE7B,GAAG,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;gBAC9B,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC;gBAChC,IAAI,CAAC,KAAK,EAAE;oBACV,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;iBACxC;gBACG,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChD,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;gBAC1B,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;gBACzB,IAAI,CAAC,MAAM,EAAE;oBACX,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;iBACrC;gBACG,UAAU,GAAG,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,eAAe,CAAC,CAAA;gBAChD,WAAM,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,uBAAgB,MAAM,MAAG,EAAE,CAAC,EAAA;;gBAAvE,OAAO,GAAG,SAA6D;gBACvE,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;gBACvB,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAA;gBAClD,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAA;gBAChD,IAAI,CAAC,MAAM,EAAE;oBACX,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;iBACrC;gBACD,IAAI,CAAC,OAAO,EAAE;oBACZ,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;iBACtC;gBACG,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBACrC,WAAM,YAAY,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,EAAA;;gBAApD,IAAI,GAAG,SAA6C;gBACxD,IAAA,sBAAc,EAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;gBAC1D,WAAW,GAAG,eAAe,CAAC,YAAY,CAAC;gBAC/C,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;;;;gBAE/B,OAAO,CAAC,KAAK,CAAC,OAAK,CAAC,CAAC;gBACrB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAK,CAAC,SAAS,CAAC,CAAA;;;;;KAGxC,CAAA;AAlCY,QAAA,MAAM,UAkClB"}
|
package/lib/endpoints/login.js
CHANGED
|
@@ -55,30 +55,28 @@ var login = function (req, res) { return __awaiter(void 0, void 0, void 0, funct
|
|
|
55
55
|
});
|
|
56
56
|
if (!user) {
|
|
57
57
|
res.status(401).send();
|
|
58
|
-
return [2
|
|
58
|
+
return [2];
|
|
59
59
|
}
|
|
60
|
-
return [4
|
|
60
|
+
return [4, bcrypt.compare(bcryptPassword, user.services.password.bcrypt)];
|
|
61
61
|
case 1:
|
|
62
62
|
match = _a.sent();
|
|
63
63
|
if (!match) {
|
|
64
64
|
res.status(401).send();
|
|
65
|
-
return [2
|
|
65
|
+
return [2];
|
|
66
66
|
}
|
|
67
67
|
authtToken = null;
|
|
68
68
|
stampedAuthToken = (0, utils_1.generateStampedLoginToken)();
|
|
69
69
|
authtToken = stampedAuthToken.token;
|
|
70
70
|
hashedToken = (0, utils_1.hashStampedToken)(stampedAuthToken);
|
|
71
|
-
return [4
|
|
71
|
+
return [4, (0, utils_1.insertHashedLoginToken)(user._id, hashedToken)];
|
|
72
72
|
case 2:
|
|
73
73
|
_a.sent();
|
|
74
|
-
return [4
|
|
74
|
+
return [4, (0, session_1.getSession)(authtToken, spaceId)];
|
|
75
75
|
case 3:
|
|
76
76
|
userSession = _a.sent();
|
|
77
|
-
// set cookie to response
|
|
78
|
-
// maxAge 3 month
|
|
79
77
|
(0, utils_1.setAuthCookies)(req, res, user._id, authtToken, userSession.spaceId);
|
|
80
78
|
res.setHeader('X-Space-Token', userSession.spaceId + ',' + authtToken);
|
|
81
|
-
return [2
|
|
79
|
+
return [2, res.send(userSession)];
|
|
82
80
|
}
|
|
83
81
|
});
|
|
84
82
|
}); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/endpoints/login.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,IAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACjC,IAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AACnC,sCAAwC;AACxC,kCAA+G;AAKxG,IAAM,KAAK,GAAG,UAAO,GAAY,EAAE,GAAa;;;;;gBAC/C,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAChC,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAChC,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC9B,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAClC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;oBAC5B,GAAG,EAAE,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE,gBAAgB,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;iBAC1F,CAAC,CAAC;gBACH,IAAI,CAAC,IAAI,EAAE;oBACP,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;oBACvB,
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/endpoints/login.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,IAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACjC,IAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AACnC,sCAAwC;AACxC,kCAA+G;AAKxG,IAAM,KAAK,GAAG,UAAO,GAAY,EAAE,GAAa;;;;;gBAC/C,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAChC,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAChC,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC9B,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAClC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;oBAC5B,GAAG,EAAE,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE,gBAAgB,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;iBAC1F,CAAC,CAAC;gBACH,IAAI,CAAC,IAAI,EAAE;oBACP,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;oBACvB,WAAO;iBACV;gBACW,WAAM,MAAM,CAAC,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAA;;gBAA3E,KAAK,GAAG,SAAmE;gBAC/E,IAAI,CAAC,KAAK,EAAE;oBACR,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;oBACvB,WAAO;iBACV;gBACG,UAAU,GAAG,IAAI,CAAC;gBAClB,gBAAgB,GAAG,IAAA,iCAAyB,GAAE,CAAC;gBACnD,UAAU,GAAG,gBAAgB,CAAC,KAAK,CAAC;gBAChC,WAAW,GAAG,IAAA,wBAAgB,EAAC,gBAAgB,CAAC,CAAC;gBACrD,WAAM,IAAA,8BAAsB,EAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,EAAA;;gBAAnD,SAAmD,CAAC;gBAClC,WAAM,IAAA,oBAAU,EAAC,UAAU,EAAE,OAAO,CAAC,EAAA;;gBAAnD,WAAW,GAAG,SAAqC;gBAGvD,IAAA,sBAAc,EAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;gBACpE,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,WAAW,CAAC,OAAO,GAAG,GAAG,GAAG,UAAU,CAAC,CAAC;gBACvE,WAAO,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,EAAC;;;KAChC,CAAA;AA5BY,QAAA,KAAK,SA4BjB"}
|
package/lib/endpoints/logout.js
CHANGED
|
@@ -41,7 +41,7 @@ var utils_1 = require("../utils");
|
|
|
41
41
|
var logout = function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
|
|
42
42
|
return __generator(this, function (_a) {
|
|
43
43
|
(0, utils_1.clearAuthCookies)(req, res);
|
|
44
|
-
return [2
|
|
44
|
+
return [2, res.end()];
|
|
45
45
|
});
|
|
46
46
|
}); };
|
|
47
47
|
exports.logout = logout;
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,WAAO,GAAG,CAAC,GAAG,EAAE,EAAC;;KACpB,CAAA;AAHY,QAAA,MAAM,UAGlB"}
|
|
@@ -46,35 +46,35 @@ var validate = function (req, res) { return __awaiter(void 0, void 0, void 0, fu
|
|
|
46
46
|
switch (_a.label) {
|
|
47
47
|
case 0:
|
|
48
48
|
utcOffset = req.body.utcOffset;
|
|
49
|
-
return [4
|
|
49
|
+
return [4, (0, session_1.auth)(req, res)];
|
|
50
50
|
case 1:
|
|
51
51
|
userSession = _a.sent();
|
|
52
|
-
return [4
|
|
52
|
+
return [4, (0, objectql_1.getSteedosSchema)().getObject('space_users').find({ filters: [['space', '=', userSession.spaceId], ['user', '=', userSession.userId], ['user_accepted', '=', true]] })];
|
|
53
53
|
case 2:
|
|
54
54
|
spaceUser = _a.sent();
|
|
55
|
-
if (!userSession.userId) return [3
|
|
56
|
-
if (!(spaceUser.length > 0)) return [3
|
|
57
|
-
return [4
|
|
55
|
+
if (!userSession.userId) return [3, 9];
|
|
56
|
+
if (!(spaceUser.length > 0)) return [3, 8];
|
|
57
|
+
return [4, (0, objectql_1.getSteedosSchema)().getObject('users').findOne(userSession.userId, { fields: ['utcOffset', 'password_expired', 'lockout'] })];
|
|
58
58
|
case 3:
|
|
59
59
|
user = _a.sent();
|
|
60
|
-
if (!user.lockout) return [3
|
|
60
|
+
if (!user.lockout) return [3, 4];
|
|
61
61
|
(0, utils_1.clearAuthCookies)(req, res);
|
|
62
|
-
return [3
|
|
62
|
+
return [3, 7];
|
|
63
63
|
case 4:
|
|
64
64
|
(0, utils_1.setAuthCookies)(req, res, userSession.userId, userSession.authToken, userSession.spaceId);
|
|
65
|
-
if (!!user.hasOwnProperty('utcOffset')) return [3
|
|
66
|
-
return [4
|
|
65
|
+
if (!!user.hasOwnProperty('utcOffset')) return [3, 6];
|
|
66
|
+
return [4, (0, objectql_1.getSteedosSchema)().getObject('users').update(userSession.userId, { 'utcOffset': utcOffset })];
|
|
67
67
|
case 5:
|
|
68
68
|
_a.sent();
|
|
69
69
|
_a.label = 6;
|
|
70
|
-
case 6: return [2
|
|
71
|
-
case 7: return [3
|
|
70
|
+
case 6: return [2, res.send(Object.assign({}, userSession, { password_expired: user.password_expired }))];
|
|
71
|
+
case 7: return [3, 9];
|
|
72
72
|
case 8:
|
|
73
73
|
(0, utils_1.clearAuthCookies)(req, res);
|
|
74
74
|
_a.label = 9;
|
|
75
75
|
case 9:
|
|
76
76
|
(0, utils_1.clearAuthCookies)(req, res);
|
|
77
|
-
return [2
|
|
77
|
+
return [2, res.status(401).send({
|
|
78
78
|
"error": "Validate Request -- Missing X-Auth-Token",
|
|
79
79
|
"instance": "1329598861",
|
|
80
80
|
"success": false
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,WAAM,IAAA,cAAI,EAAC,GAAG,EAAE,GAAG,CAAC,EAAA;;gBAAlC,WAAW,GAAG,SAAoB;gBACtB,WAAM,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,cAAkB;qBACf,CAAA,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA,EAApB,cAAoB;gBACR,WAAM,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,cAAY;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,cAAiC;gBACjC,WAAM,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,WAAO,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,WAAO,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"}
|
|
@@ -10,7 +10,6 @@ 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);
|
|
12
12
|
exports.authExpress.post('/api/v4/users/validate', validate_1.validate);
|
|
13
|
-
// 保留以前的接口路由
|
|
14
13
|
exports.authExpress.post('/api/setup/login', login_1.login);
|
|
15
14
|
exports.authExpress.post('/api/setup/logout', logout_1.logout);
|
|
16
15
|
exports.authExpress.post('/api/setup/validate', validate_1.validate);
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;AAGpD,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/session.js
CHANGED
|
@@ -62,21 +62,21 @@ function getSessionByUserId(userId, spaceId) {
|
|
|
62
62
|
switch (_a.label) {
|
|
63
63
|
case 0:
|
|
64
64
|
if (!userId) {
|
|
65
|
-
return [2
|
|
65
|
+
return [2];
|
|
66
66
|
}
|
|
67
|
-
return [4
|
|
67
|
+
return [4, (0, userSession_1.getUserSession)(userId)];
|
|
68
68
|
case 1:
|
|
69
69
|
userSession = _a.sent();
|
|
70
70
|
if (!userSession) {
|
|
71
|
-
return [2
|
|
71
|
+
return [2];
|
|
72
72
|
}
|
|
73
73
|
spaceUserSession = {};
|
|
74
|
-
if (!spaceId) return [3
|
|
75
|
-
return [4
|
|
74
|
+
if (!spaceId) return [3, 3];
|
|
75
|
+
return [4, (0, spaceUserSession_1.getSpaceUserSession)(spaceId, userId)];
|
|
76
76
|
case 2:
|
|
77
77
|
spaceUserSession = _a.sent();
|
|
78
78
|
_a.label = 3;
|
|
79
|
-
case 3: return [2
|
|
79
|
+
case 3: return [2, assignSession(spaceId, userSession, spaceUserSession)];
|
|
80
80
|
}
|
|
81
81
|
});
|
|
82
82
|
});
|
|
@@ -96,36 +96,36 @@ function getSession(token, spaceId, clientInfos) {
|
|
|
96
96
|
switch (_a.label) {
|
|
97
97
|
case 0:
|
|
98
98
|
if (!token) {
|
|
99
|
-
return [2
|
|
99
|
+
return [2];
|
|
100
100
|
}
|
|
101
101
|
userId = null;
|
|
102
|
-
if (!(0, apikey_1.isAPIKey)(token)) return [3
|
|
103
|
-
return [4
|
|
102
|
+
if (!(0, apikey_1.isAPIKey)(token)) return [3, 2];
|
|
103
|
+
return [4, (0, apikey_1.verifyAPIKey)(token)];
|
|
104
104
|
case 1:
|
|
105
105
|
apiKeyInfo = _a.sent();
|
|
106
106
|
if (apiKeyInfo) {
|
|
107
107
|
userId = apiKeyInfo.userId;
|
|
108
108
|
spaceId = apiKeyInfo.spaceId;
|
|
109
109
|
}
|
|
110
|
-
return [3
|
|
111
|
-
case 2: return [4
|
|
110
|
+
return [3, 4];
|
|
111
|
+
case 2: return [4, (0, tokenMap_1.getUserIdByToken)(token, clientInfos)];
|
|
112
112
|
case 3:
|
|
113
113
|
userId = _a.sent();
|
|
114
114
|
_a.label = 4;
|
|
115
115
|
case 4:
|
|
116
116
|
if (!userId) {
|
|
117
|
-
return [2
|
|
117
|
+
return [2];
|
|
118
118
|
}
|
|
119
|
-
return [4
|
|
119
|
+
return [4, (0, userSession_1.getUserSession)(userId)];
|
|
120
120
|
case 5:
|
|
121
121
|
userSession = _a.sent();
|
|
122
122
|
if (!userSession) {
|
|
123
|
-
return [2
|
|
123
|
+
return [2];
|
|
124
124
|
}
|
|
125
|
-
return [4
|
|
125
|
+
return [4, (0, spaceUserSession_1.getSpaceUserSession)(spaceId, userId)];
|
|
126
126
|
case 6:
|
|
127
127
|
spaceUserSession = _a.sent();
|
|
128
|
-
return [2
|
|
128
|
+
return [2, assignSession(spaceId, userSession, spaceUserSession)];
|
|
129
129
|
}
|
|
130
130
|
});
|
|
131
131
|
});
|
|
@@ -134,7 +134,6 @@ exports.getSession = getSession;
|
|
|
134
134
|
function getUserAgent(req) {
|
|
135
135
|
var userAgent = req.headers["user-agent"] || "";
|
|
136
136
|
if (req.headers["x-ucbrowser-ua"]) {
|
|
137
|
-
// special case of UC Browser
|
|
138
137
|
userAgent = req.headers["x-ucbrowser-ua"];
|
|
139
138
|
}
|
|
140
139
|
return userAgent;
|
|
@@ -156,7 +155,6 @@ function getLoginDevice(userAgent) {
|
|
|
156
155
|
return { is_phone: is_phone, is_tablet: is_tablet };
|
|
157
156
|
}
|
|
158
157
|
exports.getLoginDevice = getLoginDevice;
|
|
159
|
-
// 解析Request对象，返回SteedosUserSession类型
|
|
160
158
|
function auth(request, response) {
|
|
161
159
|
return __awaiter(this, void 0, void 0, function () {
|
|
162
160
|
var cookies, authToken, spaceToken, authorization, spaceId, spaceAuthToken, userAgent, loginDevice, user;
|
|
@@ -192,37 +190,36 @@ function auth(request, response) {
|
|
|
192
190
|
}
|
|
193
191
|
userAgent = getUserAgent(request) || "";
|
|
194
192
|
loginDevice = getLoginDevice(userAgent);
|
|
195
|
-
return [4
|
|
193
|
+
return [4, getSession(authToken, spaceId, loginDevice)];
|
|
196
194
|
case 1:
|
|
197
195
|
user = _a.sent();
|
|
198
196
|
if ((0, objectql_1.isTemplateSpace)(spaceId)) {
|
|
199
|
-
return [2
|
|
197
|
+
return [2, Object.assign({ authToken: authToken }, user, loginDevice, {
|
|
200
198
|
spaceId: spaceId
|
|
201
199
|
})];
|
|
202
200
|
}
|
|
203
201
|
else {
|
|
204
|
-
return [2
|
|
202
|
+
return [2, Object.assign({ authToken: authToken }, user, loginDevice)];
|
|
205
203
|
}
|
|
206
|
-
return [2
|
|
204
|
+
return [2];
|
|
207
205
|
}
|
|
208
206
|
});
|
|
209
207
|
});
|
|
210
208
|
}
|
|
211
209
|
exports.auth = auth;
|
|
212
|
-
// 给Request对象添加user属性，值为SteedosUserSession类型
|
|
213
210
|
function setRequestUser(request, response, next) {
|
|
214
211
|
return __awaiter(this, void 0, void 0, function () {
|
|
215
212
|
var user;
|
|
216
213
|
return __generator(this, function (_a) {
|
|
217
214
|
switch (_a.label) {
|
|
218
|
-
case 0: return [4
|
|
215
|
+
case 0: return [4, auth(request, response)];
|
|
219
216
|
case 1:
|
|
220
217
|
user = _a.sent();
|
|
221
218
|
if (user.userId) {
|
|
222
219
|
request.user = user;
|
|
223
220
|
}
|
|
224
221
|
next();
|
|
225
|
-
return [2
|
|
222
|
+
return [2];
|
|
226
223
|
}
|
|
227
224
|
});
|
|
228
225
|
});
|
|
@@ -232,12 +229,6 @@ function removeUserSessionsCacheByUserId(userId, is_phone) {
|
|
|
232
229
|
return (0, tokenMap_1.removeUserTokens)(userId, is_phone);
|
|
233
230
|
}
|
|
234
231
|
exports.removeUserSessionsCacheByUserId = removeUserSessionsCacheByUserId;
|
|
235
|
-
/**
|
|
236
|
-
* 判断属性值是否已变更，转字符串比对
|
|
237
|
-
* @param newDoc
|
|
238
|
-
* @param oldDoc
|
|
239
|
-
* @returns true/false
|
|
240
|
-
*/
|
|
241
232
|
function isPropValueChanged(newDoc, oldDoc, props) {
|
|
242
233
|
for (var _i = 0, props_1 = props; _i < props_1.length; _i++) {
|
|
243
234
|
var key = props_1[_i];
|
package/lib/session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAmF;AAEnF,uCAA+D;AAC/D,6CAA8C;AAC9C,uDAAwD;AAGxD,mCAAkD;AAElD,yCAAkC;AAKlC,IAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAEnC,SAAS,aAAa,CAAC,OAAO,EAAE,WAAW,EAAE,YAAY;IACvD,IAAI,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;IAC5E,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,aAAa,CAAC,OAAO;IAC5B,IAAI,OAAO,EAAE;QACX,OAAO,OAAO,CAAC,SAAS,CAAC;QACzB,OAAO,OAAO,CAAC,GAAG,CAAC;KACpB;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAsB,kBAAkB,CACtC,MAAM,EACN,OAAQ;;;;;;oBAER,IAAI,CAAC,MAAM,EAAE;wBACX,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"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"}
|