@inrupt/solid-client-authn-browser 1.11.8-release-1991825920-10184-1647422678.0 → 1.11.8
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/.eslintrc.js +0 -2
- package/.prettierignore +3 -0
- package/dist/ClientAuthentication.d.ts +3 -2
- package/dist/ClientAuthentication.js +27 -16
- package/dist/ClientAuthentication.js.map +1 -1
- package/dist/Session.d.ts +0 -1
- package/dist/Session.js +2 -45
- package/dist/Session.js.map +1 -1
- package/dist/dependencies.js +4 -4
- package/dist/dependencies.js.map +1 -1
- package/dist/login/oidc/AggregateRedirectHandler.d.ts +4 -0
- package/dist/login/oidc/{redirectHandler/AggregateRedirectHandler.js → AggregateRedirectHandler.js} +0 -0
- package/dist/login/oidc/AggregateRedirectHandler.js.map +1 -0
- package/dist/login/oidc/{redirectHandler → incomingRedirectHandler}/AuthCodeRedirectHandler.d.ts +2 -3
- package/dist/login/oidc/{redirectHandler → incomingRedirectHandler}/AuthCodeRedirectHandler.js +1 -23
- package/dist/login/oidc/incomingRedirectHandler/AuthCodeRedirectHandler.js.map +1 -0
- package/dist/login/oidc/{redirectHandler → incomingRedirectHandler}/ErrorOidcHandler.d.ts +2 -2
- package/dist/login/oidc/{redirectHandler → incomingRedirectHandler}/ErrorOidcHandler.js +0 -0
- package/dist/login/oidc/incomingRedirectHandler/ErrorOidcHandler.js.map +1 -0
- package/dist/login/oidc/incomingRedirectHandler/FallbackRedirectHandler.d.ts +7 -0
- package/dist/login/oidc/{redirectHandler → incomingRedirectHandler}/FallbackRedirectHandler.js +0 -0
- package/dist/login/oidc/incomingRedirectHandler/FallbackRedirectHandler.js.map +1 -0
- package/dist/login/oidc/oidcHandlers/AuthorizationCodeWithPkceOidcHandler.js +2 -1
- package/dist/login/oidc/oidcHandlers/AuthorizationCodeWithPkceOidcHandler.js.map +1 -1
- package/dist/sessionInfo/SessionInfoManager.js +0 -8
- package/dist/sessionInfo/SessionInfoManager.js.map +1 -1
- package/dist/solid-client-authn.bundle.js +1 -1
- package/jest.config.js +3 -0
- package/package.json +4 -14
- package/src/ClientAuthentication.spec.ts +99 -23
- package/src/ClientAuthentication.ts +36 -16
- package/src/Session.spec.ts +0 -224
- package/src/Session.ts +8 -88
- package/src/__mocks__/ClientAuthentication.ts +24 -14
- package/src/dependencies.ts +4 -4
- package/src/login/__mocks__/LoginHandler.ts +6 -7
- package/src/login/oidc/{redirectHandler/AggregateRedirectHandler.ts → AggregateRedirectHandler.ts} +6 -6
- package/src/login/oidc/__mocks__/Redirector.ts +9 -9
- package/src/login/oidc/{redirectHandler → incomingRedirectHandler}/AuthCodeRedirectHandler.spec.ts +1 -171
- package/src/login/oidc/{redirectHandler → incomingRedirectHandler}/AuthCodeRedirectHandler.ts +2 -70
- package/src/login/oidc/{redirectHandler → incomingRedirectHandler}/ErrorOidcHandler.spec.ts +0 -0
- package/src/login/oidc/{redirectHandler → incomingRedirectHandler}/ErrorOidcHandler.ts +2 -2
- package/src/login/oidc/{redirectHandler → incomingRedirectHandler}/FallbackRedirectHandler.spec.ts +0 -0
- package/src/login/oidc/{redirectHandler → incomingRedirectHandler}/FallbackRedirectHandler.ts +2 -2
- package/src/login/oidc/oidcHandlers/AuthorizationCodeWithPkceOidcHandler.spec.ts +38 -20
- package/src/login/oidc/oidcHandlers/AuthorizationCodeWithPkceOidcHandler.ts +2 -3
- package/src/logout/__mocks__/LogoutHandler.ts +3 -12
- package/src/sessionInfo/SessionInfoManager.spec.ts +4 -30
- package/src/sessionInfo/SessionInfoManager.ts +0 -10
- package/dist/login/AggregateLoginHandler.d.ts +0 -4
- package/dist/login/AggregateLoginHandler.js +0 -10
- package/dist/login/AggregateLoginHandler.js.map +0 -1
- package/dist/login/oidc/redirectHandler/AggregateRedirectHandler.d.ts +0 -4
- package/dist/login/oidc/redirectHandler/AggregateRedirectHandler.js.map +0 -1
- package/dist/login/oidc/redirectHandler/AuthCodeRedirectHandler.js.map +0 -1
- package/dist/login/oidc/redirectHandler/ErrorOidcHandler.js.map +0 -1
- package/dist/login/oidc/redirectHandler/FallbackRedirectHandler.d.ts +0 -7
- package/dist/login/oidc/redirectHandler/FallbackRedirectHandler.js.map +0 -1
- package/dist/login/webid/WebIdLoginHandler.d.ts +0 -5
- package/dist/login/webid/WebIdLoginHandler.js +0 -12
- package/dist/login/webid/WebIdLoginHandler.js.map +0 -1
- package/examples/demoAuthentiationMonitor/index.js +0 -34
- package/examples/demoAuthentiationMonitor/package-lock.json +0 -916
- package/examples/demoAuthentiationMonitor/package.json +0 -15
- package/examples/demoClientApp/.babelrc +0 -3
- package/examples/demoClientApp/package-lock.json +0 -11643
- package/examples/demoClientApp/package.json +0 -36
- package/examples/demoClientApp/src/DemoClientApp.js +0 -678
- package/examples/demoClientApp/src/index.html +0 -142
- package/examples/demoClientApp/src/index.js +0 -26
- package/examples/demoClientApp/webpack.config.js +0 -39
- package/examples/single/bundle/.babelrc +0 -3
- package/examples/single/bundle/README.md +0 -11
- package/examples/single/bundle/client-app-profile.ttl +0 -10
- package/examples/single/bundle/package-lock.json +0 -11196
- package/examples/single/bundle/package.json +0 -31
- package/examples/single/bundle/src/App.js +0 -123
- package/examples/single/bundle/src/index.html +0 -10
- package/examples/single/bundle/src/index.js +0 -26
- package/examples/single/bundle/webpack.config.js +0 -33
- package/examples/single/script/README.md +0 -11
- package/examples/single/script/index.html +0 -36
- package/examples/single/script/package-lock.json +0 -1293
- package/examples/single/script/package.json +0 -20
- package/examples/single/script/server.ts +0 -18
- package/src/login/AggregateLoginHandler.spec.ts +0 -41
- package/src/login/AggregateLoginHandler.ts +0 -47
- package/src/login/oidc/redirectHandler/__mocks__/RedirectHandler.ts +0 -47
- package/src/login/webid/WebIdLoginHandler.spec.ts +0 -43
- package/src/login/webid/WebIdLoginHandler.ts +0 -55
package/.eslintrc.js
CHANGED
|
@@ -7,8 +7,6 @@ module.exports = {
|
|
|
7
7
|
// removed, at which point this workaround can be removed...
|
|
8
8
|
"no-shadow": "off",
|
|
9
9
|
"@typescript-eslint/no-shadow": "error",
|
|
10
|
-
|
|
11
|
-
"license-header/header": ["error", "../../resources/license-header.js"],
|
|
12
10
|
},
|
|
13
11
|
parserOptions: {
|
|
14
12
|
project: "./tsconfig.eslint.json",
|
package/.prettierignore
ADDED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ILoginHandler, ILogoutHandler,
|
|
1
|
+
import { ILoginHandler, ILogoutHandler, IIncomingRedirectHandler, ISessionInfo, ISessionInfoManager, IIssuerConfigFetcher, ISessionInternalInfo, ILoginOptions } from "@inrupt/solid-client-authn-core";
|
|
2
2
|
import { EventEmitter } from "events";
|
|
3
3
|
export default class ClientAuthentication {
|
|
4
4
|
private loginHandler;
|
|
@@ -6,7 +6,7 @@ export default class ClientAuthentication {
|
|
|
6
6
|
private logoutHandler;
|
|
7
7
|
private sessionInfoManager;
|
|
8
8
|
private issuerConfigFetcher;
|
|
9
|
-
constructor(loginHandler: ILoginHandler, redirectHandler:
|
|
9
|
+
constructor(loginHandler: ILoginHandler, redirectHandler: IIncomingRedirectHandler, logoutHandler: ILogoutHandler, sessionInfoManager: ISessionInfoManager, issuerConfigFetcher: IIssuerConfigFetcher);
|
|
10
10
|
login: (options: ILoginOptions, eventEmitter: EventEmitter) => Promise<void>;
|
|
11
11
|
fetch: ((input: RequestInfo, init?: RequestInit | undefined) => Promise<Response>) & typeof fetch;
|
|
12
12
|
logout: (sessionId: string) => Promise<void>;
|
|
@@ -14,4 +14,5 @@ export default class ClientAuthentication {
|
|
|
14
14
|
getAllSessionInfo: () => Promise<ISessionInfo[]>;
|
|
15
15
|
validateCurrentSession: (currentSessionId: string) => Promise<(ISessionInfo & ISessionInternalInfo) | null>;
|
|
16
16
|
handleIncomingRedirect: (url: string, eventEmitter: EventEmitter) => Promise<ISessionInfo | undefined>;
|
|
17
|
+
private cleanUrlAfterRedirect;
|
|
17
18
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const solid_client_authn_core_1 = require("@inrupt/solid-client-authn-core");
|
|
3
4
|
const oidc_client_ext_1 = require("@inrupt/oidc-client-ext");
|
|
4
5
|
const globalFetch = (request, init) => window.fetch(request, init);
|
|
5
6
|
class ClientAuthentication {
|
|
@@ -41,24 +42,34 @@ class ClientAuthentication {
|
|
|
41
42
|
return sessionInfo;
|
|
42
43
|
};
|
|
43
44
|
this.handleIncomingRedirect = async (url, eventEmitter) => {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
}
|
|
45
|
+
try {
|
|
46
|
+
const redirectInfo = await this.redirectHandler.handle(url, eventEmitter);
|
|
47
|
+
this.fetch = redirectInfo.fetch.bind(window);
|
|
48
|
+
this.cleanUrlAfterRedirect(url);
|
|
49
|
+
return {
|
|
50
|
+
isLoggedIn: redirectInfo.isLoggedIn,
|
|
51
|
+
webId: redirectInfo.webId,
|
|
52
|
+
sessionId: redirectInfo.sessionId,
|
|
53
|
+
expirationDate: redirectInfo.expirationDate,
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
catch (err) {
|
|
57
|
+
this.cleanUrlAfterRedirect(url);
|
|
58
|
+
eventEmitter.emit(solid_client_authn_core_1.EVENTS.ERROR, "redirect", err);
|
|
59
|
+
return undefined;
|
|
60
|
+
}
|
|
60
61
|
};
|
|
61
62
|
}
|
|
63
|
+
cleanUrlAfterRedirect(url) {
|
|
64
|
+
const cleanedUpUrl = new URL(url);
|
|
65
|
+
cleanedUpUrl.searchParams.delete("state");
|
|
66
|
+
cleanedUpUrl.searchParams.delete("code");
|
|
67
|
+
cleanedUpUrl.searchParams.delete("id_token");
|
|
68
|
+
cleanedUpUrl.searchParams.delete("access_token");
|
|
69
|
+
cleanedUpUrl.searchParams.delete("error");
|
|
70
|
+
cleanedUpUrl.searchParams.delete("error_description");
|
|
71
|
+
window.history.replaceState(null, "", cleanedUpUrl.toString());
|
|
72
|
+
}
|
|
62
73
|
}
|
|
63
74
|
exports.default = ClientAuthentication;
|
|
64
75
|
//# sourceMappingURL=ClientAuthentication.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClientAuthentication.js","sourceRoot":"","sources":["../src/ClientAuthentication.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"ClientAuthentication.js","sourceRoot":"","sources":["../src/ClientAuthentication.ts"],"names":[],"mappings":"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"}
|
package/dist/Session.d.ts
CHANGED
|
@@ -20,7 +20,6 @@ export declare class Session extends EventEmitter {
|
|
|
20
20
|
readonly info: ISessionInfo;
|
|
21
21
|
private clientAuthentication;
|
|
22
22
|
private tokenRequestInProgress;
|
|
23
|
-
private tmpFetchWithCookies;
|
|
24
23
|
constructor(sessionOptions?: Partial<ISessionOptions>, sessionId?: string);
|
|
25
24
|
login: (options: ILoginInputOptions) => Promise<void>;
|
|
26
25
|
fetch: (url: RequestInfo, init?: RequestInit | undefined) => Promise<Response>;
|
package/dist/Session.js
CHANGED
|
@@ -36,7 +36,6 @@ class Session extends events_1.EventEmitter {
|
|
|
36
36
|
constructor(sessionOptions = {}, sessionId) {
|
|
37
37
|
super();
|
|
38
38
|
this.tokenRequestInProgress = false;
|
|
39
|
-
this.tmpFetchWithCookies = false;
|
|
40
39
|
this.login = async (options) => {
|
|
41
40
|
var _a;
|
|
42
41
|
await this.clientAuthentication.login({
|
|
@@ -47,20 +46,12 @@ class Session extends events_1.EventEmitter {
|
|
|
47
46
|
return new Promise(() => undefined);
|
|
48
47
|
};
|
|
49
48
|
this.fetch = async (url, init) => {
|
|
50
|
-
return this.clientAuthentication.fetch(url,
|
|
51
|
-
...init,
|
|
52
|
-
credentials: this.tmpFetchWithCookies
|
|
53
|
-
?
|
|
54
|
-
"include"
|
|
55
|
-
:
|
|
56
|
-
init === null || init === void 0 ? void 0 : init.credentials,
|
|
57
|
-
});
|
|
49
|
+
return this.clientAuthentication.fetch(url, init);
|
|
58
50
|
};
|
|
59
51
|
this.internalLogout = async (emitSignal) => {
|
|
60
52
|
window.localStorage.removeItem(constant_1.KEY_CURRENT_SESSION);
|
|
61
53
|
await this.clientAuthentication.logout(this.info.sessionId);
|
|
62
54
|
this.info.isLoggedIn = false;
|
|
63
|
-
this.tmpFetchWithCookies = false;
|
|
64
55
|
if (emitSignal) {
|
|
65
56
|
this.emit(solid_client_authn_core_1.EVENTS.LOGOUT);
|
|
66
57
|
}
|
|
@@ -80,41 +71,6 @@ class Session extends events_1.EventEmitter {
|
|
|
80
71
|
(0, iframe_1.postRedirectUrlToParent)(url);
|
|
81
72
|
return undefined;
|
|
82
73
|
}
|
|
83
|
-
if (options.useEssSession !== true ||
|
|
84
|
-
options.restorePreviousSession === true) {
|
|
85
|
-
window.localStorage.setItem("tmp-resource-server-session-enabled", "false");
|
|
86
|
-
}
|
|
87
|
-
else {
|
|
88
|
-
window.localStorage.setItem("tmp-resource-server-session-enabled", "true");
|
|
89
|
-
}
|
|
90
|
-
const storedSessionCookieReference = window.localStorage.getItem("tmp-resource-server-session-info");
|
|
91
|
-
if (typeof storedSessionCookieReference === "string" &&
|
|
92
|
-
options.restorePreviousSession !== true &&
|
|
93
|
-
options.useEssSession === true) {
|
|
94
|
-
function isValidSessionCookieReference(reference) {
|
|
95
|
-
var _a;
|
|
96
|
-
const resourceServers = Object.keys((_a = reference.sessions) !== null && _a !== void 0 ? _a : {});
|
|
97
|
-
return (typeof reference.webId === "string" &&
|
|
98
|
-
resourceServers.length > 0 &&
|
|
99
|
-
typeof reference.sessions[resourceServers[0]].expiration === "number");
|
|
100
|
-
}
|
|
101
|
-
const reference = JSON.parse(storedSessionCookieReference);
|
|
102
|
-
if (isValidSessionCookieReference(reference)) {
|
|
103
|
-
const resourceServers = Object.keys(reference.sessions);
|
|
104
|
-
const webIdOrigin = new URL(reference.webId).hostname;
|
|
105
|
-
const ownResourceServer = resourceServers.find((resourceServer) => {
|
|
106
|
-
return new URL(resourceServer).hostname === webIdOrigin;
|
|
107
|
-
});
|
|
108
|
-
const relevantServer = ownResourceServer !== null && ownResourceServer !== void 0 ? ownResourceServer : resourceServers[0];
|
|
109
|
-
if (reference.sessions[relevantServer].expiration - Date.now() >
|
|
110
|
-
5 * 60 * 1000) {
|
|
111
|
-
this.info.isLoggedIn = true;
|
|
112
|
-
this.info.webId = reference.webId;
|
|
113
|
-
this.tmpFetchWithCookies = true;
|
|
114
|
-
return this.info;
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
}
|
|
118
74
|
this.tokenRequestInProgress = true;
|
|
119
75
|
const sessionInfo = await this.clientAuthentication.handleIncomingRedirect(url, this);
|
|
120
76
|
if (isLoggedIn(sessionInfo)) {
|
|
@@ -178,6 +134,7 @@ class Session extends events_1.EventEmitter {
|
|
|
178
134
|
this.on(solid_client_authn_core_1.EVENTS.LOGIN, () => window.localStorage.setItem(constant_1.KEY_CURRENT_SESSION, this.info.sessionId));
|
|
179
135
|
this.on(solid_client_authn_core_1.EVENTS.SESSION_EXPIRED, () => this.internalLogout(false));
|
|
180
136
|
this.on(solid_client_authn_core_1.EVENTS.ERROR, () => this.internalLogout(false));
|
|
137
|
+
window.localStorage.removeItem("tmp-resource-server-session-enabled");
|
|
181
138
|
}
|
|
182
139
|
onLogin(callback) {
|
|
183
140
|
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,
|
|
1
|
+
{"version":3,"file":"Session.js","sourceRoot":"","sources":["../src/Session.ts"],"names":[],"mappings":"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"}
|
package/dist/dependencies.js
CHANGED
|
@@ -10,15 +10,15 @@ const ClientAuthentication_1 = __importDefault(require("./ClientAuthentication")
|
|
|
10
10
|
const OidcLoginHandler_1 = __importDefault(require("./login/oidc/OidcLoginHandler"));
|
|
11
11
|
const AuthorizationCodeWithPkceOidcHandler_1 = __importDefault(require("./login/oidc/oidcHandlers/AuthorizationCodeWithPkceOidcHandler"));
|
|
12
12
|
const IssuerConfigFetcher_1 = __importDefault(require("./login/oidc/IssuerConfigFetcher"));
|
|
13
|
-
const FallbackRedirectHandler_1 = require("./login/oidc/
|
|
13
|
+
const FallbackRedirectHandler_1 = require("./login/oidc/incomingRedirectHandler/FallbackRedirectHandler");
|
|
14
14
|
const GeneralLogoutHandler_1 = __importDefault(require("./logout/GeneralLogoutHandler"));
|
|
15
15
|
const SessionInfoManager_1 = require("./sessionInfo/SessionInfoManager");
|
|
16
|
-
const AuthCodeRedirectHandler_1 = require("./login/oidc/
|
|
17
|
-
const AggregateRedirectHandler_1 = __importDefault(require("./login/oidc/
|
|
16
|
+
const AuthCodeRedirectHandler_1 = require("./login/oidc/incomingRedirectHandler/AuthCodeRedirectHandler");
|
|
17
|
+
const AggregateRedirectHandler_1 = __importDefault(require("./login/oidc/AggregateRedirectHandler"));
|
|
18
18
|
const BrowserStorage_1 = __importDefault(require("./storage/BrowserStorage"));
|
|
19
19
|
const Redirector_1 = __importDefault(require("./login/oidc/Redirector"));
|
|
20
20
|
const ClientRegistrar_1 = __importDefault(require("./login/oidc/ClientRegistrar"));
|
|
21
|
-
const ErrorOidcHandler_1 = require("./login/oidc/
|
|
21
|
+
const ErrorOidcHandler_1 = require("./login/oidc/incomingRedirectHandler/ErrorOidcHandler");
|
|
22
22
|
const TokenRefresher_1 = __importDefault(require("./login/oidc/refresh/TokenRefresher"));
|
|
23
23
|
function getClientAuthenticationWithDependencies(dependencies) {
|
|
24
24
|
const inMemoryStorage = new solid_client_authn_core_1.InMemoryStorage();
|
package/dist/dependencies.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../src/dependencies.ts"],"names":[],"mappings":";;;;;;AA6BA,6EAA4E;AAC5E,8EAA6D;AAC7D,kFAA0D;AAC1D,qFAA6D;AAC7D,0IAAkH;AAClH,2FAAmE;AACnE,
|
|
1
|
+
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../src/dependencies.ts"],"names":[],"mappings":";;;;;;AA6BA,6EAA4E;AAC5E,8EAA6D;AAC7D,kFAA0D;AAC1D,qFAA6D;AAC7D,0IAAkH;AAClH,2FAAmE;AACnE,0GAAuG;AACvG,yFAAiE;AACjE,yEAAsE;AACtE,0GAAuG;AACvG,qGAA6E;AAC7E,8EAAsD;AACtD,yEAAiD;AACjD,mFAA2D;AAC3D,4FAAyF;AACzF,yFAAiE;AAOjE,SAAgB,uCAAuC,CAAC,YAGvD;IACC,MAAM,eAAe,GAAG,IAAI,yCAAe,EAAE,CAAC;IAC9C,MAAM,aAAa,GAAG,YAAY,CAAC,aAAa,IAAI,eAAe,CAAC;IACpE,MAAM,eAAe,GAAG,YAAY,CAAC,eAAe,IAAI,IAAI,wBAAc,EAAE,CAAC;IAE7E,MAAM,cAAc,GAAG,IAAI,wBAAqB,CAC9C,aAAa,EACb,eAAe,CAChB,CAAC;IAEF,MAAM,mBAAmB,GAAG,IAAI,6BAAmB,CAAC,cAAc,CAAC,CAAC;IACpE,MAAM,eAAe,GAAG,IAAI,yBAAe,CAAC,cAAc,CAAC,CAAC;IAE5D,MAAM,kBAAkB,GAAG,IAAI,uCAAkB,CAAC,cAAc,CAAC,CAAC;IAElE,MAAM,cAAc,GAAG,IAAI,wBAAc,CACvC,cAAc,EACd,mBAAmB,EACnB,eAAe,CAChB,CAAC;IAGF,MAAM,YAAY,GAAG,IAAI,0BAAgB,CACvC,cAAc,EACd,IAAI,8CAAoC,CAAC,cAAc,EAAE,IAAI,oBAAU,EAAE,CAAC,EAC1E,mBAAmB,EACnB,eAAe,CAChB,CAAC;IAEF,MAAM,eAAe,GAAG,IAAI,kCAAwB,CAAC;QACnD,IAAI,mCAAgB,EAAE;QACtB,IAAI,iDAAuB,CACzB,cAAc,EACd,kBAAkB,EAClB,mBAAmB,EACnB,eAAe,EACf,cAAc,CACf;QAGD,IAAI,iDAAuB,EAAE;KAC9B,CAAC,CAAC;IAEH,OAAO,IAAI,8BAAoB,CAC7B,YAAY,EACZ,eAAe,EACf,IAAI,8BAAoB,CAAC,kBAAkB,CAAC,EAC5C,kBAAkB,EAClB,mBAAmB,CACpB,CAAC;AACJ,CAAC;AArDD,0FAqDC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { IIncomingRedirectHandler, AggregateHandler, IncomingRedirectInput, IncomingRedirectResult } from "@inrupt/solid-client-authn-core";
|
|
2
|
+
export default class AggregateRedirectHandler extends AggregateHandler<IncomingRedirectInput, IncomingRedirectResult> implements IIncomingRedirectHandler {
|
|
3
|
+
constructor(redirectHandlers: IIncomingRedirectHandler[]);
|
|
4
|
+
}
|
package/dist/login/oidc/{redirectHandler/AggregateRedirectHandler.js → AggregateRedirectHandler.js}
RENAMED
|
File without changes
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AggregateRedirectHandler.js","sourceRoot":"","sources":["../../../src/login/oidc/AggregateRedirectHandler.ts"],"names":[],"mappings":";;AA6BA,6EAKyC;AAKzC,MAAqB,wBACnB,SAAQ,0CAA+D;IAGvE,YAAY,gBAA4C;QACtD,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAC1B,CAAC;CACF;AAPD,2CAOC"}
|
package/dist/login/oidc/{redirectHandler → incomingRedirectHandler}/AuthCodeRedirectHandler.d.ts
RENAMED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { IClientRegistrar, IIssuerConfigFetcher,
|
|
2
|
+
import { IClientRegistrar, IIssuerConfigFetcher, IIncomingRedirectHandler, ISessionInfo, ISessionInfoManager, IStorageUtility, ITokenRefresher } from "@inrupt/solid-client-authn-core";
|
|
3
3
|
import { EventEmitter } from "events";
|
|
4
|
-
export declare
|
|
5
|
-
export declare class AuthCodeRedirectHandler implements IRedirectHandler {
|
|
4
|
+
export declare class AuthCodeRedirectHandler implements IIncomingRedirectHandler {
|
|
6
5
|
private storageUtility;
|
|
7
6
|
private sessionInfoManager;
|
|
8
7
|
private issuerConfigFetcher;
|
package/dist/login/oidc/{redirectHandler → incomingRedirectHandler}/AuthCodeRedirectHandler.js
RENAMED
|
@@ -1,25 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.AuthCodeRedirectHandler =
|
|
3
|
+
exports.AuthCodeRedirectHandler = void 0;
|
|
4
4
|
const solid_client_authn_core_1 = require("@inrupt/solid-client-authn-core");
|
|
5
5
|
const oidc_client_ext_1 = require("@inrupt/oidc-client-ext");
|
|
6
|
-
exports.DEFAULT_LIFESPAN = 30 * 60 * 1000;
|
|
7
|
-
async function setupResourceServerSession(webId, authenticatedFetch, storageUtility) {
|
|
8
|
-
const webIdAsUrl = new URL(webId);
|
|
9
|
-
const resourceServerIri = webIdAsUrl.origin;
|
|
10
|
-
await authenticatedFetch(webId);
|
|
11
|
-
try {
|
|
12
|
-
const resourceServerResponse = await authenticatedFetch(`${resourceServerIri}/session`);
|
|
13
|
-
if (resourceServerResponse.status === 200) {
|
|
14
|
-
await storageUtility.storeResourceServerSessionInfo(webId, resourceServerIri, Date.now() + exports.DEFAULT_LIFESPAN);
|
|
15
|
-
return;
|
|
16
|
-
}
|
|
17
|
-
await storageUtility.clearResourceServerSessionInfo(resourceServerIri);
|
|
18
|
-
}
|
|
19
|
-
catch (_e) {
|
|
20
|
-
await storageUtility.clearResourceServerSessionInfo(resourceServerIri);
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
6
|
class AuthCodeRedirectHandler {
|
|
24
7
|
constructor(storageUtility, sessionInfoManager, issuerConfigFetcher, clientRegistrar, tokerRefresher) {
|
|
25
8
|
this.storageUtility = storageUtility;
|
|
@@ -93,11 +76,6 @@ class AuthCodeRedirectHandler {
|
|
|
93
76
|
}, {
|
|
94
77
|
secure: false,
|
|
95
78
|
});
|
|
96
|
-
const essWorkaroundDisabled = window.localStorage.getItem("tmp-resource-server-session-enabled") ===
|
|
97
|
-
"false";
|
|
98
|
-
if (!essWorkaroundDisabled) {
|
|
99
|
-
await setupResourceServerSession(tokens.webId, authFetch, this.storageUtility);
|
|
100
|
-
}
|
|
101
79
|
const sessionInfo = await this.sessionInfoManager.get(storedSessionId);
|
|
102
80
|
if (!sessionInfo) {
|
|
103
81
|
throw new Error(`Could not retrieve session: [${storedSessionId}].`);
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AuthCodeRedirectHandler.js","sourceRoot":"","sources":["../../../../src/login/oidc/incomingRedirectHandler/AuthCodeRedirectHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import {
|
|
2
|
+
import { IIncomingRedirectHandler, ISessionInfo } from "@inrupt/solid-client-authn-core";
|
|
3
3
|
import type { EventEmitter } from "events";
|
|
4
|
-
export declare class ErrorOidcHandler implements
|
|
4
|
+
export declare class ErrorOidcHandler implements IIncomingRedirectHandler {
|
|
5
5
|
canHandle(redirectUrl: string): Promise<boolean>;
|
|
6
6
|
handle(redirectUrl: string, eventEmitter?: EventEmitter): Promise<ISessionInfo & {
|
|
7
7
|
fetch: typeof fetch;
|
|
File without changes
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ErrorOidcHandler.js","sourceRoot":"","sources":["../../../../src/login/oidc/incomingRedirectHandler/ErrorOidcHandler.ts"],"names":[],"mappings":";;;AA0BA,6EAIyC;AAGzC,gFAAoF;AAQpF,MAAa,gBAAgB;IAC3B,KAAK,CAAC,SAAS,CAAC,WAAmB;QACjC,IAAI;YAEF,OAAO,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SACvD;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CACb,IAAI,WAAW,+DAA+D,CAAC,EAAE,CAClF,CAAC;SACH;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CACV,WAAmB,EACnB,YAA2B;QAE3B,IAAI,YAAY,KAAK,SAAS,EAAE;YAC9B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;YACjC,MAAM,QAAQ,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC/C,MAAM,mBAAmB,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;YACtE,YAAY,CAAC,IAAI,CAAC,gCAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,mBAAmB,CAAC,CAAC;SAChE;QACD,OAAO,IAAA,8CAAyB,GAAE,CAAC;IACrC,CAAC;CACF;AAxBD,4CAwBC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { IIncomingRedirectHandler, ISessionInfo } from "@inrupt/solid-client-authn-core";
|
|
2
|
+
export declare class FallbackRedirectHandler implements IIncomingRedirectHandler {
|
|
3
|
+
canHandle(redirectUrl: string): Promise<boolean>;
|
|
4
|
+
handle(_redirectUrl: string): Promise<ISessionInfo & {
|
|
5
|
+
fetch: typeof fetch;
|
|
6
|
+
}>;
|
|
7
|
+
}
|
package/dist/login/oidc/{redirectHandler → incomingRedirectHandler}/FallbackRedirectHandler.js
RENAMED
|
File without changes
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"FallbackRedirectHandler.js","sourceRoot":"","sources":["../../../../src/login/oidc/incomingRedirectHandler/FallbackRedirectHandler.ts"],"names":[],"mappings":";;;AA+BA,gFAAoF;AAQpF,MAAa,uBAAuB;IAClC,KAAK,CAAC,SAAS,CAAC,WAAmB;QACjC,IAAI;YAGF,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;YACrB,OAAO,IAAI,CAAC;SACb;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CACb,IAAI,WAAW,+DAA+D,CAAC,EAAE,CAClF,CAAC;SACH;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CAEV,YAAoB;QAEpB,OAAO,IAAA,8CAAyB,GAAE,CAAC;IACrC,CAAC;CACF;AApBD,0DAoBC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const solid_client_authn_core_1 = require("@inrupt/solid-client-authn-core");
|
|
3
4
|
const oidc_client_ext_1 = require("@inrupt/oidc-client-ext");
|
|
4
5
|
class AuthorizationCodeWithPkceOidcHandler {
|
|
5
6
|
constructor(storageUtility, redirector) {
|
|
@@ -19,7 +20,7 @@ class AuthorizationCodeWithPkceOidcHandler {
|
|
|
19
20
|
redirect_uri: oidcLoginOptions.redirectUrl.toString(),
|
|
20
21
|
post_logout_redirect_uri: oidcLoginOptions.redirectUrl.toString(),
|
|
21
22
|
response_type: "code",
|
|
22
|
-
scope:
|
|
23
|
+
scope: solid_client_authn_core_1.DEFAULT_SCOPES,
|
|
23
24
|
filterProtocolClaims: true,
|
|
24
25
|
loadUserInfo: false,
|
|
25
26
|
code_verifier: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthorizationCodeWithPkceOidcHandler.js","sourceRoot":"","sources":["../../../../src/login/oidc/oidcHandlers/AuthorizationCodeWithPkceOidcHandler.ts"],"names":[],"mappings":";;
|
|
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"}
|
|
@@ -13,14 +13,6 @@ function getUnauthenticatedSession() {
|
|
|
13
13
|
}
|
|
14
14
|
exports.getUnauthenticatedSession = getUnauthenticatedSession;
|
|
15
15
|
async function clear(sessionId, storage) {
|
|
16
|
-
const storedSessionCookieReference = await storage.get("tmp-resource-server-session-info");
|
|
17
|
-
const reference = JSON.parse(storedSessionCookieReference !== null && storedSessionCookieReference !== void 0 ? storedSessionCookieReference : "{}");
|
|
18
|
-
const { webId } = reference;
|
|
19
|
-
if (webId !== undefined) {
|
|
20
|
-
const webIdAsUrl = new URL(webId);
|
|
21
|
-
const resourceServerIri = webIdAsUrl.origin;
|
|
22
|
-
await storage.clearResourceServerSessionInfo(resourceServerIri);
|
|
23
|
-
}
|
|
24
16
|
await Promise.all([
|
|
25
17
|
storage.deleteAllUserData(sessionId, { secure: false }),
|
|
26
18
|
storage.deleteAllUserData(sessionId, { secure: true }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionInfoManager.js","sourceRoot":"","sources":["../../src/sessionInfo/SessionInfoManager.ts"],"names":[],"mappings":";;;AA0BA,6EAOyC;AACzC,+BAA0B;AAC1B,6DAAqE;AAErE,SAAgB,yBAAyB;IAGvC,OAAO;QACL,UAAU,EAAE,KAAK;QACjB,SAAS,EAAE,IAAA,SAAE,GAAE;QACf,KAAK;KACN,CAAC;AACJ,CAAC;AARD,8DAQC;AAOM,KAAK,UAAU,KAAK,CACzB,SAAiB,EACjB,OAAwB;IAExB,MAAM,
|
|
1
|
+
{"version":3,"file":"SessionInfoManager.js","sourceRoot":"","sources":["../../src/sessionInfo/SessionInfoManager.ts"],"names":[],"mappings":"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"}
|