@go-mailer/jarvis 5.0.1 → 5.0.3

package/lib/middlewares/auth.js

@@ -50,12 +50,6 @@
    }
  };
  
- const authenticateMembership = (tenant_id, memberships = []) => {
-   const membership = memberships.find((mbrship) => Number(mbrship.tenant_id) === Number(tenant_id));
-   if (!membership || membership.status !== "active") throw new Error("Unauthorized");
-   return tenant_id;
- };
- 
  const authenticateParamKey = async (request, response, next) => {
    try {
      const { api_key: token } = request.params;
@@ -67,18 +61,6 @@
    }
  };
  
- const authenticateTenant = async (request, response, next) => {
-   try {
-     const tenant_id = extractId(request, "tenant_id");
-     request.tenant_id = request.is_admin ? tenant_id : authenticateMembership(tenant_id, request.memberships || []);
- 
-     next();
-   } catch (e) {
-     authLogger.error(e, "authenticateUser");
-     return response.status(403).json(Errors.UNAUTHORIZED);
-   }
- };
- 
  const authenticateUser = async (request, response, next) => {
    try {
      // env vars
@@ -96,10 +78,10 @@
        return next();
      }
  
-     const { id: user_id, is_admin, memberships } = await jwt.verify(token, SECRET, { issuer: ISSUER });
+     const { id: user_id, is_admin, tenant_id } = await jwt.verify(token, SECRET, { issuer: ISSUER });
      request.is_admin = !!is_admin;
      request.user_id = is_admin ? extractId(request, "user_id") : user_id;
-     request.memberships = memberships;
+     request.tenant_id = is_admin ? extractId(request, "tenant_id") : tenant_id;
  
      next();
    } catch (e) {
@@ -112,7 +94,6 @@
    authenticateAdmin,
    authenticateBearerKey,
    authenticateParamKey,
-   authenticateTenant,
    authenticateUser,
  };
  

package/lib/redis/schemas/index.js

@@ -1,11 +1,13 @@
-const { CampaignSchema } = require('./Campaign')
 const { ContactImportSchema } = require('./Contact')
 const { PostalSchema } = require('./Postal')
 const { TaskSchema } = require('./automation/Task')
+const { CampaignSchema } = require('./mailing/Campaign')
+const { MailActionSchema } = require('./mailing/Mailaction')
 
 module.exports = {
   CampaignSchema,
   ContactImportSchema,
+  MailActionSchema,
   PostalSchema,
   AutomationTaskSchema: TaskSchema
 }

package/lib/redis/schemas/mailing/Mailaction.js

@@ -0,0 +1,11 @@
+const { Schema } = require('redis-om')
+
+const MailActionSchema = new Schema('mailaction', {
+  email: { type: 'string' },
+  resource_id: { type: 'number' },
+  resource_type: { type: 'string' }
+})
+
+module.exports = {
+  MailActionSchema
+}

package/package.json

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