move cache to fp

Author: felixheck

src/cache.js

@@ -1,25 +1,15 @@
-let instance
-
 /**
  * @function
  * @public
  *
- * Initiate a cache singleton
+ * Initiate a cache
  *
  * @param {Hapi.Server} server The created server instance
  * @param {Object|boolean} opts The instance its options
- * @returns {Object} The cache instance
+ * @returns {Object|false} The cache instance
  */
 function init (server, opts) {
-  if (instance === undefined) {
-    if (opts === false) {
-      instance = false
-    } else {
-      instance = server.cache(opts === true ? {} : opts)
-    }
-  }
-
-  return instance
+  return opts ? server.cache(opts === true ? {} : opts) : false
 }
 
 /**
@@ -29,11 +19,12 @@ function init (server, opts) {
  * Get value out of cache by key.
  * Just if cache is initiated.
  *
+ * @param {Object} The cache instance
  * @param {*} key The key to be searched
  * @param {Function} done The callback handler
  */
-function get (key, done) {
-  instance ? instance.get(key, done) : done(null, false)
+function get (cache, key, done) {
+  cache ? cache.get(key, done) : done(null, false)
 }
 
 /**
@@ -43,29 +34,18 @@ function get (key, done) {
  * Set value specified by key in cache.
  * Just if cache is initiated.
  *
+ * @param {Object} The cache instance
  * @param {*} key The key to be indexed
  * @param {*} value The value to be stored
  * @param {number} ttl The time to live
  * @param {Function} done The callback handler
  */
-function set (key, value, ttl, done) {
-  instance && instance.set(key, value, ttl, done)
-}
-
-/**
- * @function
- * @public
- *
- * Reset the current cache instance
- *
- */
-function reset () {
-  instance = undefined
+function set (cache, key, value, ttl, done) {
+  cache && cache.set(key, value, ttl, done)
 }
 
 module.exports = {
   init,
   get,
-  set,
-  reset
+  set
 }

src/index.js

@@ -9,10 +9,11 @@ const pkg = require('../package.json')
  * @type {Object|GrantManager}
  * @private
  *
- * The plugin related options and GrantManager instance.
+ * The plugin related options and instances.
  */
 let options
 let manager
+let store
 
 /**
  * @function
@@ -68,7 +69,7 @@ function handleKeycloakValidation (tkn, reply) {
     const { expiresIn, credentials } = tkn.getData(options.userInfo)
     const userData = { credentials }
 
-    cache.set(tkn.get(), userData, expiresIn)
+    cache.set(store, tkn.get(), userData, expiresIn)
     reply.continue(userData)
   }).catch((err) => {
     reply(error('unauthorized', err, error.msg.invalid))
@@ -94,7 +95,7 @@ function validate (field, reply) {
     return done(error('unauthorized', error.msg.missing))
   }
 
-  cache.get(tkn.get(), (err, cached) => {
+  cache.get(store, tkn.get(), (err, cached) => {
     const isCached = cached && !err
     isCached ? done.continue(cached) : handleKeycloakValidation(tkn, done)
   })
@@ -138,8 +139,7 @@ function strategy (server) {
 function plugin (server, opts, next) {
   options = verify(opts)
   manager = new GrantManager(options)
-
-  cache.init(server, options.cache)
+  store = cache.init(server, options.cache)
 
   server.auth.scheme('keycloak-jwt', strategy)
   server.decorate('server', 'kjwt', { validate })

test/cache.spec.js

@@ -2,40 +2,12 @@ const test = require('ava')
 const helpers = require('./_helpers')
 const cache = require('../src/cache')
 
-test.afterEach.always('reset cache', () => {
-  cache.reset()
-})
-
-test.cb.serial('just create one instance – object', (t) => {
-  helpers.getServer(false, (server) => {
-    const cch1 = cache.init(server, { segment: 'foo' })
-    const cch2 = cache.init(server, { segment: 'foo' })
-
-    t.truthy(cch1)
-    t.truthy(cch2)
-    t.deepEqual(cch1, cch2)
-    t.end()
-  })
-})
-
-test.cb.serial('just create one instance – boolean', (t) => {
-  helpers.getServer(false, (server) => {
-    const cch1 = cache.init(server, false)
-    const cch2 = cache.init(server, false)
-
-    t.is(cch1, false)
-    t.is(cch2, false)
-    t.is(cch1, cch2)
-    t.end()
-  })
-})
-
 test.cb.serial('set and get value', (t) => {
   helpers.getServer(false, (server) => {
-    cache.init(server, { segment: 'foo' })
-    cache.set('bar', 42, 10000)
+    const store = cache.init(server, { segment: 'foo' })
+    cache.set(store, 'bar', 42, 10000)
 
-    cache.get('bar', (err, res) => {
+    cache.get(store, 'bar', (err, res) => {
       t.falsy(err)
       t.is(res, 42)
       t.end()
@@ -45,10 +17,10 @@ test.cb.serial('set and get value', (t) => {
 
 test.cb.serial('set and get value – no cache', (t) => {
   helpers.getServer(false, (server) => {
-    cache.init(server, false)
-    cache.set('bar', 42, 10000)
+    const store = cache.init(server, false)
+    cache.set(store, 'bar', 42, 10000)
 
-    cache.get('bar', (err, res) => {
+    cache.get(store, 'bar', (err, res) => {
       t.falsy(err)
       t.is(res, false)
       t.end()
@@ -58,11 +30,11 @@ test.cb.serial('set and get value – no cache', (t) => {
 
 test.cb.serial('set and get value – expired', (t) => {
   helpers.getServer(false, (server) => {
-    cache.init(server, { segment: 'foo' })
-    cache.set('bar', 42, 100)
+    const store = cache.init(server, { segment: 'foo' })
+    cache.set(store, 'bar', 42, 100)
 
     setTimeout(() => {
-      cache.get('bar', (err, res) => {
+      cache.get(store, 'bar', (err, res) => {
         t.falsy(err)
         t.is(res, null)
         t.end()

test/index.publicKey.spec.js

@@ -1,11 +1,6 @@
 const test = require('ava')
 const helpers = require('./_helpers')
 const fixtures = require('./fixtures')
-const cache = require('../src/cache')
-
-test.afterEach.always('reset instances and prototypes', () => {
-  cache.reset()
-})
 
 const publicKeyConfig = {
   realmUrl: fixtures.common.realmUrl,

test/index.secret.spec.js

@@ -2,10 +2,8 @@ const nock = require('nock')
 const test = require('ava')
 const helpers = require('./_helpers')
 const fixtures = require('./fixtures')
-const cache = require('../src/cache')
 
 test.afterEach.always('reset instances and prototypes', () => {
-  cache.reset()
   nock.cleanAll()
 })
 

test/index.server.spec.js

@@ -2,10 +2,8 @@ const nock = require('nock')
 const test = require('ava')
 const helpers = require('./_helpers')
 const fixtures = require('./fixtures')
-const cache = require('../src/cache')
 
 test.afterEach.always('reset instances and prototypes', () => {
-  cache.reset()
   nock.cleanAll()
 })