Callback backwards compatibility

src/JwksClient.js

@@ -1,6 +1,6 @@
 const debug = require('debug');
 const { retrieveSigningKeys } = require('./utils') ;
-const { request, cacheSigningKey, rateLimitSigningKey, getKeysInterceptor } = require('./wrappers');
+const { request, cacheSigningKey, rateLimitSigningKey, getKeysInterceptor, callbackSupport } = require('./wrappers');
 const JwksError = require('./errors/JwksError');
 const SigningKeyNotFoundError = require('./errors/SigningKeyNotFoundError');
 
@@ -25,6 +25,8 @@ class JwksClient {
  if (this.options.cache) {
  this.getSigningKey = cacheSigningKey(this, options);
  }
+
+ this.getSigningKey = callbackSupport(this, options);
  }
 
  async getKeys() {

src/wrappers/callbackSupport.js

@@ -0,0 +1,16 @@
+const { callbackify } = require('util');
+
+const callbackSupport = (client) => {
+ const getSigningKey = client.getSigningKey.bind(client);
+
+ return (kid, cb) => {
+ if (cb) {
+ const callbackFunc = callbackify(getSigningKey);
+ return callbackFunc(kid, cb);
+ }
+
+ return getSigningKey(kid);
+ };
+};
+
+module.exports.default = callbackSupport;

src/wrappers/index.js

@@ -2,5 +2,6 @@ module.exports = {
  request: require('./request').default,
  cacheSigningKey: require('./cache').default,
  rateLimitSigningKey: require('./rateLimit').default,
- getKeysInterceptor: require('./interceptor').default
+ getKeysInterceptor: require('./interceptor').default,
+ callbackSupport: require('./callbackSupport').default
 };

tests/jwksClient.tests.js

@@ -383,6 +383,40 @@ describe('JwksClient', () => {
  });
 
  describe('#getSigningKey', () => {
+ describe('when a callback is supplied', () => {
+ it('should return the key found to the callback', (done) => {
+ nock(jwksHost)
+ .get('/.well-known/jwks.json')
+ .reply(200, x5cMultiple);
+
+ const client = new JwksClient({
+ jwksUri: `${jwksHost}/.well-known/jwks.json`
+ });
+ const key = x5cMultiple.keys[0];
+
+ client.getSigningKey(key.kid, (err, foundKey) => {
+ expect(foundKey.kid).to.equal(key.kid);
+ done();
+ });
+ });
+
+ it('should return any errors to the callback', (done) => {
+ nock(jwksHost)
+ .get('/.well-known/jwks.json')
+ .reply(200, x5cMultiple);
+
+ const client = new JwksClient({
+ jwksUri: `${jwksHost}/.well-known/jwks.json`
+ });
+
+ client.getSigningKey('123', (err) => {
+ expect(err).not.to.be.null;
+ expect(err.name).to.equal('SigningKeyNotFoundError');
+ done();
+ });
+ });
+ });
+
  it('should return error if signing key is not found', async () => {
  nock(jwksHost)
  .get('/.well-known/jwks.json')