Merge branch 'master' into snyk-upgrade-2ea8e5c83885746b0f13e95b25debd67

Author: adamjmcgrath

index.d.ts

@@ -30,7 +30,13 @@ declare namespace JwksRsa {
     timeout?: number;
     requestAgent?: HttpAgent | HttpsAgent;
     fetcher?(jwksUri: string): Promise<{ keys: any }>;
-    getKeysInterceptor?(): Promise<SigningKey[]>;
+    getKeysInterceptor?(): Promise<JSONWebKey[]>;
+  }
+
+  interface JSONWebKey {
+    kid: string,
+    alg: string,
+    [key: string]: any
   }
 
   interface CertSigningKey {

tests/ts-definitions.tests.ts

@@ -23,4 +23,25 @@ describe('typescript definition', () => {
       expect(key).to.contain('-----BEGIN PUBLIC KEY');
     });
   });
+
+  describe('getKeysInterceptor', async () => {
+    const keySetResponse = {
+      keys: [
+        {
+          alg: 'RS256',
+          kty: 'RSA',
+          use: 'sig',
+          kid: 'NkFCNEE1NDFDNTQ5RTQ5OTE1QzRBMjYyMzY0NEJCQTJBMjJBQkZCMA'
+        }
+      ]
+    };
+
+    const client = new jwksRsa.JwksClient({
+      jwksUri: `${jwksHost}/.well-known/jwks.json`,
+      getKeysInterceptor: () => Promise.resolve(keySetResponse.keys)
+    });
+
+    const key = await client.getSigningKey('NkFCNEE1NDFDNTQ5RTQ5OTE1QzRBMjYyMzY0NEJCQTJBMjJBQkZCMA');
+    expect(key.kid).to.equal('NkFCNEE1NDFDNTQ5RTQ5OTE1QzRBMjYyMzY0NEJCQTJBMjJBQkZCMA');
+  });
 });