oidc-spa 10.0.3 → 10.0.4
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/core/createOidc.js +1 -1
- package/core/oidcClientTsUserToTokens.js +20 -14
- package/core/oidcClientTsUserToTokens.js.map +1 -1
- package/esm/core/createOidc.mjs +1 -1
- package/esm/core/oidcClientTsUserToTokens.mjs +20 -14
- package/esm/core/oidcClientTsUserToTokens.mjs.map +1 -1
- package/package.json +1 -1
- package/src/core/oidcClientTsUserToTokens.ts +21 -15
package/core/createOidc.js
CHANGED
|
@@ -75,7 +75,7 @@ const ensureNonBlankPaint_1 = require("../tools/ensureNonBlankPaint");
|
|
|
75
75
|
const StateDataCookie_1 = require("./StateDataCookie");
|
|
76
76
|
const loadWebcryptoLinerShim_1 = require("../tools/loadWebcryptoLinerShim");
|
|
77
77
|
// NOTE: Replaced at build time
|
|
78
|
-
const VERSION = "10.0.
|
|
78
|
+
const VERSION = "10.0.4";
|
|
79
79
|
const globalContext = {
|
|
80
80
|
prOidcByConfigId: new Map(),
|
|
81
81
|
hasLogoutBeenCalled: (0, id_1.id)(false),
|
|
@@ -129,27 +129,33 @@ function createOidcClientTsUserToTokens(params) {
|
|
|
129
129
|
hasRefreshToken: true,
|
|
130
130
|
refreshToken,
|
|
131
131
|
refreshTokenExpirationTime: (() => {
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
132
|
+
for (const propertyName of [
|
|
133
|
+
"refresh_expires_at",
|
|
134
|
+
"refresh_token_expires_at"
|
|
135
|
+
]) {
|
|
136
|
+
const expiresAt = oidcClientTsUser.__oidc_spa_tokenResponse[propertyName];
|
|
137
|
+
if (expiresAt === undefined) {
|
|
138
|
+
continue;
|
|
136
139
|
}
|
|
137
|
-
(0, assert_1.assert)(typeof
|
|
138
|
-
if (
|
|
140
|
+
(0, assert_1.assert)(typeof expiresAt === "number", "2033392");
|
|
141
|
+
if (expiresAt === 0) {
|
|
139
142
|
return INFINITY_TIME_1.INFINITY_TIME;
|
|
140
143
|
}
|
|
141
|
-
return
|
|
144
|
+
return expiresAt * 1000;
|
|
142
145
|
}
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
146
|
+
for (const propertyName of [
|
|
147
|
+
"refresh_expires_in",
|
|
148
|
+
"refresh_token_expires_in"
|
|
149
|
+
]) {
|
|
150
|
+
const expiresIn = oidcClientTsUser.__oidc_spa_tokenResponse[propertyName];
|
|
151
|
+
if (expiresIn === undefined) {
|
|
152
|
+
continue;
|
|
147
153
|
}
|
|
148
|
-
(0, assert_1.assert)(typeof
|
|
149
|
-
if (
|
|
154
|
+
(0, assert_1.assert)(typeof expiresIn === "number", "2033425330");
|
|
155
|
+
if (expiresIn === 0) {
|
|
150
156
|
return INFINITY_TIME_1.INFINITY_TIME;
|
|
151
157
|
}
|
|
152
|
-
return issuedAtTime +
|
|
158
|
+
return issuedAtTime + expiresIn * 1000;
|
|
153
159
|
}
|
|
154
160
|
read_from_jwt: {
|
|
155
161
|
const expirationTime = (0, readExpirationTimeInJwt_1.readExpirationTimeInJwt)(refreshToken);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidcClientTsUserToTokens.js","sourceRoot":"","sources":["../src/core/oidcClientTsUserToTokens.ts"],"names":[],"mappings":";;AAUA,
|
|
1
|
+
{"version":3,"file":"oidcClientTsUserToTokens.js","sourceRoot":"","sources":["../src/core/oidcClientTsUserToTokens.ts"],"names":[],"mappings":"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"}
|
package/esm/core/createOidc.mjs
CHANGED
|
@@ -35,7 +35,7 @@ import { ensureNonBlankPaint } from "../tools/ensureNonBlankPaint.mjs";
|
|
|
35
35
|
import { setStateDataCookieIfEnabled, clearStateDataCookie, getIsStateDataCookieEnabled } from "./StateDataCookie.mjs";
|
|
36
36
|
import { loadWebcryptoLinerShim, hasLoadWebcryptoLinerShimBeenCalled } from "../tools/loadWebcryptoLinerShim.mjs";
|
|
37
37
|
// NOTE: Replaced at build time
|
|
38
|
-
const VERSION = "10.0.
|
|
38
|
+
const VERSION = "10.0.4";
|
|
39
39
|
const globalContext = {
|
|
40
40
|
prOidcByConfigId: new Map(),
|
|
41
41
|
hasLogoutBeenCalled: id(false),
|
|
@@ -126,27 +126,33 @@ export function createOidcClientTsUserToTokens(params) {
|
|
|
126
126
|
hasRefreshToken: true,
|
|
127
127
|
refreshToken,
|
|
128
128
|
refreshTokenExpirationTime: (() => {
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
129
|
+
for (const propertyName of [
|
|
130
|
+
"refresh_expires_at",
|
|
131
|
+
"refresh_token_expires_at"
|
|
132
|
+
]) {
|
|
133
|
+
const expiresAt = oidcClientTsUser.__oidc_spa_tokenResponse[propertyName];
|
|
134
|
+
if (expiresAt === undefined) {
|
|
135
|
+
continue;
|
|
133
136
|
}
|
|
134
|
-
assert(typeof
|
|
135
|
-
if (
|
|
137
|
+
assert(typeof expiresAt === "number", "2033392");
|
|
138
|
+
if (expiresAt === 0) {
|
|
136
139
|
return INFINITY_TIME;
|
|
137
140
|
}
|
|
138
|
-
return
|
|
141
|
+
return expiresAt * 1000;
|
|
139
142
|
}
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
143
|
+
for (const propertyName of [
|
|
144
|
+
"refresh_expires_in",
|
|
145
|
+
"refresh_token_expires_in"
|
|
146
|
+
]) {
|
|
147
|
+
const expiresIn = oidcClientTsUser.__oidc_spa_tokenResponse[propertyName];
|
|
148
|
+
if (expiresIn === undefined) {
|
|
149
|
+
continue;
|
|
144
150
|
}
|
|
145
|
-
assert(typeof
|
|
146
|
-
if (
|
|
151
|
+
assert(typeof expiresIn === "number", "2033425330");
|
|
152
|
+
if (expiresIn === 0) {
|
|
147
153
|
return INFINITY_TIME;
|
|
148
154
|
}
|
|
149
|
-
return issuedAtTime +
|
|
155
|
+
return issuedAtTime + expiresIn * 1000;
|
|
150
156
|
}
|
|
151
157
|
read_from_jwt: {
|
|
152
158
|
const expirationTime = readExpirationTimeInJwt(refreshToken);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidcClientTsUserToTokens.mjs","sourceRoot":"","sources":["../../src/core/oidcClientTsUserToTokens.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAC;AACvC,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAuC,MAAM,2BAA2B,CAAC;AAGxG,MAAM,UAAU,8BAA8B,CAAiD,MAW9F;IACG,MAAM,EACF,QAAQ,EACR,oBAAoB,EACpB,gCAAgC,EAChC,YAAY,EACZ,yBAAyB,EACzB,GAAG,EACN,GAAG,MAAM,CAAC;IAEX,SAAS,wBAAwB,CAAC,MAGjC;QACG,MAAM,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,GAAG,MAAM,CAAC;QAE7D,MAAM,WAAW,GAAG,uBAAuB,KAAK,SAAS,CAAC;QAE1D,MAAM,WAAW,GAAG,gBAAgB,CAAC,YAAY,CAAC;QAElD,MAAM,YAAY,GAAG,gBAAgB,CAAC,aAAa,CAAC;QAEpD,MAAM,OAAO,GAAG,gBAAgB,CAAC,QAAQ,CAAC;QAE1C,MAAM,CAAC,OAAO,KAAK,SAAS,EAAE,yCAAyC,CAAC,CAAC;QAEzE,MAAM,uBAAuB,GAAG,SAAS,CAA0C,OAAO,CAAC,CAAC;QAE5F,IAAI,WAAW,EAAE,CAAC;YACd,GAAG,EAAE,CACD;gBACI,kBAAkB;gBAClB,oBAAoB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,0CAA0C;gBACpF,IAAI,CAAC,SAAS,CAAC,uBAAuB,EAAE,IAAI,EAAE,CAAC,CAAC;aACnD,CAAC,IAAI,CAAC,EAAE,CAAC,CACb,CAAC;QACN,CAAC;QAED,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE;YACzB,IAAI,cAA8B,CAAC;YAEnC,IAAI,oBAAoB,KAAK,SAAS,EAAE,CAAC;gBACrC,cAAc,GAAG,oBAAoB,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;gBAErE,IAAI,WAAW,EAAE,CAAC;oBACd,GAAG,EAAE,CACD;wBACI,yDAAyD;wBACzD,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;qBAC1C,CAAC,IAAI,CAAC,EAAE,CAAC,CACb,CAAC;gBACN,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,mBAAmB;gBACnB,cAAc,GAAG,uBAAuB,CAAC;YAC7C,CAAC;YAED,IACI,uBAAuB,KAAK,SAAS;gBACrC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,EAC5E,CAAC;gBACC,2EAA2E;gBAC3E,OAAO,uBAAuB,CAAC;YACnC,CAAC;YAED,OAAO,cAAc,CAAC;QAC1B,CAAC,CAAC,EAAE,CAAC;QAEL,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE;YACvB,0DAA0D;YAC1D,2DAA2D;YAC3D,6BAA6B;YAC7B,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE;gBACvB,IAAI,GAAuB,CAAC;gBAE5B,IAAI,CAAC;oBACD,MAAM,cAAc,GAAG,uBAAuB,CAAC,GAAG,CAAC;oBACnD,MAAM,CAAC,cAAc,KAAK,SAAS,IAAI,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC;oBAC3E,GAAG,GAAG,cAAc,CAAC;gBACzB,CAAC;gBAAC,MAAM,CAAC;oBACL,GAAG,GAAG,SAAS,CAAC;gBACpB,CAAC;gBAED,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;oBACpB,OAAO,SAAS,CAAC;gBACrB,CAAC;gBAED,OAAO,GAAG,CAAC;YACf,CAAC,CAAC,EAAE,CAAC;YAEL,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;gBAC7B,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC;YACtB,CAAC;YAED,OAAO,YAAY,GAAG,IAAI,CAAC;QAC/B,CAAC,CAAC,EAAE,CAAC;QAEL,MAAM,8BAA8B,GAAmC;YACnE,kBAAkB,EAAE,gBAAgB,CAAC,mCAAmC;YACxE,YAAY;SACf,CAAC;QAEF,MAAM,aAAa,GAAuC;YACtD,GAAG,CAAC,gCAAgC;gBAChC,CAAC,CAAC;oBACI,WAAW,EAAE,OAAO;oBACpB,yBAAyB,EAAE,CAAC,GAAG,EAAE;wBAC7B,MAAM,cAAc,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC;wBAExD,MAAM,CACF,cAAc,KAAK,SAAS,EAC5B,oGAAoG,CACvG,CAAC;wBAEF,OAAO,cAAc,CAAC;oBAC1B,CAAC,CAAC,EAAE;iBACP;gBACH,CAAC,CAAC;oBACI,WAAW;oBACX,yBAAyB,EAAE,CAAC,GAAG,EAAE;wBAC7B,aAAa,EAAE,CAAC;4BACZ,MAAM,cAAc,GAAG,uBAAuB,CAAC,WAAW,CAAC,CAAC;4BAE5D,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;gCAC/B,MAAM,aAAa,CAAC;4BACxB,CAAC;4BAED,OAAO,cAAc,CAAC;wBAC1B,CAAC;wBAED,mCAAmC,EAAE,CAAC;4BAClC,MAAM,EAAE,UAAU,EAAE,GAAG,gBAAgB,CAAC,wBAAwB,CAAC;4BAEjE,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gCAC3B,MAAM,mCAAmC,CAAC;4BAC9C,CAAC;4BAED,MAAM,CAAC,OAAO,UAAU,KAAK,QAAQ,EAAE,SAAS,CAAC,CAAC;4BAElD,OAAO,UAAU,GAAG,IAAI,CAAC;wBAC7B,CAAC;wBAED,mCAAmC,EAAE,CAAC;4BAClC,MAAM,EAAE,UAAU,EAAE,GAAG,gBAAgB,CAAC,wBAAwB,CAAC;4BAEjE,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gCAC3B,MAAM,mCAAmC,CAAC;4BAC9C,CAAC;4BAED,MAAM,CAAC,OAAO,UAAU,KAAK,QAAQ,EAAE,WAAW,CAAC,CAAC;4BAEpD,OAAO,YAAY,GAAG,UAAU,GAAG,IAAK,CAAC;wBAC7C,CAAC;wBAED,MAAM,CAAC,KAAK,EAAE,4CAA4C,CAAC,CAAC;oBAChE,CAAC,CAAC,EAAE;iBACP,CAAC;YACR,OAAO;YACP,cAAc;YACd,uBAAuB;YACvB,YAAY;YACZ,gBAAgB,EAAE,sBAAsB,CAAC,8BAA8B,CAAC;SAC3E,CAAC;QAEF,MAAM,MAAM,GACR,YAAY,KAAK,SAAS;YACtB,CAAC,CAAC,EAAE,CAAkD;gBAChD,GAAG,aAAa;gBAChB,eAAe,EAAE,KAAK;aACzB,CAAC;YACJ,CAAC,CAAC,EAAE,CAA+C;gBAC7C,GAAG,aAAa;gBAChB,eAAe,EAAE,IAAI;gBACrB,YAAY;gBACZ,0BAA0B,EAAE,CAAC,GAAG,EAAE;oBAC9B,
|
|
1
|
+
{"version":3,"file":"oidcClientTsUserToTokens.mjs","sourceRoot":"","sources":["../../src/core/oidcClientTsUserToTokens.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -194,36 +194,42 @@ export function createOidcClientTsUserToTokens<DecodedIdToken extends Record<str
|
|
|
194
194
|
hasRefreshToken: true,
|
|
195
195
|
refreshToken,
|
|
196
196
|
refreshTokenExpirationTime: (() => {
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
197
|
+
for (const propertyName of [
|
|
198
|
+
"refresh_expires_at",
|
|
199
|
+
"refresh_token_expires_at"
|
|
200
|
+
] as const) {
|
|
201
|
+
const expiresAt = oidcClientTsUser.__oidc_spa_tokenResponse[propertyName];
|
|
202
|
+
|
|
203
|
+
if (expiresAt === undefined) {
|
|
204
|
+
continue;
|
|
202
205
|
}
|
|
203
206
|
|
|
204
|
-
assert(typeof
|
|
207
|
+
assert(typeof expiresAt === "number", "2033392");
|
|
205
208
|
|
|
206
|
-
if (
|
|
209
|
+
if (expiresAt === 0) {
|
|
207
210
|
return INFINITY_TIME;
|
|
208
211
|
}
|
|
209
212
|
|
|
210
|
-
return
|
|
213
|
+
return expiresAt * 1000;
|
|
211
214
|
}
|
|
212
215
|
|
|
213
|
-
|
|
214
|
-
|
|
216
|
+
for (const propertyName of [
|
|
217
|
+
"refresh_expires_in",
|
|
218
|
+
"refresh_token_expires_in"
|
|
219
|
+
] as const) {
|
|
220
|
+
const expiresIn = oidcClientTsUser.__oidc_spa_tokenResponse[propertyName];
|
|
215
221
|
|
|
216
|
-
if (
|
|
217
|
-
|
|
222
|
+
if (expiresIn === undefined) {
|
|
223
|
+
continue;
|
|
218
224
|
}
|
|
219
225
|
|
|
220
|
-
assert(typeof
|
|
226
|
+
assert(typeof expiresIn === "number", "2033425330");
|
|
221
227
|
|
|
222
|
-
if (
|
|
228
|
+
if (expiresIn === 0) {
|
|
223
229
|
return INFINITY_TIME;
|
|
224
230
|
}
|
|
225
231
|
|
|
226
|
-
return issuedAtTime +
|
|
232
|
+
return issuedAtTime + expiresIn * 1000;
|
|
227
233
|
}
|
|
228
234
|
|
|
229
235
|
read_from_jwt: {
|