@steedos/auth 2.1.82 → 2.1.84
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.d.ts +0 -2
- package/lib/apikey.js +3 -3
- package/lib/apikey.js.map +1 -1
- package/lib/auth-middleware.js +3 -2
- package/lib/auth-middleware.js.map +1 -1
- package/lib/endpoints/jwt.js +8 -7
- package/lib/endpoints/jwt.js.map +1 -1
- package/lib/endpoints/login.js +7 -6
- package/lib/endpoints/login.js.map +1 -1
- package/lib/endpoints/logout.js +3 -2
- package/lib/endpoints/logout.js.map +1 -1
- package/lib/endpoints/validate.js +10 -9
- package/lib/endpoints/validate.js.map +1 -1
- package/lib/index.js +2 -1
- package/lib/index.js.map +1 -1
- package/lib/session.js +12 -12
- package/lib/session.js.map +1 -1
- package/lib/spaceUserSession.js +11 -11
- package/lib/spaceUserSession.js.map +1 -1
- package/lib/tokenMap.js +4 -4
- package/lib/tokenMap.js.map +1 -1
- package/lib/userSession.js +5 -5
- package/lib/userSession.js.map +1 -1
- package/lib/utils/index.js +14 -8
- package/lib/utils/index.js.map +1 -1
- package/package.json +3 -3
package/lib/apikey.d.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
declare const HEADER_AUTH = "Authorization";
|
|
2
1
|
export declare function isAPIKey(token: any): any;
|
|
3
2
|
export declare function verifyAPIKey(token: any): Promise<{
|
|
4
3
|
userId: any;
|
|
@@ -8,4 +7,3 @@ export declare function getAPIKey(spaceId: any): Promise<any>;
|
|
|
8
7
|
export declare function getAPIKeyAuthHeader(spaceId: any): Promise<{
|
|
9
8
|
Authorization: string;
|
|
10
9
|
}>;
|
|
11
|
-
export {};
|
package/lib/apikey.js
CHANGED
|
@@ -11,17 +11,17 @@ exports.isAPIKey = isAPIKey;
|
|
|
11
11
|
async function verifyAPIKey(token) {
|
|
12
12
|
if (isAPIKey(token)) {
|
|
13
13
|
const apikey = token.replace('apikey,', '');
|
|
14
|
-
const records = await objectql_1.getObject('api_keys').find({ filters: [['api_key', '=', apikey], ['active', '=', true]] });
|
|
14
|
+
const records = await (0, objectql_1.getObject)('api_keys').find({ filters: [['api_key', '=', apikey], ['active', '=', true]] });
|
|
15
15
|
if (records.length > 0) {
|
|
16
16
|
const record = records[0];
|
|
17
|
-
await objectql_1.getObject('api_keys').update(record._id, { last_use_time: new Date() });
|
|
17
|
+
await (0, objectql_1.getObject)('api_keys').update(record._id, { last_use_time: new Date() });
|
|
18
18
|
return { userId: record.owner, spaceId: record.space };
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
22
|
exports.verifyAPIKey = verifyAPIKey;
|
|
23
23
|
async function getAPIKey(spaceId) {
|
|
24
|
-
const space = await objectql_1.getObject('spaces').findOne(spaceId, {});
|
|
24
|
+
const space = await (0, objectql_1.getObject)('spaces').findOne(spaceId, {});
|
|
25
25
|
if (space) {
|
|
26
26
|
return space.api_key;
|
|
27
27
|
}
|
package/lib/apikey.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apikey.js","sourceRoot":"","sources":["../src/apikey.ts"],"names":[],"mappings":";;;AAAA,gDAA4D;AAE5D,MAAM,WAAW,GAAG,eAAe,CAAC;AACpC,MAAM,SAAS,GAAG,QAAQ,CAAC;AAE3B,SAAgB,QAAQ,CAAC,KAAK;IAC1B,OAAO,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;AACtC,CAAC;AAFD,4BAEC;AAEM,KAAK,UAAU,YAAY,CAAC,KAAK;IACpC,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE;QACjB,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,MAAM,oBAAS,
|
|
1
|
+
{"version":3,"file":"apikey.js","sourceRoot":"","sources":["../src/apikey.ts"],"names":[],"mappings":";;;AAAA,gDAA4D;AAE5D,MAAM,WAAW,GAAG,eAAe,CAAC;AACpC,MAAM,SAAS,GAAG,QAAQ,CAAC;AAE3B,SAAgB,QAAQ,CAAC,KAAK;IAC1B,OAAO,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;AACtC,CAAC;AAFD,4BAEC;AAEM,KAAK,UAAU,YAAY,CAAC,KAAK;IACpC,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE;QACjB,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,MAAM,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,CAAC;QACjH,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACpB,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAC1B,MAAM,IAAA,oBAAS,EAAC,UAAU,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;YAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;SAC1D;KACJ;AACL,CAAC;AAVD,oCAUC;AAEM,KAAK,UAAU,SAAS,CAAC,OAAO;IACnC,MAAM,KAAK,GAAG,MAAM,IAAA,oBAAS,EAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC7D,IAAI,KAAK,EAAE;QACP,OAAO,KAAK,CAAC,OAAO,CAAC;KACxB;AACL,CAAC;AALD,8BAKC;AAEM,KAAK,UAAU,mBAAmB,CAAC,OAAO;IAC7C,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,OAAO,EAAE;QACV,MAAM,IAAI,uBAAY,CAAC,sBAAsB,CAAC,CAAC;KAClD;SAAI;QACD,OAAO,EAAC,CAAC,WAAW,CAAC,EAAE,GAAG,SAAS,WAAW,OAAO,EAAE,EAAC,CAAC;KAC5D;AACL,CAAC;AAPD,kDAOC"}
|
package/lib/auth-middleware.js
CHANGED
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.requireAuthentication = void 0;
|
|
4
4
|
const session_1 = require("./session");
|
|
5
|
-
|
|
6
|
-
await session_1.setRequestUser(req, res, function () {
|
|
5
|
+
const requireAuthentication = async (req, res, next) => {
|
|
6
|
+
await (0, session_1.setRequestUser)(req, res, function () {
|
|
7
7
|
if (req.user) {
|
|
8
8
|
next();
|
|
9
9
|
}
|
|
@@ -12,4 +12,5 @@ exports.requireAuthentication = async (req, res, next) => {
|
|
|
12
12
|
}
|
|
13
13
|
});
|
|
14
14
|
};
|
|
15
|
+
exports.requireAuthentication = requireAuthentication;
|
|
15
16
|
//# sourceMappingURL=auth-middleware.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-middleware.js","sourceRoot":"","sources":["../src/auth-middleware.ts"],"names":[],"mappings":";;;AAAA,uCAA2C;
|
|
1
|
+
{"version":3,"file":"auth-middleware.js","sourceRoot":"","sources":["../src/auth-middleware.ts"],"names":[],"mappings":";;;AAAA,uCAA2C;AAOpC,MAAM,qBAAqB,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAgB,EAAE,EAAE;IACzF,MAAM,IAAA,wBAAc,EAAC,GAAG,EAAE,GAAG,EAAE;QAC3B,IAAI,GAAG,CAAC,IAAI,EAAE;YACV,IAAI,EAAE,CAAC;SACV;aACI;YACD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,mCAAmC,EAAE,CAAC,CAAC;SAC3F;IACL,CAAC,CAAC,CAAC;AAEP,CAAC,CAAA;AAVY,QAAA,qBAAqB,yBAUjC"}
|
package/lib/endpoints/jwt.js
CHANGED
|
@@ -17,12 +17,12 @@ const objectql_1 = require("@steedos/objectql");
|
|
|
17
17
|
async function getTokenInfo(req) {
|
|
18
18
|
let payload = req.user;
|
|
19
19
|
let data = { userId: '', authToken: '' };
|
|
20
|
-
let userObj = objectql_1.getSteedosSchema().getObject('users');
|
|
20
|
+
let userObj = (0, objectql_1.getSteedosSchema)().getObject('users');
|
|
21
21
|
let user = (await userObj.find({ filters: `username eq '${payload.username}'`, fields: ['_id'] }))[0];
|
|
22
22
|
if (user) {
|
|
23
23
|
let userId = user._id;
|
|
24
24
|
let authToken = payload.sessionId ? `${payload.iss}-${payload.username}-${payload.sessionId}` : `${payload.iss}-${payload.username}`;
|
|
25
|
-
let hashedToken = utils_1.hashLoginToken(authToken).replace(/\//g, '%2F');
|
|
25
|
+
let hashedToken = (0, utils_1.hashLoginToken)(authToken).replace(/\//g, '%2F');
|
|
26
26
|
let filters = `(services/resume/loginTokens/hashedToken eq '${hashedToken}')`;
|
|
27
27
|
if (await userObj.count({ filters: filters })) {
|
|
28
28
|
data = { userId: userId, authToken: authToken };
|
|
@@ -32,14 +32,14 @@ async function getTokenInfo(req) {
|
|
|
32
32
|
token: authToken,
|
|
33
33
|
when: new Date
|
|
34
34
|
};
|
|
35
|
-
let hashedTokenObj = utils_1.hashStampedToken(stampedToken);
|
|
36
|
-
await utils_1.insertHashedLoginToken(userId, hashedTokenObj);
|
|
35
|
+
let hashedTokenObj = (0, utils_1.hashStampedToken)(stampedToken);
|
|
36
|
+
await (0, utils_1.insertHashedLoginToken)(userId, hashedTokenObj);
|
|
37
37
|
data = { userId: userId, authToken: authToken };
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
return data;
|
|
41
41
|
}
|
|
42
|
-
|
|
42
|
+
const jwtSSO = async (req, res) => {
|
|
43
43
|
try {
|
|
44
44
|
let jwt = require('jsonwebtoken');
|
|
45
45
|
let token = req.query.jwt_token;
|
|
@@ -52,7 +52,7 @@ exports.jwtSSO = async (req, res) => {
|
|
|
52
52
|
if (!issuer) {
|
|
53
53
|
throw new Error('issuer is needed!');
|
|
54
54
|
}
|
|
55
|
-
let collection = objectql_1.getSteedosSchema().getObject('OAuth2Clients');
|
|
55
|
+
let collection = (0, objectql_1.getSteedosSchema)().getObject('OAuth2Clients');
|
|
56
56
|
let clients = await collection.find({ filters: `clientId eq '${issuer}'` });
|
|
57
57
|
let clientInfo = clients[0];
|
|
58
58
|
let secret = clientInfo ? clientInfo.clientSecret : '';
|
|
@@ -65,7 +65,7 @@ exports.jwtSSO = async (req, res) => {
|
|
|
65
65
|
}
|
|
66
66
|
let verifiedPayload = jwt.verify(token, secret);
|
|
67
67
|
let data = await getTokenInfo({ user: verifiedPayload });
|
|
68
|
-
utils_1.setAuthCookies(req, res, data.userId, data.authToken, spaceId);
|
|
68
|
+
(0, utils_1.setAuthCookies)(req, res, data.userId, data.authToken, spaceId);
|
|
69
69
|
let redirectUrl = verifiedPayload.redirect_url;
|
|
70
70
|
res.redirect(302, redirectUrl);
|
|
71
71
|
}
|
|
@@ -74,4 +74,5 @@ exports.jwtSSO = async (req, res) => {
|
|
|
74
74
|
res.status(500).send(error.messenger);
|
|
75
75
|
}
|
|
76
76
|
};
|
|
77
|
+
exports.jwtSSO = jwtSSO;
|
|
77
78
|
//# sourceMappingURL=jwt.js.map
|
package/lib/endpoints/jwt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../src/endpoints/jwt.ts"],"names":[],"mappings":";;;AAAA,oCAAoG;AACpG,gDAAoD;AAEpD,gDAAgD;AAChD,6BAA6B;AAC7B,mEAAmE;AACnE,sFAAsF;AACtF,kCAAkC;AAClC,mEAAmE;AACnE,+BAA+B;AAC/B,iCAAiC;AACjC,uBAAuB;AACvB,OAAO;AACP,IAAI;AAEJ,KAAK,UAAU,YAAY,CAAC,GAAG;IAC7B,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,CAAA;IACtB,IAAI,IAAI,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAA;IACxC,IAAI,OAAO,GAAG,2BAAgB,
|
|
1
|
+
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../src/endpoints/jwt.ts"],"names":[],"mappings":"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"}
|
package/lib/endpoints/login.js
CHANGED
|
@@ -5,7 +5,7 @@ const SHA256 = require("sha256");
|
|
|
5
5
|
const bcrypt = require('bcryptjs');
|
|
6
6
|
const session_1 = require("../session");
|
|
7
7
|
const utils_1 = require("../utils");
|
|
8
|
-
|
|
8
|
+
const login = async (req, res) => {
|
|
9
9
|
let username = req.body["username"];
|
|
10
10
|
let password = req.body["password"];
|
|
11
11
|
let spaceId = req.body["spaceId"]; // 需要登录的工作区Id，如果不传入，自动选中第一个工作区
|
|
@@ -23,15 +23,16 @@ exports.login = async (req, res) => {
|
|
|
23
23
|
return;
|
|
24
24
|
}
|
|
25
25
|
let authtToken = null;
|
|
26
|
-
let stampedAuthToken = utils_1.generateStampedLoginToken();
|
|
26
|
+
let stampedAuthToken = (0, utils_1.generateStampedLoginToken)();
|
|
27
27
|
authtToken = stampedAuthToken.token;
|
|
28
|
-
let hashedToken = utils_1.hashStampedToken(stampedAuthToken);
|
|
29
|
-
await utils_1.insertHashedLoginToken(user._id, hashedToken);
|
|
30
|
-
let userSession = await session_1.getSession(authtToken, spaceId);
|
|
28
|
+
let hashedToken = (0, utils_1.hashStampedToken)(stampedAuthToken);
|
|
29
|
+
await (0, utils_1.insertHashedLoginToken)(user._id, hashedToken);
|
|
30
|
+
let userSession = await (0, session_1.getSession)(authtToken, spaceId);
|
|
31
31
|
// set cookie to response
|
|
32
32
|
// maxAge 3 month
|
|
33
|
-
utils_1.setAuthCookies(req, res, user._id, authtToken, userSession.spaceId);
|
|
33
|
+
(0, utils_1.setAuthCookies)(req, res, user._id, authtToken, userSession.spaceId);
|
|
34
34
|
res.setHeader('X-Space-Token', userSession.spaceId + ',' + authtToken);
|
|
35
35
|
return res.send(userSession);
|
|
36
36
|
};
|
|
37
|
+
exports.login = login;
|
|
37
38
|
//# sourceMappingURL=login.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/endpoints/login.ts"],"names":[],"mappings":";;;AAEA,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACjC,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AACnC,wCAAwC;AACxC,oCAA+G;
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/endpoints/login.ts"],"names":[],"mappings":";;;AAEA,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACjC,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AACnC,wCAAwC;AACxC,oCAA+G;AAIxG,MAAM,KAAK,GAAG,KAAK,EAAE,GAAoB,EAAE,GAAqB,EAAE,EAAE;IACvE,IAAI,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpC,IAAI,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpC,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,8BAA8B;IACjE,IAAI,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;IACtC,IAAI,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;QAC5B,GAAG,EAAE,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE,gBAAgB,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;KAC1F,CAAC,CAAC;IACH,IAAI,CAAC,IAAI,EAAE;QACP,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QACvB,OAAO;KACV;IACD,IAAI,KAAK,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAChF,IAAI,CAAC,KAAK,EAAE;QACR,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QACvB,OAAO;KACV;IACD,IAAI,UAAU,GAAG,IAAI,CAAC;IACtB,IAAI,gBAAgB,GAAG,IAAA,iCAAyB,GAAE,CAAC;IACnD,UAAU,GAAG,gBAAgB,CAAC,KAAK,CAAC;IACpC,IAAI,WAAW,GAAG,IAAA,wBAAgB,EAAC,gBAAgB,CAAC,CAAC;IACrD,MAAM,IAAA,8BAAsB,EAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IACpD,IAAI,WAAW,GAAG,MAAM,IAAA,oBAAU,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACxD,yBAAyB;IACzB,iBAAiB;IACjB,IAAA,sBAAc,EAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACpE,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,WAAW,CAAC,OAAO,GAAG,GAAG,GAAG,UAAU,CAAC,CAAC;IACvE,OAAO,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AACjC,CAAC,CAAA;AA5BY,QAAA,KAAK,SA4BjB"}
|
package/lib/endpoints/logout.js
CHANGED
|
@@ -2,8 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.logout = void 0;
|
|
4
4
|
const utils_1 = require("../utils");
|
|
5
|
-
|
|
6
|
-
utils_1.clearAuthCookies(req, res);
|
|
5
|
+
const logout = async (req, res) => {
|
|
6
|
+
(0, utils_1.clearAuthCookies)(req, res);
|
|
7
7
|
return res.end();
|
|
8
8
|
};
|
|
9
|
+
exports.logout = logout;
|
|
9
10
|
//# sourceMappingURL=logout.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../src/endpoints/logout.ts"],"names":[],"mappings":";;;AAEA,oCAA4C;
|
|
1
|
+
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../src/endpoints/logout.ts"],"names":[],"mappings":";;;AAEA,oCAA4C;AAErC,MAAM,MAAM,GAAG,KAAK,EAAE,GAAoB,EAAE,GAAqB,EAAE,EAAE;IACxE,IAAA,wBAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC3B,OAAO,GAAG,CAAC,GAAG,EAAE,CAAC;AACrB,CAAC,CAAA;AAHY,QAAA,MAAM,UAGlB"}
|
|
@@ -4,33 +4,34 @@ exports.validate = void 0;
|
|
|
4
4
|
const session_1 = require("../session");
|
|
5
5
|
const utils_1 = require("../utils");
|
|
6
6
|
const objectql_1 = require("@steedos/objectql");
|
|
7
|
-
|
|
7
|
+
const validate = async (req, res) => {
|
|
8
8
|
let utcOffset = req.body.utcOffset;
|
|
9
|
-
let userSession = await session_1.auth(req, res);
|
|
10
|
-
let spaceUser = await objectql_1.getSteedosSchema().getObject('space_users').find({ filters: [['space', '=', userSession.spaceId], ['user', '=', userSession.userId], ['user_accepted', '=', true]] });
|
|
9
|
+
let userSession = await (0, session_1.auth)(req, res);
|
|
10
|
+
let spaceUser = await (0, objectql_1.getSteedosSchema)().getObject('space_users').find({ filters: [['space', '=', userSession.spaceId], ['user', '=', userSession.userId], ['user_accepted', '=', true]] });
|
|
11
11
|
if (userSession.userId) {
|
|
12
12
|
if (spaceUser.length > 0) {
|
|
13
|
-
let user = await objectql_1.getSteedosSchema().getObject('users').findOne(userSession.userId, { fields: ['utcOffset', 'password_expired', 'lockout'] });
|
|
13
|
+
let user = await (0, objectql_1.getSteedosSchema)().getObject('users').findOne(userSession.userId, { fields: ['utcOffset', 'password_expired', 'lockout'] });
|
|
14
14
|
if (user.lockout) {
|
|
15
|
-
utils_1.clearAuthCookies(req, res);
|
|
15
|
+
(0, utils_1.clearAuthCookies)(req, res);
|
|
16
16
|
}
|
|
17
17
|
else {
|
|
18
|
-
utils_1.setAuthCookies(req, res, userSession.userId, userSession.authToken, userSession.spaceId);
|
|
18
|
+
(0, utils_1.setAuthCookies)(req, res, userSession.userId, userSession.authToken, userSession.spaceId);
|
|
19
19
|
if (!user.hasOwnProperty('utcOffset')) {
|
|
20
|
-
await objectql_1.getSteedosSchema().getObject('users').update(userSession.userId, { 'utcOffset': utcOffset });
|
|
20
|
+
await (0, objectql_1.getSteedosSchema)().getObject('users').update(userSession.userId, { 'utcOffset': utcOffset });
|
|
21
21
|
}
|
|
22
22
|
return res.send(Object.assign({}, userSession, { password_expired: user.password_expired }));
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
25
|
else {
|
|
26
|
-
utils_1.clearAuthCookies(req, res);
|
|
26
|
+
(0, utils_1.clearAuthCookies)(req, res);
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
|
-
utils_1.clearAuthCookies(req, res);
|
|
29
|
+
(0, utils_1.clearAuthCookies)(req, res);
|
|
30
30
|
return res.status(401).send({
|
|
31
31
|
"error": "Validate Request -- Missing X-Auth-Token",
|
|
32
32
|
"instance": "1329598861",
|
|
33
33
|
"success": false
|
|
34
34
|
});
|
|
35
35
|
};
|
|
36
|
+
exports.validate = validate;
|
|
36
37
|
//# sourceMappingURL=validate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/endpoints/validate.ts"],"names":[],"mappings":";;;AAEA,wCAAkC;AAClC,oCAA4D;AAC5D,gDAAqD;
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/endpoints/validate.ts"],"names":[],"mappings":";;;AAEA,wCAAkC;AAClC,oCAA4D;AAC5D,gDAAqD;AAE9C,MAAM,QAAQ,GAAG,KAAK,EAAE,GAAoB,EAAE,GAAqB,EAAE,EAAE;IAC1E,IAAI,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;IACnC,IAAI,WAAW,GAAG,MAAM,IAAA,cAAI,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACvC,IAAI,SAAS,GAAG,MAAM,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,CAAC;IAC1L,IAAI,WAAW,CAAC,MAAM,EAAE;QACpB,IAAG,SAAS,CAAC,MAAM,GAAG,CAAC,EAAC;YACpB,IAAI,IAAI,GAAG,MAAM,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,CAAC;YAC3I,IAAG,IAAI,CAAC,OAAO,EAAC;gBACZ,IAAA,wBAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAA;aAC7B;iBAAI;gBACD,IAAA,sBAAc,EAAC,GAAG,EAAE,GAAG,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;gBACzF,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE;oBACnC,MAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAA;iBACrG;gBACD,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,EAAE,EAAC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAC,CAAC,CAAC,CAAC;aAC9F;SACJ;aAAI;YACD,IAAA,wBAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAA;SAC7B;KACJ;IACD,IAAA,wBAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC3B,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;QACxB,OAAO,EAAE,0CAA0C;QACnD,UAAU,EAAE,YAAY;QACxB,SAAS,EAAE,KAAK;KACnB,CAAC,CAAA;AACN,CAAC,CAAA;AA1BY,QAAA,QAAQ,YA0BpB"}
|
package/lib/index.js
CHANGED
|
@@ -7,9 +7,10 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
|
|
|
7
7
|
o[k2] = m[k];
|
|
8
8
|
}));
|
|
9
9
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
10
|
-
for (var p in m) if (p !== "default" && !
|
|
10
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
11
11
|
};
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
|
+
exports.requireAuthentication = exports.getAPIKeyAuthHeader = exports.authExpress = exports.removeUserSessionsCacheByUserId = exports.getSessionByUserIdSync = exports.getSessionByUserId = exports.setRequestUser = exports.auth = exports.getSession = void 0;
|
|
13
14
|
var session_1 = require("./session");
|
|
14
15
|
Object.defineProperty(exports, "getSession", { enumerable: true, get: function () { return session_1.getSession; } });
|
|
15
16
|
Object.defineProperty(exports, "auth", { enumerable: true, get: function () { return session_1.auth; } });
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCAA0I;AAAjI,qGAAA,UAAU,OAAA;AAAE,+FAAA,IAAI,OAAA;AAAE,yGAAA,cAAc,OAAA;AAAE,6GAAA,kBAAkB,OAAA;AAAE,iHAAA,sBAAsB,OAAA;AAAE,0HAAA,+BAA+B,OAAA;AACtH,0CAAwB;AACxB,6CAA2B;AAC3B,gDAA8B;AAC9B,qDAAmC;AACnC,2DAAmD;AAA1C,iHAAA,WAAW,OAAA;AACpB,mCAA+C;AAAtC,6GAAA,mBAAmB,OAAA;AAC5B,qDAA0D;AAAjD,wHAAA,qBAAqB,OAAA"}
|
package/lib/session.js
CHANGED
|
@@ -23,13 +23,13 @@ async function getSessionByUserId(userId, spaceId) {
|
|
|
23
23
|
if (!userId) {
|
|
24
24
|
return;
|
|
25
25
|
}
|
|
26
|
-
let userSession = await userSession_1.getUserSession(userId);
|
|
26
|
+
let userSession = await (0, userSession_1.getUserSession)(userId);
|
|
27
27
|
if (!userSession) {
|
|
28
28
|
return;
|
|
29
29
|
}
|
|
30
30
|
let spaceUserSession = {};
|
|
31
31
|
if (spaceId) {
|
|
32
|
-
spaceUserSession = await spaceUserSession_1.getSpaceUserSession(spaceId, userId);
|
|
32
|
+
spaceUserSession = await (0, spaceUserSession_1.getSpaceUserSession)(spaceId, userId);
|
|
33
33
|
}
|
|
34
34
|
return assignSession(spaceId, userSession, spaceUserSession);
|
|
35
35
|
}
|
|
@@ -38,7 +38,7 @@ function getSessionByUserIdSync(userId, spaceId) {
|
|
|
38
38
|
let getSessionFn = function () {
|
|
39
39
|
return getSessionByUserId(userId, spaceId);
|
|
40
40
|
};
|
|
41
|
-
return objectql_1.wrapAsync(getSessionFn, {});
|
|
41
|
+
return (0, objectql_1.wrapAsync)(getSessionFn, {});
|
|
42
42
|
}
|
|
43
43
|
exports.getSessionByUserIdSync = getSessionByUserIdSync;
|
|
44
44
|
async function getSession(token, spaceId, clientInfos) {
|
|
@@ -46,24 +46,24 @@ async function getSession(token, spaceId, clientInfos) {
|
|
|
46
46
|
return;
|
|
47
47
|
}
|
|
48
48
|
let userId = null;
|
|
49
|
-
if (apikey_1.isAPIKey(token)) {
|
|
50
|
-
const apiKeyInfo = await apikey_1.verifyAPIKey(token);
|
|
49
|
+
if ((0, apikey_1.isAPIKey)(token)) {
|
|
50
|
+
const apiKeyInfo = await (0, apikey_1.verifyAPIKey)(token);
|
|
51
51
|
if (apiKeyInfo) {
|
|
52
52
|
userId = apiKeyInfo.userId;
|
|
53
53
|
spaceId = apiKeyInfo.spaceId;
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
56
|
else {
|
|
57
|
-
userId = await tokenMap_1.getUserIdByToken(token, clientInfos);
|
|
57
|
+
userId = await (0, tokenMap_1.getUserIdByToken)(token, clientInfos);
|
|
58
58
|
}
|
|
59
59
|
if (!userId) {
|
|
60
60
|
return;
|
|
61
61
|
}
|
|
62
|
-
let userSession = await userSession_1.getUserSession(userId);
|
|
62
|
+
let userSession = await (0, userSession_1.getUserSession)(userId);
|
|
63
63
|
if (!userSession) {
|
|
64
64
|
return;
|
|
65
65
|
}
|
|
66
|
-
let spaceUserSession = await spaceUserSession_1.getSpaceUserSession(spaceId, userId);
|
|
66
|
+
let spaceUserSession = await (0, spaceUserSession_1.getSpaceUserSession)(spaceId, userId);
|
|
67
67
|
return assignSession(spaceId, userSession, spaceUserSession);
|
|
68
68
|
}
|
|
69
69
|
exports.getSession = getSession;
|
|
@@ -81,7 +81,7 @@ function getLoginDevice(userAgent) {
|
|
|
81
81
|
let is_tablet = false;
|
|
82
82
|
if (userAgent) {
|
|
83
83
|
try {
|
|
84
|
-
const { phone, tablet } = ismobilejs_1.default(userAgent);
|
|
84
|
+
const { phone, tablet } = (0, ismobilejs_1.default)(userAgent);
|
|
85
85
|
is_phone = phone;
|
|
86
86
|
is_tablet = tablet;
|
|
87
87
|
}
|
|
@@ -103,7 +103,7 @@ async function auth(request, response) {
|
|
|
103
103
|
request.headers["x-space-id"];
|
|
104
104
|
if (authorization && authorization.split(" ")[0] == "Bearer") {
|
|
105
105
|
let spaceAuthToken = authorization.split(" ")[1];
|
|
106
|
-
if (apikey_1.isAPIKey(spaceAuthToken)) {
|
|
106
|
+
if ((0, apikey_1.isAPIKey)(spaceAuthToken)) {
|
|
107
107
|
authToken = spaceAuthToken;
|
|
108
108
|
}
|
|
109
109
|
else {
|
|
@@ -124,7 +124,7 @@ async function auth(request, response) {
|
|
|
124
124
|
let userAgent = getUserAgent(request) || "";
|
|
125
125
|
const loginDevice = getLoginDevice(userAgent);
|
|
126
126
|
let user = await getSession(authToken, spaceId, loginDevice);
|
|
127
|
-
if (objectql_1.isTemplateSpace(spaceId)) {
|
|
127
|
+
if ((0, objectql_1.isTemplateSpace)(spaceId)) {
|
|
128
128
|
return Object.assign({ authToken: authToken }, user, loginDevice, {
|
|
129
129
|
spaceId: spaceId,
|
|
130
130
|
});
|
|
@@ -144,7 +144,7 @@ async function setRequestUser(request, response, next) {
|
|
|
144
144
|
}
|
|
145
145
|
exports.setRequestUser = setRequestUser;
|
|
146
146
|
function removeUserSessionsCacheByUserId(userId, is_phone) {
|
|
147
|
-
return tokenMap_1.removeUserTokens(userId, is_phone);
|
|
147
|
+
return (0, tokenMap_1.removeUserTokens)(userId, is_phone);
|
|
148
148
|
}
|
|
149
149
|
exports.removeUserSessionsCacheByUserId = removeUserSessionsCacheByUserId;
|
|
150
150
|
//# 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":";;;AAAA,gDAAmF;AAEnF,yCAA+D;AAC/D,+CAA8C;AAC9C,yDAAwD;AAGxD,qCAAkD;AAElD,2CAAkC;AAKlC,MAAM,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;AAEM,KAAK,UAAU,kBAAkB,CACtC,MAAM,EACN,OAAQ;IAER,IAAI,CAAC,MAAM,EAAE;QACX,OAAO;KACR;IAED,IAAI,WAAW,GAAG,MAAM,4BAAc,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"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"}
|
package/lib/spaceUserSession.js
CHANGED
|
@@ -9,14 +9,14 @@ const SPACEUSERCACHENAME = 'space_users_cache';
|
|
|
9
9
|
const internalProfiles = ['admin', 'user', 'supplier', 'customer'];
|
|
10
10
|
async function getSpaceUserProfile(userId, spaceId) {
|
|
11
11
|
let filters = `(space eq '${spaceId}') and (user eq '${userId}')`;
|
|
12
|
-
let spaceUser = await objectql_1.getSteedosSchema().getObject('space_users').find({ filters: filters, fields: ['profile'] });
|
|
12
|
+
let spaceUser = await (0, objectql_1.getSteedosSchema)().getObject('space_users').find({ filters: filters, fields: ['profile'] });
|
|
13
13
|
if (spaceUser && spaceUser.length > 0) {
|
|
14
14
|
return spaceUser[0].profile;
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
17
|
async function getUserRoles(userId, spaceId) {
|
|
18
18
|
let roles = ['user'];
|
|
19
|
-
let space = await objectql_1.getSteedosSchema().getObject('spaces').findOne(spaceId, { fields: ['admins'] });
|
|
19
|
+
let space = await (0, objectql_1.getSteedosSchema)().getObject('spaces').findOne(spaceId, { fields: ['admins'] });
|
|
20
20
|
if (space && space.admins.includes(userId)) {
|
|
21
21
|
roles = ['admin'];
|
|
22
22
|
}
|
|
@@ -25,7 +25,7 @@ async function getUserRoles(userId, spaceId) {
|
|
|
25
25
|
roles = [profile];
|
|
26
26
|
}
|
|
27
27
|
let filters = `(space eq '${spaceId}') and (users eq '${userId}')`;
|
|
28
|
-
let permission_sets = await objectql_1.getSteedosSchema().getObject('permission_set').directFind({ filters: filters, fields: ['name'] });
|
|
28
|
+
let permission_sets = await (0, objectql_1.getSteedosSchema)().getObject('permission_set').directFind({ filters: filters, fields: ['name'] });
|
|
29
29
|
permission_sets.forEach(p => {
|
|
30
30
|
if (!_.include(internalProfiles, p.name)) {
|
|
31
31
|
roles.push(p.name);
|
|
@@ -50,7 +50,7 @@ async function getObjectDataByIds(objectName, ids, fields) {
|
|
|
50
50
|
if (fields && fields.length > 0) {
|
|
51
51
|
query['fields'] = fields;
|
|
52
52
|
}
|
|
53
|
-
return await objectql_1.getSteedosSchema().getObject(objectName).find(query);
|
|
53
|
+
return await (0, objectql_1.getSteedosSchema)().getObject(objectName).find(query);
|
|
54
54
|
}
|
|
55
55
|
async function getUserPermissionShares(spaceUser) {
|
|
56
56
|
let userFilters = [`(users eq '${spaceUser.user}')`];
|
|
@@ -58,15 +58,15 @@ async function getUserPermissionShares(spaceUser) {
|
|
|
58
58
|
userFilters.push(`(organizations eq '${orgId}')`);
|
|
59
59
|
});
|
|
60
60
|
let filters = `((${userFilters.join(' or ')}) and space eq '${spaceUser.space}')`;
|
|
61
|
-
return await objectql_1.getSteedosSchema().getObject('permission_shares').find({ filters: filters, fields: ['_id', 'object_name'] });
|
|
61
|
+
return await (0, objectql_1.getSteedosSchema)().getObject('permission_shares').find({ filters: filters, fields: ['_id', 'object_name'] });
|
|
62
62
|
}
|
|
63
63
|
function getSpaceSessionFromCache(spaceId, userId) {
|
|
64
|
-
let spaceUserSession = objectql_1.getConfig(SPACEUSERCACHENAME, `${spaceId}-${userId}`);
|
|
64
|
+
let spaceUserSession = (0, objectql_1.getConfig)(SPACEUSERCACHENAME, `${spaceId}-${userId}`);
|
|
65
65
|
if (!spaceUserSession) {
|
|
66
66
|
return null;
|
|
67
67
|
}
|
|
68
|
-
if (utils_1.isExpried(spaceUserSession.expiredAt)) {
|
|
69
|
-
objectql_1.removeConfig(SPACEUSERCACHENAME, spaceUserSession);
|
|
68
|
+
if ((0, utils_1.isExpried)(spaceUserSession.expiredAt)) {
|
|
69
|
+
(0, objectql_1.removeConfig)(SPACEUSERCACHENAME, spaceUserSession);
|
|
70
70
|
return null;
|
|
71
71
|
}
|
|
72
72
|
return spaceUserSession;
|
|
@@ -74,7 +74,7 @@ function getSpaceSessionFromCache(spaceId, userId) {
|
|
|
74
74
|
exports.getSpaceSessionFromCache = getSpaceSessionFromCache;
|
|
75
75
|
function addSpaceSessionToCache(spaceId, userId, spaceUserSession) {
|
|
76
76
|
spaceUserSession._id = `${spaceId}-${userId}`;
|
|
77
|
-
objectql_1.addConfig(SPACEUSERCACHENAME, spaceUserSession);
|
|
77
|
+
(0, objectql_1.addConfig)(SPACEUSERCACHENAME, spaceUserSession);
|
|
78
78
|
}
|
|
79
79
|
exports.addSpaceSessionToCache = addSpaceSessionToCache;
|
|
80
80
|
async function getSpaceUserSession(spaceId, userId) {
|
|
@@ -83,9 +83,9 @@ async function getSpaceUserSession(spaceId, userId) {
|
|
|
83
83
|
let expiredAt = new Date().getTime() + sessionCacheInMinutes * 60 * 1000;
|
|
84
84
|
let su = null;
|
|
85
85
|
let suFields = ['_id', 'space', 'company_id', 'company_ids', 'organization', 'organizations', 'organizations_parents', 'user'];
|
|
86
|
-
let spaceUser = await objectql_1.getSteedosSchema().getObject('space_users').find({ filters: `(space eq '${spaceId}') and (user eq '${userId}') and (user_accepted eq true)`, fields: suFields });
|
|
86
|
+
let spaceUser = await (0, objectql_1.getSteedosSchema)().getObject('space_users').find({ filters: `(space eq '${spaceId}') and (user eq '${userId}') and (user_accepted eq true)`, fields: suFields });
|
|
87
87
|
// 如果spaceid和user不匹配，则取用户的第一个工作区
|
|
88
|
-
let spaceUsers = await objectql_1.getSteedosSchema().getObject('space_users').find({ filters: `(user eq '${userId}') and (user_accepted eq true)`, fields: suFields });
|
|
88
|
+
let spaceUsers = await (0, objectql_1.getSteedosSchema)().getObject('space_users').find({ filters: `(user eq '${userId}') and (user_accepted eq true)`, fields: suFields });
|
|
89
89
|
if (spaceUser && spaceUser[0]) {
|
|
90
90
|
su = spaceUser[0];
|
|
91
91
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spaceUserSession.js","sourceRoot":"","sources":["../src/spaceUserSession.ts"],"names":[],"mappings":";;;AAAA,gDAAyF;AACzF,mCAAmC;AACnC,MAAM,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAChC,MAAM,qBAAqB,GAAG,EAAE,CAAC;AACjC,MAAM,kBAAkB,GAAG,mBAAmB,CAAC;AAE/C,MAAM,gBAAgB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,CAAA;AAElE,KAAK,UAAU,mBAAmB,CAAC,MAAc,EAAE,OAAe;IAC9D,IAAI,OAAO,GAAG,cAAc,OAAO,oBAAoB,MAAM,IAAI,CAAC;IAClE,IAAI,SAAS,GAAG,MAAM,2BAAgB,
|
|
1
|
+
{"version":3,"file":"spaceUserSession.js","sourceRoot":"","sources":["../src/spaceUserSession.ts"],"names":[],"mappings":"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"}
|
package/lib/tokenMap.js
CHANGED
|
@@ -5,11 +5,11 @@ const crypto = require("crypto");
|
|
|
5
5
|
const objectql_1 = require("@steedos/objectql");
|
|
6
6
|
const TOKENMAPCACHENAME = "token_map_cache";
|
|
7
7
|
function getTokenMapCache(token) {
|
|
8
|
-
return objectql_1.getConfig(TOKENMAPCACHENAME, token);
|
|
8
|
+
return (0, objectql_1.getConfig)(TOKENMAPCACHENAME, token);
|
|
9
9
|
}
|
|
10
10
|
function setTokenMapCache(token, tokenMap) {
|
|
11
11
|
tokenMap._id = token;
|
|
12
|
-
objectql_1.addConfig(TOKENMAPCACHENAME, tokenMap);
|
|
12
|
+
(0, objectql_1.addConfig)(TOKENMAPCACHENAME, tokenMap);
|
|
13
13
|
}
|
|
14
14
|
function _hashLoginToken(token) {
|
|
15
15
|
const hash = crypto.createHash("sha256");
|
|
@@ -19,7 +19,7 @@ function _hashLoginToken(token) {
|
|
|
19
19
|
async function getUser(token) {
|
|
20
20
|
let hashedToken = _hashLoginToken(token).replace(/\//g, "%2F");
|
|
21
21
|
let filters = `(services/resume/loginTokens/hashedToken eq '${hashedToken}')`;
|
|
22
|
-
let users = await objectql_1.getSteedosSchema()
|
|
22
|
+
let users = await (0, objectql_1.getSteedosSchema)()
|
|
23
23
|
.getObject("users")
|
|
24
24
|
.find({ filters: filters, fields: ["_id"] });
|
|
25
25
|
return users[0];
|
|
@@ -41,7 +41,7 @@ async function getUserIdByToken(token, clientInfos = {}) {
|
|
|
41
41
|
}
|
|
42
42
|
exports.getUserIdByToken = getUserIdByToken;
|
|
43
43
|
function removeUserTokens(userId, is_phone) {
|
|
44
|
-
objectql_1.removeManyConfigs(TOKENMAPCACHENAME, { userId: userId, is_phone });
|
|
44
|
+
(0, objectql_1.removeManyConfigs)(TOKENMAPCACHENAME, { userId: userId, is_phone });
|
|
45
45
|
}
|
|
46
46
|
exports.removeUserTokens = removeUserTokens;
|
|
47
47
|
//# sourceMappingURL=tokenMap.js.map
|
package/lib/tokenMap.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenMap.js","sourceRoot":"","sources":["../src/tokenMap.ts"],"names":[],"mappings":";;;AAAA,iCAAkC;AAClC,gDAK2B;AAC3B,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;AAE5C,SAAS,gBAAgB,CAAC,KAAK;IAC7B,OAAO,oBAAS,
|
|
1
|
+
{"version":3,"file":"tokenMap.js","sourceRoot":"","sources":["../src/tokenMap.ts"],"names":[],"mappings":";;;AAAA,iCAAkC;AAClC,gDAK2B;AAC3B,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;AAE5C,SAAS,gBAAgB,CAAC,KAAK;IAC7B,OAAO,IAAA,oBAAS,EAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;AAC7C,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAK,EAAE,QAAQ;IACvC,QAAQ,CAAC,GAAG,GAAG,KAAK,CAAC;IACrB,IAAA,oBAAS,EAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,eAAe,CAAC,KAAa;IACpC,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnB,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAC/B,CAAC;AAED,KAAK,UAAU,OAAO,CAAC,KAAa;IAClC,IAAI,WAAW,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC/D,IAAI,OAAO,GAAG,gDAAgD,WAAW,IAAI,CAAC;IAC9E,IAAI,KAAK,GAAG,MAAM,IAAA,2BAAgB,GAAE;SACjC,SAAS,CAAC,OAAO,CAAC;SAClB,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC/C,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAEM,KAAK,UAAU,gBAAgB,CAAC,KAAK,EAAE,WAAW,GAAG,EAAE;IAC5D,IAAI,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACvC,IAAI,CAAC,QAAQ,EAAE;QACb,IAAI,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC;QAChC,IAAI,IAAI,EAAE;YACR,IAAI,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC;YACtB,gBAAgB,CACd,KAAK,EACL,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CACnD,CAAC;YACF,OAAO,MAAM,CAAC;SACf;aAAM;YACL,OAAO;SACR;KACF;IACD,OAAO,QAAQ,CAAC,MAAM,CAAC;AACzB,CAAC;AAhBD,4CAgBC;AAED,SAAgB,gBAAgB,CAAC,MAAM,EAAE,QAAQ;IAC/C,IAAA,4BAAiB,EAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;AACrE,CAAC;AAFD,4CAEC"}
|
package/lib/userSession.js
CHANGED
|
@@ -6,12 +6,12 @@ const utils_1 = require("./utils");
|
|
|
6
6
|
const sessionCacheInMinutes = 10;
|
|
7
7
|
const USERCACHENAME = 'users_cache';
|
|
8
8
|
function getSessionFromCache(userId) {
|
|
9
|
-
let userSession = objectql_1.getConfig(USERCACHENAME, userId);
|
|
9
|
+
let userSession = (0, objectql_1.getConfig)(USERCACHENAME, userId);
|
|
10
10
|
if (!userSession) {
|
|
11
11
|
return null;
|
|
12
12
|
}
|
|
13
|
-
if (utils_1.isExpried(userSession.expiredAt)) {
|
|
14
|
-
objectql_1.removeConfig(USERCACHENAME, userSession);
|
|
13
|
+
if ((0, utils_1.isExpried)(userSession.expiredAt)) {
|
|
14
|
+
(0, objectql_1.removeConfig)(USERCACHENAME, userSession);
|
|
15
15
|
return null;
|
|
16
16
|
}
|
|
17
17
|
return userSession;
|
|
@@ -19,11 +19,11 @@ function getSessionFromCache(userId) {
|
|
|
19
19
|
exports.getSessionFromCache = getSessionFromCache;
|
|
20
20
|
function addSessionToCache(userId, userSession) {
|
|
21
21
|
userSession._id = userId;
|
|
22
|
-
objectql_1.addConfig(USERCACHENAME, userSession);
|
|
22
|
+
(0, objectql_1.addConfig)(USERCACHENAME, userSession);
|
|
23
23
|
}
|
|
24
24
|
exports.addSessionToCache = addSessionToCache;
|
|
25
25
|
async function getUser(userId) {
|
|
26
|
-
let user = await objectql_1.getSteedosSchema().getObject('users').findOne(userId, { fields: ['name', 'username', 'mobile', 'email', 'utcOffset', 'steedos_id', 'locale'] });
|
|
26
|
+
let user = await (0, objectql_1.getSteedosSchema)().getObject('users').findOne(userId, { fields: ['name', 'username', 'mobile', 'email', 'utcOffset', 'steedos_id', 'locale'] });
|
|
27
27
|
return user;
|
|
28
28
|
}
|
|
29
29
|
async function getUserSession(userId) {
|
package/lib/userSession.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userSession.js","sourceRoot":"","sources":["../src/userSession.ts"],"names":[],"mappings":";;;AAAA,gDAAyF;AACzF,mCAAmC;AACnC,MAAM,qBAAqB,GAAG,EAAE,CAAC;AACjC,MAAM,aAAa,GAAG,aAAa,CAAC;AAEpC,SAAgB,mBAAmB,CAAC,MAAM;IACtC,IAAI,WAAW,GAAG,oBAAS,
|
|
1
|
+
{"version":3,"file":"userSession.js","sourceRoot":"","sources":["../src/userSession.ts"],"names":[],"mappings":";;;AAAA,gDAAyF;AACzF,mCAAmC;AACnC,MAAM,qBAAqB,GAAG,EAAE,CAAC;AACjC,MAAM,aAAa,GAAG,aAAa,CAAC;AAEpC,SAAgB,mBAAmB,CAAC,MAAM;IACtC,IAAI,WAAW,GAAG,IAAA,oBAAS,EAAC,aAAa,EAAE,MAAM,CAAC,CAAA;IAClD,IAAI,CAAC,WAAW,EAAE;QACd,OAAO,IAAI,CAAC;KACf;IACD,IAAI,IAAA,iBAAS,EAAC,WAAW,CAAC,SAAS,CAAC,EAAE;QAClC,IAAA,uBAAY,EAAC,aAAa,EAAE,WAAW,CAAC,CAAC;QACzC,OAAO,IAAI,CAAC;KACf;IACD,OAAO,WAAW,CAAC;AACvB,CAAC;AAVD,kDAUC;AAED,SAAgB,iBAAiB,CAAC,MAAM,EAAE,WAAW;IACjD,WAAW,CAAC,GAAG,GAAG,MAAM,CAAA;IACxB,IAAA,oBAAS,EAAC,aAAa,EAAE,WAAW,CAAC,CAAC;AAC1C,CAAC;AAHD,8CAGC;AAED,KAAK,UAAU,OAAO,CAAC,MAAM;IACzB,IAAI,IAAI,GAAG,MAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;IACjK,OAAO,IAAI,CAAC;AAChB,CAAC;AAEM,KAAK,UAAU,cAAc,CAAC,MAAM;IACvC,IAAI,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,qBAAqB,GAAG,EAAE,GAAG,IAAI,CAAC;IACzE,IAAI,OAAO,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC1C,IAAI,CAAC,OAAO,EAAE;QACV,IAAI,IAAI,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;QACjC,IAAI,IAAI,EAAE;YACN,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC;YAC1B,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YACzB,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YACjC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YAC7B,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;YAC3B,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YACnC,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;YACrC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YAC7B,IAAG,IAAI,CAAC,MAAM,IAAI,OAAO,EAAC;gBACtB,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAA;aAC1B;iBAAK,IAAG,IAAI,CAAC,MAAM,IAAI,OAAO,EAAC;gBAC5B,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAA;aAC7B;iBAAI;gBACD,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAA;aACjC;YACD,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;YAC9B,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACnC,OAAO,OAAO,CAAC;SAClB;aACI;YACD,OAAM;SACT;KACJ;IACD,OAAO,OAAO,CAAA;AAClB,CAAC;AA/BD,wCA+BC"}
|
package/lib/utils/index.js
CHANGED
|
@@ -5,24 +5,27 @@ const crypto = require("crypto");
|
|
|
5
5
|
const random_1 = require("./random");
|
|
6
6
|
const objectql_1 = require("@steedos/objectql");
|
|
7
7
|
const Cookies = require('cookies');
|
|
8
|
-
|
|
8
|
+
const hashLoginToken = function (loginToken) {
|
|
9
9
|
const hash = crypto.createHash('sha256');
|
|
10
10
|
hash.update(loginToken);
|
|
11
11
|
return hash.digest('base64');
|
|
12
12
|
};
|
|
13
|
-
exports.
|
|
13
|
+
exports.hashLoginToken = hashLoginToken;
|
|
14
|
+
const generateStampedLoginToken = function () {
|
|
14
15
|
return {
|
|
15
16
|
token: random_1.default.secret(),
|
|
16
17
|
when: new Date
|
|
17
18
|
};
|
|
18
19
|
};
|
|
19
|
-
exports.
|
|
20
|
+
exports.generateStampedLoginToken = generateStampedLoginToken;
|
|
21
|
+
const hashStampedToken = function (stampedToken) {
|
|
20
22
|
const hashedStampedToken = Object.keys(stampedToken).reduce((prev, key) => key === 'token' ?
|
|
21
23
|
prev : Object.assign(Object.assign({}, prev), { [key]: stampedToken[key] }), {});
|
|
22
|
-
return Object.assign(Object.assign({}, hashedStampedToken), { hashedToken: exports.hashLoginToken(stampedToken.token) });
|
|
24
|
+
return Object.assign(Object.assign({}, hashedStampedToken), { hashedToken: (0, exports.hashLoginToken)(stampedToken.token) });
|
|
23
25
|
};
|
|
24
|
-
exports.
|
|
25
|
-
|
|
26
|
+
exports.hashStampedToken = hashStampedToken;
|
|
27
|
+
const insertHashedLoginToken = async function (userId, hashedToken) {
|
|
28
|
+
let userObject = (0, objectql_1.getSteedosSchema)().getObject('users');
|
|
26
29
|
let user = await userObject.findOne(userId, { fields: ['services'] });
|
|
27
30
|
if (!user['services']) {
|
|
28
31
|
user['services'] = {};
|
|
@@ -34,7 +37,8 @@ exports.insertHashedLoginToken = async function (userId, hashedToken) {
|
|
|
34
37
|
let data = { services: user['services'] };
|
|
35
38
|
return await userObject.update(userId, data);
|
|
36
39
|
};
|
|
37
|
-
exports.
|
|
40
|
+
exports.insertHashedLoginToken = insertHashedLoginToken;
|
|
41
|
+
const setAuthCookies = function (req, res, userId, authToken, spaceId) {
|
|
38
42
|
let cookies = new Cookies(req, res);
|
|
39
43
|
let options = {
|
|
40
44
|
maxAge: 90 * 60 * 60 * 24 * 1000,
|
|
@@ -49,7 +53,8 @@ exports.setAuthCookies = function (req, res, userId, authToken, spaceId) {
|
|
|
49
53
|
}
|
|
50
54
|
return;
|
|
51
55
|
};
|
|
52
|
-
exports.
|
|
56
|
+
exports.setAuthCookies = setAuthCookies;
|
|
57
|
+
const clearAuthCookies = function (req, res) {
|
|
53
58
|
let cookies = new Cookies(req, res);
|
|
54
59
|
let options = {
|
|
55
60
|
maxAge: 0,
|
|
@@ -62,6 +67,7 @@ exports.clearAuthCookies = function (req, res) {
|
|
|
62
67
|
cookies.set("X-Space-Token", null, options);
|
|
63
68
|
return;
|
|
64
69
|
};
|
|
70
|
+
exports.clearAuthCookies = clearAuthCookies;
|
|
65
71
|
function isExpried(expiredAt) {
|
|
66
72
|
return expiredAt <= new Date().getTime();
|
|
67
73
|
}
|
package/lib/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;AAAA,iCAAkC;AAClC,qCAA6C;AAC7C,gDAAqD;AACrD,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.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": "2.1.
|
|
4
|
+
"version": "2.1.84",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"watch": "tsc --watch",
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"access": "public"
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@steedos/objectql": "2.1.
|
|
17
|
+
"@steedos/objectql": "2.1.84",
|
|
18
18
|
"cookies": "^0.7.3",
|
|
19
19
|
"express": "^4.16.4",
|
|
20
20
|
"express-jwt": "^5.3.1",
|
|
@@ -33,5 +33,5 @@
|
|
|
33
33
|
"ts-node": "^8.0.3",
|
|
34
34
|
"typescript": "3.5.3"
|
|
35
35
|
},
|
|
36
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "fa51966927144ba76a624c9cda06f238ef784ab4"
|
|
37
37
|
}
|