@inrupt/solid-client-authn-browser 1.13.3 → 1.14.0
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 +4 -3
- package/dist/Session.js +21 -17
- package/dist/Session.js.map +1 -1
- package/dist/defaultSession.d.ts +1 -0
- package/dist/defaultSession.js +5 -1
- package/dist/defaultSession.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/login/oidc/incomingRedirectHandler/AuthCodeRedirectHandler.js +0 -6
- package/dist/login/oidc/incomingRedirectHandler/AuthCodeRedirectHandler.js.map +1 -1
- package/dist/solid-client-authn.bundle.js +1 -1
- package/package.json +4 -4
- package/src/Session.spec.ts +251 -122
- package/src/Session.ts +43 -18
- package/src/defaultSession.spec.ts +28 -19
- package/src/defaultSession.ts +15 -1
- package/src/index.ts +1 -0
- package/src/login/oidc/incomingRedirectHandler/AuthCodeRedirectHandler.spec.ts +4 -10
- package/src/login/oidc/incomingRedirectHandler/AuthCodeRedirectHandler.ts +0 -13
package/dist/Session.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import {
|
|
3
|
-
import
|
|
2
|
+
import { ILoginInputOptions, ISessionInfo, IStorage, IHasSessionEventListener, ISessionEventListener } from "@inrupt/solid-client-authn-core";
|
|
3
|
+
import EventEmitter from "events";
|
|
4
4
|
import ClientAuthentication from "./ClientAuthentication";
|
|
5
5
|
export interface ISessionOptions {
|
|
6
6
|
secureStorage: IStorage;
|
|
@@ -14,8 +14,9 @@ export interface IHandleIncomingRedirectOptions {
|
|
|
14
14
|
url?: string;
|
|
15
15
|
}
|
|
16
16
|
export declare function silentlyAuthenticate(sessionId: string, clientAuthn: ClientAuthentication, session: Session): Promise<boolean>;
|
|
17
|
-
export declare class Session extends EventEmitter {
|
|
17
|
+
export declare class Session extends EventEmitter implements IHasSessionEventListener {
|
|
18
18
|
readonly info: ISessionInfo;
|
|
19
|
+
readonly events: ISessionEventListener;
|
|
19
20
|
private clientAuthentication;
|
|
20
21
|
private tokenRequestInProgress;
|
|
21
22
|
constructor(sessionOptions?: Partial<ISessionOptions>, sessionId?: string | undefined);
|
package/dist/Session.js
CHANGED
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.Session = exports.silentlyAuthenticate = void 0;
|
|
4
|
-
const events_1 = require("events");
|
|
5
7
|
const solid_client_authn_core_1 = require("@inrupt/solid-client-authn-core");
|
|
6
8
|
const uuid_1 = require("uuid");
|
|
9
|
+
const events_1 = __importDefault(require("events"));
|
|
7
10
|
const dependencies_1 = require("./dependencies");
|
|
8
11
|
const constant_1 = require("./constant");
|
|
9
12
|
async function silentlyAuthenticate(sessionId, clientAuthn, session) {
|
|
@@ -19,7 +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",
|
|
22
|
-
}, session);
|
|
25
|
+
}, session.events);
|
|
23
26
|
return true;
|
|
24
27
|
}
|
|
25
28
|
return false;
|
|
@@ -28,7 +31,7 @@ exports.silentlyAuthenticate = silentlyAuthenticate;
|
|
|
28
31
|
function isLoggedIn(sessionInfo) {
|
|
29
32
|
return !!(sessionInfo === null || sessionInfo === void 0 ? void 0 : sessionInfo.isLoggedIn);
|
|
30
33
|
}
|
|
31
|
-
class Session extends events_1.
|
|
34
|
+
class Session extends events_1.default {
|
|
32
35
|
constructor(sessionOptions = {}, sessionId = undefined) {
|
|
33
36
|
super();
|
|
34
37
|
this.tokenRequestInProgress = false;
|
|
@@ -38,7 +41,7 @@ class Session extends events_1.EventEmitter {
|
|
|
38
41
|
sessionId: this.info.sessionId,
|
|
39
42
|
...options,
|
|
40
43
|
tokenType: (_a = options.tokenType) !== null && _a !== void 0 ? _a : "DPoP",
|
|
41
|
-
}, this);
|
|
44
|
+
}, this.events);
|
|
42
45
|
return new Promise(() => { });
|
|
43
46
|
};
|
|
44
47
|
this.fetch = async (url, init) => {
|
|
@@ -49,7 +52,7 @@ class Session extends events_1.EventEmitter {
|
|
|
49
52
|
await this.clientAuthentication.logout(this.info.sessionId);
|
|
50
53
|
this.info.isLoggedIn = false;
|
|
51
54
|
if (emitSignal) {
|
|
52
|
-
this.emit(solid_client_authn_core_1.EVENTS.LOGOUT);
|
|
55
|
+
this.events.emit(solid_client_authn_core_1.EVENTS.LOGOUT);
|
|
53
56
|
}
|
|
54
57
|
};
|
|
55
58
|
this.logout = async () => this.internalLogout(true);
|
|
@@ -64,16 +67,16 @@ class Session extends events_1.EventEmitter {
|
|
|
64
67
|
const options = typeof inputOptions === "string" ? { url: inputOptions } : inputOptions;
|
|
65
68
|
const url = (_a = options.url) !== null && _a !== void 0 ? _a : window.location.href;
|
|
66
69
|
this.tokenRequestInProgress = true;
|
|
67
|
-
const sessionInfo = await this.clientAuthentication.handleIncomingRedirect(url, this);
|
|
70
|
+
const sessionInfo = await this.clientAuthentication.handleIncomingRedirect(url, this.events);
|
|
68
71
|
if (isLoggedIn(sessionInfo)) {
|
|
69
72
|
this.setSessionInfo(sessionInfo);
|
|
70
73
|
const currentUrl = window.localStorage.getItem(constant_1.KEY_CURRENT_URL);
|
|
71
74
|
if (currentUrl === null) {
|
|
72
|
-
this.emit(solid_client_authn_core_1.EVENTS.LOGIN);
|
|
75
|
+
this.events.emit(solid_client_authn_core_1.EVENTS.LOGIN);
|
|
73
76
|
}
|
|
74
77
|
else {
|
|
75
78
|
window.localStorage.removeItem(constant_1.KEY_CURRENT_URL);
|
|
76
|
-
this.emit(solid_client_authn_core_1.EVENTS.SESSION_RESTORED, currentUrl);
|
|
79
|
+
this.events.emit(solid_client_authn_core_1.EVENTS.SESSION_RESTORED, currentUrl);
|
|
77
80
|
}
|
|
78
81
|
}
|
|
79
82
|
else if (options.restorePreviousSession === true) {
|
|
@@ -88,6 +91,7 @@ class Session extends events_1.EventEmitter {
|
|
|
88
91
|
this.tokenRequestInProgress = false;
|
|
89
92
|
return sessionInfo;
|
|
90
93
|
};
|
|
94
|
+
this.events = new Proxy(this, (0, solid_client_authn_core_1.buildProxyHandler)(Session.prototype, "events only implements ISessionEventListener"));
|
|
91
95
|
if (sessionOptions.clientAuthentication) {
|
|
92
96
|
this.clientAuthentication = sessionOptions.clientAuthentication;
|
|
93
97
|
}
|
|
@@ -113,31 +117,31 @@ class Session extends events_1.EventEmitter {
|
|
|
113
117
|
isLoggedIn: false,
|
|
114
118
|
};
|
|
115
119
|
}
|
|
116
|
-
this.on(solid_client_authn_core_1.EVENTS.LOGIN, () => window.localStorage.setItem(constant_1.KEY_CURRENT_SESSION, this.info.sessionId));
|
|
117
|
-
this.on(solid_client_authn_core_1.EVENTS.SESSION_EXPIRED, () => this.internalLogout(false));
|
|
118
|
-
this.on(solid_client_authn_core_1.EVENTS.ERROR, () => this.internalLogout(false));
|
|
120
|
+
this.events.on(solid_client_authn_core_1.EVENTS.LOGIN, () => window.localStorage.setItem(constant_1.KEY_CURRENT_SESSION, this.info.sessionId));
|
|
121
|
+
this.events.on(solid_client_authn_core_1.EVENTS.SESSION_EXPIRED, () => this.internalLogout(false));
|
|
122
|
+
this.events.on(solid_client_authn_core_1.EVENTS.ERROR, () => this.internalLogout(false));
|
|
119
123
|
}
|
|
120
124
|
onLogin(callback) {
|
|
121
|
-
this.on(solid_client_authn_core_1.EVENTS.LOGIN, callback);
|
|
125
|
+
this.events.on(solid_client_authn_core_1.EVENTS.LOGIN, callback);
|
|
122
126
|
}
|
|
123
127
|
onLogout(callback) {
|
|
124
|
-
this.on(solid_client_authn_core_1.EVENTS.LOGOUT, callback);
|
|
128
|
+
this.events.on(solid_client_authn_core_1.EVENTS.LOGOUT, callback);
|
|
125
129
|
}
|
|
126
130
|
onError(callback) {
|
|
127
|
-
this.on(solid_client_authn_core_1.EVENTS.ERROR, callback);
|
|
131
|
+
this.events.on(solid_client_authn_core_1.EVENTS.ERROR, callback);
|
|
128
132
|
}
|
|
129
133
|
onSessionRestore(callback) {
|
|
130
|
-
this.on(solid_client_authn_core_1.EVENTS.SESSION_RESTORED, callback);
|
|
134
|
+
this.events.on(solid_client_authn_core_1.EVENTS.SESSION_RESTORED, callback);
|
|
131
135
|
}
|
|
132
136
|
onSessionExpiration(callback) {
|
|
133
|
-
this.on(solid_client_authn_core_1.EVENTS.SESSION_EXPIRED, callback);
|
|
137
|
+
this.events.on(solid_client_authn_core_1.EVENTS.SESSION_EXPIRED, callback);
|
|
134
138
|
}
|
|
135
139
|
setSessionInfo(sessionInfo) {
|
|
136
140
|
this.info.isLoggedIn = sessionInfo.isLoggedIn;
|
|
137
141
|
this.info.webId = sessionInfo.webId;
|
|
138
142
|
this.info.sessionId = sessionInfo.sessionId;
|
|
139
143
|
this.info.expirationDate = sessionInfo.expirationDate;
|
|
140
|
-
this.on(solid_client_authn_core_1.EVENTS.SESSION_EXTENDED, (expiresIn) => {
|
|
144
|
+
this.events.on(solid_client_authn_core_1.EVENTS.SESSION_EXTENDED, (expiresIn) => {
|
|
141
145
|
this.info.expirationDate = Date.now() + expiresIn * 1000;
|
|
142
146
|
});
|
|
143
147
|
}
|
package/dist/Session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Session.js","sourceRoot":"","sources":["../src/Session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Session.js","sourceRoot":"","sources":["../src/Session.ts"],"names":[],"mappings":"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"}
|
package/dist/defaultSession.d.ts
CHANGED
|
@@ -7,3 +7,4 @@ export declare const handleIncomingRedirect: Session["handleIncomingRedirect"];
|
|
|
7
7
|
export declare const onLogin: Session["onLogin"];
|
|
8
8
|
export declare const onLogout: Session["onLogout"];
|
|
9
9
|
export declare const onSessionRestore: Session["onSessionRestore"];
|
|
10
|
+
export declare const events: () => Session["events"];
|
package/dist/defaultSession.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.onSessionRestore = exports.onLogout = exports.onLogin = exports.handleIncomingRedirect = exports.logout = exports.login = exports.fetch = exports.getDefaultSession = void 0;
|
|
3
|
+
exports.events = exports.onSessionRestore = exports.onLogout = exports.onLogin = exports.handleIncomingRedirect = exports.logout = exports.login = exports.fetch = exports.getDefaultSession = void 0;
|
|
4
4
|
const Session_1 = require("./Session");
|
|
5
5
|
let defaultSession;
|
|
6
6
|
function getDefaultSession() {
|
|
@@ -45,4 +45,8 @@ const onSessionRestore = (...args) => {
|
|
|
45
45
|
return session.onSessionRestore(...args);
|
|
46
46
|
};
|
|
47
47
|
exports.onSessionRestore = onSessionRestore;
|
|
48
|
+
const events = () => {
|
|
49
|
+
return getDefaultSession().events;
|
|
50
|
+
};
|
|
51
|
+
exports.events = events;
|
|
48
52
|
//# sourceMappingURL=defaultSession.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaultSession.js","sourceRoot":"","sources":["../src/defaultSession.ts"],"names":[],"mappings":";;;AAqBA,uCAAoC;AAEpC,IAAI,
|
|
1
|
+
{"version":3,"file":"defaultSession.js","sourceRoot":"","sources":["../src/defaultSession.ts"],"names":[],"mappings":";;;AAqBA,uCAAoC;AAEpC,IAAI,cAAmC,CAAC;AAYxC,SAAgB,iBAAiB;IAC/B,IAAI,OAAO,cAAc,KAAK,WAAW,EAAE;QACzC,cAAc,GAAG,IAAI,iBAAO,EAAE,CAAC;KAChC;IACD,OAAO,cAAc,CAAC;AACxB,CAAC;AALD,8CAKC;AAWM,MAAM,KAAK,GAAqB,CAAC,GAAG,IAAI,EAAE,EAAE;IACjD,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;IACpC,OAAO,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC;AAHW,QAAA,KAAK,SAGhB;AASK,MAAM,KAAK,GAAqB,CAAC,GAAG,IAAI,EAAE,EAAE;IACjD,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;IACpC,OAAO,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC;AAHW,QAAA,KAAK,SAGhB;AAQK,MAAM,MAAM,GAAsB,CAAC,GAAG,IAAI,EAAE,EAAE;IACnD,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;IACpC,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;AACjC,CAAC,CAAC;AAHW,QAAA,MAAM,UAGjB;AAQK,MAAM,sBAAsB,GAAsC,CACvE,GAAG,IAAI,EACP,EAAE;IACF,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;IACpC,OAAO,OAAO,CAAC,sBAAsB,CAAC,GAAG,IAAI,CAAC,CAAC;AACjD,CAAC,CAAC;AALW,QAAA,sBAAsB,0BAKjC;AAYK,MAAM,OAAO,GAAuB,CAAC,GAAG,IAAI,EAAE,EAAE;IACrD,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;IACpC,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;AAClC,CAAC,CAAC;AAHW,QAAA,OAAO,WAGlB;AAUK,MAAM,QAAQ,GAAwB,CAAC,GAAG,IAAI,EAAE,EAAE;IACvD,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;IACpC,OAAO,OAAO,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC;AAHW,QAAA,QAAQ,YAGnB;AASK,MAAM,gBAAgB,GAAgC,CAAC,GAAG,IAAI,EAAE,EAAE;IACvE,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;IACpC,OAAO,OAAO,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC,CAAC;AAC3C,CAAC,CAAC;AAHW,QAAA,gBAAgB,oBAG3B;AAOK,MAAM,MAAM,GAAG,GAAsB,EAAE;IAC5C,OAAO,iBAAiB,EAAE,CAAC,MAAM,CAAC;AACpC,CAAC,CAAC;AAFW,QAAA,MAAM,UAEjB"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export { Session, ISessionOptions } from "./Session";
|
|
2
2
|
export { getClientAuthenticationWithDependencies } from "./dependencies";
|
|
3
3
|
export * from "./defaultSession";
|
|
4
|
-
export { ILoginInputOptions, ISessionInfo, IStorage, NotImplementedError, ConfigurationError, InMemoryStorage, } from "@inrupt/solid-client-authn-core";
|
|
4
|
+
export { ILoginInputOptions, ISessionInfo, IStorage, NotImplementedError, ConfigurationError, InMemoryStorage, EVENTS, } from "@inrupt/solid-client-authn-core";
|
package/dist/index.js
CHANGED
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.InMemoryStorage = exports.ConfigurationError = exports.NotImplementedError = exports.getClientAuthenticationWithDependencies = exports.Session = void 0;
|
|
17
|
+
exports.EVENTS = exports.InMemoryStorage = exports.ConfigurationError = exports.NotImplementedError = exports.getClientAuthenticationWithDependencies = exports.Session = void 0;
|
|
18
18
|
var Session_1 = require("./Session");
|
|
19
19
|
Object.defineProperty(exports, "Session", { enumerable: true, get: function () { return Session_1.Session; } });
|
|
20
20
|
var dependencies_1 = require("./dependencies");
|
|
@@ -24,4 +24,5 @@ var solid_client_authn_core_1 = require("@inrupt/solid-client-authn-core");
|
|
|
24
24
|
Object.defineProperty(exports, "NotImplementedError", { enumerable: true, get: function () { return solid_client_authn_core_1.NotImplementedError; } });
|
|
25
25
|
Object.defineProperty(exports, "ConfigurationError", { enumerable: true, get: function () { return solid_client_authn_core_1.ConfigurationError; } });
|
|
26
26
|
Object.defineProperty(exports, "InMemoryStorage", { enumerable: true, get: function () { return solid_client_authn_core_1.InMemoryStorage; } });
|
|
27
|
+
Object.defineProperty(exports, "EVENTS", { enumerable: true, get: function () { return solid_client_authn_core_1.EVENTS; } });
|
|
27
28
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAqBA,qCAAqD;AAA5C,kGAAA,OAAO,OAAA;AAEhB,+CAAyE;AAAhE,uIAAA,uCAAuC,OAAA;AAEhD,mDAAiC;AAIjC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAqBA,qCAAqD;AAA5C,kGAAA,OAAO,OAAA;AAEhB,+CAAyE;AAAhE,uIAAA,uCAAuC,OAAA;AAEhD,mDAAiC;AAIjC,2EAQyC;AAJvC,8HAAA,mBAAmB,OAAA;AACnB,6HAAA,kBAAkB,OAAA;AAClB,0HAAA,eAAe,OAAA;AACf,iHAAA,MAAM,OAAA"}
|
|
@@ -74,12 +74,6 @@ class AuthCodeRedirectHandler {
|
|
|
74
74
|
webId: tokens.webId,
|
|
75
75
|
isLoggedIn: "true",
|
|
76
76
|
}, { secure: true });
|
|
77
|
-
url.searchParams.delete("code");
|
|
78
|
-
await this.storageUtility.setForUser(storedSessionId, {
|
|
79
|
-
redirectUrl: url.toString(),
|
|
80
|
-
}, {
|
|
81
|
-
secure: false,
|
|
82
|
-
});
|
|
83
77
|
const sessionInfo = await this.sessionInfoManager.get(storedSessionId);
|
|
84
78
|
if (!sessionInfo) {
|
|
85
79
|
throw new Error(`Could not retrieve session: [${storedSessionId}].`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthCodeRedirectHandler.js","sourceRoot":"","sources":["../../../../src/login/oidc/incomingRedirectHandler/AuthCodeRedirectHandler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AuthCodeRedirectHandler.js","sourceRoot":"","sources":["../../../../src/login/oidc/incomingRedirectHandler/AuthCodeRedirectHandler.ts"],"names":[],"mappings":"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"}
|