@go-mailer/jarvis 10.5.1 → 10.7.0

package/lib/clients/go-flags.js

@@ -3,6 +3,24 @@ const Env = require('../env')
 const BASE_URI = Env.fetch('GO_FLAGS_URI', true)
 const API_KEY = Env.fetch('GO_FLAGS_KEY', true)
 
+const sendLog = async ({ environment, service, type, message, log_data }) => {
+  await axios.post(
+    `${BASE_URI}/api/v1/logs`,
+    {
+      environment,
+      type,
+      message,
+      service,
+      metadata: log_data
+    },
+    {
+      headers: {
+        authorization: `Bearer ${API_KEY}`
+      }
+    }
+  )
+}
+
 const verifyFeatureFlag = async (flag_name, criteria = {}, environment = '') => {
   const { error, payload } = (
     await axios.post(
@@ -24,4 +42,4 @@ const verifyFeatureFlag = async (flag_name, criteria = {}, environment = '') =>
   return payload.is_permitted
 }
 
-module.exports = { verifyFeatureFlag }
+module.exports = { sendLog, verifyFeatureFlag }

package/lib/clients/iam.js

@@ -32,6 +32,28 @@ const fetchTenants = async (query = '') => {
   return { tenants, size: meta?.size || 0 }
 }
 
+const refreshToken = async (data = {}, query = '', tries = 0) => {
+  try {
+    const { data: response } = await axios.post(
+      `${IAM_URI}/guests/token/refresh?${query}`,
+      { ...data },
+      {
+        headers: {
+          authorization: `Bearer ${DEFAULT_TOKEN}`
+        }
+      }
+    )
+
+    const { error, payload } = response
+    if (error) throw new Error(error)
+
+    return payload
+  } catch (e) {
+    if (tries < 3) return await refreshToken(data, query, tries + 1)
+    return null
+  }
+}
+
 const verifyAPIKey = async (key) => {
   const { error, payload } = (
     await axios.get(`${API_SERVICE_URI}/keys/verify/${key}`, {
@@ -68,4 +90,4 @@ const verifyFeatureFlag = async (flag_name, criteria = {}) => {
   return payload.is_permitted
 }
 
-module.exports = { checkAuthority, fetchTenants, verifyAPIKey, verifyFeatureFlag }
+module.exports = { checkAuthority, fetchTenants, refreshToken, verifyAPIKey, verifyFeatureFlag }

package/lib/middlewares/auth.js

@@ -10,8 +10,7 @@ const geoip = require('geoip-lite')
 const Env = require('../env')
 const Errors = require('./errors')
 const { ProcessLogger } = require('./logger')
-const { checkAuthority, verifyAPIKey } = require('../clients/iam')
-const { localCache } = require('../redis/cache')
+const { verifyAPIKey } = require('../clients/iam')
 const authLogger = new ProcessLogger('Authenticator')
 
 // helpers
@@ -98,10 +97,18 @@ const authenticateUser = async (request, response, next) => {
       return next()
     }
 
-    const { id: user_id, is_admin, tenant_id } = await jwt.verify(token, SECRET, { issuer: ISSUER })
+    const {
+      id: user_id,
+      is_admin,
+      tenant_id,
+      permissions,
+      permission_expires_at
+    } = await jwt.verify(token, SECRET, { issuer: ISSUER })
     request.is_admin = !!is_admin
     request.user_id = is_admin ? extractId(request, 'user_id') : user_id
     request.tenant_id = is_admin ? extractId(request, 'tenant_id') : tenant_id
+    request.permissions = permissions
+    request.permission_expires_at = permission_expires_at
 
     next()
   } catch (e) {
@@ -113,15 +120,17 @@ const authenticateUser = async (request, response, next) => {
 const authorizeUser = ({ action, resource }) => {
   return async (request, response, next) => {
     try {
-      const { is_admin, is_service_request, tenant_id, user_id } = request
+      const { is_admin, is_service_request, permissions, permission_expires_at } = request
       if (is_admin || is_service_request) return next()
 
-      const key = `${resource}:${action}:${tenant_id}:${user_id}`
-      const has_authority = localCache.get_item(key)
-      if (has_authority == null) {
-        const is_permitted = await checkAuthority({ action, resource, tenant_id, user_id })
-        localCache.add_item(key, is_permitted, 15 * 60)
-      } else if (has_authority === false) {
+      if (!permissions || !permission_expires_at) throw new Error('Unauthorized')
+      if (Date.now() > permission_expires_at) {
+        throw new Error('')
+      }
+
+      const is_superadmin = Object.keys(permissions)[0].includes('*')
+      const is_permitted = permissions[`${resource}:${action}`]
+      if (!is_superadmin && !is_permitted) {
         throw new Error('Unauthorized')
       }
 

package/lib/middlewares/logger.js

@@ -2,8 +2,11 @@
  * @author Oguntuberu Nathan O. <nateoguns.work@gmail.com>
  **/
 
+const { sendLog } = require('../clients/go-flags')
 const Env = require('../env')
 const { randomUUID } = require('crypto')
+const app_name = Env.fetch('APP_NAME', true)
+const env = Env.fetch('NODE_ENV', true)
 
 function hashLogData (log = {}) {
   const hashed = JSON.stringify(log).replace(/\w+@/gi, '************')
@@ -11,7 +14,6 @@ function hashLogData (log = {}) {
 }
 
 function RequestLogger () {
-  const app_name = Env.fetch('APP_NAME', true)
   return (request, response, next) => {
     if (!request.request_id) request.request_id = randomUUID()
 
@@ -54,14 +56,14 @@ function RequestLogger () {
       }
 
       log.error = payload ? payload.error : statusMessage
-      // if (error) {
-      //   log.error = error;
-      //   logtail.error(pathname, hashLogData(log));
-      // } else {
-      //   logtail.info(pathname, hashLogData(log));
-      // }
+      let log_type = 'info'
+      let message = 'Success'
+      if (log.error) {
+        log_type = 'error'
+        message = log.error
+        sendLog({ type: log_type, service: app_name, environment: env, message: message, log_data: log })
+      }
 
-      // logtail.flush();
       console.log(pathname, hashLogData({ status_code: log.status_code, request_id: log.request_id }))
     })
 
@@ -75,14 +77,13 @@ class ProcessLogger {
   }
 
   error (error, method = 'unspecified_method', params = {}) {
-    // logtail.error(`${this.service}:${method}:${error.message}`, hashLogData({
-    //   app_name: Env.fetch("APP_NAME", true),
-    //   type: "process",
-    //   message: error.message,
-    //   trace: error.stack,
-    //   params,
-    // }));
-    // logtail.flush();
+    sendLog({
+      type: 'error',
+      service: app_name,
+      environment: env,
+      message: error.message,
+      log_data: { ...params, stack: error.stack }
+    })
     console.log(`${this.service}:${method}:${error.message}`, params, error.stack)
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@go-mailer/jarvis",
-  "version": "10.5.1",
+  "version": "10.7.0",
   "main": "index.js",
   "repository": "git@github.com:go-mailer-ltd/jarvis-node.git",
   "author": "Nathan Oguntuberu <nateoguns.work@gmail.com>",