@sendhome/common 1.0.151 → 1.0.153

package/build/events/publishers/user-created-event.d.ts

@@ -1,6 +1,8 @@
 import { Subjects } from "../subjects/subjects";
 import { UserStatus } from "../types/user-status";
-import { UserRoles } from "../types/user-roles";
+import { AccountType } from "../types/account-type";
+import { AdminLevels } from "../types/admin-levels";
+import { ProviderLevels } from "../types/provider-levels";
 import { SendCountry } from "../types/send-country";
 export interface UserCreatedEvent {
     subject: Subjects.UserCreated;
@@ -20,8 +22,9 @@ export interface UserCreatedEvent {
         otp_expiration: Date;
         reset_token: string;
         reset_token_expiration: Date;
-        role: UserRoles;
-        permissions: number[];
+        account_type: AccountType;
+        provider_level: ProviderLevels;
+        admin_level: AdminLevels;
         status: UserStatus;
         referred_by: number;
         referred_user_coupon_awarded: boolean;

package/build/events/publishers/user-updated-event.d.ts

@@ -1,6 +1,8 @@
 import { Subjects } from "../subjects/subjects";
 import { UserStatus } from "../types/user-status";
-import { UserRoles } from "../types/user-roles";
+import { AccountType } from "../types/account-type";
+import { AdminLevels } from "../types/admin-levels";
+import { ProviderLevels } from "../types/provider-levels";
 import { SendCountry } from "../types/send-country";
 export interface UserUpdatedEvent {
     subject: Subjects.UserUpdated;
@@ -20,8 +22,9 @@ export interface UserUpdatedEvent {
         otp_expiration: Date;
         reset_token: string;
         reset_token_expiration: Date;
-        role: UserRoles;
-        permissions: number[];
+        account_type: AccountType;
+        provider_level: ProviderLevels;
+        admin_level: AdminLevels;
         status: UserStatus;
         referred_by: number;
         referred_user_coupon_awarded: boolean;

package/build/events/types/account-type.d.ts

@@ -0,0 +1,5 @@
+export declare enum AccountType {
+    Client = "client",
+    Admin = "admin",
+    Provider = "provider"
+}

package/build/events/types/account-type.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AccountType = void 0;
+var AccountType;
+(function (AccountType) {
+    AccountType["Client"] = "client";
+    AccountType["Admin"] = "admin";
+    AccountType["Provider"] = "provider";
+})(AccountType = exports.AccountType || (exports.AccountType = {}));

package/build/events/types/admin-levels.d.ts

@@ -0,0 +1,5 @@
+export declare enum AdminLevels {
+    Admin = "admin",
+    Supervisor = "supervisor",
+    SupportAgent = "supportAgent"
+}

package/build/events/types/admin-levels.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AdminLevels = void 0;
+var AdminLevels;
+(function (AdminLevels) {
+    AdminLevels["Admin"] = "admin";
+    AdminLevels["Supervisor"] = "supervisor";
+    AdminLevels["SupportAgent"] = "supportAgent";
+})(AdminLevels = exports.AdminLevels || (exports.AdminLevels = {}));

package/build/events/types/provider-levels.d.ts

@@ -0,0 +1,5 @@
+export declare enum ProviderLevels {
+    Seller = "seller",
+    Teller = "teller",
+    Manager = "manager"
+}

package/build/events/types/provider-levels.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProviderLevels = void 0;
+var ProviderLevels;
+(function (ProviderLevels) {
+    ProviderLevels["Seller"] = "seller";
+    ProviderLevels["Teller"] = "teller";
+    ProviderLevels["Manager"] = "manager";
+})(ProviderLevels = exports.ProviderLevels || (exports.ProviderLevels = {}));

package/build/index.d.ts

@@ -1,92 +1,94 @@
-export * from './errors/bad-request-error';
-export * from './errors/custom-error';
-export * from './errors/database-connection-error';
-export * from './errors/not-authorized-error';
-export * from './errors/not-found-error';
-export * from './errors/request-validation-error';
-export * from './middlewares/current-user';
-export * from './middlewares/error-handler';
-export * from './middlewares/require-auth';
-export * from './middlewares/validate-request';
-export * from './events/base-listener';
-export * from './events/base-publisher';
-export * from './events/subjects/subjects';
-export * from './events/publishers/bonus-awarded-event';
-export * from './events/publishers/branch-created-event';
-export * from './events/publishers/branch-updated-event';
-export * from './events/publishers/brand-created-event';
-export * from './events/publishers/brand-updated-event';
-export * from './events/publishers/cart-created-event';
-export * from './events/publishers/cart-deleted-event';
-export * from './events/publishers/cart-expiration-event';
-export * from './events/publishers/cart-updated-event';
-export * from './events/publishers/cart-item-created-event';
-export * from './events/publishers/cart-item-deleted-event';
-export * from './events/publishers/cart-item-updated-event';
-export * from './events/publishers/category-created-event';
-export * from './events/publishers/category-updated-event';
-export * from './events/publishers/collection-created-event';
-export * from './events/publishers/collection-updated-event';
-export * from './events/publishers/company-created-event';
-export * from './events/publishers/company-updated-event';
-export * from './events/publishers/coupon-created-event';
-export * from './events/publishers/coupon-updated-event';
-export * from './events/publishers/coupon-expired-event';
-export * from './events/publishers/delivery-created-event';
-export * from './events/publishers/delivery-updated-event';
-export * from './events/publishers/faq-created-event';
-export * from './events/publishers/faq-updated-event';
-export * from './events/publishers/location-created-event';
-export * from './events/publishers/location-updated-event';
-export * from './events/publishers/module-created-event';
-export * from './events/publishers/module-updated-event';
-export * from './events/publishers/order-cancellation-created-event';
-export * from './events/publishers/order-cancellation-updated-event';
-export * from './events/publishers/order-collected-event';
-export * from './events/publishers/order-created-event';
-export * from './events/publishers/order-expiration-completed';
-export * from './events/publishers/order-expiration-event';
-export * from './events/publishers/order-expiration-warning';
-export * from './events/publishers/order-updated-event';
-export * from './events/publishers/payment-created-event';
-export * from './events/publishers/payment-updated-event';
-export * from './events/publishers/order-updated-event';
-export * from './events/publishers/product-created-event';
-export * from './events/publishers/product-updated-event';
-export * from './events/publishers/productItem-created-event';
-export * from './events/publishers/productItem-updated-event';
-export * from './events/publishers/recipient-created-event';
-export * from './events/publishers/recipient-updated-event';
-export * from './events/publishers/timeline-created-event';
-export * from './events/publishers/topic-created-event';
-export * from './events/publishers/topic-updated-event';
-export * from './events/publishers/user-created-event';
-export * from './events/publishers/user-updated-event';
-export * from './events/types/branch-status';
-export * from './events/types/brand-status';
-export * from './events/types/cart-status';
-export * from './events/types/cart-item-status';
-export * from './events/types/category-status';
-export * from './events/types/collection-status';
-export * from './events/types/collection-type';
-export * from './events/types/company-status';
-export * from './events/types/company-type';
-export * from './events/types/country';
-export * from './events/types/coupon-status';
-export * from './events/types/delivery-status';
-export * from './events/types/help-category';
-export * from './events/types/location-status';
-export * from './events/types/media-status';
-export * from './events/types/module-status';
-export * from './events/types/order-cancellation-status';
-export * from './events/types/order-status';
-export * from './events/types/payment-status';
-export * from './events/types/product_class';
-export * from './events/types/product-status';
-export * from './events/types/receive-country';
-export * from './events/types/recipient-status';
-export * from './events/types/send-country';
-export * from './events/types/timeline-stage';
-export * from './events/types/unit-type';
-export * from './events/types/user-roles';
-export * from './events/types/user-status';
+export * from "./errors/bad-request-error";
+export * from "./errors/custom-error";
+export * from "./errors/database-connection-error";
+export * from "./errors/not-authorized-error";
+export * from "./errors/not-found-error";
+export * from "./errors/request-validation-error";
+export * from "./middlewares/current-user";
+export * from "./middlewares/error-handler";
+export * from "./middlewares/require-auth";
+export * from "./middlewares/validate-request";
+export * from "./events/base-listener";
+export * from "./events/base-publisher";
+export * from "./events/subjects/subjects";
+export * from "./events/publishers/bonus-awarded-event";
+export * from "./events/publishers/branch-created-event";
+export * from "./events/publishers/branch-updated-event";
+export * from "./events/publishers/brand-created-event";
+export * from "./events/publishers/brand-updated-event";
+export * from "./events/publishers/cart-created-event";
+export * from "./events/publishers/cart-deleted-event";
+export * from "./events/publishers/cart-expiration-event";
+export * from "./events/publishers/cart-updated-event";
+export * from "./events/publishers/cart-item-created-event";
+export * from "./events/publishers/cart-item-deleted-event";
+export * from "./events/publishers/cart-item-updated-event";
+export * from "./events/publishers/category-created-event";
+export * from "./events/publishers/category-updated-event";
+export * from "./events/publishers/collection-created-event";
+export * from "./events/publishers/collection-updated-event";
+export * from "./events/publishers/company-created-event";
+export * from "./events/publishers/company-updated-event";
+export * from "./events/publishers/coupon-created-event";
+export * from "./events/publishers/coupon-updated-event";
+export * from "./events/publishers/coupon-expired-event";
+export * from "./events/publishers/delivery-created-event";
+export * from "./events/publishers/delivery-updated-event";
+export * from "./events/publishers/faq-created-event";
+export * from "./events/publishers/faq-updated-event";
+export * from "./events/publishers/location-created-event";
+export * from "./events/publishers/location-updated-event";
+export * from "./events/publishers/module-created-event";
+export * from "./events/publishers/module-updated-event";
+export * from "./events/publishers/order-cancellation-created-event";
+export * from "./events/publishers/order-cancellation-updated-event";
+export * from "./events/publishers/order-collected-event";
+export * from "./events/publishers/order-created-event";
+export * from "./events/publishers/order-expiration-completed";
+export * from "./events/publishers/order-expiration-event";
+export * from "./events/publishers/order-expiration-warning";
+export * from "./events/publishers/order-updated-event";
+export * from "./events/publishers/payment-created-event";
+export * from "./events/publishers/payment-updated-event";
+export * from "./events/publishers/order-updated-event";
+export * from "./events/publishers/product-created-event";
+export * from "./events/publishers/product-updated-event";
+export * from "./events/publishers/productItem-created-event";
+export * from "./events/publishers/productItem-updated-event";
+export * from "./events/publishers/recipient-created-event";
+export * from "./events/publishers/recipient-updated-event";
+export * from "./events/publishers/timeline-created-event";
+export * from "./events/publishers/topic-created-event";
+export * from "./events/publishers/topic-updated-event";
+export * from "./events/publishers/user-created-event";
+export * from "./events/publishers/user-updated-event";
+export * from "./events/types/account-type";
+export * from "./events/types/admin-levels";
+export * from "./events/types/branch-status";
+export * from "./events/types/brand-status";
+export * from "./events/types/cart-status";
+export * from "./events/types/cart-item-status";
+export * from "./events/types/category-status";
+export * from "./events/types/collection-status";
+export * from "./events/types/collection-type";
+export * from "./events/types/company-status";
+export * from "./events/types/company-type";
+export * from "./events/types/country";
+export * from "./events/types/coupon-status";
+export * from "./events/types/delivery-status";
+export * from "./events/types/help-category";
+export * from "./events/types/location-status";
+export * from "./events/types/media-status";
+export * from "./events/types/module-status";
+export * from "./events/types/order-cancellation-status";
+export * from "./events/types/order-status";
+export * from "./events/types/payment-status";
+export * from "./events/types/product_class";
+export * from "./events/types/product-status";
+export * from "./events/types/provider-levels";
+export * from "./events/types/receive-country";
+export * from "./events/types/recipient-status";
+export * from "./events/types/send-country";
+export * from "./events/types/timeline-stage";
+export * from "./events/types/unit-type";
+export * from "./events/types/user-status";

package/build/index.js

@@ -75,6 +75,8 @@ __exportStar(require("./events/publishers/topic-created-event"), exports);
 __exportStar(require("./events/publishers/topic-updated-event"), exports);
 __exportStar(require("./events/publishers/user-created-event"), exports);
 __exportStar(require("./events/publishers/user-updated-event"), exports);
+__exportStar(require("./events/types/account-type"), exports);
+__exportStar(require("./events/types/admin-levels"), exports);
 __exportStar(require("./events/types/branch-status"), exports);
 __exportStar(require("./events/types/brand-status"), exports);
 __exportStar(require("./events/types/cart-status"), exports);
@@ -96,10 +98,10 @@ __exportStar(require("./events/types/order-status"), exports);
 __exportStar(require("./events/types/payment-status"), exports);
 __exportStar(require("./events/types/product_class"), exports);
 __exportStar(require("./events/types/product-status"), exports);
+__exportStar(require("./events/types/provider-levels"), exports);
 __exportStar(require("./events/types/receive-country"), exports);
 __exportStar(require("./events/types/recipient-status"), exports);
 __exportStar(require("./events/types/send-country"), exports);
 __exportStar(require("./events/types/timeline-stage"), exports);
 __exportStar(require("./events/types/unit-type"), exports);
-__exportStar(require("./events/types/user-roles"), exports);
 __exportStar(require("./events/types/user-status"), exports);

package/build/middlewares/require-auth-old.d.ts

@@ -0,0 +1,14 @@
+import { Request, Response, NextFunction } from 'express';
+interface UserPayload {
+    id: string;
+    email: string;
+}
+declare global {
+    namespace Express {
+        interface Request {
+            currentUser?: UserPayload;
+        }
+    }
+}
+export declare const requireAuth: (req: Request, res: Response, next: NextFunction) => void;
+export {};

package/build/middlewares/require-auth-old.js

@@ -0,0 +1,29 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requireAuth = void 0;
+const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
+const not_authorized_error_1 = require("../errors/not-authorized-error");
+const requireAuth = (req, res, next) => {
+    let token;
+    if (req.headers.authorization &&
+        req.headers.authorization.startsWith("Bearer")) {
+        // Set token from Bearer token in header
+        token = req.headers.authorization.split(" ")[1];
+    }
+    // Make sure token exists
+    if (!token) {
+        throw new not_authorized_error_1.NotAuthorizedError();
+    }
+    try {
+        const payload = jsonwebtoken_1.default.verify(token, "EDWIN"
+        // process.env.JWT_KEY!
+        );
+        req.currentUser = payload;
+    }
+    catch (err) { }
+    next();
+};
+exports.requireAuth = requireAuth;

package/build/middlewares/require-auth.d.ts

@@ -10,5 +10,5 @@ declare global {
         }
     }
 }
-export declare const requireAuth: (req: Request, res: Response, next: NextFunction) => void;
+export declare const validateSession: (sessionServiceUrl: string, deviceInfo: string) => (req: Request, res: Response, next: NextFunction) => Promise<void>;
 export {};

package/build/middlewares/require-auth.js

@@ -1,30 +1,48 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.requireAuth = void 0;
+exports.validateSession = void 0;
+const axios_1 = __importDefault(require("axios"));
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
-const not_authorized_error_1 = require("../errors/not-authorized-error");
-const requireAuth = (req, res, next) => {
-    let token;
-    if (req.headers.authorization &&
-        req.headers.authorization.startsWith("Bearer")) {
-        // Set token from Bearer token in header
-        token = req.headers.authorization.split(" ")[1];
-    }
-    // Make sure token exists
-    if (!token) {
-        throw new not_authorized_error_1.NotAuthorizedError();
-    }
-    try {
-        const payload = jsonwebtoken_1.default.verify(token, "EDWIN"
-        // process.env.JWT_KEY!
-        );
-        req.currentUser = payload;
-        console.log("req.currentUser", req.currentUser);
-    }
-    catch (err) { }
-    next();
+// Middleware to validate user session per device
+const validateSession = (sessionServiceUrl, deviceInfo) => {
+    return (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
+        try {
+            const token = req.cookies.token || ((_a = req.headers.authorization) === null || _a === void 0 ? void 0 : _a.split(' ')[1]);
+            if (!token) {
+                res.status(401).json({ message: 'No session token provided' });
+                return;
+            }
+            const payload = jsonwebtoken_1.default.verify(token, "EDWIN"
+            // process.env.JWT_KEY!
+            );
+            // Call the session service to validate the session
+            const response = yield axios_1.default.get(`${sessionServiceUrl}/api/validate-session/${payload.id}`, {
+                params: { device_info: deviceInfo }, // Send the device info for validation
+            });
+            if (response.status !== 200) {
+                res.status(401).json({ message: 'Invalid or expired session' });
+                return;
+            }
+            // Attach user ID to request object
+            req.currentUser = response.data;
+            next();
+        }
+        catch (error) {
+            res.status(500).json({ message: 'Server error during session validation', error });
+        }
+    });
 };
-exports.requireAuth = requireAuth;
+exports.validateSession = validateSession;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sendhome/common",
-  "version": "1.0.151",
+  "version": "1.0.153",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -24,6 +24,7 @@
     "@types/express": "^4.17.13",
     "@types/jsonwebtoken": "^8.5.8",
     "@types/mongoose": "^5.11.97",
+    "axios": "^1.7.7",
     "cookie-session": "^2.0.0",
     "express": "^4.17.2",
     "express-validator": "^6.14.0",

package/build/events/types/user-roles.d.ts

@@ -1,6 +0,0 @@
-export declare enum UserRoles {
-    User = "user",
-    Administrator = "administrator",
-    Provider = "provider",
-    Recipient = "recipient"
-}

package/build/events/types/user-roles.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserRoles = void 0;
-var UserRoles;
-(function (UserRoles) {
-    UserRoles["User"] = "user";
-    UserRoles["Administrator"] = "administrator";
-    UserRoles["Provider"] = "provider";
-    UserRoles["Recipient"] = "recipient";
-})(UserRoles = exports.UserRoles || (exports.UserRoles = {}));