oidc-spa 8.6.17 → 8.6.19

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oidc-spa",
-    "version": "8.6.17",
+    "version": "8.6.19",
     "description": "OpenID Connect / OAuth2 solution for Centric Web Applications",
     "repository": {
         "type": "git",

package/src/core/createOidc.ts

@@ -59,6 +59,7 @@ import {
     getIsStateDataCookieEnabled
 } from "./StateDataCookie";
 import { getIsTokenSubstitutionEnabled } from "./tokenPlaceholderSubstitution";
+import { loadWebcryptoLinerShim } from "../tools/loadWebcryptoLinerShim";
 
 // NOTE: Replaced at build time
 const VERSION = "{{OIDC_SPA_VERSION}}";
@@ -388,6 +389,11 @@ export async function createOidc_nonMemoized<
 
     const { issuerUri, clientId, configId, log } = preProcessedParams;
 
+    if (window.crypto.subtle === undefined) {
+        log?.("window.crypto.subtle not present, lazily loading polyfills.");
+        await loadWebcryptoLinerShim();
+    }
+
     const getExtraQueryParams = (() => {
         if (extraQueryParamsOrGetter === undefined) {
             return undefined;
@@ -2053,8 +2059,8 @@ export async function createOidc_nonMemoized<
             sessionId
         });
 
-        const { unsubscribe: unsubscribeFromIsUserActive } = evtIsUserActive.subscribe(isUserActive => {
-            if (isUserActive) {
+        const { unsubscribe: unsubscribeFromIsUserActive } = evtIsUserActive.subscribe(eventData => {
+            if (eventData.isUserActive) {
                 if (stopCountdown !== undefined) {
                     stopCountdown();
                     stopCountdown = undefined;
@@ -2067,7 +2073,11 @@ export async function createOidc_nonMemoized<
                 assert(currentRefreshTokenTtlInSeconds !== undefined, "902992326");
 
                 stopCountdown = startCountdown({
-                    countDownFromSeconds: currentRefreshTokenTtlInSeconds
+                    countDownFromSeconds: Math.floor(
+                        (currentRefreshTokenTtlInSeconds * 1_000 -
+                            eventData.hasBeenInactiveForHowLongMs) /
+                            1_000
+                    )
                 }).stopCountdown;
             }
         });

package/src/core/evtIsUserActive.ts

@@ -5,13 +5,15 @@ import { id } from "../tools/tsafe/id";
 
 const globalContext = {
     appInstanceId: Math.random().toString(36).slice(2),
-    evtIsUserActiveBySessionId: new Map<string, NonPostableEvt<boolean>>()
+    evtIsUserActiveBySessionId: new Map<string, NonPostableEvt<EventData>>()
 };
 
+type EventData = { isUserActive: true } | { isUserActive: false; hasBeenInactiveForHowLongMs: number };
+
 export function createEvtIsUserActive(params: {
     configId: string;
     sessionId: string | undefined;
-}): NonPostableEvt<boolean> {
+}): NonPostableEvt<EventData> {
     const { configId, sessionId } = params;
 
     use_existing_instance: {
@@ -60,15 +62,19 @@ export function createEvtIsUserActive(params: {
         return { notifyOtherTabsOfUserInteraction, subscribeToUserInteractionOnOtherTabs };
     })();
 
-    const evtIsUserActive = createEvt<boolean>();
+    const evtIsUserActive = createEvt<EventData>();
     let isUserActive = true;
 
     const scheduleSetInactive = () => {
+        const start = performance.now();
+
         const timer = setTimeout(() => {
+            const elapsed = performance.now() - start;
             assert(isUserActive, "011507");
             isUserActive = false;
-            evtIsUserActive.post(isUserActive);
+            evtIsUserActive.post({ isUserActive, hasBeenInactiveForHowLongMs: elapsed });
         }, 5_000);
+
         return () => {
             clearTimeout(timer);
             clearScheduledSetInactive = undefined;
@@ -89,7 +95,7 @@ export function createEvtIsUserActive(params: {
 
         if (!isUserActive) {
             isUserActive = true;
-            evtIsUserActive.post(isUserActive);
+            evtIsUserActive.post({ isUserActive });
         }
     };
 

package/src/core/loginOrGoToAuthServer.ts

@@ -356,16 +356,6 @@ export function createLoginOrGoToAuthServer(params: {
                 error => {
                     assert(error instanceof Error, "393430");
 
-                    if (error.message.includes("Crypto.subtle is available only in secure contexts")) {
-                        throw new Error(
-                            [
-                                `oidc-spa: ${error.message}.`,
-                                "\nTo fix this error see:",
-                                "https://docs.oidc-spa.dev/v/v8/resources/fixing-crypto.subtle-is-available-only-in-secure-contexts-https"
-                            ].join(" ")
-                        );
-                    }
-
                     assert(false, `This is a bug in oidc-spa, please report: ${error.message}`);
                 }
             );

package/src/core/loginSilent.ts

@@ -207,17 +207,6 @@ export async function loginSilent(params: {
                     return;
                 }
 
-                if (error.message.includes("Crypto.subtle is available only in secure contexts")) {
-                    clearTimeouts({ wasSuccess: false });
-                    throw new Error(
-                        [
-                            `oidc-spa: ${error.message}.`,
-                            "\nTo fix this error see:",
-                            "https://docs.oidc-spa.dev/v/v8/resources/fixing-crypto.subtle-is-available-only-in-secure-contexts-https"
-                        ].join(" ")
-                    );
-                }
-
                 assert(false, `This is a bug in oidc-spa, please report: ${error.message}`);
             }
         );

package/src/tools/loadWebcryptoLinerShim.ts

@@ -0,0 +1,11 @@
+let prLoaded: Promise<void> | undefined = undefined;
+
+export function loadWebcryptoLinerShim() {
+    if (prLoaded !== undefined) {
+        return prLoaded;
+    }
+
+    prLoaded = import("../vendor/frontend/webcrypto-liner-shim").then(() => {});
+
+    return prLoaded;
+}

package/src/tools/startCountdown.ts

@@ -6,10 +6,15 @@ export function createStartCountdown(params: {
     function startCountdown(params: { countDownFromSeconds: number }) {
         const { countDownFromSeconds } = params;
 
-        let timer: ReturnType<typeof setTimeout>;
+        let timer: ReturnType<typeof setTimeout> | undefined = undefined;
 
         (async () => {
-            let secondsLeft = Math.floor(countDownFromSeconds);
+            let secondsLeft = Math.max(0, Math.floor(countDownFromSeconds));
+
+            if (secondsLeft === 0) {
+                tickCallback({ secondsLeft: 0 });
+                return;
+            }
 
             while (true) {
                 const start = performance.now();
@@ -35,7 +40,9 @@ export function createStartCountdown(params: {
         })();
 
         const stopCountdown = () => {
-            clearTimeout(timer);
+            if (timer !== undefined) {
+                clearTimeout(timer);
+            }
             tickCallback({ secondsLeft: undefined });
         };
 

package/src/vendor/frontend/webcrypto-liner-shim.ts

@@ -0,0 +1,3 @@
+import "webcrypto-liner-shim";
+
+export {};

package/tools/loadWebcryptoLinerShim.d.ts

@@ -0,0 +1 @@
+export declare function loadWebcryptoLinerShim(): Promise<void>;

package/tools/loadWebcryptoLinerShim.js

@@ -0,0 +1,45 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadWebcryptoLinerShim = loadWebcryptoLinerShim;
+let prLoaded = undefined;
+function loadWebcryptoLinerShim() {
+    if (prLoaded !== undefined) {
+        return prLoaded;
+    }
+    prLoaded = Promise.resolve().then(() => __importStar(require("../vendor/frontend/webcrypto-liner-shim"))).then(() => { });
+    return prLoaded;
+}
+//# sourceMappingURL=loadWebcryptoLinerShim.js.map

package/tools/loadWebcryptoLinerShim.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"loadWebcryptoLinerShim.js","sourceRoot":"","sources":["../src/tools/loadWebcryptoLinerShim.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,wDAQC;AAVD,IAAI,QAAQ,GAA8B,SAAS,CAAC;AAEpD,SAAgB,sBAAsB;IAClC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,QAAQ,GAAG,kDAAO,yCAAyC,IAAE,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAE5E,OAAO,QAAQ,CAAC;AACpB,CAAC"}

package/tools/startCountdown.js

@@ -5,9 +5,13 @@ function createStartCountdown(params) {
     const { tickCallback } = params;
     function startCountdown(params) {
         const { countDownFromSeconds } = params;
-        let timer;
+        let timer = undefined;
         (async () => {
-            let secondsLeft = Math.floor(countDownFromSeconds);
+            let secondsLeft = Math.max(0, Math.floor(countDownFromSeconds));
+            if (secondsLeft === 0) {
+                tickCallback({ secondsLeft: 0 });
+                return;
+            }
             while (true) {
                 const start = performance.now();
                 await new Promise(resolve => {
@@ -25,7 +29,9 @@ function createStartCountdown(params) {
             }
         })();
         const stopCountdown = () => {
-            clearTimeout(timer);
+            if (timer !== undefined) {
+                clearTimeout(timer);
+            }
             tickCallback({ secondsLeft: undefined });
         };
         return { stopCountdown };

package/tools/startCountdown.js.map

@@ -1 +1 @@
-{"version":3,"file":"startCountdown.js","sourceRoot":"","sources":["../src/tools/startCountdown.ts"],"names":[],"mappings":";;AAAA,oDA6CC;AA7CD,SAAgB,oBAAoB,CAAC,MAEpC;IACG,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;IAEhC,SAAS,cAAc,CAAC,MAAwC;QAC5D,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,CAAC;QAExC,IAAI,KAAoC,CAAC;QAEzC,CAAC,KAAK,IAAI,EAAE;YACR,IAAI,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;YAEnD,OAAO,IAAI,EAAE,CAAC;gBACV,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;gBAEhC,MAAM,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;oBAC9B,KAAK,GAAG,UAAU,CAAC,OAAO,EAAE,IAAK,CAAC,CAAC;gBACvC,CAAC,CAAC,CAAC;gBAEH,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;gBAE/D,WAAW,GAAG,WAAW,GAAG,OAAO,CAAC;gBAEpC,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;oBAClB,WAAW,GAAG,CAAC,CAAC;gBACpB,CAAC;gBAED,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;gBAE9B,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;oBACpB,MAAM;gBACV,CAAC;YACL,CAAC;QACL,CAAC,CAAC,EAAE,CAAC;QAEL,MAAM,aAAa,GAAG,GAAG,EAAE;YACvB,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,YAAY,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC;QAC7C,CAAC,CAAC;QAEF,OAAO,EAAE,aAAa,EAAE,CAAC;IAC7B,CAAC;IAED,OAAO,EAAE,cAAc,EAAE,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"startCountdown.js","sourceRoot":"","sources":["../src/tools/startCountdown.ts"],"names":[],"mappings":";;AAAA,oDAoDC;AApDD,SAAgB,oBAAoB,CAAC,MAEpC;IACG,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;IAEhC,SAAS,cAAc,CAAC,MAAwC;QAC5D,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,CAAC;QAExC,IAAI,KAAK,GAA8C,SAAS,CAAC;QAEjE,CAAC,KAAK,IAAI,EAAE;YACR,IAAI,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC;YAEhE,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;gBACpB,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC;gBACjC,OAAO;YACX,CAAC;YAED,OAAO,IAAI,EAAE,CAAC;gBACV,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;gBAEhC,MAAM,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;oBAC9B,KAAK,GAAG,UAAU,CAAC,OAAO,EAAE,IAAK,CAAC,CAAC;gBACvC,CAAC,CAAC,CAAC;gBAEH,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;gBAE/D,WAAW,GAAG,WAAW,GAAG,OAAO,CAAC;gBAEpC,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;oBAClB,WAAW,GAAG,CAAC,CAAC;gBACpB,CAAC;gBAED,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;gBAE9B,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;oBACpB,MAAM;gBACV,CAAC;YACL,CAAC;QACL,CAAC,CAAC,EAAE,CAAC;QAEL,MAAM,aAAa,GAAG,GAAG,EAAE;YACvB,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACtB,YAAY,CAAC,KAAK,CAAC,CAAC;YACxB,CAAC;YACD,YAAY,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC;QAC7C,CAAC,CAAC;QAEF,OAAO,EAAE,aAAa,EAAE,CAAC;IAC7B,CAAC;IAED,OAAO,EAAE,cAAc,EAAE,CAAC;AAC9B,CAAC"}

package/vendor/frontend/webcrypto-liner-shim.d.ts

@@ -0,0 +1,2 @@
+import "webcrypto-liner-shim";
+export {};