@openstax/ts-utils 1.16.2 → 1.17.0

package/dist/esm/services/launchParams/signer.d.ts

@@ -21,7 +21,7 @@ export declare const createLaunchSigner: <C extends string = "launch">({ configS
     jwks: () => Promise<{
         keys: JWK.RawKey[];
     }>;
-    sign: (subject: string, maxExpiresIn?: string | number | null | undefined) => Promise<string>;
+    sign: (subject: string, maxExp?: number | null | undefined) => Promise<string>;
 };
 export declare type LaunchSigner = ReturnType<ReturnType<typeof createLaunchSigner>>;
 export {};

package/dist/esm/services/launchParams/signer.js

@@ -28,17 +28,21 @@ export const createLaunchSigner = ({ configSpace }) => (configProvider) => {
         return keystore;
     });
     const jwks = async () => (await getKeyStore()).toJSON(false);
-    const getExpiresInWithMax = async (maxExpiresIn) => {
+    const getExpiresInWithMax = async (maxExp) => {
         const expiresIn = await getExpiresIn();
-        const maxExpiresInSeconds = typeof maxExpiresIn === 'number' ? maxExpiresIn :
-            typeof maxExpiresIn === 'string' ? Math.floor(ms(maxExpiresIn) / 1000) :
-                undefined;
-        return maxExpiresInSeconds ? Math.min(Math.floor(ms(expiresIn) / 1000), maxExpiresInSeconds) : expiresIn;
+        // The ms library used by jsonwebtoken can handle a value in seconds as well as a string like '1d'
+        if (!maxExp) {
+            return expiresIn;
+        }
+        // Convert both values to seconds for comparison
+        const expiresInSeconds = Math.floor(ms(expiresIn) / 1000);
+        const maxExpSeconds = maxExp - Math.floor(Date.now() / 1000);
+        return Math.min(expiresInSeconds, maxExpSeconds);
     };
-    const sign = async (subject, maxExpiresIn) => {
+    const sign = async (subject, maxExp) => {
         const alg = await getAlg();
         // expiresIn can be a number of seconds or a string like '1h' or '1d'
-        const expiresIn = await getExpiresInWithMax(maxExpiresIn);
+        const expiresIn = await getExpiresInWithMax(maxExp);
         const iss = await getIss();
         const header = { alg, iss };
         return jwt.sign({}, await getPrivateKey(), { algorithm: alg, expiresIn, header, issuer: iss, subject });