@sendhome/common 1.0.168 → 1.0.170

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

@@ -1,6 +1,6 @@
 import { Subjects } from "../subjects/subjects";
 import { OrderStatus } from "../types/order-status";
-import { CompanyType } from "../types/company-type";
+import { Category } from "../types/category";
 import { ReceiveCountry } from "../types/receive-country";
 import { SendCountry } from "../types/send-country";
 interface CardPaymentDetails {
@@ -23,7 +23,7 @@ export interface OrderCreatedEvent {
     data: {
         id: string;
         order_number: number;
-        order_type: CompanyType;
+        order_type: Category;
         items: string[];
         pay_amount: number;
         receive_amount: number;

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

@@ -1,6 +1,6 @@
 import { Subjects } from "../subjects/subjects";
 import { OrderStatus } from "../types/order-status";
-import { CompanyType } from "../types/company-type";
+import { Category } from "../types/category";
 import { ReceiveCountry } from "../types/receive-country";
 import { SendCountry } from "../types/send-country";
 interface CardPaymentDetails {
@@ -23,7 +23,7 @@ export interface OrderUpdatedEvent {
     data: {
         id: string;
         order_number: number;
-        order_type: CompanyType;
+        order_type: Category;
         items: string[];
         pay_amount: number;
         receive_amount: number;

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

@@ -1,7 +1,6 @@
 import { Subjects } from "../subjects/subjects";
-import { ProductClass } from "../types/product_class";
 import { ProductStatus } from "../types/product-status";
-import { CompanyType } from "../types/company-type";
+import { Category } from "../types/category";
 import { UnitType } from "../types/unit-type";
 import { ReceiveCountry } from "../types/receive-country";
 interface IGroceriesFields {
@@ -42,8 +41,7 @@ export interface ProductCreatedEvent {
         product_id: number;
         name: string;
         description: string;
-        product_type: CompanyType;
-        product_class: ProductClass;
+        product_category: Category;
         brand: string;
         unit: UnitType;
         unit_value: number;

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

@@ -1,7 +1,6 @@
 import { Subjects } from "../subjects/subjects";
-import { ProductClass } from "../types/product_class";
 import { ProductStatus } from "../types/product-status";
-import { CompanyType } from "../types/company-type";
+import { Category } from "../types/category";
 import { UnitType } from "../types/unit-type";
 import { ReceiveCountry } from "../types/receive-country";
 interface IGroceriesFields {
@@ -42,8 +41,7 @@ export interface ProductUpdatedEvent {
         product_id: number;
         name: string;
         description: string;
-        product_type: CompanyType;
-        product_class: ProductClass;
+        product_category: Category;
         brand: string;
         unit: UnitType;
         unit_value: number;

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

@@ -1,8 +1,7 @@
 import { Subjects } from "../subjects/subjects";
 import { ProductStatus } from "../types/product-status";
 import { ReceiveCountry } from "../types/receive-country";
-import { CompanyType } from "../types/company-type";
-import { ProductClass } from "../types/product_class";
+import { Category } from "../types/category";
 import { UnitType } from "../types/unit-type";
 interface IGroceriesFields {
     expiration_date?: Date;
@@ -39,8 +38,7 @@ interface ProductAttrs {
     product_id: number;
     name: string;
     description: string;
-    product_type: CompanyType;
-    product_class: ProductClass;
+    product_category: Category;
     brand?: string;
     unit?: UnitType;
     unit_value?: number;
@@ -55,7 +53,7 @@ export interface ProductItemCreatedEvent {
     data: {
         id: string;
         price: number;
-        product_type: CompanyType;
+        product_category: Category;
         category: string;
         brand: string;
         product: ProductAttrs | string;

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

@@ -1,8 +1,7 @@
 import { Subjects } from "../subjects/subjects";
 import { ProductStatus } from "../types/product-status";
 import { ReceiveCountry } from "../types/receive-country";
-import { CompanyType } from "../types/company-type";
-import { ProductClass } from "../types/product_class";
+import { Category } from "../types/category";
 import { UnitType } from "../types/unit-type";
 interface IGroceriesFields {
     expiration_date?: Date;
@@ -39,8 +38,7 @@ interface ProductAttrs {
     product_id: number;
     name: string;
     description: string;
-    product_type: CompanyType;
-    product_class: ProductClass;
+    product_category: Category;
     brand?: string;
     unit?: UnitType;
     unit_value?: number;
@@ -55,7 +53,7 @@ export interface ProductItemUpdatedEvent {
     data: {
         id: string;
         price: number;
-        product_type: CompanyType;
+        product_category: Category;
         category: string;
         brand: string;
         product: ProductAttrs | string;

package/build/middlewares/check-user-access.d.ts

@@ -13,8 +13,9 @@ declare global {
         }
     }
 }
-export declare const checkUserAccess: (requiredAccountType: string, requiredLevels?: {
-    provider?: string[] | undefined;
-    admin?: string[] | undefined;
-} | undefined) => (req: Request, res: Response, next: NextFunction) => Response<any, Record<string, any>> | undefined;
+export declare const checkUserAccess: (allowedRoles: {
+    client?: string[];
+    provider?: string[];
+    admin?: string[];
+}) => (req: Request, res: Response, next: NextFunction) => void | Response<any, Record<string, any>>;
 export {};

package/build/middlewares/check-user-access.js

@@ -1,28 +1,50 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkUserAccess = void 0;
-const checkUserAccess = (requiredAccountType, requiredLevels) => {
+const checkUserAccess = (allowedRoles) => {
     return (req, res, next) => {
-        const { account_type, provider_level = '', admin_level = '' } = req.currentUser; // Default to empty string if undefined
+        const { account_type, provider_level = "", admin_level = "", } = req.currentUser || {};
         console.log("req.currentUser", req.currentUser);
-        console.log("requiredLevels", requiredLevels);
-        // Check if the user's account_type matches the required account_type
-        if (account_type !== requiredAccountType) {
-            return res.status(403).send({ error: 'You do not have the necessary permissions to access this resource' });
+        console.log("allowedRoles", allowedRoles);
+        // Check for client access if account_type is 'client' and client level is in allowedRoles.client
+        if (account_type === "client" && allowedRoles.client) {
+            if (allowedRoles.client.includes("client")) {
+                return next(); // Client is allowed to access this route
+            }
+            else {
+                return res
+                    .status(403)
+                    .send({ error: "Clinet level not authorized for this resource" });
+            }
         }
-        // Check provider levels for 'provider' users
-        if (account_type === 'provider' && (requiredLevels === null || requiredLevels === void 0 ? void 0 : requiredLevels.provider)) {
-            if (!requiredLevels.provider.includes(provider_level)) {
-                return res.status(403).send({ error: 'Provider level not authorized for this resource' });
+        // Check for provider access if account_type is 'provider' and provider level is in allowedRoles.provider
+        if (account_type === "provider" && allowedRoles.provider) {
+            if (allowedRoles.provider.includes(provider_level)) {
+                return next(); // Provider level is authorized
+            }
+            else {
+                return res
+                    .status(403)
+                    .send({ error: "Provider level not authorized for this resource" });
             }
         }
-        // Check admin levels for 'admin' users
-        if (account_type === 'admin' && (requiredLevels === null || requiredLevels === void 0 ? void 0 : requiredLevels.admin)) {
-            if (!requiredLevels.admin.includes(admin_level)) {
-                return res.status(403).send({ error: 'Admin level not authorized for this resource' });
+        // Check for admin access if account_type is 'admin' and admin level is in allowedRoles.admin
+        if (account_type === "admin" && allowedRoles.admin) {
+            if (allowedRoles.admin.includes(admin_level)) {
+                return next(); // Admin level is authorized
+            }
+            else {
+                return res
+                    .status(403)
+                    .send({ error: "Admin level not authorized for this resource" });
             }
         }
-        next();
+        // If none of the conditions match, deny access
+        return res
+            .status(403)
+            .send({
+            error: "You do not have the necessary permissions to access this resource",
+        });
     };
 };
 exports.checkUserAccess = checkUserAccess;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sendhome/common",
-  "version": "1.0.168",
+  "version": "1.0.170",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",