fix error handling

Author: felixheck

src/index.js

@@ -3,7 +3,7 @@ const { GrantManager } = require('keycloak-auth-utils')
 const KeycloakToken = require('keycloak-auth-utils/lib/token')
 const cache = require('./cache')
 const token = require('./token')
-const { error, fakeToolkit, verify } = require('./utils')
+const { raiseError, errors, fakeToolkit, verify } = require('./utils')
 const pkg = require('../package.json')
 
 /**
@@ -48,10 +48,11 @@ async function verifySignedJwt (tkn) {
  * @throws {Error} If token is invalid
  */
 async function introspect (tkn) {
-  const res = await manager.validateAccessToken(tkn)
-
-  if (res === false) {
-    throw Error(error.msg.invalid)
+  try {
+    const isValid = await manager.validateAccessToken(tkn)
+    if (isValid === false) throw Error(errors.invalid)
+  } catch (err) {
+    throw Error(errors.invalid)
   }
 
   return tkn
@@ -69,9 +70,15 @@ async function introspect (tkn) {
  * @throws {Error} If request failed or token is invalid
  */
 async function getRpt (tkn) {
-  const { data } = await axios.get(`${options.realmUrl}/authz/entitlement/${options.clientId}`, {
-    headers: { authorization: `bearer ${tkn}` }
-  })
+  let data = {}
+
+  try {
+    ({ data } = await axios.get(`${options.realmUrl}/authz/entitlement/${options.clientId}`, {
+      headers: { authorization: `bearer ${tkn}` }
+    }))
+  } catch (err) {
+    throw Error(errors.rpt)
+  }
 
   return data.rpt
 }
@@ -111,7 +118,7 @@ async function handleKeycloakValidation (tkn, h) {
     await cache.set(store, tkn, userData, expiresIn)
     return h.authenticated(userData)
   } catch (err) {
-    throw error('unauthorized', null, error.msg.invalid)
+    throw raiseError('unauthorized', err, errors.invalid)
   }
 }
 
@@ -131,7 +138,7 @@ async function validate (field, h = (data) => data) {
   const reply = fakeToolkit(h)
 
   if (!tkn) {
-    throw error('unauthorized', error.msg.missing)
+    throw raiseError('unauthorized', null, errors.missing)
   }
 
   const cached = await cache.get(store, tkn)

src/utils.js

@@ -73,18 +73,14 @@ function verify (opts) {
  * @param {string} msg The error message
  * @returns {Boom} The created `Boom` error
  */
-function error (type, err, msg) {
-  return boom[type](err ? err.message || err.toString() : msg, 'Bearer')
+function raiseError (type, err, msg) {
+  return boom[type](err ? err.message : msg, 'Bearer')
 }
 
-/**
- * @type Object
- *
- * Error messages
- */
-error.msg = {
+const errors = {
+  invalid: 'Invalid credentials',
   missing: 'Missing or invalid authorization header',
-  invalid: 'Invalid credentials'
+  rpt: 'Retrieving the RPT failed'
 }
 
 /**
@@ -105,7 +101,8 @@ function fakeToolkit (h) {
 }
 
 module.exports = {
-  error,
+  raiseError,
+  errors,
   fakeToolkit,
   verify
 }

test/index.entitlement.spec.js

@@ -84,7 +84,7 @@ test('authentication does fail – invalid token', async (t) => {
 
   t.truthy(res)
   t.is(res.statusCode, 401)
-  t.is(res.headers['www-authenticate'], 'Bearer error="Invalid credentials"')
+  t.is(res.headers['www-authenticate'], 'Bearer error="Retrieving the RPT failed"')
 })
 
 test('authentication does fail – invalid header', async (t) => {

test/index.verify.spec.js

@@ -49,7 +49,7 @@ test('authentication does fail – expired token', async (t) => {
 
   t.truthy(res)
   t.is(res.statusCode, 401)
-  t.is(res.headers['www-authenticate'], 'Bearer error="Invalid credentials"')
+  t.is(res.headers['www-authenticate'], 'Bearer error="invalid token (expired)"')
 })
 
 test('authentication does fail – invalid header', async (t) => {

test/utils.spec.js

@@ -3,20 +3,20 @@ const test = require('ava')
 const utils = require('../src/utils')
 
 test('get boom error with default message', (t) => {
-  const result = utils.error('badRequest')
+  const result = utils.raiseError('badRequest')
   t.truthy(result)
   t.deepEqual(result, boom.badRequest(undefined, 'Bearer'))
 })
 
 test('get boom error with default message', (t) => {
-  const result = utils.error('badRequest', undefined, 'foobar')
+  const result = utils.raiseError('badRequest', undefined, 'foobar')
   t.truthy(result)
   t.deepEqual(result, boom.badRequest('foobar', 'Bearer'))
 })
 
 test('get boom error with error message', (t) => {
   const mockErr = new Error('barfoo')
-  const result = utils.error('badRequest', mockErr, 'foobar')
+  const result = utils.raiseError('badRequest', mockErr, 'foobar')
   t.truthy(result)
   t.deepEqual(result, boom.badRequest(mockErr.message, 'Bearer'))
 })