@inrupt/solid-client-authn-browser 1.11.9-refactorremove-iframe-support-2359993287-10852-1653071565.0 → 1.11.9
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/dist/Session.d.ts +3 -1
- package/dist/Session.js +20 -3
- package/dist/Session.js.map +1 -1
- package/dist/iframe.d.ts +3 -0
- package/dist/iframe.js +43 -0
- package/dist/iframe.js.map +1 -0
- package/dist/login/oidc/ClientRegistrar.js +6 -2
- package/dist/login/oidc/ClientRegistrar.js.map +1 -1
- package/dist/login/oidc/Redirector.js +4 -0
- package/dist/login/oidc/Redirector.js.map +1 -1
- package/dist/login/oidc/oidcHandlers/AuthorizationCodeWithPkceOidcHandler.js +1 -0
- package/dist/login/oidc/oidcHandlers/AuthorizationCodeWithPkceOidcHandler.js.map +1 -1
- package/dist/solid-client-authn.bundle.js +1 -1
- package/package.json +4 -4
- package/src/Session.spec.ts +194 -0
- package/src/Session.ts +48 -5
- package/src/iframe.spec.ts +193 -0
- package/src/iframe.ts +103 -0
- package/src/login/oidc/ClientRegistrar.spec.ts +80 -0
- package/src/login/oidc/ClientRegistrar.ts +22 -7
- package/src/login/oidc/Redirector.spec.ts +14 -0
- package/src/login/oidc/Redirector.ts +3 -0
- package/src/login/oidc/oidcHandlers/AuthorizationCodeWithPkceOidcHandler.ts +1 -0
package/dist/Session.d.ts
CHANGED
|
@@ -13,7 +13,9 @@ export interface IHandleIncomingRedirectOptions {
|
|
|
13
13
|
useEssSession?: boolean;
|
|
14
14
|
url?: string;
|
|
15
15
|
}
|
|
16
|
-
export declare function silentlyAuthenticate(sessionId: string, clientAuthn: ClientAuthentication,
|
|
16
|
+
export declare function silentlyAuthenticate(sessionId: string, clientAuthn: ClientAuthentication, options: {
|
|
17
|
+
inIframe?: boolean | undefined;
|
|
18
|
+
} | undefined, session: Session): Promise<boolean>;
|
|
17
19
|
export declare class Session extends EventEmitter {
|
|
18
20
|
readonly info: ISessionInfo;
|
|
19
21
|
private clientAuthentication;
|
package/dist/Session.js
CHANGED
|
@@ -6,7 +6,10 @@ const solid_client_authn_core_1 = require("@inrupt/solid-client-authn-core");
|
|
|
6
6
|
const uuid_1 = require("uuid");
|
|
7
7
|
const dependencies_1 = require("./dependencies");
|
|
8
8
|
const constant_1 = require("./constant");
|
|
9
|
-
|
|
9
|
+
const iframe_1 = require("./iframe");
|
|
10
|
+
async function silentlyAuthenticate(sessionId, clientAuthn, options = {
|
|
11
|
+
inIframe: false,
|
|
12
|
+
}, session) {
|
|
10
13
|
var _a;
|
|
11
14
|
const storedSessionInfo = await clientAuthn.validateCurrentSession(sessionId);
|
|
12
15
|
if (storedSessionInfo !== null) {
|
|
@@ -19,6 +22,7 @@ async function silentlyAuthenticate(sessionId, clientAuthn, session) {
|
|
|
19
22
|
clientId: storedSessionInfo.clientAppId,
|
|
20
23
|
clientSecret: storedSessionInfo.clientAppSecret,
|
|
21
24
|
tokenType: (_a = storedSessionInfo.tokenType) !== null && _a !== void 0 ? _a : "DPoP",
|
|
25
|
+
inIframe: options.inIframe,
|
|
22
26
|
}, session);
|
|
23
27
|
return true;
|
|
24
28
|
}
|
|
@@ -63,6 +67,10 @@ class Session extends events_1.EventEmitter {
|
|
|
63
67
|
}
|
|
64
68
|
const options = typeof inputOptions === "string" ? { url: inputOptions } : inputOptions;
|
|
65
69
|
const url = (_a = options.url) !== null && _a !== void 0 ? _a : window.location.href;
|
|
70
|
+
if (window.frameElement !== null) {
|
|
71
|
+
(0, iframe_1.postRedirectUrlToParent)(url);
|
|
72
|
+
return undefined;
|
|
73
|
+
}
|
|
66
74
|
this.tokenRequestInProgress = true;
|
|
67
75
|
const sessionInfo = await this.clientAuthentication.handleIncomingRedirect(url, this);
|
|
68
76
|
if (isLoggedIn(sessionInfo)) {
|
|
@@ -79,7 +87,7 @@ class Session extends events_1.EventEmitter {
|
|
|
79
87
|
else if (options.restorePreviousSession === true) {
|
|
80
88
|
const storedSessionId = window.localStorage.getItem(constant_1.KEY_CURRENT_SESSION);
|
|
81
89
|
if (storedSessionId !== null) {
|
|
82
|
-
const attemptedSilentAuthentication = await silentlyAuthenticate(storedSessionId, this.clientAuthentication, this);
|
|
90
|
+
const attemptedSilentAuthentication = await silentlyAuthenticate(storedSessionId, this.clientAuthentication, undefined, this);
|
|
83
91
|
if (attemptedSilentAuthentication) {
|
|
84
92
|
return new Promise(() => { });
|
|
85
93
|
}
|
|
@@ -113,10 +121,19 @@ class Session extends events_1.EventEmitter {
|
|
|
113
121
|
isLoggedIn: false,
|
|
114
122
|
};
|
|
115
123
|
}
|
|
124
|
+
(0, iframe_1.setupIframeListener)(async (redirectUrl) => {
|
|
125
|
+
const sessionInfo = await this.clientAuthentication.handleIncomingRedirect(redirectUrl, this);
|
|
126
|
+
if (!isLoggedIn(sessionInfo)) {
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
129
|
+
this.setSessionInfo(sessionInfo);
|
|
130
|
+
});
|
|
131
|
+
this.on("tokenRenewal", () => silentlyAuthenticate(this.info.sessionId, this.clientAuthentication, {
|
|
132
|
+
inIframe: true,
|
|
133
|
+
}, this));
|
|
116
134
|
this.on(solid_client_authn_core_1.EVENTS.LOGIN, () => window.localStorage.setItem(constant_1.KEY_CURRENT_SESSION, this.info.sessionId));
|
|
117
135
|
this.on(solid_client_authn_core_1.EVENTS.SESSION_EXPIRED, () => this.internalLogout(false));
|
|
118
136
|
this.on(solid_client_authn_core_1.EVENTS.ERROR, () => this.internalLogout(false));
|
|
119
|
-
window.localStorage.removeItem("tmp-resource-server-session-enabled");
|
|
120
137
|
}
|
|
121
138
|
onLogin(callback) {
|
|
122
139
|
this.on(solid_client_authn_core_1.EVENTS.LOGIN, callback);
|
package/dist/Session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Session.js","sourceRoot":"","sources":["../src/Session.ts"],"names":[],"mappings":";;;AAwBA,mCAAsC;AACtC,6EAKyC;AACzC,+BAA0B;AAE1B,iDAAyE;AACzE,yCAAkE;
|
|
1
|
+
{"version":3,"file":"Session.js","sourceRoot":"","sources":["../src/Session.ts"],"names":[],"mappings":";;;AAwBA,mCAAsC;AACtC,6EAKyC;AACzC,+BAA0B;AAE1B,iDAAyE;AACzE,yCAAkE;AAClE,qCAAwE;AA8DjE,KAAK,UAAU,oBAAoB,CACxC,SAAiB,EACjB,WAAiC,EACjC,UAEI;IACF,QAAQ,EAAE,KAAK;CAChB,EACD,OAAgB;;IAEhB,MAAM,iBAAiB,GAAG,MAAM,WAAW,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;IAC9E,IAAI,iBAAiB,KAAK,IAAI,EAAE;QAK9B,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,0BAAe,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACnE,MAAM,WAAW,CAAC,KAAK,CACrB;YACE,SAAS;YACT,MAAM,EAAE,MAAM;YACd,UAAU,EAAE,iBAAiB,CAAC,MAAM;YACpC,WAAW,EAAE,iBAAiB,CAAC,WAAW;YAC1C,QAAQ,EAAE,iBAAiB,CAAC,WAAW;YACvC,YAAY,EAAE,iBAAiB,CAAC,eAAe;YAC/C,SAAS,EAAE,MAAA,iBAAiB,CAAC,SAAS,mCAAI,MAAM;YAChD,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC3B,EACD,OAAO,CACR,CAAC;QACF,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAjCD,oDAiCC;AAED,SAAS,UAAU,CACjB,WAA0B;IAE1B,OAAO,CAAC,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,CAAA,CAAC;AACnC,CAAC;AAKD,MAAa,OAAQ,SAAQ,qBAAY;IAyBvC,YACE,iBAA2C,EAAE,EAC7C,SAAkB;QAElB,KAAK,EAAE,CAAC;QArBF,2BAAsB,GAAG,KAAK,CAAC;QAkGvC,UAAK,GAAG,KAAK,EAAE,OAA2B,EAAiB,EAAE;;YAC3D,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,CACnC;gBACE,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;gBAC9B,GAAG,OAAO;gBAEV,SAAS,EAAE,MAAA,OAAO,CAAC,SAAS,mCAAI,MAAM;aACvC,EACD,IAAI,CACL,CAAC;YAKF,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC,CAAC;QAQF,UAAK,GAAG,KAAK,EAAE,GAAgB,EAAE,IAAkB,EAAqB,EAAE;YACxE,OAAO,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACpD,CAAC,CAAC;QASM,mBAAc,GAAG,KAAK,EAAE,UAAmB,EAAiB,EAAE;YAIpE,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,8BAAmB,CAAC,CAAC;YACpD,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC5D,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;YAC7B,IAAI,UAAU,EAAE;gBACd,IAAI,CAAC,IAAI,CAAC,gCAAM,CAAC,MAAM,CAAC,CAAC;aAC1B;QACH,CAAC,CAAC;QAKF,WAAM,GAAG,KAAK,IAAmB,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAQ9D,2BAAsB,GAAG,KAAK,EAC5B,eAAwD,EAAE,EACvB,EAAE;;YACrC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;gBACxB,OAAO,IAAI,CAAC,IAAI,CAAC;aAClB;YAED,IAAI,IAAI,CAAC,sBAAsB,EAAE;gBAC/B,OAAO,SAAS,CAAC;aAClB;YACD,MAAM,OAAO,GACX,OAAO,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC;YAC1E,MAAM,GAAG,GAAG,MAAA,OAAO,CAAC,GAAG,mCAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;YAEhD,IAAI,MAAM,CAAC,YAAY,KAAK,IAAI,EAAE;gBAGhC,IAAA,gCAAuB,EAAC,GAAG,CAAC,CAAC;gBAC7B,OAAO,SAAS,CAAC;aAClB;YAED,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC;YACnC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,sBAAsB,CACxE,GAAG,EACH,IAAI,CACL,CAAC;YACF,IAAI,UAAU,CAAC,WAAW,CAAC,EAAE;gBAC3B,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;gBACjC,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,0BAAe,CAAC,CAAC;gBAChE,IAAI,UAAU,KAAK,IAAI,EAAE;oBAGvB,IAAI,CAAC,IAAI,CAAC,gCAAM,CAAC,KAAK,CAAC,CAAC;iBACzB;qBAAM;oBAIL,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,0BAAe,CAAC,CAAC;oBAChD,IAAI,CAAC,IAAI,CAAC,gCAAM,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;iBAChD;aACF;iBAAM,IAAI,OAAO,CAAC,sBAAsB,KAAK,IAAI,EAAE;gBAMlD,MAAM,eAAe,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,8BAAmB,CAAC,CAAC;gBAGzE,IAAI,eAAe,KAAK,IAAI,EAAE;oBAI5B,MAAM,6BAA6B,GAAG,MAAM,oBAAoB,CAC9D,eAAe,EACf,IAAI,CAAC,oBAAoB,EACzB,SAAS,EACT,IAAI,CACL,CAAC;oBAKF,IAAI,6BAA6B,EAAE;wBACjC,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;qBAC9B;iBACF;aACF;YACD,IAAI,CAAC,sBAAsB,GAAG,KAAK,CAAC;YACpC,OAAO,WAAW,CAAC;QACrB,CAAC,CAAC;QA1MA,IAAI,cAAc,CAAC,oBAAoB,EAAE;YACvC,IAAI,CAAC,oBAAoB,GAAG,cAAc,CAAC,oBAAoB,CAAC;SACjE;aAAM,IAAI,cAAc,CAAC,aAAa,IAAI,cAAc,CAAC,eAAe,EAAE;YACzE,IAAI,CAAC,oBAAoB,GAAG,IAAA,sDAAuC,EAAC;gBAClE,aAAa,EAAE,cAAc,CAAC,aAAa;gBAC3C,eAAe,EAAE,cAAc,CAAC,eAAe;aAChD,CAAC,CAAC;SACJ;aAAM;YACL,IAAI,CAAC,oBAAoB,GAAG,IAAA,sDAAuC,EAAC,EAAE,CAAC,CAAC;SACzE;QAED,IAAI,cAAc,CAAC,WAAW,EAAE;YAC9B,IAAI,CAAC,IAAI,GAAG;gBACV,SAAS,EAAE,cAAc,CAAC,WAAW,CAAC,SAAS;gBAC/C,UAAU,EAAE,KAAK;gBACjB,KAAK,EAAE,cAAc,CAAC,WAAW,CAAC,KAAK;aACxC,CAAC;SACH;aAAM;YACL,IAAI,CAAC,IAAI,GAAG;gBACV,SAAS,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,IAAA,SAAE,GAAE;gBAC5B,UAAU,EAAE,KAAK;aAClB,CAAC;SACH;QAGD,IAAA,4BAAmB,EAAC,KAAK,EAAE,WAAmB,EAAE,EAAE;YAChD,MAAM,WAAW,GACf,MAAM,IAAI,CAAC,oBAAoB,CAAC,sBAAsB,CACpD,WAAW,EACX,IAAI,CACL,CAAC;YAKJ,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;gBAC5B,OAAO;aACR;YAGD,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE,CAC3B,oBAAoB,CAClB,IAAI,CAAC,IAAI,CAAC,SAAS,EACnB,IAAI,CAAC,oBAAoB,EACzB;YACE,QAAQ,EAAE,IAAI;SACf,EACD,IAAI,CACL,CACF,CAAC;QAMF,IAAI,CAAC,EAAE,CAAC,gCAAM,CAAC,KAAK,EAAE,GAAG,EAAE,CACzB,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,8BAAmB,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CACtE,CAAC;QAEF,IAAI,CAAC,EAAE,CAAC,gCAAM,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;QAElE,IAAI,CAAC,EAAE,CAAC,gCAAM,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1D,CAAC;IAkJD,OAAO,CAAC,QAAuB;QAC7B,IAAI,CAAC,EAAE,CAAC,gCAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAClC,CAAC;IAOD,QAAQ,CAAC,QAAuB;QAC9B,IAAI,CAAC,EAAE,CAAC,gCAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACnC,CAAC;IAQD,OAAO,CACL,QAGY;QAEZ,IAAI,CAAC,EAAE,CAAC,gCAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAClC,CAAC;IAUD,gBAAgB,CAAC,QAAyC;QACxD,IAAI,CAAC,EAAE,CAAC,gCAAM,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;IAC7C,CAAC;IAQD,mBAAmB,CAAC,QAAuB;QACzC,IAAI,CAAC,EAAE,CAAC,gCAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAEO,cAAc,CACpB,WAAgD;QAEhD,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,WAAW,CAAC,UAAU,CAAC;QAC9C,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC;QACpC,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC;QAC5C,IAAI,CAAC,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC,cAAc,CAAC;QACtD,IAAI,CAAC,EAAE,CAAC,gCAAM,CAAC,gBAAgB,EAAE,CAAC,SAAiB,EAAE,EAAE;YACrD,IAAI,CAAC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,IAAI,CAAC;QAC3D,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA/SD,0BA+SC"}
|
package/dist/iframe.d.ts
ADDED
package/dist/iframe.js
ADDED
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.postRedirectUrlToParent = exports.setupIframeListener = exports.redirectInIframe = void 0;
|
|
4
|
+
let redirectIframe;
|
|
5
|
+
function getRedirectIframe() {
|
|
6
|
+
if (typeof redirectIframe === "undefined") {
|
|
7
|
+
redirectIframe = window.document.createElement("iframe");
|
|
8
|
+
redirectIframe.setAttribute("hidden", "true");
|
|
9
|
+
redirectIframe.setAttribute("sandbox", "allow-scripts allow-same-origin");
|
|
10
|
+
}
|
|
11
|
+
return redirectIframe;
|
|
12
|
+
}
|
|
13
|
+
function redirectInIframe(redirectUrl) {
|
|
14
|
+
const iframe = getRedirectIframe();
|
|
15
|
+
window.document.body.appendChild(iframe);
|
|
16
|
+
iframe.src = redirectUrl;
|
|
17
|
+
}
|
|
18
|
+
exports.redirectInIframe = redirectInIframe;
|
|
19
|
+
function setupIframeListener(handleIframeRedirect) {
|
|
20
|
+
if (typeof window === "undefined") {
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
window.addEventListener("message", async (evt) => {
|
|
24
|
+
const iframe = getRedirectIframe();
|
|
25
|
+
if (evt.origin === window.location.origin &&
|
|
26
|
+
evt.source === iframe.contentWindow) {
|
|
27
|
+
if (typeof evt.data.redirectUrl === "string") {
|
|
28
|
+
await handleIframeRedirect(evt.data.redirectUrl);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
if (window.document.body.contains(iframe)) {
|
|
32
|
+
window.document.body.removeChild(iframe);
|
|
33
|
+
}
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
exports.setupIframeListener = setupIframeListener;
|
|
37
|
+
function postRedirectUrlToParent(redirectUrl) {
|
|
38
|
+
window.top.postMessage({
|
|
39
|
+
redirectUrl,
|
|
40
|
+
}, window.location.origin);
|
|
41
|
+
}
|
|
42
|
+
exports.postRedirectUrlToParent = postRedirectUrlToParent;
|
|
43
|
+
//# sourceMappingURL=iframe.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"iframe.js","sourceRoot":"","sources":["../src/iframe.ts"],"names":[],"mappings":";;;AAyBA,IAAI,cAAiC,CAAC;AAItC,SAAS,iBAAiB;IACxB,IAAI,OAAO,cAAc,KAAK,WAAW,EAAE;QACzC,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACzD,cAAc,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC9C,cAAc,CAAC,YAAY,CAAC,SAAS,EAAE,iCAAiC,CAAC,CAAC;KAC3E;IACD,OAAO,cAAc,CAAC;AACxB,CAAC;AASD,SAAgB,gBAAgB,CAAC,WAAmB;IAClD,MAAM,MAAM,GAAG,iBAAiB,EAAE,CAAC;IACnC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACzC,MAAM,CAAC,GAAG,GAAG,WAAW,CAAC;AAC3B,CAAC;AAJD,4CAIC;AAYD,SAAgB,mBAAmB,CACjC,oBAA+D;IAO/D,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;QACjC,OAAO;KACR;IACD,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,KAAK,EAAE,GAAiB,EAAE,EAAE;QAC7D,MAAM,MAAM,GAAG,iBAAiB,EAAE,CAAC;QACnC,IACE,GAAG,CAAC,MAAM,KAAK,MAAM,CAAC,QAAQ,CAAC,MAAM;YACrC,GAAG,CAAC,MAAM,KAAK,MAAM,CAAC,aAAa,EACnC;YACA,IAAI,OAAO,GAAG,CAAC,IAAI,CAAC,WAAW,KAAK,QAAQ,EAAE;gBAE5C,MAAM,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAClD;SACF;QAED,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YACzC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;SAC1C;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AA3BD,kDA2BC;AAMD,SAAgB,uBAAuB,CAAC,WAAmB;IAEzD,MAAM,CAAC,GAAI,CAAC,WAAW,CACrB;QACE,WAAW;KACZ,EACD,MAAM,CAAC,QAAQ,CAAC,MAAM,CACvB,CAAC;AACJ,CAAC;AARD,0DAQC"}
|
|
@@ -6,6 +6,7 @@ class ClientRegistrar {
|
|
|
6
6
|
this.storageUtility = storageUtility;
|
|
7
7
|
}
|
|
8
8
|
async getClient(options, issuerConfig) {
|
|
9
|
+
var _a;
|
|
9
10
|
const [storedClientId, storedClientSecret,] = await Promise.all([
|
|
10
11
|
this.storageUtility.getForUser(options.sessionId, "clientId", {
|
|
11
12
|
secure: false,
|
|
@@ -21,8 +22,11 @@ class ClientRegistrar {
|
|
|
21
22
|
clientType: "dynamic",
|
|
22
23
|
};
|
|
23
24
|
}
|
|
25
|
+
const extendedOptions = { ...options };
|
|
26
|
+
extendedOptions.registrationAccessToken =
|
|
27
|
+
(_a = extendedOptions.registrationAccessToken) !== null && _a !== void 0 ? _a : (await this.storageUtility.getForUser(options.sessionId, "registrationAccessToken"));
|
|
24
28
|
try {
|
|
25
|
-
const registeredClient = await (0, oidc_client_ext_1.registerClient)(
|
|
29
|
+
const registeredClient = await (0, oidc_client_ext_1.registerClient)(extendedOptions, issuerConfig);
|
|
26
30
|
const infoToSave = {
|
|
27
31
|
clientId: registeredClient.clientId,
|
|
28
32
|
};
|
|
@@ -33,7 +37,7 @@ class ClientRegistrar {
|
|
|
33
37
|
infoToSave.idTokenSignedResponseAlg =
|
|
34
38
|
registeredClient.idTokenSignedResponseAlg;
|
|
35
39
|
}
|
|
36
|
-
await this.storageUtility.setForUser(
|
|
40
|
+
await this.storageUtility.setForUser(extendedOptions.sessionId, infoToSave, {
|
|
37
41
|
secure: false,
|
|
38
42
|
});
|
|
39
43
|
return registeredClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClientRegistrar.js","sourceRoot":"","sources":["../../../src/login/oidc/ClientRegistrar.ts"],"names":[],"mappings":";;AAiCA,6DAAyD;AAKzD,MAAqB,eAAe;IAClC,YAAoB,cAA+B;QAA/B,mBAAc,GAAd,cAAc,CAAiB;IAAG,CAAC;IAEvD,KAAK,CAAC,SAAS,CACb,OAAgC,EAChC,YAA2B
|
|
1
|
+
{"version":3,"file":"ClientRegistrar.js","sourceRoot":"","sources":["../../../src/login/oidc/ClientRegistrar.ts"],"names":[],"mappings":";;AAiCA,6DAAyD;AAKzD,MAAqB,eAAe;IAClC,YAAoB,cAA+B;QAA/B,mBAAc,GAAd,cAAc,CAAiB;IAAG,CAAC;IAEvD,KAAK,CAAC,SAAS,CACb,OAAgC,EAChC,YAA2B;;QAG3B,MAAM,CACJ,cAAc,EACd,kBAAkB,EAEnB,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACpB,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,EAAE;gBAC5D,MAAM,EAAE,KAAK;aACd,CAAC;YACF,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,EAAE;gBAChE,MAAM,EAAE,KAAK;aACd,CAAC;SAKH,CAAC,CAAC;QACH,IAAI,cAAc,EAAE;YAClB,OAAO;gBACL,QAAQ,EAAE,cAAc;gBACxB,YAAY,EAAE,kBAAkB;gBAChC,UAAU,EAAE,SAAS;aACtB,CAAC;SACH;QACD,MAAM,eAAe,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;QAEvC,eAAe,CAAC,uBAAuB;YACrC,MAAA,eAAe,CAAC,uBAAuB,mCACvC,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CACnC,OAAO,CAAC,SAAS,EACjB,yBAAyB,CAC1B,CAAC,CAAC;QAEL,IAAI;YACF,MAAM,gBAAgB,GAAG,MAAM,IAAA,gCAAc,EAC3C,eAAe,EACf,YAAY,CACb,CAAC;YAEF,MAAM,UAAU,GAA2B;gBACzC,QAAQ,EAAE,gBAAgB,CAAC,QAAQ;aACpC,CAAC;YACF,IAAI,gBAAgB,CAAC,YAAY,EAAE;gBACjC,UAAU,CAAC,YAAY,GAAG,gBAAgB,CAAC,YAAY,CAAC;aACzD;YACD,IAAI,gBAAgB,CAAC,wBAAwB,EAAE;gBAC7C,UAAU,CAAC,wBAAwB;oBACjC,gBAAgB,CAAC,wBAAwB,CAAC;aAC7C;YACD,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAClC,eAAe,CAAC,SAAS,EACzB,UAAU,EACV;gBAIE,MAAM,EAAE,KAAK;aACd,CACF,CAAC;YACF,OAAO,gBAAgB,CAAC;SACzB;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,gCAAgC,KAAK,GAAG,CAAC,CAAC;SAC3D;IACH,CAAC;CACF;AAvED,kCAuEC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const iframe_1 = require("../../iframe");
|
|
3
4
|
class Redirector {
|
|
4
5
|
redirect(redirectUrl, options) {
|
|
5
6
|
if (options && options.handleRedirect) {
|
|
@@ -8,6 +9,9 @@ class Redirector {
|
|
|
8
9
|
else if (options && options.redirectByReplacingState) {
|
|
9
10
|
window.history.replaceState({}, "", redirectUrl);
|
|
10
11
|
}
|
|
12
|
+
else if (options === null || options === void 0 ? void 0 : options.redirectInIframe) {
|
|
13
|
+
(0, iframe_1.redirectInIframe)(redirectUrl);
|
|
14
|
+
}
|
|
11
15
|
else {
|
|
12
16
|
window.location.href = redirectUrl;
|
|
13
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Redirector.js","sourceRoot":"","sources":["../../../src/login/oidc/Redirector.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"Redirector.js","sourceRoot":"","sources":["../../../src/login/oidc/Redirector.ts"],"names":[],"mappings":";;AA8BA,yCAAgD;AAKhD,MAAqB,UAAU;IAC7B,QAAQ,CAAC,WAAmB,EAAE,OAA4B;QACxD,IAAI,OAAO,IAAI,OAAO,CAAC,cAAc,EAAE;YACrC,OAAO,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;SACrC;aAAM,IAAI,OAAO,IAAI,OAAO,CAAC,wBAAwB,EAAE;YACtD,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC,CAAC;SAClD;aAAM,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,EAAE;YACpC,IAAA,yBAAgB,EAAC,WAAW,CAAC,CAAC;SAC/B;aAAM;YACL,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,WAAW,CAAC;SACpC;IACH,CAAC;CACF;AAZD,6BAYC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthorizationCodeWithPkceOidcHandler.js","sourceRoot":"","sources":["../../../../src/login/oidc/oidcHandlers/AuthorizationCodeWithPkceOidcHandler.ts"],"names":[],"mappings":";;AA6BA,6EAOyC;AACzC,6DAAqD;AAOrD,MAAqB,oCAAoC;IAGvD,YACU,cAA+B,EAC/B,UAAuB;QADvB,mBAAc,GAAd,cAAc,CAAiB;QAC/B,eAAU,GAAV,UAAU,CAAa;IAC9B,CAAC;IAEJ,KAAK,CAAC,SAAS,CAAC,gBAA8B;QAC5C,OAAO,CAAC,CAAC,CACP,gBAAgB,CAAC,mBAAmB,CAAC,mBAAmB;YACxD,gBAAgB,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,OAAO,CAC9D,oBAAoB,CACrB,GAAG,CAAC,CAAC,CACP,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,gBAA8B;;QAEzC,MAAM,WAAW,GAAG;YAClB,SAAS,EAAE,gBAAgB,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC7C,SAAS,EAAE,gBAAgB,CAAC,MAAM,CAAC,QAAQ;YAC3C,aAAa,EAAE,gBAAgB,CAAC,MAAM,CAAC,YAAY;YACnD,YAAY,EAAE,gBAAgB,CAAC,WAAW,CAAC,QAAQ,EAAE;YACrD,wBAAwB,EAAE,gBAAgB,CAAC,WAAW,CAAC,QAAQ,EAAE;YACjE,aAAa,EAAE,MAAM;YACrB,KAAK,EAAE,wCAAc;YACrB,oBAAoB,EAAE,IAAI;YAI1B,YAAY,EAAE,KAAK;YACnB,aAAa,EAAE,IAAI;YACnB,MAAM,EAAE,MAAA,gBAAgB,CAAC,MAAM,mCAAI,SAAS;SAC7C,CAAC;QAGF,MAAM,iBAAiB,GAAG,IAAI,4BAAU,CAAC,WAAW,CAAC,CAAC;QAEtD,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC;QAEpC,IAAI;YACF,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,mBAAmB,EAAE,CAAC;YACrE,MAAM,OAAO,CAAC,GAAG,CAAC;gBAWhB,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,EAAE;oBAC3C,SAAS,EAAE,gBAAgB,CAAC,SAAS;iBACtC,CAAC;gBAMF,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,SAAS,EAAE;oBAE7C,YAAY,EAAE,cAAc,CAAC,KAAK,CAAC,cAAc;oBACjD,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,QAAQ,EAAE;oBAE1C,WAAW,EAAE,gBAAgB,CAAC,WAAW;oBACzC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO;iBAC/C,CAAC;aACH,CAAC,CAAC;YAEH,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE;gBACjD,cAAc,EAAE,gBAAgB,CAAC,cAAc;
|
|
1
|
+
{"version":3,"file":"AuthorizationCodeWithPkceOidcHandler.js","sourceRoot":"","sources":["../../../../src/login/oidc/oidcHandlers/AuthorizationCodeWithPkceOidcHandler.ts"],"names":[],"mappings":";;AA6BA,6EAOyC;AACzC,6DAAqD;AAOrD,MAAqB,oCAAoC;IAGvD,YACU,cAA+B,EAC/B,UAAuB;QADvB,mBAAc,GAAd,cAAc,CAAiB;QAC/B,eAAU,GAAV,UAAU,CAAa;IAC9B,CAAC;IAEJ,KAAK,CAAC,SAAS,CAAC,gBAA8B;QAC5C,OAAO,CAAC,CAAC,CACP,gBAAgB,CAAC,mBAAmB,CAAC,mBAAmB;YACxD,gBAAgB,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,OAAO,CAC9D,oBAAoB,CACrB,GAAG,CAAC,CAAC,CACP,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,gBAA8B;;QAEzC,MAAM,WAAW,GAAG;YAClB,SAAS,EAAE,gBAAgB,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC7C,SAAS,EAAE,gBAAgB,CAAC,MAAM,CAAC,QAAQ;YAC3C,aAAa,EAAE,gBAAgB,CAAC,MAAM,CAAC,YAAY;YACnD,YAAY,EAAE,gBAAgB,CAAC,WAAW,CAAC,QAAQ,EAAE;YACrD,wBAAwB,EAAE,gBAAgB,CAAC,WAAW,CAAC,QAAQ,EAAE;YACjE,aAAa,EAAE,MAAM;YACrB,KAAK,EAAE,wCAAc;YACrB,oBAAoB,EAAE,IAAI;YAI1B,YAAY,EAAE,KAAK;YACnB,aAAa,EAAE,IAAI;YACnB,MAAM,EAAE,MAAA,gBAAgB,CAAC,MAAM,mCAAI,SAAS;SAC7C,CAAC;QAGF,MAAM,iBAAiB,GAAG,IAAI,4BAAU,CAAC,WAAW,CAAC,CAAC;QAEtD,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC;QAEpC,IAAI;YACF,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,mBAAmB,EAAE,CAAC;YACrE,MAAM,OAAO,CAAC,GAAG,CAAC;gBAWhB,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,EAAE;oBAC3C,SAAS,EAAE,gBAAgB,CAAC,SAAS;iBACtC,CAAC;gBAMF,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,SAAS,EAAE;oBAE7C,YAAY,EAAE,cAAc,CAAC,KAAK,CAAC,cAAc;oBACjD,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,QAAQ,EAAE;oBAE1C,WAAW,EAAE,gBAAgB,CAAC,WAAW;oBACzC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO;iBAC/C,CAAC;aACH,CAAC,CAAC;YAEH,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE;gBACjD,cAAc,EAAE,gBAAgB,CAAC,cAAc;gBAC/C,gBAAgB,EAAE,gBAAgB,CAAC,QAAQ;aAC5C,CAAC,CAAC;SACJ;QAAC,OAAO,GAAY,EAAE;YAErB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACpB;QAGD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AArFD,uDAqFC"}
|