@builder6/oidc 3.0.0-alpha.26 → 3.0.0-alpha.27
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.
|
@@ -87,7 +87,19 @@ let OidcController = class OidcController {
|
|
|
87
87
|
delete req.session[`oidc_${providerId}_nonce`];
|
|
88
88
|
delete req.session[`oidc_${providerId}_returnTo`];
|
|
89
89
|
await this.oidcService.recordLoginSession(user, space, auth_token, req);
|
|
90
|
-
|
|
90
|
+
let redirectUrl = '/';
|
|
91
|
+
if (returnTo.indexOf('#') > -1) {
|
|
92
|
+
redirectUrl = returnTo.replace(/#.*$/, `#uid=${user}`);
|
|
93
|
+
}
|
|
94
|
+
else {
|
|
95
|
+
if (returnTo.indexOf('?') > -1) {
|
|
96
|
+
redirectUrl += `&uid=${user}`;
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
redirectUrl += `?uid=${user}`;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
return res.redirect(redirectUrl);
|
|
91
103
|
}
|
|
92
104
|
catch (e) {
|
|
93
105
|
console.log(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc.controller.js","sourceRoot":"","sources":["../../src/oidc/oidc.controller.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"oidc.controller.js","sourceRoot":"","sources":["../../src/oidc/oidc.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAUwB;AAGxB,iDAA+C;AAC/C,iDAA6C;AAC7C,yCAA6C;AAGtC,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YACmB,WAAwB,EACxB,WAAwB;QADxB,gBAAW,GAAX,WAAW,CAAa;QACxB,gBAAW,GAAX,WAAW,CAAa;IACxC,CAAC;IAGE,AAAN,KAAK,CAAC,KAAK,CACY,UAAkB,EACpB,QAAgB,EAC5B,GAAG,EACH,GAAG;QAEV,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,MAAM,sBAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAEtD,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC;YAC/B,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,aAAa,EAAE,QAAQ,CAAC,aAAa;YACrC,aAAa,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC;YACtC,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,MAAM,CAAC,gBAAgB,CAAC;YACzC,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,KAAK,EAAE,QAAQ,CAAC,KAAK;YAErB,cAAc,EAAE,QAAQ,CAAC,cAAc;YACvC,qBAAqB,EAAE,QAAQ,CAAC,qBAAqB;SACtD,CAAC,CAAC;QAEH,GAAG,CAAC,OAAO,CAAC,QAAQ,UAAU,QAAQ,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC;QACzD,GAAG,CAAC,OAAO,CAAC,QAAQ,UAAU,gBAAgB,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC;QACzE,GAAG,CAAC,OAAO,CAAC,QAAQ,UAAU,QAAQ,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC;QAGzD,IAAI,QAAQ,EAAE,CAAC;YACb,GAAG,CAAC,OAAO,CAAC,QAAQ,UAAU,WAAW,CAAC,GAAG,QAAQ,CAAC;QACxD,CAAC;QAED,OAAO,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAClC,CAAC;IAGK,AAAN,KAAK,CAAC,QAAQ,CACS,UAAkB,EAChC,GAAG,EACH,GAAG;QAEV,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,UAAU,QAAQ,CAAC,CAAC;QAC5D,MAAM,cAAc,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,UAAU,gBAAgB,CAAC,CAAC;QACvE,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,UAAU,QAAQ,CAAC,CAAC;QAC5D,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,UAAU,WAAW,CAAC,IAAI,GAAG,CAAC;QAEnE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,MAAM,sBAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAEtD,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC;YAC/B,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,aAAa,EAAE,QAAQ,CAAC,aAAa;YACrC,aAAa,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC;YACtC,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAE1C,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE;YACpE,KAAK,EAAE,WAAW;YAClB,aAAa,EAAE,cAAc;YAC7B,KAAK,EAAE,WAAW;SACnB,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,CAAC,8BAA8B,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QAE/D,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QAEtD,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC;gBACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAEzD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,WAAW,CAAC;gBAC9D,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,cAAc,CAAC;gBACxD,IAAI,cAAc,EAAE,CAAC;oBACnB,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACtD,CAAC;gBACD,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,GAAG,EAAE;oBACnC,OAAO,EAAE,IAAI;oBACb,QAAQ,EAAE,KAAK;oBACf,UAAU;oBACV,YAAY;iBACb,CAAC,CAAC;gBAEH,OAAO,GAAG,CAAC,OAAO,CAAC,QAAQ,UAAU,QAAQ,CAAC,CAAC;gBAC/C,OAAO,GAAG,CAAC,OAAO,CAAC,QAAQ,UAAU,gBAAgB,CAAC,CAAC;gBACvD,OAAO,GAAG,CAAC,OAAO,CAAC,QAAQ,UAAU,QAAQ,CAAC,CAAC;gBAC/C,OAAO,GAAG,CAAC,OAAO,CAAC,QAAQ,UAAU,WAAW,CAAC,CAAC;gBAGlD,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;gBAExE,IAAI,WAAW,GAAG,GAAG,CAAC;gBAEtB,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;oBAC/B,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC;gBACzD,CAAC;qBAAM,CAAC;oBACN,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;wBAC/B,WAAW,IAAI,QAAQ,IAAI,EAAE,CAAC;oBAChC,CAAC;yBAAM,CAAC;wBACN,WAAW,IAAI,QAAQ,IAAI,EAAE,CAAC;oBAChC,CAAC;gBACH,CAAC;gBACD,OAAO,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YACnC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACf,MAAM,IAAI,sBAAa,CACrB,iDAAiD,KAAK,GAAG,EACzD,mBAAU,CAAC,SAAS,CACrB,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,sBAAa,CACrB,oCAAoC,EACpC,mBAAU,CAAC,SAAS,CACrB,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAA;AAhIY,wCAAc;AAOnB;IADL,IAAA,YAAG,EAAC,mBAAmB,CAAC;IAEtB,WAAA,IAAA,cAAK,EAAC,YAAY,CAAC,CAAA;IACnB,WAAA,IAAA,cAAK,EAAC,UAAU,CAAC,CAAA;IACjB,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,YAAG,GAAE,CAAA;;;;2CA+BP;AAGK;IADL,IAAA,YAAG,EAAC,4BAA4B,CAAC;IAE/B,WAAA,IAAA,cAAK,EAAC,YAAY,CAAC,CAAA;IACnB,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,YAAG,GAAE,CAAA;;;;8CA+EP;yBA/HU,cAAc;IAD1B,IAAA,mBAAU,EAAC,aAAa,CAAC;qCAGQ,0BAAW;QACX,kBAAW;GAHhC,cAAc,CAgI1B"}
|
|
@@ -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;
|
|
@@ -31,10 +32,12 @@ let OidcService = class OidcService {
|
|
|
31
32
|
const state = openid_client_1.generators.random();
|
|
32
33
|
const nonce = openid_client_1.generators.random();
|
|
33
34
|
return {
|
|
34
|
-
issuer: this.configService.get('oidc.issuer')
|
|
35
|
-
|
|
36
|
-
client_id: this.configService.get('oidc.client.id')
|
|
37
|
-
|
|
35
|
+
issuer: this.configService.get('oidc.issuer') ||
|
|
36
|
+
this.configService.get('identity.oidc.issuer'),
|
|
37
|
+
client_id: this.configService.get('oidc.client.id') ||
|
|
38
|
+
this.configService.get('identity.oidc.client.id'),
|
|
39
|
+
client_secret: this.configService.get('oidc.client.secret') ||
|
|
40
|
+
this.configService.get('identity.oidc.client.secret'),
|
|
38
41
|
redirect_uri: `${this.configService.get('host')}/api/v6/oidc/${providerId}/login/callback`,
|
|
39
42
|
scope: this.configService.get('oidc.scope') || 'openid email profile',
|
|
40
43
|
state,
|
|
@@ -46,7 +49,10 @@ let OidcService = class OidcService {
|
|
|
46
49
|
}
|
|
47
50
|
async recordLoginSession(userId, spaceId, auth_token, req) {
|
|
48
51
|
const userAgent = this.getUserAgent(req) || '';
|
|
49
|
-
|
|
52
|
+
let ip = request_ip_1.default.getClientIp(req);
|
|
53
|
+
if (ip.indexOf('::ffff:') === 0) {
|
|
54
|
+
ip = ip.substring(7);
|
|
55
|
+
}
|
|
50
56
|
let is_phone = false;
|
|
51
57
|
let is_tablet = false;
|
|
52
58
|
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": "3.0.0-alpha.
|
|
3
|
+
"version": "3.0.0-alpha.27",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"files": [
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"build:watch": "rimraf dist && tsc --watch"
|
|
13
13
|
},
|
|
14
14
|
"dependencies": {
|
|
15
|
-
"@builder6/core": "3.0.0-alpha.
|
|
15
|
+
"@builder6/core": "3.0.0-alpha.27",
|
|
16
16
|
"ejs": "^3.1.10",
|
|
17
17
|
"ismobilejs": "^1.1.1",
|
|
18
18
|
"lodash": "^4.17.5",
|
|
@@ -21,5 +21,8 @@
|
|
|
21
21
|
"publishConfig": {
|
|
22
22
|
"access": "public"
|
|
23
23
|
},
|
|
24
|
-
"gitHead": "
|
|
24
|
+
"gitHead": "6ff90c224f62325de95c21735307d626dc6350e7",
|
|
25
|
+
"devDependencies": {
|
|
26
|
+
"@types/request-ip": "^0.0.41"
|
|
27
|
+
}
|
|
25
28
|
}
|