@openhps/solid 0.1.0-alpha.27 → 0.1.0-alpha.28
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.
|
@@ -37,11 +37,34 @@ class SolidClientService extends SolidService_1.SolidService {
|
|
|
37
37
|
});
|
|
38
38
|
}
|
|
39
39
|
interactiveLogin(oidcIssuer = this.options.defaultOidcIssuer) {
|
|
40
|
-
const session = new solid_client_authn_node_1.Session(
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
oidcIssuer,
|
|
40
|
+
const session = new solid_client_authn_node_1.Session({
|
|
41
|
+
insecureStorage: this,
|
|
42
|
+
secureStorage: this,
|
|
44
43
|
});
|
|
44
|
+
if (this.options.clientId && this.options.clientSecret) {
|
|
45
|
+
return new Promise((resolve, reject) => {
|
|
46
|
+
session
|
|
47
|
+
.login({
|
|
48
|
+
oidcIssuer,
|
|
49
|
+
clientId: this.options.clientId,
|
|
50
|
+
clientSecret: this.options.clientSecret,
|
|
51
|
+
clientName: this.options.clientName,
|
|
52
|
+
})
|
|
53
|
+
.then(() => {
|
|
54
|
+
resolve(session);
|
|
55
|
+
})
|
|
56
|
+
.catch(reject);
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
else {
|
|
60
|
+
return (0, solid_node_interactive_auth_1.interactiveLogin)({
|
|
61
|
+
session,
|
|
62
|
+
oidcIssuer,
|
|
63
|
+
clientId: this.options.clientId,
|
|
64
|
+
clientSecret: this.options.clientSecret,
|
|
65
|
+
clientName: this.options.clientName,
|
|
66
|
+
});
|
|
67
|
+
}
|
|
45
68
|
}
|
|
46
69
|
onLogin(req, res) {
|
|
47
70
|
const session = new solid_client_authn_node_1.Session({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SolidClientService.js","sourceRoot":"","sources":["../../../src/node/SolidClientService.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAChD,6EAA+F;AAC/F,yDAA+E;AAC/E,sCAA+C;AAC/C,6EAA+D;AAE/D,MAAa,kBAAmB,SAAQ,2BAAY;IAIhD,YAAY,OAAgC;QACxC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,IAAI,CAAC,OAAO,CAAC,oBAAoB;YACjC,IAAI,CAAC,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrF,IAAI,IAAI,CAAC,OAAO,CAAC,kBAAkB;YAC/B,IAAI,CAAC,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjF,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACjD,CAAC;IAEO,QAAQ;QACZ,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;gBACxD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAA6B,CAAC;aAC7D;iBAAM;gBACH,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,UAAoC,CAAC;gBACtE,IAAI,CAAC,OAAO,GAAG,OAAO,EAAE,CAAC;gBACzB,IAAI,CAAC,OAAO,CAAC,GAAG,CACZ,aAAa,CAAC;oBACV,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC;oBACxE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;iBACjF,CAAC,CACL,CAAC;gBACF,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;aAC1D;YACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAClE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACxE,OAAO,EAAE,CAAC;QACd,CAAC,CAAC,CAAC;IACP,CAAC;IAQD,gBAAgB,CAAC,aAAqB,IAAI,CAAC,OAAO,CAAC,iBAAiB;QAChE,MAAM,OAAO,GAAG,IAAI,iCAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"SolidClientService.js","sourceRoot":"","sources":["../../../src/node/SolidClientService.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,11 +34,34 @@ export class SolidClientService extends SolidService {
|
|
|
34
34
|
});
|
|
35
35
|
}
|
|
36
36
|
interactiveLogin(oidcIssuer = this.options.defaultOidcIssuer) {
|
|
37
|
-
const session = new Session(
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
oidcIssuer,
|
|
37
|
+
const session = new Session({
|
|
38
|
+
insecureStorage: this,
|
|
39
|
+
secureStorage: this,
|
|
41
40
|
});
|
|
41
|
+
if (this.options.clientId && this.options.clientSecret) {
|
|
42
|
+
return new Promise((resolve, reject) => {
|
|
43
|
+
session
|
|
44
|
+
.login({
|
|
45
|
+
oidcIssuer,
|
|
46
|
+
clientId: this.options.clientId,
|
|
47
|
+
clientSecret: this.options.clientSecret,
|
|
48
|
+
clientName: this.options.clientName,
|
|
49
|
+
})
|
|
50
|
+
.then(() => {
|
|
51
|
+
resolve(session);
|
|
52
|
+
})
|
|
53
|
+
.catch(reject);
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
else {
|
|
57
|
+
return interactiveLogin({
|
|
58
|
+
session,
|
|
59
|
+
oidcIssuer,
|
|
60
|
+
clientId: this.options.clientId,
|
|
61
|
+
clientSecret: this.options.clientSecret,
|
|
62
|
+
clientName: this.options.clientName,
|
|
63
|
+
});
|
|
64
|
+
}
|
|
42
65
|
}
|
|
43
66
|
onLogin(req, res) {
|
|
44
67
|
const session = new Session({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SolidClientService.js","sourceRoot":"","sources":["../../../src/node/SolidClientService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAChD,OAAO,EAAE,OAAO,EAAgB,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC/F,OAAO,EAA2B,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,OAAO,kBAAmB,SAAQ,YAAY;IAIhD,YAAY,OAAgC;QACxC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,IAAI,CAAC,OAAO,CAAC,oBAAoB;YACjC,IAAI,CAAC,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrF,IAAI,IAAI,CAAC,OAAO,CAAC,kBAAkB;YAC/B,IAAI,CAAC,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjF,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACjD,CAAC;IAEO,QAAQ;QACZ,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;gBACxD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAA6B,CAAC;aAC7D;iBAAM;gBACH,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,UAAoC,CAAC;gBACtE,IAAI,CAAC,OAAO,GAAG,OAAO,EAAE,CAAC;gBACzB,IAAI,CAAC,OAAO,CAAC,GAAG,CACZ,aAAa,CAAC;oBACV,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC;oBACxE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;iBACjF,CAAC,CACL,CAAC;gBACF,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;aAC1D;YACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAClE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACxE,OAAO,EAAE,CAAC;QACd,CAAC,CAAC,CAAC;IACP,CAAC;IAQD,gBAAgB,CAAC,aAAqB,IAAI,CAAC,OAAO,CAAC,iBAAiB;QAChE,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"SolidClientService.js","sourceRoot":"","sources":["../../../src/node/SolidClientService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAChD,OAAO,EAAE,OAAO,EAAgB,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC/F,OAAO,EAA2B,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,OAAO,kBAAmB,SAAQ,YAAY;IAIhD,YAAY,OAAgC;QACxC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,IAAI,CAAC,OAAO,CAAC,oBAAoB;YACjC,IAAI,CAAC,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrF,IAAI,IAAI,CAAC,OAAO,CAAC,kBAAkB;YAC/B,IAAI,CAAC,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjF,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACjD,CAAC;IAEO,QAAQ;QACZ,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;gBACxD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAA6B,CAAC;aAC7D;iBAAM;gBACH,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,UAAoC,CAAC;gBACtE,IAAI,CAAC,OAAO,GAAG,OAAO,EAAE,CAAC;gBACzB,IAAI,CAAC,OAAO,CAAC,GAAG,CACZ,aAAa,CAAC;oBACV,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC;oBACxE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;iBACjF,CAAC,CACL,CAAC;gBACF,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;aAC1D;YACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAClE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACxE,OAAO,EAAE,CAAC;QACd,CAAC,CAAC,CAAC;IACP,CAAC;IAQD,gBAAgB,CAAC,aAAqB,IAAI,CAAC,OAAO,CAAC,iBAAiB;QAChE,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC;YACxB,eAAe,EAAE,IAAI;YACrB,aAAa,EAAE,IAAI;SACtB,CAAC,CAAC;QACH,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;YACpD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACnC,OAAO;qBACF,KAAK,CAAC;oBACH,UAAU;oBACV,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;oBAC/B,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY;oBACvC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;iBACtC,CAAC;qBACD,IAAI,CAAC,GAAG,EAAE;oBACP,OAAO,CAAC,OAAO,CAAC,CAAC;gBACrB,CAAC,CAAC;qBACD,KAAK,CAAC,MAAM,CAAC,CAAC;YACvB,CAAC,CAAC,CAAC;SACN;aAAM;YACH,OAAO,gBAAgB,CAAC;gBACpB,OAAO;gBACP,UAAU;gBACV,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;gBAC/B,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY;gBACvC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;aACtC,CAAC,CAAC;SACN;IACL,CAAC;IAES,OAAO,CAAC,GAAoB,EAAE,GAAqB;QACzD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC;YACxB,eAAe,EAAE,IAAI;YACrB,aAAa,EAAE,IAAI;SACtB,CAAC,CAAC;QACH,GAAG,CAAC,OAAQ,CAAC,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC;QAChD,OAAO;aACF,KAAK,CAAC;YACH,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;YACrC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,iBAAiB;YAC1C,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;YACnC,cAAc,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC;SAC7D,CAAC;aACD,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE;YACd,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;IACX,CAAC;IAES,UAAU,CAAC,GAAoB,EAAE,GAAqB;QAC5D,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAQ,CAAC,SAAS,CAAC;aACvC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YACd,OAAO,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,QAAQ,GAAG,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,WAAW,CAAC,CAAC;QACpG,CAAC,CAAC;aACD,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YACX,MAAM,MAAM,GAAG,IAAI,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAClD,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YAClC,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC1D,CAAC,CAAC;aACD,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE;YACrB,IAAI,IAAI,CAAC,UAAU,EAAE;gBACjB,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;aACrD;iBAAM;gBACH,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,8BAA8B,CAAC,CAAC;aACnF;QACL,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE;YACd,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,OAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC9E,CAAC,CAAC,CAAC;IACX,CAAC;IAED,eAAe,CAAC,SAAiB;QAC7B,OAAO,qBAAqB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAClD,CAAC;CACJ"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openhps/solid",
|
|
3
|
-
"version": "0.1.0-alpha.
|
|
3
|
+
"version": "0.1.0-alpha.28",
|
|
4
4
|
"description": "Open Hybrid Positioning System",
|
|
5
5
|
"author": "Maxim Van de Wynckel",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -111,6 +111,7 @@
|
|
|
111
111
|
"@typescript-eslint/parser": "^5.20.0",
|
|
112
112
|
"buffer": "^6.0.3",
|
|
113
113
|
"chai": "^4.3.6",
|
|
114
|
+
"dotenv": "^16.0.0",
|
|
114
115
|
"eslint": "^8.14.0",
|
|
115
116
|
"eslint-config-prettier": "^8.5.0",
|
|
116
117
|
"eslint-plugin-deprecation": "^1.3.2",
|
|
@@ -47,11 +47,33 @@ export class SolidClientService extends SolidService {
|
|
|
47
47
|
* @returns {Promise<Session>} Session promise
|
|
48
48
|
*/
|
|
49
49
|
interactiveLogin(oidcIssuer: string = this.options.defaultOidcIssuer): Promise<Session> {
|
|
50
|
-
const session = new Session(
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
oidcIssuer,
|
|
50
|
+
const session = new Session({
|
|
51
|
+
insecureStorage: this,
|
|
52
|
+
secureStorage: this,
|
|
54
53
|
});
|
|
54
|
+
if (this.options.clientId && this.options.clientSecret) {
|
|
55
|
+
return new Promise((resolve, reject) => {
|
|
56
|
+
session
|
|
57
|
+
.login({
|
|
58
|
+
oidcIssuer,
|
|
59
|
+
clientId: this.options.clientId,
|
|
60
|
+
clientSecret: this.options.clientSecret,
|
|
61
|
+
clientName: this.options.clientName,
|
|
62
|
+
})
|
|
63
|
+
.then(() => {
|
|
64
|
+
resolve(session);
|
|
65
|
+
})
|
|
66
|
+
.catch(reject);
|
|
67
|
+
});
|
|
68
|
+
} else {
|
|
69
|
+
return interactiveLogin({
|
|
70
|
+
session,
|
|
71
|
+
oidcIssuer,
|
|
72
|
+
clientId: this.options.clientId,
|
|
73
|
+
clientSecret: this.options.clientSecret,
|
|
74
|
+
clientName: this.options.clientName,
|
|
75
|
+
});
|
|
76
|
+
}
|
|
55
77
|
}
|
|
56
78
|
|
|
57
79
|
protected onLogin(req: express.Request, res: express.Response): void {
|