oidc-spa 6.15.0 → 7.0.0

package/src/react/react.tsx

@@ -3,8 +3,6 @@ import {
     useState,
     createContext,
     useContext,
-    useReducer,
-    useRef,
     type ReactNode,
     type ComponentType,
     type FC,
@@ -33,10 +31,7 @@ export namespace OidcReact {
         }) => Promise<never>;
         initializationError: OidcInitializationError | undefined;
 
-        /** @deprecated: Use `const { decodedIdToken, tokens} = useOidc();` */
-        oidcTokens?: never;
         decodedIdToken?: never;
-        tokens?: never;
         logout?: never;
         subscribeToAutoLogoutCountdown?: never;
         goToAuthServer?: never;
@@ -46,10 +41,7 @@ export namespace OidcReact {
 
     export type LoggedIn<DecodedIdToken extends Record<string, unknown>> = Common & {
         isUserLoggedIn: true;
-        /** @deprecated: Use `const { decodedIdToken, tokens} = useOidc();` */
-        oidcTokens: Oidc.Tokens<DecodedIdToken>;
         decodedIdToken: DecodedIdToken;
-        tokens: Oidc.Tokens<DecodedIdToken> | undefined;
         logout: Oidc.LoggedIn["logout"];
         renewTokens: Oidc.LoggedIn["renewTokens"];
         subscribeToAutoLogoutCountdown: (
@@ -259,62 +251,22 @@ export function createOidcReactApi_dependencyInjection<
             }
         }
 
-        const [, forceUpdate] = useReducer(() => [], []);
-        // TODO: Remove in next major version
-        useEffect(() => {
-            if (!oidc.isUserLoggedIn) {
-                return;
-            }
-
-            const { unsubscribe } = oidc.subscribeToTokensChange(forceUpdate);
-
-            return unsubscribe;
-        }, [oidc]);
-
-        const tokensState_ref = useRef<{
-            isConsumerReadingTokens: boolean;
-            tokens: Oidc.Tokens<DecodedIdToken> | undefined;
-        }>({
-            isConsumerReadingTokens: false,
-            tokens: undefined
-        });
+        const [, reRenderIfDecodedIdTokenChanged] = useState(
+            !oidc.isUserLoggedIn ? undefined : oidc.getDecodedIdToken()
+        );
 
         useEffect(() => {
             if (!oidc.isUserLoggedIn) {
                 return;
             }
 
-            const updateTokens = (tokens: Oidc.Tokens<DecodedIdToken>) => {
-                if (tokens === tokensState_ref.current.tokens) {
-                    return;
-                }
-
-                const tokenState = tokensState_ref.current;
-
-                tokenState.tokens = tokens;
-
-                if (tokenState.isConsumerReadingTokens) {
-                    forceUpdate();
-                }
-            };
+            const { unsubscribe } = oidc.subscribeToTokensChange(() =>
+                reRenderIfDecodedIdTokenChanged(oidc.getDecodedIdToken())
+            );
 
-            let isActive = true;
+            reRenderIfDecodedIdTokenChanged(oidc.getDecodedIdToken());
 
-            oidc.getTokens_next().then(tokens => {
-                if (!isActive) {
-                    return;
-                }
-                updateTokens(tokens);
-            });
-
-            const { unsubscribe } = oidc.subscribeToTokensChange(tokens => {
-                updateTokens(tokens);
-            });
-
-            return () => {
-                isActive = false;
-                unsubscribe();
-            };
+            return unsubscribe;
         }, []);
 
         const common: OidcReact.Common = {
@@ -334,13 +286,7 @@ export function createOidcReactApi_dependencyInjection<
         const oidcReact: OidcReact.LoggedIn<DecodedIdToken> = {
             ...common,
             isUserLoggedIn: true,
-            oidcTokens: oidc.getTokens(),
             decodedIdToken: oidc.getDecodedIdToken(),
-            get tokens() {
-                const tokensState = tokensState_ref.current;
-                tokensState.isConsumerReadingTokens = true;
-                return tokensState.tokens;
-            },
             logout: oidc.logout,
             renewTokens: oidc.renewTokens,
             subscribeToAutoLogoutCountdown: oidc.subscribeToAutoLogoutCountdown,
@@ -422,17 +368,10 @@ export function createOidcReactApi_dependencyInjection<
         return oidc;
     });
 
-    async function getOidc(): Promise<Oidc<DecodedIdToken>> {
+    function getOidc(): Promise<Oidc<DecodedIdToken>> {
         dReadyToCreate.resolve();
 
-        // TODO: Directly return oidc in next major version
-        const oidc = await prOidc;
-
-        if (oidc.isUserLoggedIn) {
-            await oidc.getTokens_next();
-        }
-
-        return oidc;
+        return prOidc;
     }
 
     const oidcReact: OidcReactApi<DecodedIdToken, false> = {
@@ -449,7 +388,7 @@ export function createOidcReactApi_dependencyInjection<
 
 /** @see: https://docs.oidc-spa.dev/v/v6/usage#react-api */
 export function createReactOidc<
-    DecodedIdToken extends Record<string, unknown> = Record<string, unknown>,
+    DecodedIdToken extends Record<string, unknown> = Oidc.Tokens.DecodedIdToken_base,
     AutoLogin extends boolean = false
 >(params: ValueOrAsyncGetter<ParamsOfCreateOidc<DecodedIdToken, AutoLogin>>) {
     return createOidcReactApi_dependencyInjection(params, createOidc);

package/src/tools/readExpirationTimeInJwt.ts

@@ -3,15 +3,14 @@ import { assert } from "../vendor/frontend/tsafe";
 
 // Return undefined if token provided wasn't a JWT or if it hasn't an exp claim number
 export function readExpirationTimeInJwt(token: string): number | undefined {
-    let expirationTime: number;
+    let exp: number;
 
     try {
-        expirationTime = decodeJwt<{ exp: number }>(token).exp * 1000;
-
-        assert(typeof expirationTime === "number" && !isNaN(expirationTime));
+        exp = decodeJwt<{ exp: number }>(token).exp;
+        assert(typeof exp === "number");
     } catch {
         return undefined;
     }
 
-    return expirationTime;
+    return exp * 1000;
 }

package/tools/readExpirationTimeInJwt.js

@@ -5,14 +5,14 @@ var decodeJwt_1 = require("./decodeJwt");
 var tsafe_1 = require("../vendor/frontend/tsafe");
 // Return undefined if token provided wasn't a JWT or if it hasn't an exp claim number
 function readExpirationTimeInJwt(token) {
-    var expirationTime;
+    var exp;
     try {
-        expirationTime = (0, decodeJwt_1.decodeJwt)(token).exp * 1000;
-        (0, tsafe_1.assert)(typeof expirationTime === "number" && !isNaN(expirationTime));
+        exp = (0, decodeJwt_1.decodeJwt)(token).exp;
+        (0, tsafe_1.assert)(typeof exp === "number");
     }
     catch (_a) {
         return undefined;
     }
-    return expirationTime;
+    return exp * 1000;
 }
 //# sourceMappingURL=readExpirationTimeInJwt.js.map

package/tools/readExpirationTimeInJwt.js.map

@@ -1 +1 @@
-{"version":3,"file":"readExpirationTimeInJwt.js","sourceRoot":"","sources":["../src/tools/readExpirationTimeInJwt.ts"],"names":[],"mappings":";;AAIA,0DAYC;AAhBD,yCAAwC;AACxC,kDAAkD;AAElD,sFAAsF;AACtF,SAAgB,uBAAuB,CAAC,KAAa;IACjD,IAAI,cAAsB,CAAC;IAE3B,IAAI,CAAC;QACD,cAAc,GAAG,IAAA,qBAAS,EAAkB,KAAK,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC;QAE9D,IAAA,cAAM,EAAC,OAAO,cAAc,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;IACzE,CAAC;IAAC,WAAM,CAAC;QACL,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,cAAc,CAAC;AAC1B,CAAC"}
+{"version":3,"file":"readExpirationTimeInJwt.js","sourceRoot":"","sources":["../src/tools/readExpirationTimeInJwt.ts"],"names":[],"mappings":";;AAIA,0DAWC;AAfD,yCAAwC;AACxC,kDAAkD;AAElD,sFAAsF;AACtF,SAAgB,uBAAuB,CAAC,KAAa;IACjD,IAAI,GAAW,CAAC;IAEhB,IAAI,CAAC;QACD,GAAG,GAAG,IAAA,qBAAS,EAAkB,KAAK,CAAC,CAAC,GAAG,CAAC;QAC5C,IAAA,cAAM,EAAC,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC;IACpC,CAAC;IAAC,WAAM,CAAC;QACL,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,GAAG,GAAG,IAAI,CAAC;AACtB,CAAC"}