@go-mailer/jarvis 5.0.7 → 5.0.9

package/lib/middlewares/auth.js

@@ -3,6 +3,10 @@
  */
 
 const jwt = require('jsonwebtoken')
+const requestIP = require('request-ip')
+const DeviceDetector = require('node-device-detector')
+const geoip = require('geoip-lite')
+
 const Env = require('../env')
 const Errors = require('./errors')
 const { ProcessLogger } = require('./logger')
@@ -10,16 +14,6 @@ const { checkAuthority, verifyAPIKey } = require('../clients/iam')
 const authLogger = new ProcessLogger('Authenticator')
 
 // helpers
-const extractToken = (headers) => {
-  const { authorization } = headers
-  if (!authorization) throw new Error('Unauthorized')
-
-  const [, token] = authorization.split(' ')
-  if (!token) throw new Error('Unauthorized')
-
-  return token
-}
-
 const extractId = (request, key) => {
   const { params, query, body } = request
   let id = { $exists: true }
@@ -30,6 +24,31 @@ const extractId = (request, key) => {
   return id
 }
 
+const extractRequestHeaders = (request) => {
+  const original_header_values = request.headers['x-original-headers']
+  if (original_header_values && Object.keys(JSON.parse(original_header_values)).length) {
+    const values = JSON.parse(original_header_values)
+    return {
+      ip_address: values.ip_address || '',
+      user_agent: values.user_agent || ''
+    }
+  }
+  return {
+    ip_address: requestIP.getClientIp(request),
+    user_agent: request.headers['user-agent']
+  }
+}
+
+const extractToken = (headers) => {
+  const { authorization } = headers
+  if (!authorization) throw new Error('Unauthorized')
+
+  const [, token] = authorization.split(' ')
+  if (!token) throw new Error('Unauthorized')
+
+  return token
+}
+
 // main
 
 const authenticateAdmin = async (request, response, next) => {
@@ -94,7 +113,7 @@ const authorizeUser = ({ action, resource }) => {
   return async (request, response, next) => {
     try {
       const { is_admin, tenant_id, user_id } = request
-      if (is_admin) next()
+      if (is_admin) return next()
 
       await checkAuthority({ action, resource, tenant_id, user_id })
       next()
@@ -105,10 +124,40 @@ const authorizeUser = ({ action, resource }) => {
   }
 }
 
+const extractDeviceInformation = (request) => {
+  const { ip_address, user_agent } = extractRequestHeaders(request)
+  const ip_parts = ip_address.split(':')
+  const ip4 = ip_parts.pop()
+  const ip6 = ip_parts.join(':')
+  const geolocation = geoip.lookup(ip4 || ip6) || {}
+
+  const detector = new DeviceDetector({
+    clientIndexes: true,
+    deviceIndexes: true,
+    deviceAliasCode: false
+  })
+  const { os, client } = detector.detect(user_agent)
+
+  const user_device_details = {
+    city: geolocation?.city || 'NA',
+    country: geolocation?.country || 'NA',
+    ll: geolocation?.ll,
+    os: { name: os?.name, short_name: os?.short_name },
+    client: {
+      type: client?.type,
+      name: client?.name,
+      short_name: client?.short_name,
+      family: client?.family
+    }
+  }
+  return user_device_details
+}
+
 module.exports = {
   authenticateAdmin,
   authenticateBearerKey,
   authenticateParamKey,
   authenticateUser,
-  authorizeUser
+  authorizeUser,
+  extractDeviceInformation
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@go-mailer/jarvis",
-  "version": "5.0.7",
+  "version": "5.0.9",
   "main": "index.js",
   "repository": "git@github.com:go-mailer-ltd/jarvis-node.git",
   "author": "Nathan Oguntuberu <nateoguns.work@gmail.com>",
@@ -13,9 +13,12 @@
     "@logtail/node": "^0.3.3",
     "axios": "^1.3.4",
     "dotenv": "^16.0.3",
+    "geoip-lite": "^1.4.10",
     "jsonwebtoken": "^9.0.0",
+    "node-device-detector": "^2.1.1",
     "redis": "^4.6.12",
-    "redis-om": "^0.4.3"
+    "redis-om": "^0.4.3",
+    "request-ip": "^3.3.0"
   },
   "devDependencies": {
     "chai": "^4.3.7",