Merge pull request #1 from felixheck/release/0.1.1

Release/0.1.1

Author: felixheck

src/index.js

@@ -1,32 +1,49 @@
+const { GrantManager } = require('keycloak-auth-utils')
 const cache = require('./cache')
-const manager = require('./manager')
 const token = require('./token')
 const { error, fakeReply, verify } = require('./utils')
 const pkg = require('../package.json')
 
+let manager
+
+/**
+ * @function
+ * @public
+ *
+ * Get user information based on token with help of Keycloak.
+ * If all validations and requests are successful, save the
+ * token and its user data in memory cache.
+ *
+ * @param {string} token The token to be validated
+ * @param {Function} reply The callback handler
+ */
+function handleKeycloakUserInfo (tkn, reply) {
+  manager.userInfo(tkn.get()).then((userInfo) => {
+    const { scope, expiresIn } = tkn.getData()
+    const userData = { credentials: Object.assign({ scope }, userInfo) }
+
+    cache.set(tkn.get(), userData, expiresIn)
+    reply.continue(userData)
+  }).catch((err) => {
+    reply(error('unauthorized', err))
+  })
+}
+
 /**
  * @function
  * @public
  *
  * Validate a token with help of Keycloak.
- * If all validations and requests are successful,
- * save the token and its user data in memory cache.
  *
  * @param {string} token The token to be validated
  * @param {Function} reply The callback handler
  */
 function handleKeycloakValidation (tkn, reply) {
-  const rawTkn = tkn.get()
+  const invalidate = (err) => reply(error('unauthorized', err, error.msg.invalid))
 
-  manager.validateAccessToken(rawTkn, reply, () => {
-    manager.userInfo(rawTkn, reply, (userInfo) => {
-      const { scope, expiresIn } = tkn.getData()
-      const userData = { credentials: Object.assign({ scope }, userInfo) }
-      cache.set(tkn.get(), userData, expiresIn)
-
-      return reply.continue(userData)
-    })
-  })
+  manager.validateAccessToken(tkn.get()).then((res) => {
+    res ? handleKeycloakUserInfo(tkn, reply) : invalidate()
+  }).catch(invalidate)
 }
 
 /**
@@ -49,11 +66,8 @@ function validate (field, reply) {
   }
 
   cache.get(tkn.get(), (err, cached) => {
-    if (cached && !err) {
-      return reply.continue(cached)
-    }
-
-    return handleKeycloakValidation(tkn, reply)
+    const isCached = cached && !err
+    isCached ? reply.continue(cached) : handleKeycloakValidation(tkn, reply)
   })
 }
 
@@ -94,7 +108,7 @@ function strategy (server) {
  */
 function plugin (server, opts, next) {
   opts = verify(opts)
-  manager.init(opts.client)
+  manager = new GrantManager(opts.client)
   cache.init(server, opts.cache)
 
   server.auth.scheme('keycloak-jwt', strategy)

src/manager.js

@@ -17,12 +17,13 @@ function token (field) {
    * @private
    *
    * Extract bearer token out of header.
+   * https://tools.ietf.org/html/rfc7519
    *
    * @param {string} header The header to be scanned
    * @returns {string} The extracted header
    */
   function extractToken (header) {
-    return /^(?:bearer) ([A-Za-z0-9-_=]+\.[A-Za-z0-9-_=]+\.?[A-Za-z0-9-_.+/=]*)$/i.exec(header)
+    return /^(?:bearer) ([a-zA-Z0-9\-_]+?\.[a-zA-Z0-9\-_]+?\.([a-zA-Z0-9\-_]+)?)$/i.exec(header)
   }
 
   /**

src/token.js

@@ -1,7 +1,11 @@
 const hapi = require('hapi')
+const _ = require('lodash')
+const { GrantManager } = require('keycloak-auth-utils')
 const authKeycloak = require('../src')
 const fixtures = require('./_fixtures')
 
+const GrantManagerClone = {}
+
 /**
  * @type Object
  * @private
@@ -13,6 +17,27 @@ const defaults = {
   cache: false
 }
 
+/**
+ * @type Object.<Function>
+ * @public
+ *
+ * Provide several functions to clone, reset and
+ * stub methods of `GrantManager`.
+ */
+const prototypes = {
+  clone () {
+    GrantManagerClone.prototype = _.cloneDeep(GrantManager.prototype)
+  },
+  reset () {
+    GrantManager.prototype = GrantManagerClone.prototype
+  },
+  stub (name, value, type = 'resolve') {
+    GrantManager.prototype[name] = function () {
+      return Promise[type](value)
+    }
+  }
+}
+
 /**
  * @function
  * @private
@@ -36,6 +61,21 @@ function registerRoutes (server) {
     {
       method: 'GET',
       path: '/role',
+      config: {
+        auth: {
+          strategies: ['keycloak-jwt'],
+          access: {
+            scope: ['editor']
+          }
+        },
+        handler (req, reply) {
+          reply({ foo: 42 })
+        }
+      }
+    },
+    {
+      method: 'GET',
+      path: '/role/guest',
       config: {
         auth: {
           strategies: ['keycloak-jwt'],
@@ -84,17 +124,7 @@ function registerPlugin (server, options = defaults, done = () => {}) {
 function getServer (options, done) {
   const server = new hapi.Server()
 
-  server.connection({
-    host: '127.0.0.1',
-    port: 1337
-  })
-
-  process.on('SIGINT', () => {
-    server.stop({ timeout: 10000 }).then((err) => {
-      process.exit((err) ? 1 : 0)
-    })
-  })
-
+  server.connection()
   server.initialize((err) => {
     if (err) throw err
 
@@ -108,5 +138,6 @@ function getServer (options, done) {
 
 module.exports = {
   getServer,
-  registerPlugin
+  registerPlugin,
+  prototypes
 }

test/_helpers.js

@@ -1,13 +1,13 @@
 const test = require('ava')
-const helpers = require('./_helpers')
+const { getServer } = require('./_helpers')
 const cache = require('../src/cache')
 
 test.afterEach('reset cache', () => {
   cache.reset()
 })
 
 test.cb.serial('just create one instance – object', (t) => {
-  helpers.getServer(false, (server) => {
+  getServer(false, (server) => {
     const cch1 = cache.init(server, { segment: 'foo' })
     const cch2 = cache.init(server, { segment: 'foo' })
 
@@ -19,7 +19,7 @@ test.cb.serial('just create one instance – object', (t) => {
 })
 
 test.cb.serial('just create one instance – boolean', (t) => {
-  helpers.getServer(false, (server) => {
+  getServer(false, (server) => {
     const cch1 = cache.init(server, false)
     const cch2 = cache.init(server, false)
 
@@ -31,7 +31,7 @@ test.cb.serial('just create one instance – boolean', (t) => {
 })
 
 test.cb.serial('set and get value', (t) => {
-  helpers.getServer(false, (server) => {
+  getServer(false, (server) => {
     cache.init(server, { segment: 'foo' })
     cache.set('bar', 42, 10000)
 
@@ -44,7 +44,7 @@ test.cb.serial('set and get value', (t) => {
 })
 
 test.cb.serial('set and get value – no cache', (t) => {
-  helpers.getServer(false, (server) => {
+  getServer(false, (server) => {
     cache.init(server, false)
     cache.set('bar', 42, 10000)
 
@@ -57,7 +57,7 @@ test.cb.serial('set and get value – no cache', (t) => {
 })
 
 test.cb.serial('set and get value – expired', (t) => {
-  helpers.getServer(false, (server) => {
+  getServer(false, (server) => {
     cache.init(server, { segment: 'foo' })
     cache.set('bar', 42, 100)