@go-mailer/jarvis 3.1.0 → 3.1.2

package/lib/middlewares/auth.js

@@ -20,6 +20,15 @@ const extract_token = (headers) => {
   return token;
 };
 
+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
+}
+
 // main
 const authenticateUser = async (request, response, next) => {
   try {
@@ -39,7 +48,7 @@ const authenticateUser = async (request, response, next) => {
 
     const { tenant_id, is_admin } = await jwt.verify(token, SECRET, { issuer: ISSUER });
     request.is_admin = !!is_admin;
-    request.tenant_id = is_admin ? { $exists: true } : tenant_id;
+    request.tenant_id = is_admin ? extract_tenant_id(request) : tenant_id;
 
     next();
   } catch (e) {

package/lib/query.js

@@ -1,12 +1,13 @@
 const buildQuery = (options) => {
-  const seek_conditions = {}
   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
+  const seek_conditions = { ...buildBooleanQuery(options.bool || '')}
 
   const { skip, limit } = determinePagination(options.page, options.population)
 
   /** Delete sort and return fields */
+  delete options.bool
   delete options.count
   delete options.page
   delete options.population
@@ -40,6 +41,23 @@ const buildQuery = (options) => {
   }
 }
 
+const buildBooleanQuery = (value) => {
+  const values = value.split(',')
+  return values.reduce((sac, val) => {
+    let truthiness = true
+    let key = val
+    if (val[0] === '-') {
+      truthiness = false
+      key = val.substr(1)
+    }
+    
+    return {
+      ...sac,
+      [key]: truthiness
+    }
+  }, {})
+}
+
 const buildInQuery = (value) => {
   const values = value.split(':')
   return {

package/package.json

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