@steedos/accounts 3.0.0-beta.99 → 3.0.0
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/core/index.js +22 -17
- package/lib/core/index.js.map +1 -1
- package/lib/rest-express/endpoints/authorize.js +2 -2
- package/lib/rest-express/endpoints/authorize.js.map +1 -1
- package/lib/rest-express/endpoints/impersonate.js +25 -23
- package/lib/rest-express/endpoints/impersonate.js.map +1 -1
- package/lib/rest-express/endpoints/login.js +95 -93
- package/lib/rest-express/endpoints/login.js.map +1 -1
- package/lib/rest-express/endpoints/logout.js +2 -2
- package/lib/rest-express/endpoints/logout.js.map +1 -1
- package/lib/rest-express/endpoints/oauth/provider-callback.js +35 -33
- package/lib/rest-express/endpoints/oauth/provider-callback.js.map +1 -1
- package/lib/rest-express/endpoints/password/change-password.js +2 -2
- package/lib/rest-express/endpoints/password/change-password.js.map +1 -1
- package/lib/rest-express/endpoints/refresh-access-token.js +25 -23
- package/lib/rest-express/endpoints/refresh-access-token.js.map +1 -1
- package/lib/rest-express/endpoints/service-authenticate.js +76 -74
- package/lib/rest-express/endpoints/service-authenticate.js.map +1 -1
- package/lib/rest-express/endpoints/update-session.js +44 -42
- package/lib/rest-express/endpoints/update-session.js.map +1 -1
- package/lib/rest-express/utils/getClientIp.js +16 -0
- package/lib/rest-express/utils/getClientIp.js.map +1 -0
- package/package.json +7 -8
- package/src/core/index.ts +11 -19
- package/src/rest-express/endpoints/authorize.ts +2 -2
- package/src/rest-express/endpoints/impersonate.ts +30 -31
- package/src/rest-express/endpoints/login.ts +66 -61
- package/src/rest-express/endpoints/logout.ts +2 -2
- package/src/rest-express/endpoints/oauth/provider-callback.ts +45 -38
- package/src/rest-express/endpoints/password/change-password.ts +4 -4
- package/src/rest-express/endpoints/refresh-access-token.ts +23 -24
- package/src/rest-express/endpoints/service-authenticate.ts +87 -68
- package/src/rest-express/endpoints/update-session.ts +50 -42
- package/src/rest-express/utils/getClientIp.ts +25 -0
package/lib/core/index.js
CHANGED
|
@@ -281,25 +281,30 @@ var getSteedosService = function () {
|
|
|
281
281
|
};
|
|
282
282
|
exports.getSteedosService = getSteedosService;
|
|
283
283
|
var sendMail = function (mail) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
284
|
-
var to, subject, html,
|
|
284
|
+
var to, subject, html, mailOptions, e_1;
|
|
285
285
|
return tslib_1.__generator(this, function (_a) {
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
286
|
+
switch (_a.label) {
|
|
287
|
+
case 0:
|
|
288
|
+
to = mail.to, subject = mail.subject, html = mail.html;
|
|
289
|
+
console.log(chalk_1.default.green("MAIL: ".concat(to, ", ").concat(subject)));
|
|
290
|
+
_a.label = 1;
|
|
291
|
+
case 1:
|
|
292
|
+
_a.trys.push([1, 3, , 4]);
|
|
293
|
+
mailOptions = {
|
|
294
|
+
to: to,
|
|
295
|
+
subject: subject,
|
|
296
|
+
html: html,
|
|
297
|
+
};
|
|
298
|
+
return [4, (0, objectql_1.getSteedosSchema)().broker.call("@builder6/email.send", mailOptions)];
|
|
299
|
+
case 2:
|
|
300
|
+
_a.sent();
|
|
301
|
+
return [3, 4];
|
|
302
|
+
case 3:
|
|
303
|
+
e_1 = _a.sent();
|
|
304
|
+
console.log(e_1);
|
|
305
|
+
return [3, 4];
|
|
306
|
+
case 4: return [2];
|
|
301
307
|
}
|
|
302
|
-
return [2];
|
|
303
308
|
});
|
|
304
309
|
}); };
|
|
305
310
|
exports.sendMail = sendMail;
|
package/lib/core/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ exports.authorize = void 0;
|
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var lodash_1 = require("lodash");
|
|
6
6
|
var steedos_auth_1 = require("../utils/steedos-auth");
|
|
7
|
-
var
|
|
7
|
+
var getClientIp_1 = require("../utils/getClientIp");
|
|
8
8
|
var get_user_agent_1 = require("../utils/get-user-agent");
|
|
9
9
|
var queryString = require("querystring");
|
|
10
10
|
var authorize = function (accountsServer) {
|
|
@@ -16,7 +16,7 @@ var authorize = function (accountsServer) {
|
|
|
16
16
|
connection = req.query.connection || "steedos";
|
|
17
17
|
state = req.query.state || "";
|
|
18
18
|
userAgent = (0, get_user_agent_1.getUserAgent)(req);
|
|
19
|
-
ip =
|
|
19
|
+
ip = (0, getClientIp_1.getClientIp)(req);
|
|
20
20
|
query = queryString.stringify(req.query);
|
|
21
21
|
redirect_uri = req.query.redirect_uri
|
|
22
22
|
? req.query.redirect_uri
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authorize.js","sourceRoot":"","sources":["../../../src/rest-express/endpoints/authorize.ts"],"names":[],"mappings":";;;;AAEA,iCAAsC;AAGtC,sDAAyE;AAEzE,
|
|
1
|
+
{"version":3,"file":"authorize.js","sourceRoot":"","sources":["../../../src/rest-express/endpoints/authorize.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,30 +2,32 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.impersonate = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
|
-
var
|
|
5
|
+
var getClientIp_1 = require("../utils/getClientIp");
|
|
6
6
|
var get_user_agent_1 = require("../utils/get-user-agent");
|
|
7
7
|
var send_error_1 = require("../utils/send-error");
|
|
8
|
-
var impersonate = function (accountsServer) {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
});
|
|
8
|
+
var impersonate = function (accountsServer) {
|
|
9
|
+
return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
10
|
+
var _a, impersonated, accessToken, userAgent, ip, impersonateRes, err_1;
|
|
11
|
+
return tslib_1.__generator(this, function (_b) {
|
|
12
|
+
switch (_b.label) {
|
|
13
|
+
case 0:
|
|
14
|
+
_b.trys.push([0, 2, , 3]);
|
|
15
|
+
_a = req.body, impersonated = _a.impersonated, accessToken = _a.accessToken;
|
|
16
|
+
userAgent = (0, get_user_agent_1.getUserAgent)(req);
|
|
17
|
+
ip = (0, getClientIp_1.getClientIp)(req);
|
|
18
|
+
return [4, accountsServer.impersonate(accessToken, impersonated, ip, userAgent)];
|
|
19
|
+
case 1:
|
|
20
|
+
impersonateRes = _b.sent();
|
|
21
|
+
res.json(impersonateRes);
|
|
22
|
+
return [3, 3];
|
|
23
|
+
case 2:
|
|
24
|
+
err_1 = _b.sent();
|
|
25
|
+
(0, send_error_1.sendError)(res, err_1);
|
|
26
|
+
return [3, 3];
|
|
27
|
+
case 3: return [2];
|
|
28
|
+
}
|
|
29
|
+
});
|
|
30
|
+
}); };
|
|
31
|
+
};
|
|
30
32
|
exports.impersonate = impersonate;
|
|
31
33
|
//# sourceMappingURL=impersonate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"impersonate.js","sourceRoot":"","sources":["../../../src/rest-express/endpoints/impersonate.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"impersonate.js","sourceRoot":"","sources":["../../../src/rest-express/endpoints/impersonate.ts"],"names":[],"mappings":";;;;AACA,oDAAmD;AAGnD,0DAAuD;AACvD,kDAAgD;AAEzC,IAAM,WAAW,GACtB,UAAC,cAA8B;IAC/B,OAAA,UAAO,GAAoB,EAAE,GAAqB;;;;;;oBAExC,KAMF,GAAG,CAAC,IAAI,EALV,YAAY,kBAAA,EACZ,WAAW,iBAAA,CAIA;oBACP,SAAS,GAAG,IAAA,6BAAY,EAAC,GAAG,CAAC,CAAC;oBAC9B,EAAE,GAAG,IAAA,yBAAW,EAAC,GAAG,CAAC,CAAC;oBACL,WAAM,cAAc,CAAC,WAAW,CACrD,WAAW,EACX,YAAY,EACZ,EAAE,EACF,SAAS,CACV,EAAA;;oBALK,cAAc,GAAG,SAKtB;oBACD,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;;;;oBAEzB,IAAA,sBAAS,EAAC,GAAG,EAAE,KAAG,CAAC,CAAC;;;;;SAEvB;AArBD,CAqBC,CAAC;AAvBS,QAAA,WAAW,eAuBpB"}
|
|
@@ -2,108 +2,110 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.login = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
|
-
var
|
|
5
|
+
var getClientIp_1 = require("../utils/getClientIp");
|
|
6
6
|
var get_user_agent_1 = require("../utils/get-user-agent");
|
|
7
7
|
var send_error_1 = require("../utils/send-error");
|
|
8
8
|
var steedos_auth_1 = require("../utils/steedos-auth");
|
|
9
9
|
var ismobilejs_1 = require("ismobilejs");
|
|
10
10
|
var objectql_1 = require("@steedos/objectql");
|
|
11
11
|
var spaces_1 = require("./spaces");
|
|
12
|
-
var login = function (accountsServer) {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
(0, steedos_auth_1.setAuthCookies)(req, res, result.user._id, result.token, result.tokens.accessToken);
|
|
36
|
-
try {
|
|
37
|
-
if (result && result.user) {
|
|
38
|
-
delete result.user['services'];
|
|
12
|
+
var login = function (accountsServer) {
|
|
13
|
+
return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
14
|
+
var userAgent, ip, status, message, result, err_1, is_phone, is_tablet, _a, phone, tablet, space, remote_user, foundUser, _b, password, data;
|
|
15
|
+
var _c;
|
|
16
|
+
return tslib_1.__generator(this, function (_d) {
|
|
17
|
+
switch (_d.label) {
|
|
18
|
+
case 0:
|
|
19
|
+
userAgent = (0, get_user_agent_1.getUserAgent)(req) || "";
|
|
20
|
+
ip = (0, getClientIp_1.getClientIp)(req);
|
|
21
|
+
status = "success";
|
|
22
|
+
message = "";
|
|
23
|
+
result = null;
|
|
24
|
+
_d.label = 1;
|
|
25
|
+
case 1:
|
|
26
|
+
_d.trys.push([1, 3, 4, 11]);
|
|
27
|
+
return [4, accountsServer.loginWithService("password", req.body, {
|
|
28
|
+
ip: ip,
|
|
29
|
+
userAgent: userAgent,
|
|
30
|
+
})];
|
|
31
|
+
case 2:
|
|
32
|
+
result = _d.sent();
|
|
33
|
+
if (result._next) {
|
|
34
|
+
return [2, res.json(result)];
|
|
39
35
|
}
|
|
40
|
-
|
|
41
|
-
catch (error) {
|
|
42
|
-
}
|
|
43
|
-
res.json(result);
|
|
44
|
-
return [2];
|
|
45
|
-
case 3:
|
|
46
|
-
err_1 = _d.sent();
|
|
47
|
-
console.log(err_1);
|
|
48
|
-
status = 'fail';
|
|
49
|
-
message = err_1.message;
|
|
50
|
-
(0, send_error_1.sendError)(res, { message: err_1.message });
|
|
51
|
-
return [3, 11];
|
|
52
|
-
case 4:
|
|
53
|
-
is_phone = false;
|
|
54
|
-
is_tablet = false;
|
|
55
|
-
if (userAgent) {
|
|
36
|
+
(0, steedos_auth_1.setAuthCookies)(req, res, result.user._id, result.token, result.tokens.accessToken);
|
|
56
37
|
try {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
}
|
|
61
|
-
catch (Exception) {
|
|
62
|
-
console.log("Exception", Exception);
|
|
38
|
+
if (result && result.user) {
|
|
39
|
+
delete result.user["services"];
|
|
40
|
+
}
|
|
63
41
|
}
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
name: '登录',
|
|
83
|
-
type: 'login',
|
|
84
|
-
remote_user: remote_user,
|
|
85
|
-
remote_addr: ip,
|
|
86
|
-
http_user_agent: userAgent,
|
|
87
|
-
is_mobile: is_phone,
|
|
88
|
-
is_tablet: is_tablet,
|
|
89
|
-
object: 'users',
|
|
90
|
-
status: status,
|
|
91
|
-
create: new Date(),
|
|
92
|
-
space: space._id,
|
|
93
|
-
message: message,
|
|
94
|
-
data: JSON.stringify(data),
|
|
95
|
-
related_to: {
|
|
96
|
-
o: "users",
|
|
97
|
-
ids: [remote_user]
|
|
42
|
+
catch (error) { }
|
|
43
|
+
res.json(result);
|
|
44
|
+
return [2];
|
|
45
|
+
case 3:
|
|
46
|
+
err_1 = _d.sent();
|
|
47
|
+
console.log(err_1);
|
|
48
|
+
status = "fail";
|
|
49
|
+
message = err_1.message;
|
|
50
|
+
(0, send_error_1.sendError)(res, { message: err_1.message });
|
|
51
|
+
return [3, 11];
|
|
52
|
+
case 4:
|
|
53
|
+
is_phone = false;
|
|
54
|
+
is_tablet = false;
|
|
55
|
+
if (userAgent) {
|
|
56
|
+
try {
|
|
57
|
+
_a = (0, ismobilejs_1.default)(userAgent), phone = _a.phone, tablet = _a.tablet;
|
|
58
|
+
is_phone = phone;
|
|
59
|
+
is_tablet = tablet;
|
|
98
60
|
}
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
61
|
+
catch (Exception) {
|
|
62
|
+
console.log("Exception", Exception);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
return [4, (0, spaces_1.getFirstSpace)(accountsServer)];
|
|
66
|
+
case 5:
|
|
67
|
+
space = _d.sent();
|
|
68
|
+
remote_user = null;
|
|
69
|
+
if (!!result) return [3, 7];
|
|
70
|
+
return [4, accountsServer
|
|
71
|
+
.getServices()["password"].foundUser(req.body.user)];
|
|
72
|
+
case 6:
|
|
73
|
+
foundUser = _d.sent();
|
|
74
|
+
remote_user = foundUser ? foundUser._id : null;
|
|
75
|
+
return [3, 8];
|
|
76
|
+
case 7:
|
|
77
|
+
remote_user = (_c = result === null || result === void 0 ? void 0 : result.user) === null || _c === void 0 ? void 0 : _c._id;
|
|
78
|
+
_d.label = 8;
|
|
79
|
+
case 8:
|
|
80
|
+
if (!space) return [3, 10];
|
|
81
|
+
_b = req.body, password = _b.password, data = tslib_1.__rest(_b, ["password"]);
|
|
82
|
+
return [4, (0, objectql_1.getObject)("operation_logs").insert({
|
|
83
|
+
name: "登录",
|
|
84
|
+
type: "login",
|
|
85
|
+
remote_user: remote_user,
|
|
86
|
+
remote_addr: ip,
|
|
87
|
+
http_user_agent: userAgent,
|
|
88
|
+
is_mobile: is_phone,
|
|
89
|
+
is_tablet: is_tablet,
|
|
90
|
+
object: "users",
|
|
91
|
+
status: status,
|
|
92
|
+
create: new Date(),
|
|
93
|
+
space: space._id,
|
|
94
|
+
message: message,
|
|
95
|
+
data: JSON.stringify(data),
|
|
96
|
+
related_to: {
|
|
97
|
+
o: "users",
|
|
98
|
+
ids: [remote_user],
|
|
99
|
+
},
|
|
100
|
+
})];
|
|
101
|
+
case 9:
|
|
102
|
+
_d.sent();
|
|
103
|
+
_d.label = 10;
|
|
104
|
+
case 10: return [7];
|
|
105
|
+
case 11: return [2];
|
|
106
|
+
}
|
|
107
|
+
});
|
|
108
|
+
}); };
|
|
109
|
+
};
|
|
108
110
|
exports.login = login;
|
|
109
111
|
//# sourceMappingURL=login.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/rest-express/endpoints/login.ts"],"names":[],"mappings":";;;;AAQA,
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/rest-express/endpoints/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ var tslib_1 = require("tslib");
|
|
|
5
5
|
var lodash_1 = require("lodash");
|
|
6
6
|
var steedos_auth_1 = require("../utils/steedos-auth");
|
|
7
7
|
var objectql_1 = require("@steedos/objectql");
|
|
8
|
-
var
|
|
8
|
+
var getClientIp_1 = require("../utils/getClientIp");
|
|
9
9
|
var get_user_agent_1 = require("../utils/get-user-agent");
|
|
10
10
|
var ismobilejs_1 = require("ismobilejs");
|
|
11
11
|
var objectql_2 = require("@steedos/objectql");
|
|
@@ -37,7 +37,7 @@ var logout = function (accountsServer) {
|
|
|
37
37
|
return [3, 6];
|
|
38
38
|
case 4:
|
|
39
39
|
userAgent = (0, get_user_agent_1.getUserAgent)(req) || "";
|
|
40
|
-
ip =
|
|
40
|
+
ip = (0, getClientIp_1.getClientIp)(req);
|
|
41
41
|
status = "success";
|
|
42
42
|
message = "";
|
|
43
43
|
is_phone = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/rest-express/endpoints/logout.ts"],"names":[],"mappings":";;;;AAQA,iCAA2C;AAG3C,sDAAyD;AACzD,8CAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/rest-express/endpoints/logout.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,40 +2,42 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.providerCallback = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
|
-
var
|
|
5
|
+
var getClientIp_1 = require("../../utils/getClientIp");
|
|
6
6
|
var get_user_agent_1 = require("../../utils/get-user-agent");
|
|
7
7
|
var send_error_1 = require("../../utils/send-error");
|
|
8
|
-
var providerCallback = function (accountsServer, options) {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
options.onOAuthSuccess
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
options.onOAuthError
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
});
|
|
8
|
+
var providerCallback = function (accountsServer, options) {
|
|
9
|
+
return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
10
|
+
var userAgent, ip, loggedInUser, err_1;
|
|
11
|
+
return tslib_1.__generator(this, function (_a) {
|
|
12
|
+
switch (_a.label) {
|
|
13
|
+
case 0:
|
|
14
|
+
_a.trys.push([0, 2, , 3]);
|
|
15
|
+
userAgent = (0, get_user_agent_1.getUserAgent)(req);
|
|
16
|
+
ip = (0, getClientIp_1.getClientIp)(req);
|
|
17
|
+
return [4, accountsServer.loginWithService("oauth", tslib_1.__assign(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, (req.params || {})), (req.query || {})), (req.body || {})), (req.session || {})), { ip: ip, userAgent: userAgent })];
|
|
18
|
+
case 1:
|
|
19
|
+
loggedInUser = _a.sent();
|
|
20
|
+
if (options && options.onOAuthSuccess) {
|
|
21
|
+
options.onOAuthSuccess(req, res, loggedInUser);
|
|
22
|
+
}
|
|
23
|
+
if (options && options.transformOAuthResponse) {
|
|
24
|
+
res.json(options.transformOAuthResponse(loggedInUser));
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
res.json(loggedInUser);
|
|
28
|
+
}
|
|
29
|
+
return [3, 3];
|
|
30
|
+
case 2:
|
|
31
|
+
err_1 = _a.sent();
|
|
32
|
+
if (options && options.onOAuthError) {
|
|
33
|
+
options.onOAuthError(req, res, err_1);
|
|
34
|
+
}
|
|
35
|
+
(0, send_error_1.sendError)(res, err_1);
|
|
36
|
+
return [3, 3];
|
|
37
|
+
case 3: return [2];
|
|
38
|
+
}
|
|
39
|
+
});
|
|
40
|
+
}); };
|
|
41
|
+
};
|
|
40
42
|
exports.providerCallback = providerCallback;
|
|
41
43
|
//# sourceMappingURL=provider-callback.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-callback.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/oauth/provider-callback.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"provider-callback.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/oauth/provider-callback.ts"],"names":[],"mappings":";;;;AASA,uDAAsD;AAEtD,6DAA0D;AAC1D,qDAAmD;AAO5C,IAAM,gBAAgB,GAC3B,UAAC,cAA8B,EAAE,OAAgC;IACjE,OAAA,UAAO,GAAoB,EAAE,GAAqB;;;;;;oBAExC,SAAS,GAAG,IAAA,6BAAY,EAAC,GAAG,CAAC,CAAC;oBAC9B,EAAE,GAAG,IAAA,yBAAW,EAAC,GAAG,CAAC,CAAC;oBACP,WAAM,cAAc,CAAC,gBAAgB,CACxD,OAAO,0EAEF,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,GAClB,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,GACjB,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,GAChB,CAAE,GAA0B,CAAC,OAAO,IAAI,EAAE,CAAC,GAEhD,EAAE,EAAE,IAAA,EAAE,SAAS,WAAA,EAAE,CAClB,EAAA;;oBATK,YAAY,GAAG,SASpB;oBAED,IAAI,OAAO,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;wBACtC,OAAO,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;oBACjD,CAAC;oBAED,IAAI,OAAO,IAAI,OAAO,CAAC,sBAAsB,EAAE,CAAC;wBAC9C,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC,CAAC;oBACzD,CAAC;yBAAM,CAAC;wBACN,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;oBACzB,CAAC;;;;oBAED,IAAI,OAAO,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;wBACpC,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,KAAG,CAAC,CAAC;oBACtC,CAAC;oBAED,IAAA,sBAAS,EAAC,GAAG,EAAE,KAAG,CAAC,CAAC;;;;;SAEvB;AA/BD,CA+BC,CAAC;AAjCS,QAAA,gBAAgB,oBAiCzB"}
|
|
@@ -4,7 +4,7 @@ exports.changePassword = void 0;
|
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var send_error_1 = require("../../utils/send-error");
|
|
6
6
|
var objectql_1 = require("@steedos/objectql");
|
|
7
|
-
var
|
|
7
|
+
var getClientIp_1 = require("../../utils/getClientIp");
|
|
8
8
|
var get_user_agent_1 = require("../../utils/get-user-agent");
|
|
9
9
|
var ismobilejs_1 = require("ismobilejs");
|
|
10
10
|
var db_1 = require("../../../db");
|
|
@@ -34,7 +34,7 @@ var changePassword = function (accountsServer) {
|
|
|
34
34
|
case 3:
|
|
35
35
|
_c.sent();
|
|
36
36
|
userAgent = (0, get_user_agent_1.getUserAgent)(req);
|
|
37
|
-
ip =
|
|
37
|
+
ip = (0, getClientIp_1.getClientIp)(req);
|
|
38
38
|
is_phone = false;
|
|
39
39
|
is_tablet = false;
|
|
40
40
|
if (userAgent) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-password.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/password/change-password.ts"],"names":[],"mappings":";;;;AASA,qDAAmD;AACnD,8CAAgE;AAGhE,
|
|
1
|
+
{"version":3,"file":"change-password.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/password/change-password.ts"],"names":[],"mappings":"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"}
|