@saurbit/oauth2-jwt 0.1.1 → 0.1.3

package/README.md

@@ -132,7 +132,7 @@ const authority = new JoseJwksAuthority(store, 8.64e+6); // 100 days key TTL
 
 const rotator = new JwksRotator({
   keyGenerator: authority,
-  rotatorKeyStore: store,
+  rotationTimestampStore: store,
   rotationIntervalMs: 7.884e9, // 91 days
 });
 ```

package/esm/jose_jwks_authority.js

@@ -124,7 +124,7 @@ export class JoseJwksAuthority {
         }
         const privateKey = await importJWK(key, "RS256");
         const token = await new SignJWT(payload)
-            .setProtectedHeader({ typ: "jwt", alg: "RS256", kid: key.kid })
+            .setProtectedHeader({ typ: "JWT", alg: "RS256", kid: key.kid })
             .sign(privateKey);
         return { token, kid: key.kid };
     }
@@ -154,7 +154,7 @@ export class JoseJwksAuthority {
         if ("jwk" in protectedHeader) {
             throw new Error("Unexpected JWK in header - potential forgery attempt");
         }
-        if (protectedHeader.typ && protectedHeader.typ.toLowerCase() !== "jwt") {
+        if (protectedHeader.typ && protectedHeader.typ.toUpperCase() !== "JWT") {
             throw new Error(`Unexpected typ: ${protectedHeader.typ}`);
         }
         return payload;
@@ -178,7 +178,7 @@ export class JoseJwksAuthority {
         const result = [];
         for (const payload of payloads) {
             const token = await new SignJWT(payload)
-                .setProtectedHeader({ typ: "jwt", alg: "RS256", kid: key.kid })
+                .setProtectedHeader({ typ: "JWT", alg: "RS256", kid: key.kid })
                 .sign(privateKey);
             result.push({ token, kid: key.kid });
         }

package/esm/jwks_rotator.d.ts

@@ -6,7 +6,7 @@ export interface JwksRotatorOptions {
     /** The key generator used to produce new signing key pairs during rotation. */
     keyGenerator: KeyGenerator;
     /** The store used to read and persist the last rotation timestamp. */
-    rotatorKeyStore: JwksRotationTimestampStore;
+    rotationTimestampStore: JwksRotationTimestampStore;
     /** How often (in milliseconds) new keys should be generated. For example, `7.884e9` for 91 days. */
     rotationIntervalMs: number;
 }
@@ -20,12 +20,12 @@ export interface JwksRotatorOptions {
  */
 export declare class JwksRotator {
     private readonly keyGenerator;
-    private readonly rotatorKeyStore;
+    private readonly rotationTimestampStore;
     private readonly rotationIntervalMs;
     /**
      * @param options - Rotation configuration: key generator, timestamp store, and interval.
      */
-    constructor({ keyGenerator, rotationIntervalMs, rotatorKeyStore }: JwksRotatorOptions);
+    constructor({ keyGenerator, rotationIntervalMs, rotationTimestampStore }: JwksRotatorOptions);
     /**
      * Checks if rotation is due, and performs rotation if necessary.
      * Should be called at service startup or on a schedule (e.g. every hour).

package/esm/jwks_rotator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jwks_rotator.d.ts","sourceRoot":"","sources":["../src/jwks_rotator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAEtE;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,+EAA+E;IAC/E,YAAY,EAAE,YAAY,CAAC;IAC3B,sEAAsE;IACtE,eAAe,EAAE,0BAA0B,CAAC;IAC5C,oGAAoG;IACpG,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED;;;;;;;GAOG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6B;IAC7D,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAS;IAE5C;;OAEG;gBACS,EAAE,YAAY,EAAE,kBAAkB,EAAE,eAAe,EAAE,EAAE,kBAAkB;IAMrF;;;OAGG;IACU,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;YAYlC,UAAU;CAGzB"}
+{"version":3,"file":"jwks_rotator.d.ts","sourceRoot":"","sources":["../src/jwks_rotator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAEtE;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,+EAA+E;IAC/E,YAAY,EAAE,YAAY,CAAC;IAC3B,sEAAsE;IACtE,sBAAsB,EAAE,0BAA0B,CAAC;IACnD,oGAAoG;IACpG,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED;;;;;;;GAOG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAA6B;IACpE,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAS;IAE5C;;OAEG;gBACS,EAAE,YAAY,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,EAAE,kBAAkB;IAM5F;;;OAGG;IACU,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;YAYlC,UAAU;CAGzB"}

package/esm/jwks_rotator.js

@@ -10,14 +10,14 @@ export class JwksRotator {
     /**
      * @param options - Rotation configuration: key generator, timestamp store, and interval.
      */
-    constructor({ keyGenerator, rotationIntervalMs, rotatorKeyStore }) {
+    constructor({ keyGenerator, rotationIntervalMs, rotationTimestampStore }) {
         Object.defineProperty(this, "keyGenerator", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "rotatorKeyStore", {
+        Object.defineProperty(this, "rotationTimestampStore", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -31,7 +31,7 @@ export class JwksRotator {
         });
         this.keyGenerator = keyGenerator;
         this.rotationIntervalMs = rotationIntervalMs;
-        this.rotatorKeyStore = rotatorKeyStore;
+        this.rotationTimestampStore = rotationTimestampStore;
     }
     /**
      * Checks if rotation is due, and performs rotation if necessary.
@@ -39,10 +39,10 @@ export class JwksRotator {
      */
     async checkAndRotateKeys() {
         const now = Date.now();
-        const lastRotation = await this.rotatorKeyStore.getLastRotationTimestamp();
+        const lastRotation = await this.rotationTimestampStore.getLastRotationTimestamp();
         if (isNaN(lastRotation) || now - lastRotation >= this.rotationIntervalMs) {
             await this.rotateKeys();
-            await this.rotatorKeyStore.setLastRotationTimestamp(now);
+            await this.rotationTimestampStore.setLastRotationTimestamp(now);
         }
         else {
             const _nextIn = this.rotationIntervalMs - (now - lastRotation);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saurbit/oauth2-jwt",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "JWT utilities for @saurbit/oauth2 (jose-based)",
   "keywords": [
     "oauth2",

package/script/jose_jwks_authority.js

@@ -127,7 +127,7 @@ class JoseJwksAuthority {
         }
         const privateKey = await (0, jose_1.importJWK)(key, "RS256");
         const token = await new jose_1.SignJWT(payload)
-            .setProtectedHeader({ typ: "jwt", alg: "RS256", kid: key.kid })
+            .setProtectedHeader({ typ: "JWT", alg: "RS256", kid: key.kid })
             .sign(privateKey);
         return { token, kid: key.kid };
     }
@@ -157,7 +157,7 @@ class JoseJwksAuthority {
         if ("jwk" in protectedHeader) {
             throw new Error("Unexpected JWK in header - potential forgery attempt");
         }
-        if (protectedHeader.typ && protectedHeader.typ.toLowerCase() !== "jwt") {
+        if (protectedHeader.typ && protectedHeader.typ.toUpperCase() !== "JWT") {
             throw new Error(`Unexpected typ: ${protectedHeader.typ}`);
         }
         return payload;
@@ -181,7 +181,7 @@ class JoseJwksAuthority {
         const result = [];
         for (const payload of payloads) {
             const token = await new jose_1.SignJWT(payload)
-                .setProtectedHeader({ typ: "jwt", alg: "RS256", kid: key.kid })
+                .setProtectedHeader({ typ: "JWT", alg: "RS256", kid: key.kid })
                 .sign(privateKey);
             result.push({ token, kid: key.kid });
         }

package/script/jwks_rotator.d.ts

@@ -6,7 +6,7 @@ export interface JwksRotatorOptions {
     /** The key generator used to produce new signing key pairs during rotation. */
     keyGenerator: KeyGenerator;
     /** The store used to read and persist the last rotation timestamp. */
-    rotatorKeyStore: JwksRotationTimestampStore;
+    rotationTimestampStore: JwksRotationTimestampStore;
     /** How often (in milliseconds) new keys should be generated. For example, `7.884e9` for 91 days. */
     rotationIntervalMs: number;
 }
@@ -20,12 +20,12 @@ export interface JwksRotatorOptions {
  */
 export declare class JwksRotator {
     private readonly keyGenerator;
-    private readonly rotatorKeyStore;
+    private readonly rotationTimestampStore;
     private readonly rotationIntervalMs;
     /**
      * @param options - Rotation configuration: key generator, timestamp store, and interval.
      */
-    constructor({ keyGenerator, rotationIntervalMs, rotatorKeyStore }: JwksRotatorOptions);
+    constructor({ keyGenerator, rotationIntervalMs, rotationTimestampStore }: JwksRotatorOptions);
     /**
      * Checks if rotation is due, and performs rotation if necessary.
      * Should be called at service startup or on a schedule (e.g. every hour).

package/script/jwks_rotator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jwks_rotator.d.ts","sourceRoot":"","sources":["../src/jwks_rotator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAEtE;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,+EAA+E;IAC/E,YAAY,EAAE,YAAY,CAAC;IAC3B,sEAAsE;IACtE,eAAe,EAAE,0BAA0B,CAAC;IAC5C,oGAAoG;IACpG,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED;;;;;;;GAOG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6B;IAC7D,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAS;IAE5C;;OAEG;gBACS,EAAE,YAAY,EAAE,kBAAkB,EAAE,eAAe,EAAE,EAAE,kBAAkB;IAMrF;;;OAGG;IACU,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;YAYlC,UAAU;CAGzB"}
+{"version":3,"file":"jwks_rotator.d.ts","sourceRoot":"","sources":["../src/jwks_rotator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAEtE;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,+EAA+E;IAC/E,YAAY,EAAE,YAAY,CAAC;IAC3B,sEAAsE;IACtE,sBAAsB,EAAE,0BAA0B,CAAC;IACnD,oGAAoG;IACpG,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED;;;;;;;GAOG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAA6B;IACpE,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAS;IAE5C;;OAEG;gBACS,EAAE,YAAY,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,EAAE,kBAAkB;IAM5F;;;OAGG;IACU,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;YAYlC,UAAU;CAGzB"}

package/script/jwks_rotator.js

@@ -13,14 +13,14 @@ class JwksRotator {
     /**
      * @param options - Rotation configuration: key generator, timestamp store, and interval.
      */
-    constructor({ keyGenerator, rotationIntervalMs, rotatorKeyStore }) {
+    constructor({ keyGenerator, rotationIntervalMs, rotationTimestampStore }) {
         Object.defineProperty(this, "keyGenerator", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "rotatorKeyStore", {
+        Object.defineProperty(this, "rotationTimestampStore", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -34,7 +34,7 @@ class JwksRotator {
         });
         this.keyGenerator = keyGenerator;
         this.rotationIntervalMs = rotationIntervalMs;
-        this.rotatorKeyStore = rotatorKeyStore;
+        this.rotationTimestampStore = rotationTimestampStore;
     }
     /**
      * Checks if rotation is due, and performs rotation if necessary.
@@ -42,10 +42,10 @@ class JwksRotator {
      */
     async checkAndRotateKeys() {
         const now = Date.now();
-        const lastRotation = await this.rotatorKeyStore.getLastRotationTimestamp();
+        const lastRotation = await this.rotationTimestampStore.getLastRotationTimestamp();
         if (isNaN(lastRotation) || now - lastRotation >= this.rotationIntervalMs) {
             await this.rotateKeys();
-            await this.rotatorKeyStore.setLastRotationTimestamp(now);
+            await this.rotationTimestampStore.setLastRotationTimestamp(now);
         }
         else {
             const _nextIn = this.rotationIntervalMs - (now - lastRotation);