@steedos/accounts 3.0.0-beta.65 → 3.0.0-beta.67
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.
|
@@ -9,79 +9,86 @@ var requestIp = require("request-ip");
|
|
|
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");
|
|
12
|
-
var logout = function (accountsServer) {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
(0, lodash_1.get)(req.
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
12
|
+
var logout = function (accountsServer) {
|
|
13
|
+
return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
14
|
+
var authToken, session, err_1, userAgent, ip, status, message, is_phone, is_tablet, _a, phone, tablet, broker;
|
|
15
|
+
return tslib_1.__generator(this, function (_b) {
|
|
16
|
+
switch (_b.label) {
|
|
17
|
+
case 0:
|
|
18
|
+
authToken = (0, lodash_1.get)(req.cookies, "X-Auth-Token") ||
|
|
19
|
+
(0, lodash_1.get)(req.headers, "Authorization") ||
|
|
20
|
+
(0, lodash_1.get)(req.headers, "authorization");
|
|
21
|
+
authToken = authToken && authToken.replace("Bearer ", "token");
|
|
22
|
+
authToken =
|
|
23
|
+
authToken && authToken.split(",").length > 1
|
|
24
|
+
? authToken.split(",")[0]
|
|
25
|
+
: authToken;
|
|
26
|
+
(0, steedos_auth_1.clearAuthCookies)(req, res);
|
|
27
|
+
session = null;
|
|
28
|
+
_b.label = 1;
|
|
29
|
+
case 1:
|
|
30
|
+
_b.trys.push([1, 3, 4, 6]);
|
|
31
|
+
return [4, accountsServer.logout(authToken)];
|
|
32
|
+
case 2:
|
|
33
|
+
session = _b.sent();
|
|
34
|
+
return [3, 6];
|
|
35
|
+
case 3:
|
|
36
|
+
err_1 = _b.sent();
|
|
37
|
+
return [3, 6];
|
|
38
|
+
case 4:
|
|
39
|
+
userAgent = (0, get_user_agent_1.getUserAgent)(req) || "";
|
|
40
|
+
ip = requestIp.getClientIp(req);
|
|
41
|
+
status = "success";
|
|
42
|
+
message = "";
|
|
43
|
+
is_phone = false;
|
|
44
|
+
is_tablet = false;
|
|
45
|
+
if (userAgent) {
|
|
46
|
+
try {
|
|
47
|
+
_a = (0, ismobilejs_1.default)(userAgent), phone = _a.phone, tablet = _a.tablet;
|
|
48
|
+
is_phone = phone;
|
|
49
|
+
is_tablet = tablet;
|
|
50
|
+
}
|
|
51
|
+
catch (Exception) {
|
|
52
|
+
console.log("Exception", Exception);
|
|
53
|
+
}
|
|
49
54
|
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
55
|
+
return [4, (0, objectql_1.getObject)("operation_logs").insert({
|
|
56
|
+
name: "注销",
|
|
57
|
+
type: "logout",
|
|
58
|
+
remote_user: session === null || session === void 0 ? void 0 : session.userId,
|
|
59
|
+
remote_addr: ip,
|
|
60
|
+
http_user_agent: userAgent,
|
|
61
|
+
is_mobile: is_phone,
|
|
62
|
+
is_tablet: is_tablet,
|
|
63
|
+
object: "users",
|
|
64
|
+
status: status,
|
|
65
|
+
create: new Date(),
|
|
66
|
+
space: session === null || session === void 0 ? void 0 : session.space,
|
|
67
|
+
message: message,
|
|
68
|
+
data: JSON.stringify({
|
|
69
|
+
authToken: authToken,
|
|
70
|
+
session: session,
|
|
71
|
+
}),
|
|
72
|
+
related_to: {
|
|
73
|
+
o: "users",
|
|
74
|
+
ids: [session === null || session === void 0 ? void 0 : session.userId],
|
|
75
|
+
},
|
|
76
|
+
})];
|
|
77
|
+
case 5:
|
|
78
|
+
_b.sent();
|
|
79
|
+
if (authToken) {
|
|
80
|
+
broker = (0, objectql_2.getSteedosSchema)().broker;
|
|
81
|
+
broker.broadcast("$user.logout", {
|
|
65
82
|
authToken: authToken,
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
broker.broadcast("$user.logout", {
|
|
77
|
-
authToken: authToken
|
|
78
|
-
});
|
|
79
|
-
return [7];
|
|
80
|
-
case 6:
|
|
81
|
-
res.json(null);
|
|
82
|
-
return [2];
|
|
83
|
-
}
|
|
84
|
-
});
|
|
85
|
-
}); }; };
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
return [7];
|
|
86
|
+
case 6:
|
|
87
|
+
res.json(null);
|
|
88
|
+
return [2];
|
|
89
|
+
}
|
|
90
|
+
});
|
|
91
|
+
}); };
|
|
92
|
+
};
|
|
86
93
|
exports.logout = logout;
|
|
87
94
|
//# sourceMappingURL=logout.js.map
|
|
@@ -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,sCAAwC;AACxC,0DAAuD;AACvD,yCAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/rest-express/endpoints/logout.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/accounts",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "3.0.0-beta.
|
|
4
|
+
"version": "3.0.0-beta.67",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"files": [
|
|
7
7
|
"/package.json",
|
|
@@ -29,9 +29,9 @@
|
|
|
29
29
|
"@accounts/two-factor": "^0.20.1",
|
|
30
30
|
"@accounts/types": "0.20.1",
|
|
31
31
|
"@babel/runtime": "^7.12.18",
|
|
32
|
-
"@steedos/auth": "3.0.0-beta.
|
|
33
|
-
"@steedos/objectql": "3.0.0-beta.
|
|
34
|
-
"@steedos/utils": "3.0.0-beta.
|
|
32
|
+
"@steedos/auth": "3.0.0-beta.67",
|
|
33
|
+
"@steedos/objectql": "3.0.0-beta.67",
|
|
34
|
+
"@steedos/utils": "3.0.0-beta.67",
|
|
35
35
|
"app-root-path": "^2.2.1",
|
|
36
36
|
"bcryptjs": "^2.4.3",
|
|
37
37
|
"body-parser": "1.19.0",
|
|
@@ -60,5 +60,5 @@
|
|
|
60
60
|
"publishConfig": {
|
|
61
61
|
"access": "public"
|
|
62
62
|
},
|
|
63
|
-
"gitHead": "
|
|
63
|
+
"gitHead": "8977698741a7e4f4a5355b6f6e83c910393e67ec"
|
|
64
64
|
}
|
|
@@ -3,80 +3,82 @@
|
|
|
3
3
|
* @Date: 2022-03-28 09:35:34
|
|
4
4
|
* @LastEditors: baozhoutao@steedos.com
|
|
5
5
|
* @LastEditTime: 2024-01-23 14:24:35
|
|
6
|
-
* @Description:
|
|
6
|
+
* @Description:
|
|
7
7
|
*/
|
|
8
|
-
import * as express from
|
|
9
|
-
import { get, isEmpty, map } from
|
|
10
|
-
import { AccountsServer } from
|
|
11
|
-
import { sendError } from
|
|
12
|
-
import { clearAuthCookies } from
|
|
13
|
-
import { getObject } from
|
|
14
|
-
import * as requestIp from
|
|
15
|
-
import { getUserAgent } from
|
|
16
|
-
import isMobile from
|
|
17
|
-
import { getSteedosSchema } from
|
|
18
|
-
export const logout =
|
|
19
|
-
|
|
20
|
-
res: express.Response
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
get(req.headers, 'Authorization') ||
|
|
26
|
-
get(req.headers, 'authorization');
|
|
8
|
+
import * as express from "express";
|
|
9
|
+
import { get, isEmpty, map } from "lodash";
|
|
10
|
+
import { AccountsServer } from "../../server";
|
|
11
|
+
import { sendError } from "../utils/send-error";
|
|
12
|
+
import { clearAuthCookies } from "../utils/steedos-auth";
|
|
13
|
+
import { getObject } from "@steedos/objectql";
|
|
14
|
+
import * as requestIp from "request-ip";
|
|
15
|
+
import { getUserAgent } from "../utils/get-user-agent";
|
|
16
|
+
import isMobile from "ismobilejs";
|
|
17
|
+
import { getSteedosSchema } from "@steedos/objectql";
|
|
18
|
+
export const logout =
|
|
19
|
+
(accountsServer: AccountsServer) =>
|
|
20
|
+
async (req: express.Request, res: express.Response) => {
|
|
21
|
+
let authToken =
|
|
22
|
+
get(req.cookies, "X-Auth-Token") ||
|
|
23
|
+
get(req.headers, "Authorization") ||
|
|
24
|
+
get(req.headers, "authorization");
|
|
27
25
|
|
|
28
|
-
|
|
29
|
-
|
|
26
|
+
authToken = authToken && authToken.replace("Bearer ", "token");
|
|
27
|
+
authToken =
|
|
28
|
+
authToken && authToken.split(",").length > 1
|
|
29
|
+
? authToken.split(",")[0]
|
|
30
|
+
: authToken;
|
|
30
31
|
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
32
|
+
clearAuthCookies(req, res);
|
|
33
|
+
let session = null;
|
|
34
|
+
try {
|
|
35
|
+
session = await accountsServer.logout(authToken);
|
|
36
|
+
} catch (err) {
|
|
37
|
+
//sendError(res, err);
|
|
38
|
+
} finally {
|
|
39
|
+
let userAgent = getUserAgent(req) || "";
|
|
40
|
+
const ip = requestIp.getClientIp(req);
|
|
41
|
+
let status = "success";
|
|
42
|
+
let message = "";
|
|
43
|
+
let is_phone = false;
|
|
44
|
+
let is_tablet = false;
|
|
45
|
+
if (userAgent) {
|
|
46
|
+
try {
|
|
47
|
+
const { phone, tablet } = isMobile(userAgent);
|
|
48
|
+
is_phone = phone;
|
|
49
|
+
is_tablet = tablet;
|
|
50
|
+
} catch (Exception) {
|
|
51
|
+
console.log(`Exception`, Exception);
|
|
52
|
+
}
|
|
51
53
|
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
54
|
+
await getObject("operation_logs").insert({
|
|
55
|
+
name: "注销",
|
|
56
|
+
type: "logout",
|
|
57
|
+
remote_user: session?.userId,
|
|
58
|
+
remote_addr: ip,
|
|
59
|
+
http_user_agent: userAgent,
|
|
60
|
+
is_mobile: is_phone,
|
|
61
|
+
is_tablet,
|
|
62
|
+
object: "users",
|
|
63
|
+
status: status,
|
|
64
|
+
create: new Date(),
|
|
65
|
+
space: session?.space,
|
|
66
|
+
message: message,
|
|
67
|
+
data: JSON.stringify({
|
|
68
|
+
authToken: authToken,
|
|
69
|
+
session: session,
|
|
70
|
+
}),
|
|
71
|
+
related_to: {
|
|
72
|
+
o: "users",
|
|
73
|
+
ids: [session?.userId],
|
|
74
|
+
},
|
|
75
|
+
});
|
|
76
|
+
if (authToken) {
|
|
77
|
+
const broker = getSteedosSchema().broker;
|
|
78
|
+
broker.broadcast("$user.logout", {
|
|
79
|
+
authToken: authToken,
|
|
80
|
+
});
|
|
73
81
|
}
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
broker.broadcast("$user.logout", {
|
|
78
|
-
authToken: authToken
|
|
79
|
-
});
|
|
80
|
-
}
|
|
81
|
-
res.json(null);
|
|
82
|
-
};
|
|
82
|
+
}
|
|
83
|
+
res.json(null);
|
|
84
|
+
};
|