oidc-spa 6.5.2 → 6.6.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/mock/oidc.js +6 -5
- package/mock/oidc.js.map +1 -1
- package/oidc/AuthResponse.d.ts +6 -0
- package/oidc/AuthResponse.js +59 -0
- package/oidc/AuthResponse.js.map +1 -0
- package/oidc/Oidc.d.ts +19 -8
- package/oidc/createOidc.d.ts +4 -4
- package/oidc/createOidc.js +359 -295
- package/oidc/createOidc.js.map +1 -1
- package/oidc/evtIsUserActive.d.ts +15 -0
- package/oidc/{isUserActive.js → evtIsUserActive.js} +29 -12
- package/oidc/evtIsUserActive.js.map +1 -0
- package/oidc/handleOidcCallback.d.ts +8 -1
- package/oidc/handleOidcCallback.js +68 -13
- package/oidc/handleOidcCallback.js.map +1 -1
- package/oidc/loginOrGoToAuthServer.d.ts +5 -4
- package/oidc/loginOrGoToAuthServer.js +190 -227
- package/oidc/loginOrGoToAuthServer.js.map +1 -1
- package/oidc/loginPropagationToOtherTabs.d.ts +17 -0
- package/oidc/loginPropagationToOtherTabs.js +41 -0
- package/oidc/loginPropagationToOtherTabs.js.map +1 -0
- package/oidc/loginSilent.d.ts +1 -5
- package/oidc/loginSilent.js +3 -51
- package/oidc/loginSilent.js.map +1 -1
- package/oidc/logoutPropagationToOtherTabs.js +1 -1
- package/oidc/logoutPropagationToOtherTabs.js.map +1 -1
- package/oidc/oidcClientTsUserToTokens.d.ts +1 -1
- package/oidc/oidcClientTsUserToTokens.js +45 -23
- package/oidc/oidcClientTsUserToTokens.js.map +1 -1
- package/oidc/ongoingLoginOrRefreshProcesses.d.ts +16 -0
- package/oidc/ongoingLoginOrRefreshProcesses.js +102 -0
- package/oidc/ongoingLoginOrRefreshProcesses.js.map +1 -0
- package/oidc/persistedAuthState.d.ts +16 -3
- package/oidc/persistedAuthState.js +35 -4
- package/oidc/persistedAuthState.js.map +1 -1
- package/package.json +36 -21
- package/react/react.js +8 -14
- package/react/react.js.map +1 -1
- package/src/mock/oidc.ts +14 -3
- package/src/oidc/AuthResponse.ts +26 -0
- package/src/oidc/Oidc.ts +19 -4
- package/src/oidc/createOidc.ts +233 -206
- package/src/oidc/{isUserActive.ts → evtIsUserActive.ts} +36 -10
- package/src/oidc/handleOidcCallback.ts +73 -12
- package/src/oidc/loginOrGoToAuthServer.ts +94 -87
- package/src/oidc/loginPropagationToOtherTabs.ts +63 -0
- package/src/oidc/loginSilent.ts +2 -20
- package/src/oidc/logoutPropagationToOtherTabs.ts +2 -2
- package/src/oidc/oidcClientTsUserToTokens.ts +74 -35
- package/src/oidc/ongoingLoginOrRefreshProcesses.ts +60 -0
- package/src/oidc/persistedAuthState.ts +66 -8
- package/src/react/react.tsx +8 -16
- package/src/tools/{ephemeralSessionStorage.ts → EphemeralSessionStorage.ts} +59 -27
- package/src/tools/Evt.ts +56 -0
- package/src/tools/StatefulEvt.ts +38 -0
- package/src/tools/subscribeToUserInteraction.ts +0 -1
- package/src/tools/workerTimers.ts +10 -12
- package/tools/EphemeralSessionStorage.d.ts +12 -0
- package/tools/{ephemeralSessionStorage.js → EphemeralSessionStorage.js} +29 -16
- package/tools/EphemeralSessionStorage.js.map +1 -0
- package/tools/Evt.d.ts +11 -0
- package/tools/{AwaitableEventEmitter.js → Evt.js} +24 -8
- package/tools/Evt.js.map +1 -0
- package/tools/StatefulEvt.d.ts +12 -0
- package/tools/StatefulEvt.js +24 -0
- package/tools/StatefulEvt.js.map +1 -0
- package/tools/subscribeToUserInteraction.js +2 -3
- package/tools/subscribeToUserInteraction.js.map +1 -1
- package/tools/workerTimers.js +11 -13
- package/tools/workerTimers.js.map +1 -1
- package/oidc/isUserActive.d.ts +0 -13
- package/oidc/isUserActive.js.map +0 -1
- package/src/tools/AwaitableEventEmitter.ts +0 -33
- package/src/tools/StatefulObservable.ts +0 -52
- package/tools/AwaitableEventEmitter.d.ts +0 -5
- package/tools/AwaitableEventEmitter.js.map +0 -1
- package/tools/StatefulObservable.d.ts +0 -12
- package/tools/StatefulObservable.js +0 -33
- package/tools/StatefulObservable.js.map +0 -1
- package/tools/ephemeralSessionStorage.d.ts +0 -3
- package/tools/ephemeralSessionStorage.js.map +0 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "oidc-spa",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.6.0",
|
|
4
4
|
"description": "Openidconnect client for Single Page Applications",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -15,27 +15,30 @@
|
|
|
15
15
|
"./mock/index": "./mock/index.js",
|
|
16
16
|
"./mock/oidc": "./mock/oidc.js",
|
|
17
17
|
"./mock/react": "./mock/react.js",
|
|
18
|
+
"./oidc/AuthResponse": "./oidc/AuthResponse.js",
|
|
18
19
|
"./oidc/configId": "./oidc/configId.js",
|
|
19
20
|
"./oidc/createOidc": "./oidc/createOidc.js",
|
|
21
|
+
"./oidc/evtIsUserActive": "./oidc/evtIsUserActive.js",
|
|
20
22
|
"./oidc/handleOidcCallback": "./oidc/handleOidcCallback.js",
|
|
21
23
|
"./oidc/index": "./oidc/index.js",
|
|
22
|
-
"./oidc/isUserActive": "./oidc/isUserActive.js",
|
|
23
24
|
"./oidc/loginOrGoToAuthServer": "./oidc/loginOrGoToAuthServer.js",
|
|
25
|
+
"./oidc/loginPropagationToOtherTabs": "./oidc/loginPropagationToOtherTabs.js",
|
|
24
26
|
"./oidc/loginSilent": "./oidc/loginSilent.js",
|
|
25
27
|
"./oidc/logoutPropagationToOtherTabs": "./oidc/logoutPropagationToOtherTabs.js",
|
|
26
28
|
"./oidc/Oidc": "./oidc/Oidc.js",
|
|
27
29
|
"./oidc/oidcClientTsUserToTokens": "./oidc/oidcClientTsUserToTokens.js",
|
|
28
30
|
"./oidc/OidcInitializationError": "./oidc/OidcInitializationError.js",
|
|
31
|
+
"./oidc/ongoingLoginOrRefreshProcesses": "./oidc/ongoingLoginOrRefreshProcesses.js",
|
|
29
32
|
"./oidc/persistedAuthState": "./oidc/persistedAuthState.js",
|
|
30
33
|
"./oidc/StateData": "./oidc/StateData.js",
|
|
31
34
|
"./react/index": "./react/index.js",
|
|
32
35
|
"./react/react": "./react/react.js",
|
|
33
|
-
"./tools/AwaitableEventEmitter": "./tools/AwaitableEventEmitter.js",
|
|
34
36
|
"./tools/base64": "./tools/base64.js",
|
|
35
37
|
"./tools/createObjectThatThrowsIfAccessed": "./tools/createObjectThatThrowsIfAccessed.js",
|
|
36
38
|
"./tools/decodeJwt": "./tools/decodeJwt.js",
|
|
37
39
|
"./tools/Deferred": "./tools/Deferred.js",
|
|
38
|
-
"./tools/
|
|
40
|
+
"./tools/EphemeralSessionStorage": "./tools/EphemeralSessionStorage.js",
|
|
41
|
+
"./tools/Evt": "./tools/Evt.js",
|
|
39
42
|
"./tools/generateUrlSafeRandom": "./tools/generateUrlSafeRandom.js",
|
|
40
43
|
"./tools/getDownlinkAndRtt": "./tools/getDownlinkAndRtt.js",
|
|
41
44
|
"./tools/getIsValidRemoteJson": "./tools/getIsValidRemoteJson.js",
|
|
@@ -46,7 +49,7 @@
|
|
|
46
49
|
"./tools/parseKeycloakIssuerUri": "./tools/parseKeycloakIssuerUri.js",
|
|
47
50
|
"./tools/readExpirationTimeInJwt": "./tools/readExpirationTimeInJwt.js",
|
|
48
51
|
"./tools/startCountdown": "./tools/startCountdown.js",
|
|
49
|
-
"./tools/
|
|
52
|
+
"./tools/StatefulEvt": "./tools/StatefulEvt.js",
|
|
50
53
|
"./tools/subscribeToUserInteraction": "./tools/subscribeToUserInteraction.js",
|
|
51
54
|
"./tools/toFullyQualifiedUrl": "./tools/toFullyQualifiedUrl.js",
|
|
52
55
|
"./tools/toHumanReadableDuration": "./tools/toHumanReadableDuration.js",
|
|
@@ -82,30 +85,33 @@
|
|
|
82
85
|
"./src/mock/index.ts",
|
|
83
86
|
"./src/mock/oidc.ts",
|
|
84
87
|
"./src/mock/react.tsx",
|
|
88
|
+
"./src/oidc/AuthResponse.ts",
|
|
85
89
|
"./src/oidc/Oidc.ts",
|
|
86
90
|
"./src/oidc/OidcInitializationError.ts",
|
|
87
91
|
"./src/oidc/StateData.ts",
|
|
88
92
|
"./src/oidc/configId.ts",
|
|
89
93
|
"./src/oidc/createOidc.ts",
|
|
94
|
+
"./src/oidc/evtIsUserActive.ts",
|
|
90
95
|
"./src/oidc/handleOidcCallback.ts",
|
|
91
96
|
"./src/oidc/index.ts",
|
|
92
|
-
"./src/oidc/isUserActive.ts",
|
|
93
97
|
"./src/oidc/loginOrGoToAuthServer.ts",
|
|
98
|
+
"./src/oidc/loginPropagationToOtherTabs.ts",
|
|
94
99
|
"./src/oidc/loginSilent.ts",
|
|
95
100
|
"./src/oidc/logoutPropagationToOtherTabs.ts",
|
|
96
101
|
"./src/oidc/oidcClientTsUserToTokens.ts",
|
|
102
|
+
"./src/oidc/ongoingLoginOrRefreshProcesses.ts",
|
|
97
103
|
"./src/oidc/persistedAuthState.ts",
|
|
98
104
|
"./src/react/index.ts",
|
|
99
105
|
"./src/react/react.tsx",
|
|
100
|
-
"./src/tools/AwaitableEventEmitter.ts",
|
|
101
106
|
"./src/tools/Deferred.ts",
|
|
107
|
+
"./src/tools/EphemeralSessionStorage.ts",
|
|
108
|
+
"./src/tools/Evt.ts",
|
|
102
109
|
"./src/tools/JSX.ts",
|
|
103
|
-
"./src/tools/
|
|
110
|
+
"./src/tools/StatefulEvt.ts",
|
|
104
111
|
"./src/tools/ValueOrAsyncGetter.ts",
|
|
105
112
|
"./src/tools/base64.ts",
|
|
106
113
|
"./src/tools/createObjectThatThrowsIfAccessed.ts",
|
|
107
114
|
"./src/tools/decodeJwt.ts",
|
|
108
|
-
"./src/tools/ephemeralSessionStorage.ts",
|
|
109
115
|
"./src/tools/generateUrlSafeRandom.ts",
|
|
110
116
|
"./src/tools/getDownlinkAndRtt.ts",
|
|
111
117
|
"./src/tools/getIsValidRemoteJson.ts",
|
|
@@ -143,6 +149,9 @@
|
|
|
143
149
|
"./mock/react.d.ts",
|
|
144
150
|
"./mock/react.js",
|
|
145
151
|
"./mock/react.js.map",
|
|
152
|
+
"./oidc/AuthResponse.d.ts",
|
|
153
|
+
"./oidc/AuthResponse.js",
|
|
154
|
+
"./oidc/AuthResponse.js.map",
|
|
146
155
|
"./oidc/Oidc.d.ts",
|
|
147
156
|
"./oidc/Oidc.js",
|
|
148
157
|
"./oidc/Oidc.js.map",
|
|
@@ -158,18 +167,21 @@
|
|
|
158
167
|
"./oidc/createOidc.d.ts",
|
|
159
168
|
"./oidc/createOidc.js",
|
|
160
169
|
"./oidc/createOidc.js.map",
|
|
170
|
+
"./oidc/evtIsUserActive.d.ts",
|
|
171
|
+
"./oidc/evtIsUserActive.js",
|
|
172
|
+
"./oidc/evtIsUserActive.js.map",
|
|
161
173
|
"./oidc/handleOidcCallback.d.ts",
|
|
162
174
|
"./oidc/handleOidcCallback.js",
|
|
163
175
|
"./oidc/handleOidcCallback.js.map",
|
|
164
176
|
"./oidc/index.d.ts",
|
|
165
177
|
"./oidc/index.js",
|
|
166
178
|
"./oidc/index.js.map",
|
|
167
|
-
"./oidc/isUserActive.d.ts",
|
|
168
|
-
"./oidc/isUserActive.js",
|
|
169
|
-
"./oidc/isUserActive.js.map",
|
|
170
179
|
"./oidc/loginOrGoToAuthServer.d.ts",
|
|
171
180
|
"./oidc/loginOrGoToAuthServer.js",
|
|
172
181
|
"./oidc/loginOrGoToAuthServer.js.map",
|
|
182
|
+
"./oidc/loginPropagationToOtherTabs.d.ts",
|
|
183
|
+
"./oidc/loginPropagationToOtherTabs.js",
|
|
184
|
+
"./oidc/loginPropagationToOtherTabs.js.map",
|
|
173
185
|
"./oidc/loginSilent.d.ts",
|
|
174
186
|
"./oidc/loginSilent.js",
|
|
175
187
|
"./oidc/loginSilent.js.map",
|
|
@@ -179,6 +191,9 @@
|
|
|
179
191
|
"./oidc/oidcClientTsUserToTokens.d.ts",
|
|
180
192
|
"./oidc/oidcClientTsUserToTokens.js",
|
|
181
193
|
"./oidc/oidcClientTsUserToTokens.js.map",
|
|
194
|
+
"./oidc/ongoingLoginOrRefreshProcesses.d.ts",
|
|
195
|
+
"./oidc/ongoingLoginOrRefreshProcesses.js",
|
|
196
|
+
"./oidc/ongoingLoginOrRefreshProcesses.js.map",
|
|
182
197
|
"./oidc/persistedAuthState.d.ts",
|
|
183
198
|
"./oidc/persistedAuthState.js",
|
|
184
199
|
"./oidc/persistedAuthState.js.map",
|
|
@@ -188,18 +203,21 @@
|
|
|
188
203
|
"./react/react.d.ts",
|
|
189
204
|
"./react/react.js",
|
|
190
205
|
"./react/react.js.map",
|
|
191
|
-
"./tools/AwaitableEventEmitter.d.ts",
|
|
192
|
-
"./tools/AwaitableEventEmitter.js",
|
|
193
|
-
"./tools/AwaitableEventEmitter.js.map",
|
|
194
206
|
"./tools/Deferred.d.ts",
|
|
195
207
|
"./tools/Deferred.js",
|
|
196
208
|
"./tools/Deferred.js.map",
|
|
209
|
+
"./tools/EphemeralSessionStorage.d.ts",
|
|
210
|
+
"./tools/EphemeralSessionStorage.js",
|
|
211
|
+
"./tools/EphemeralSessionStorage.js.map",
|
|
212
|
+
"./tools/Evt.d.ts",
|
|
213
|
+
"./tools/Evt.js",
|
|
214
|
+
"./tools/Evt.js.map",
|
|
197
215
|
"./tools/JSX.d.ts",
|
|
198
216
|
"./tools/JSX.js",
|
|
199
217
|
"./tools/JSX.js.map",
|
|
200
|
-
"./tools/
|
|
201
|
-
"./tools/
|
|
202
|
-
"./tools/
|
|
218
|
+
"./tools/StatefulEvt.d.ts",
|
|
219
|
+
"./tools/StatefulEvt.js",
|
|
220
|
+
"./tools/StatefulEvt.js.map",
|
|
203
221
|
"./tools/ValueOrAsyncGetter.d.ts",
|
|
204
222
|
"./tools/ValueOrAsyncGetter.js",
|
|
205
223
|
"./tools/ValueOrAsyncGetter.js.map",
|
|
@@ -212,9 +230,6 @@
|
|
|
212
230
|
"./tools/decodeJwt.d.ts",
|
|
213
231
|
"./tools/decodeJwt.js",
|
|
214
232
|
"./tools/decodeJwt.js.map",
|
|
215
|
-
"./tools/ephemeralSessionStorage.d.ts",
|
|
216
|
-
"./tools/ephemeralSessionStorage.js",
|
|
217
|
-
"./tools/ephemeralSessionStorage.js.map",
|
|
218
233
|
"./tools/generateUrlSafeRandom.d.ts",
|
|
219
234
|
"./tools/generateUrlSafeRandom.js",
|
|
220
235
|
"./tools/generateUrlSafeRandom.js.map",
|
package/react/react.js
CHANGED
|
@@ -176,24 +176,19 @@ function createOidcReactApi_dependencyInjection(paramsOrGetParams, createOidc) {
|
|
|
176
176
|
var unsubscribe = oidc.subscribeToTokensChange(forceUpdate).unsubscribe;
|
|
177
177
|
return unsubscribe;
|
|
178
178
|
}, [oidc]);
|
|
179
|
-
var
|
|
179
|
+
var tokensState_ref = (0, react_1.useRef)({
|
|
180
180
|
isConsumerReadingTokens: false,
|
|
181
181
|
tokens: undefined
|
|
182
182
|
});
|
|
183
|
-
var tokensPropertyDescriptorGetter = function () {
|
|
184
|
-
var tokenState = refTokensState.current;
|
|
185
|
-
tokenState.isConsumerReadingTokens = true;
|
|
186
|
-
return tokenState.tokens;
|
|
187
|
-
};
|
|
188
183
|
(0, react_1.useEffect)(function () {
|
|
189
184
|
if (!oidc.isUserLoggedIn) {
|
|
190
185
|
return;
|
|
191
186
|
}
|
|
192
187
|
var updateTokens = function (tokens) {
|
|
193
|
-
if (tokens ===
|
|
188
|
+
if (tokens === tokensState_ref.current.tokens) {
|
|
194
189
|
return;
|
|
195
190
|
}
|
|
196
|
-
var tokenState =
|
|
191
|
+
var tokenState = tokensState_ref.current;
|
|
197
192
|
tokenState.tokens = tokens;
|
|
198
193
|
if (tokenState.isConsumerReadingTokens) {
|
|
199
194
|
forceUpdate();
|
|
@@ -220,12 +215,11 @@ function createOidcReactApi_dependencyInjection(paramsOrGetParams, createOidc) {
|
|
|
220
215
|
if (!oidc.isUserLoggedIn) {
|
|
221
216
|
return (0, tsafe_2.id)(__assign(__assign({}, common), { isUserLoggedIn: false, login: oidc.login, initializationError: oidc.initializationError }));
|
|
222
217
|
}
|
|
223
|
-
var oidcReact = __assign(__assign({}, common), { isUserLoggedIn: true, oidcTokens: oidc.getTokens(), decodedIdToken: oidc.getDecodedIdToken(), tokens
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
});
|
|
218
|
+
var oidcReact = __assign(__assign({}, common), { isUserLoggedIn: true, oidcTokens: oidc.getTokens(), decodedIdToken: oidc.getDecodedIdToken(), get tokens() {
|
|
219
|
+
var tokensState = tokensState_ref.current;
|
|
220
|
+
tokensState.isConsumerReadingTokens = true;
|
|
221
|
+
return tokensState.tokens;
|
|
222
|
+
}, logout: oidc.logout, renewTokens: oidc.renewTokens, subscribeToAutoLogoutCountdown: oidc.subscribeToAutoLogoutCountdown, goToAuthServer: oidc.goToAuthServer, isNewBrowserSession: oidc.isNewBrowserSession, backFromAuthServer: oidc.backFromAuthServer });
|
|
229
223
|
return oidcReact;
|
|
230
224
|
}
|
|
231
225
|
var prOidc = prOidcOrInitializationError.then(function (oidcOrInitializationError) {
|
package/react/react.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react.js","sourceRoot":"","sources":["../src/react/react.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4FA,
|
|
1
|
+
{"version":3,"file":"react.js","sourceRoot":"","sources":["../src/react/react.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4FA,wFA6PC;AAGD,0CAKC;;AAjWD,+BAQe;AAEf,gCAAkG;AAClG,kDAA+D;AAC/D,kDAA8C;AAE9C,8CAA6C;AA8E7C,SAAgB,sCAAsC,CAWlD,iBAAyD,EACzD,UAAyE;IAZ7E,iBA6PC;IA5OG,IAAM,cAAc,GAAG,IAAI,mBAAQ,EAAQ,CAAC;IAE5C,IAAM,WAAW,GAAG,IAAA,qBAAa,EAAmC,SAAS,CAAC,CAAC;IAE/E,gEAAgE;IAChE,IAAM,2BAA2B,GAAG,CAAC;;;;;wBAClB,qBAAM,CAAC;;;;;yCACd,CAAA,OAAO,iBAAiB,KAAK,UAAU,CAAA,EAAvC,wBAAuC;oCACjC,SAAS,GAAG,iBAAiB,CAAC;oCAEpC,qBAAM,cAAc,CAAC,EAAE,EAAA;;oCAAvB,SAAuB,CAAC;oCAET,qBAAM,SAAS,EAAE,EAAA;;oCAA1B,WAAS,SAAiB;oCAEhC,sBAAO,QAAM,EAAC;;oCAGZ,MAAM,GAAG,iBAAiB,CAAC;oCAEjC,sBAAO,MAAM,EAAC;;;yBACjB,CAAC,EAAE,EAAA;;oBAdE,MAAM,GAAG,SAcX;;;;oBAKO,qBAAM,UAAU,CAAC,MAAM,CAAC,EAAA;;oBAA/B,IAAI,GAAG,SAAwB,CAAC;;;;oBAEhC,IAAI,CAAC,CAAC,OAAK,YAAY,8BAAuB,CAAC,EAAE,CAAC;wBAC9C,MAAM,OAAK,CAAC;oBAChB,CAAC;oBAED,sBAAO,OAAK,EAAC;wBAGjB,sBAAO,IAAI,EAAC;;;SACf,CAAC,EAAE,CAAC;IAEL,SAAS,YAAY,CAAC,KAIrB;QACW,IAAA,QAAQ,GAA8B,KAAK,SAAnC,EAAE,aAAa,GAAe,KAAK,cAApB,EAAE,QAAQ,GAAK,KAAK,SAAV,CAAW;QAE9C,IAAA,KAAA,OAA4D,IAAA,gBAAQ,EAExE,SAAS,CAAC,IAAA,EAFL,yBAAyB,QAAA,EAAE,4BAA4B,QAElD,CAAC;QAEb,IAAA,iBAAS,EAAC;YACN,cAAc,CAAC,OAAO,EAAE,CAAC;YACzB,2BAA2B,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;QACnE,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,IAAI,yBAAyB,KAAK,SAAS,EAAE,CAAC;YAC1C,OAAO,2DAAG,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,GAAI,CAAC;QAC3D,CAAC;QAED,IAAI,yBAAyB,YAAY,8BAAuB,EAAE,CAAC;YAC/D,IAAM,mBAAmB,GAAG,yBAAyB,CAAC;YAEtD,OAAO,CACH,2DACK,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,CAC3B,gCAAI,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,4EAEtB,mBAAmB,CAAC,OAAO,IAC3B,CACR,CAAC,CAAC,CAAC,CACA,uBAAC,aAAa,IAAC,mBAAmB,EAAE,mBAAmB,GAAI,CAC9D,GACF,CACN,CAAC;QACN,CAAC;QAED,IAAM,IAAI,GAAG,yBAAyB,CAAC;QAEvC,OAAO,uBAAC,WAAW,CAAC,QAAQ,IAAC,KAAK,EAAE,IAAI,YAAG,QAAQ,GAAwB,CAAC;IAChF,CAAC;IAED,SAAS,OAAO,CAAC,MAEhB;QACW,IAAQ,aAAa,GAAK,CAAA,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA,OAAjB,CAAkB;QAE/C,IAAM,IAAI,GAAG,IAAA,kBAAU,EAAC,WAAW,CAAC,CAAC;QAErC,IAAA,cAAM,EAAC,IAAI,KAAK,SAAS,EAAE,4DAA4D,CAAC,CAAC;QAEzF,eAAe,EAAE,CAAC;YACd,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;gBAC9B,MAAM,eAAe,CAAC;YAC1B,CAAC;YAED,IAAM,UAAU,GAAG,UAAC,CAAS;gBACzB,OAAA;oBACI,4CAA4C;oBAC5C,4DAAqD,CAAC,MAAG;oBACzD,+CAA+C;iBAClD,CAAC,IAAI,CAAC,GAAG,CAAC;YAJX,CAIW,CAAC;YAEhB,QAAQ,aAAa,EAAE,CAAC;gBACpB,KAAK,gBAAgB;oBACjB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;wBACvB,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,0CAA0C,CAAC,CAAC,CAAC;oBAC5E,CAAC;oBACD,MAAM;gBACV,KAAK,oBAAoB;oBACrB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;wBACtB,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,4CAA4C,CAAC,CAAC,CAAC;oBAC9E,CAAC;oBACD,MAAM;gBACV;oBACI,IAAA,cAAM,EAAsC,KAAK,CAAC,CAAC;YAC3D,CAAC;QACL,CAAC;QAEK,IAAA,KAAA,OAAkB,IAAA,kBAAU,EAAC,cAAM,OAAA,EAAE,EAAF,CAAE,EAAE,EAAE,CAAC,IAAA,EAAvC,WAAW,QAA4B,CAAC;QACjD,qCAAqC;QACrC,IAAA,iBAAS,EAAC;YACN,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;gBACvB,OAAO;YACX,CAAC;YAEO,IAAA,WAAW,GAAK,IAAI,CAAC,uBAAuB,CAAC,WAAW,CAAC,YAA9C,CAA+C;YAElE,OAAO,WAAW,CAAC;QACvB,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAEX,IAAM,eAAe,GAAG,IAAA,cAAM,EAG3B;YACC,uBAAuB,EAAE,KAAK;YAC9B,MAAM,EAAE,SAAS;SACpB,CAAC,CAAC;QAEH,IAAA,iBAAS,EAAC;YACN,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;gBACvB,OAAO;YACX,CAAC;YAED,IAAM,YAAY,GAAG,UAAC,MAAmC;gBACrD,IAAI,MAAM,KAAK,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;oBAC5C,OAAO;gBACX,CAAC;gBAED,IAAM,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC;gBAE3C,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC;gBAE3B,IAAI,UAAU,CAAC,uBAAuB,EAAE,CAAC;oBACrC,WAAW,EAAE,CAAC;gBAClB,CAAC;YACL,CAAC,CAAC;YAEF,IAAI,QAAQ,GAAG,IAAI,CAAC;YAEpB,IAAI,CAAC,cAAc,EAAE,CAAC,IAAI,CAAC,UAAA,MAAM;gBAC7B,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACZ,OAAO;gBACX,CAAC;gBACD,YAAY,CAAC,MAAM,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;YAEK,IAAA,WAAW,GAAK,IAAI,CAAC,uBAAuB,CAAC,UAAA,MAAM;gBACvD,YAAY,CAAC,MAAM,CAAC,CAAC;YACzB,CAAC,CAAC,YAFiB,CAEhB;YAEH,OAAO;gBACH,QAAQ,GAAG,KAAK,CAAC;gBACjB,WAAW,EAAE,CAAC;YAClB,CAAC,CAAC;QACN,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,IAAM,MAAM,GAAqB;YAC7B,MAAM,EAAE,IAAI,CAAC,MAAM;SACtB,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACvB,OAAO,IAAA,UAAE,wBACF,MAAM,KACT,cAAc,EAAE,KAAK,EACrB,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,IAC/C,CAAC;QACP,CAAC;QAED,IAAM,SAAS,yBACR,MAAM,KACT,cAAc,EAAE,IAAI,EACpB,UAAU,EAAE,IAAI,CAAC,SAAS,EAAE,EAC5B,cAAc,EAAE,IAAI,CAAC,iBAAiB,EAAE,EACxC,IAAI,MAAM;gBACN,IAAM,WAAW,GAAG,eAAe,CAAC,OAAO,CAAC;gBAC5C,WAAW,CAAC,uBAAuB,GAAG,IAAI,CAAC;gBAC3C,OAAO,WAAW,CAAC,MAAM,CAAC;YAC9B,CAAC,EACD,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,WAAW,EAAE,IAAI,CAAC,WAAW,EAC7B,8BAA8B,EAAE,IAAI,CAAC,8BAA8B,EACnE,cAAc,EAAE,IAAI,CAAC,cAAc,EACnC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,EAC7C,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,GAC9C,CAAC;QAEF,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAM,MAAM,GAAG,2BAA2B,CAAC,IAAI,CAAC,UAAA,yBAAyB;QACrE,IAAI,yBAAyB,YAAY,8BAAuB,EAAE,CAAC;YAC/D,OAAO,IAAI,OAAO,CAAQ,cAAO,CAAC,CAAC,CAAC;QACxC,CAAC;QAED,IAAM,IAAI,GAAG,yBAAyB,CAAC;QAEvC,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,OAAO;QACH,YAAY,cAAA;QACZ,8CAA8C;QAC9C,OAAO,SAAA;QACP,8CAA8C;QAC9C,OAAO,EAAE;;;;;wBACL,cAAc,CAAC,OAAO,EAAE,CAAC;wBAGZ,qBAAM,MAAM,EAAA;;wBAAnB,IAAI,GAAG,SAAY;6BAErB,IAAI,CAAC,cAAc,EAAnB,wBAAmB;wBACnB,qBAAM,IAAI,CAAC,cAAc,EAAE,EAAA;;wBAA3B,SAA2B,CAAC;;4BAGhC,sBAAO,IAAI,EAAC;;;aACf;KACJ,CAAC;AACN,CAAC;AAED,2DAA2D;AAC3D,SAAgB,eAAe,CAG7B,MAAyE;IACvE,OAAO,sCAAsC,CAAC,MAAM,EAAE,iBAAU,CAAC,CAAC;AACtE,CAAC"}
|
package/src/mock/oidc.ts
CHANGED
|
@@ -116,12 +116,10 @@ export async function createMockOidc<
|
|
|
116
116
|
isUserLoggedIn: true,
|
|
117
117
|
renewTokens: async () => {},
|
|
118
118
|
getTokens: (() => {
|
|
119
|
-
const
|
|
119
|
+
const tokens_common: Oidc.Tokens.Common<DecodedIdToken> = {
|
|
120
120
|
accessToken: mockedTokens.accessToken ?? "mocked-access-token",
|
|
121
121
|
accessTokenExpirationTime: mockedTokens.accessTokenExpirationTime ?? Infinity,
|
|
122
122
|
idToken: mockedTokens.idToken ?? "mocked-id-token",
|
|
123
|
-
refreshToken: mockedTokens.refreshToken ?? "mocked-refresh-token",
|
|
124
|
-
refreshTokenExpirationTime: mockedTokens.refreshTokenExpirationTime ?? Infinity,
|
|
125
123
|
decodedIdToken:
|
|
126
124
|
mockedTokens.decodedIdToken ??
|
|
127
125
|
createObjectThatThrowsIfAccessed<DecodedIdToken>({
|
|
@@ -132,6 +130,19 @@ export async function createMockOidc<
|
|
|
132
130
|
})
|
|
133
131
|
};
|
|
134
132
|
|
|
133
|
+
const tokens: Oidc.Tokens<DecodedIdToken> =
|
|
134
|
+
mockedTokens.refreshToken !== undefined || mockedTokens.hasRefreshToken === true
|
|
135
|
+
? id<Oidc.Tokens.WithRefreshToken<DecodedIdToken>>({
|
|
136
|
+
...tokens_common,
|
|
137
|
+
hasRefreshToken: true,
|
|
138
|
+
refreshToken: mockedTokens.refreshToken ?? "mocked-refresh-token",
|
|
139
|
+
refreshTokenExpirationTime: mockedTokens.refreshTokenExpirationTime
|
|
140
|
+
})
|
|
141
|
+
: id<Oidc.Tokens.WithoutRefreshToken<DecodedIdToken>>({
|
|
142
|
+
...tokens_common,
|
|
143
|
+
hasRefreshToken: false
|
|
144
|
+
});
|
|
145
|
+
|
|
135
146
|
return () => tokens;
|
|
136
147
|
})(),
|
|
137
148
|
getTokens_next: () => Promise.resolve(oidc.getTokens()),
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
export type AuthResponse = {
|
|
2
|
+
state: string;
|
|
3
|
+
[key: string]: string | undefined;
|
|
4
|
+
};
|
|
5
|
+
|
|
6
|
+
export function getIsAuthResponse(data: any): data is AuthResponse {
|
|
7
|
+
return (
|
|
8
|
+
data instanceof Object &&
|
|
9
|
+
"state" in data &&
|
|
10
|
+
typeof data.state === "string" &&
|
|
11
|
+
Object.values(data).every(value => value === undefined || typeof value === "string")
|
|
12
|
+
);
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
export function authResponseToUrl(authResponse: AuthResponse): string {
|
|
16
|
+
const authResponseUrl = new URL("https://dummy.com");
|
|
17
|
+
|
|
18
|
+
for (const [name, value] of Object.entries(authResponse)) {
|
|
19
|
+
if (value === undefined) {
|
|
20
|
+
continue;
|
|
21
|
+
}
|
|
22
|
+
authResponseUrl.searchParams.set(name, value);
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
return authResponseUrl.href;
|
|
26
|
+
}
|
package/src/oidc/Oidc.ts
CHANGED
|
@@ -100,12 +100,27 @@ export declare namespace Oidc {
|
|
|
100
100
|
};
|
|
101
101
|
|
|
102
102
|
export type Tokens<DecodedIdToken extends Record<string, unknown> = Record<string, unknown>> =
|
|
103
|
-
|
|
103
|
+
| Tokens.WithRefreshToken<DecodedIdToken>
|
|
104
|
+
| Tokens.WithoutRefreshToken<DecodedIdToken>;
|
|
105
|
+
|
|
106
|
+
export namespace Tokens {
|
|
107
|
+
export type Common<DecodedIdToken> = {
|
|
104
108
|
accessToken: string;
|
|
105
109
|
accessTokenExpirationTime: number;
|
|
106
110
|
idToken: string;
|
|
107
|
-
refreshToken: string;
|
|
108
|
-
refreshTokenExpirationTime: number;
|
|
109
111
|
decodedIdToken: DecodedIdToken;
|
|
110
|
-
}
|
|
112
|
+
};
|
|
113
|
+
|
|
114
|
+
export type WithRefreshToken<DecodedIdToken> = Common<DecodedIdToken> & {
|
|
115
|
+
hasRefreshToken: true;
|
|
116
|
+
refreshToken: string;
|
|
117
|
+
refreshTokenExpirationTime: number | undefined;
|
|
118
|
+
};
|
|
119
|
+
|
|
120
|
+
export type WithoutRefreshToken<DecodedIdToken> = Common<DecodedIdToken> & {
|
|
121
|
+
hasRefreshToken: false;
|
|
122
|
+
refreshToken?: never;
|
|
123
|
+
refreshTokenExpirationTime?: never;
|
|
124
|
+
};
|
|
125
|
+
}
|
|
111
126
|
}
|