From 6e08ddba7f397ec3e44611ed34b3e144acf3df51 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Wed, 7 Jul 2021 17:15:27 -0700
Subject: [PATCH] moved auth lib into validators lib

---
 .../rest-api/middleware/validators.js         | 19 ++++++++++++++++--
 src/lib/auth.js                               | 20 -------------------
 2 files changed, 17 insertions(+), 22 deletions(-)
 delete mode 100644 src/lib/auth.js

diff --git a/src/controllers/rest-api/middleware/validators.js b/src/controllers/rest-api/middleware/validators.js
index 47aa3a3..37bf54a 100644
--- a/src/controllers/rest-api/middleware/validators.js
+++ b/src/controllers/rest-api/middleware/validators.js
@@ -4,7 +4,6 @@
 
 const User = require('../../../adapters/localdb/models/users')
 const config = require('../../../../config')
-const getToken = require('../../../lib/auth')
 const jwt = require('jsonwebtoken')
 const wlogger = require('../../../adapters/wlogger')
 
@@ -13,7 +12,6 @@ let _this
 class Validators {
   constructor () {
     this.User = User
-    this.getToken = getToken
     this.jwt = jwt
     this.config = config
 
@@ -149,6 +147,23 @@ class Validators {
       ctx.throw(401, error.message)
     }
   }
+
+  getToken (ctx) {
+    const header = ctx.request.header.authorization
+    if (!header) {
+      return null
+    }
+    const parts = header.split(' ')
+    if (parts.length !== 2) {
+      return null
+    }
+    const scheme = parts[0]
+    const token = parts[1]
+    if (/^Bearer$/i.test(scheme)) {
+      return token
+    }
+    return null
+  }
 }
 
 module.exports = Validators
diff --git a/src/lib/auth.js b/src/lib/auth.js
deleted file mode 100644
index 246fdab..0000000
--- a/src/lib/auth.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-  Retrieves the JWT token from the header of the API request.
-*/
-
-module.exports = function getToken (ctx) {
-  const header = ctx.request.header.authorization
-  if (!header) {
-    return null
-  }
-  const parts = header.split(' ')
-  if (parts.length !== 2) {
-    return null
-  }
-  const scheme = parts[0]
-  const token = parts[1]
-  if (/^Bearer$/i.test(scheme)) {
-    return token
-  }
-  return null
-}