@builder6/oidc 0.16.4 → 0.16.5
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.
|
@@ -19,6 +19,7 @@ const openid_client_1 = require("openid-client");
|
|
|
19
19
|
const core_1 = require("@builder6/core");
|
|
20
20
|
const ismobilejs_1 = __importDefault(require("ismobilejs"));
|
|
21
21
|
const lodash_1 = __importDefault(require("lodash"));
|
|
22
|
+
const request_ip_1 = __importDefault(require("request-ip"));
|
|
22
23
|
let OidcService = class OidcService {
|
|
23
24
|
constructor(configService, mongodbService) {
|
|
24
25
|
this.configService = configService;
|
|
@@ -46,7 +47,10 @@ let OidcService = class OidcService {
|
|
|
46
47
|
}
|
|
47
48
|
async recordLoginSession(userId, spaceId, auth_token, req) {
|
|
48
49
|
const userAgent = this.getUserAgent(req) || '';
|
|
49
|
-
|
|
50
|
+
let ip = request_ip_1.default.getClientIp(req);
|
|
51
|
+
if (ip.indexOf('::ffff:') === 0) {
|
|
52
|
+
ip = ip.substring(7);
|
|
53
|
+
}
|
|
50
54
|
let is_phone = false;
|
|
51
55
|
let is_tablet = false;
|
|
52
56
|
if (userAgent) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc.service.js","sourceRoot":"","sources":["../../src/oidc/oidc.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2CAA+C;AAC/C,iDAA2C;AAC3C,yCAAgD;AAChD,4DAAkC;AAClC,oDAAuB;
|
|
1
|
+
{"version":3,"file":"oidc.service.js","sourceRoot":"","sources":["../../src/oidc/oidc.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@builder6/oidc",
|
|
3
|
-
"version": "0.16.
|
|
3
|
+
"version": "0.16.5",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"files": [
|
|
@@ -12,14 +12,18 @@
|
|
|
12
12
|
"build:watch": "rimraf dist && tsc --watch"
|
|
13
13
|
},
|
|
14
14
|
"dependencies": {
|
|
15
|
-
"@builder6/core": "0.16.
|
|
15
|
+
"@builder6/core": "0.16.5",
|
|
16
16
|
"ejs": "^3.1.10",
|
|
17
17
|
"ismobilejs": "^1.1.1",
|
|
18
18
|
"lodash": "^4.17.5",
|
|
19
|
-
"openid-client": "^5.7.1"
|
|
19
|
+
"openid-client": "^5.7.1",
|
|
20
|
+
"request-ip": "^3.3.0"
|
|
20
21
|
},
|
|
21
22
|
"publishConfig": {
|
|
22
23
|
"access": "public"
|
|
23
24
|
},
|
|
24
|
-
"gitHead": "
|
|
25
|
+
"gitHead": "e0bb2101ccec989a876c7fa69e34ba067e18c282",
|
|
26
|
+
"devDependencies": {
|
|
27
|
+
"@types/request-ip": "^0.0.41"
|
|
28
|
+
}
|
|
25
29
|
}
|