@go-mailer/jarvis 4.2.4 → 4.2.5

package/lib/middlewares/auth.js

@@ -21,38 +21,30 @@ const extract_token = (headers) => {
 };
 
 const extract_tenant_id = (request) => {
-  const { params, query } = request
-  let tenant_id = { $exists: true }
-  if (query.tenant_id) tenant_id = query.tenant_id
-  if (params.tenant_id) tenant_id = params.tenant_id
-  
-  return tenant_id
-}
+  const { params, query } = request;
+  let tenant_id = { $exists: true };
+  if (query.tenant_id) tenant_id = query.tenant_id;
+  if (params.tenant_id) tenant_id = params.tenant_id;
+
+  return tenant_id;
+};
 
 // main
-const authenticateUser = async (request, response, next) => {
-  try {
-    // env vars
-    const DEFAULT_TOKEN = Env.fetch("DEFAULT_TOKEN", true);
-    const ISSUER = Env.fetch("JWT_ISSUER", true);
-    const SECRET = Env.fetch("JWT_SECRET", true);
-    
-    const token = extract_token(request.headers);
-    if (token === DEFAULT_TOKEN) {
-      // inter-service requests
-      request.is_service_request = true;
-      // typically scope requests by tenant_id
-      request.tenant_id = request.body.tenant_id || request.query.tenant_id || { $exists: true };
-      return next();
-    }
 
-    const { tenant_id, is_admin } = await jwt.verify(token, SECRET, { issuer: ISSUER });
-    request.is_admin = !!is_admin;
-    request.tenant_id = is_admin ? extract_tenant_id(request) : tenant_id;
+const authenticateAdmin = async (request, response, next) => {
+  const { is_admin } = request;
+  if (!is_admin) return response.status(403).json(Errors.UNAUTHORIZED);
 
+  next();
+};
+
+const authenticateBearerKey = async (request, response, next) => {
+  try {
+    const token = extract_token(request.headers);
+    request.tenant_id = await verifyAPIKey(token);
     next();
   } catch (e) {
-    authLogger.error(e, "authenticateUser");
+    authLogger.error(e, "authenticateBearerKey");
     return response.status(403).json(Errors.UNAUTHORIZED);
   }
 };
@@ -68,15 +60,31 @@ const authenticateParamKey = async (request, response, next) => {
   }
 };
 
-const authenticateBearerKey = async (request, response, next) => {
+const authenticateUser = async (request, response, next) => {
   try {
+    // env vars
+    const DEFAULT_TOKEN = Env.fetch("DEFAULT_TOKEN", true);
+    const ISSUER = Env.fetch("JWT_ISSUER", true);
+    const SECRET = Env.fetch("JWT_SECRET", true);
+
     const token = extract_token(request.headers);
-    request.tenant_id = await verifyAPIKey(token);
+    if (token === DEFAULT_TOKEN) {
+      // inter-service requests
+      request.is_service_request = true;
+      // typically scope requests by tenant_id
+      request.tenant_id = request.body.tenant_id || request.query.tenant_id || { $exists: true };
+      return next();
+    }
+
+    const { tenant_id, is_admin } = await jwt.verify(token, SECRET, { issuer: ISSUER });
+    request.is_admin = !!is_admin;
+    request.tenant_id = is_admin ? extract_tenant_id(request) : tenant_id;
+
     next();
   } catch (e) {
-    authLogger.error(e, "authenticateBearerKey");
+    authLogger.error(e, "authenticateUser");
     return response.status(403).json(Errors.UNAUTHORIZED);
   }
 };
 
-module.exports = { authenticateBearerKey, authenticateParamKey, authenticateUser };
+module.exports = { authenticateAdmin, authenticateBearerKey, authenticateParamKey, authenticateUser };

package/lib/query.js

@@ -1,5 +1,5 @@
 const buildQuery = (options) => {
-  const sort_condition = options.sort_by ? buildSortOrderString(options.sort_by) : ''
+  const sort_condition = options.sort_by ? buildSortOrderString(options.sort_by) : {}
   const fields_to_return = options.return_only ? buildReturnFieldsString(options.return_only) : ''
   const count = options.count || false
   

package/package.json

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