vr-commons 1.0.99 → 1.0.101

package/dist/middlewares/{auth.middlewares.d.ts → admin/auth.admin.middlewares.d.ts}

@@ -1,4 +1,3 @@
 import { Request, Response, NextFunction } from "express";
 import { UserRole } from "vr-models";
-export declare const checkUserAuthentication: (allowedRoles: UserRole[]) => (req: Request, res: Response, next: NextFunction) => Promise<void>;
 export declare const checkAdminAuthentication: (allowedRoles: UserRole[]) => (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/dist/middlewares/admin/auth.admin.middlewares.js

@@ -0,0 +1,60 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkAdminAuthentication = void 0;
+const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
+const vr_models_1 = require("vr-models");
+const response_utils_1 = require("../../utils/response.utils");
+const checkAdminAuthentication = (allowedRoles) => async (req, res, next) => {
+    try {
+        const token = req.cookies?.access_token;
+        if (!token) {
+            return (0, response_utils_1.sendErrorResponse)(res, "Authentication required", 401);
+        }
+        let payload;
+        try {
+            payload = jsonwebtoken_1.default.verify(token, process.env.JWT_SECRET);
+        }
+        catch (error) {
+            if (error instanceof jsonwebtoken_1.default.TokenExpiredError) {
+                return (0, response_utils_1.sendErrorResponse)(res, "Session expired. Please login again.", 401);
+            }
+            return (0, response_utils_1.sendErrorResponse)(res, "Invalid session", 401);
+        }
+        const user = await vr_models_1.User.findOne({
+            where: { id: payload.userId },
+            include: [
+                {
+                    model: vr_models_1.SecurityClearance,
+                    as: "securityClearance",
+                },
+            ],
+        });
+        if (!user || !user.securityClearance) {
+            return (0, response_utils_1.sendErrorResponse)(res, "User not found", 400);
+        }
+        // 🔐 Token versioning
+        if (user.tokenVersion !== payload.tokenVersion) {
+            return (0, response_utils_1.sendErrorResponse)(res, "Session expired", 401);
+        }
+        // 🧱 Role enforcement
+        if (!allowedRoles.includes(user.securityClearance.role)) {
+            return (0, response_utils_1.sendErrorResponse)(res, "Access denied", 403);
+        }
+        // Attach user to request (same as before)
+        req.userId = user.id;
+        req.firstName = user.firstName;
+        req.lastName = user.lastName;
+        req.scRole = user.securityClearance.role;
+        req.scLevel = user.securityClearance.level;
+        req.tokenVersion = user.tokenVersion;
+        next();
+    }
+    catch (error) {
+        console.error("Authentication error:", error);
+        next(error);
+    }
+};
+exports.checkAdminAuthentication = checkAdminAuthentication;

package/dist/middlewares/admin/index.d.ts

@@ -0,0 +1 @@
+export { checkAdminAuthentication } from "./auth.admin.middlewares";

package/dist/middlewares/admin/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkAdminAuthentication = void 0;
+var auth_admin_middlewares_1 = require("./auth.admin.middlewares");
+Object.defineProperty(exports, "checkAdminAuthentication", { enumerable: true, get: function () { return auth_admin_middlewares_1.checkAdminAuthentication; } });

package/dist/middlewares/index.d.ts

@@ -1,2 +1,3 @@
-export { checkUserAuthentication, checkAdminAuthentication, } from "./auth.middlewares";
-export { checkUserAccountStatus, checkIsUserBanned, checkIsUserSuspended, } from "./account.middlewares";
+export * from "./admin";
+export * from "./shared";
+export * from "./users";

package/dist/middlewares/index.js

@@ -1,10 +1,19 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkIsUserSuspended = exports.checkIsUserBanned = exports.checkUserAccountStatus = exports.checkAdminAuthentication = exports.checkUserAuthentication = void 0;
-var auth_middlewares_1 = require("./auth.middlewares");
-Object.defineProperty(exports, "checkUserAuthentication", { enumerable: true, get: function () { return auth_middlewares_1.checkUserAuthentication; } });
-Object.defineProperty(exports, "checkAdminAuthentication", { enumerable: true, get: function () { return auth_middlewares_1.checkAdminAuthentication; } });
-var account_middlewares_1 = require("./account.middlewares");
-Object.defineProperty(exports, "checkUserAccountStatus", { enumerable: true, get: function () { return account_middlewares_1.checkUserAccountStatus; } });
-Object.defineProperty(exports, "checkIsUserBanned", { enumerable: true, get: function () { return account_middlewares_1.checkIsUserBanned; } });
-Object.defineProperty(exports, "checkIsUserSuspended", { enumerable: true, get: function () { return account_middlewares_1.checkIsUserSuspended; } });
+__exportStar(require("./admin"), exports);
+__exportStar(require("./shared"), exports);
+__exportStar(require("./users"), exports);

package/dist/middlewares/{account.middlewares.js → shared/account.shared.middlewares.js}

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkIsUserBanned = checkIsUserBanned;
 exports.checkIsUserSuspended = checkIsUserSuspended;
 exports.checkUserAccountStatus = checkUserAccountStatus;
-const account_utils_1 = require("../utils/account.utils");
-const response_utils_1 = require("../utils/response.utils");
+const account_utils_1 = require("../../utils/account.utils");
+const response_utils_1 = require("../../utils/response.utils");
 // Check if user is banned
 async function checkIsUserBanned(req, res, next) {
     try {

package/dist/middlewares/shared/index.d.ts

@@ -0,0 +1 @@
+export { checkIsUserBanned, checkIsUserSuspended, checkUserAccountStatus, } from "./account.shared.middlewares";

package/dist/middlewares/shared/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkUserAccountStatus = exports.checkIsUserSuspended = exports.checkIsUserBanned = void 0;
+var account_shared_middlewares_1 = require("./account.shared.middlewares");
+Object.defineProperty(exports, "checkIsUserBanned", { enumerable: true, get: function () { return account_shared_middlewares_1.checkIsUserBanned; } });
+Object.defineProperty(exports, "checkIsUserSuspended", { enumerable: true, get: function () { return account_shared_middlewares_1.checkIsUserSuspended; } });
+Object.defineProperty(exports, "checkUserAccountStatus", { enumerable: true, get: function () { return account_shared_middlewares_1.checkUserAccountStatus; } });

package/dist/middlewares/users/auth.users.middlewares.d.ts

@@ -0,0 +1,3 @@
+import { Request, Response, NextFunction } from "express";
+import { UserRole } from "vr-models";
+export declare const checkUserAuthentication: (allowedRoles: UserRole[]) => (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/dist/middlewares/{auth.middlewares.js → users/auth.users.middlewares.js}

@@ -3,11 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkAdminAuthentication = exports.checkUserAuthentication = void 0;
+exports.checkUserAuthentication = void 0;
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const vr_models_1 = require("vr-models");
-const response_utils_1 = require("../utils/response.utils");
-const authTokens_utils_1 = require("../utils/authTokens.utils");
+const response_utils_1 = require("../../utils/response.utils");
+const authTokens_utils_1 = require("../../utils/authTokens.utils");
 const checkUserAuthentication = (allowedRoles) => async (req, res, next) => {
     try {
         const authHeader = req.headers.authorization;
@@ -78,54 +78,3 @@ const checkUserAuthentication = (allowedRoles) => async (req, res, next) => {
     }
 };
 exports.checkUserAuthentication = checkUserAuthentication;
-const checkAdminAuthentication = (allowedRoles) => async (req, res, next) => {
-    try {
-        const token = req.cookies?.access_token;
-        if (!token) {
-            return (0, response_utils_1.sendErrorResponse)(res, "Authentication required", 401);
-        }
-        let payload;
-        try {
-            payload = jsonwebtoken_1.default.verify(token, process.env.JWT_SECRET);
-        }
-        catch (error) {
-            if (error instanceof jsonwebtoken_1.default.TokenExpiredError) {
-                return (0, response_utils_1.sendErrorResponse)(res, "Session expired. Please login again.", 401);
-            }
-            return (0, response_utils_1.sendErrorResponse)(res, "Invalid session", 401);
-        }
-        const user = await vr_models_1.User.findOne({
-            where: { id: payload.userId },
-            include: [
-                {
-                    model: vr_models_1.SecurityClearance,
-                    as: "securityClearance",
-                },
-            ],
-        });
-        if (!user || !user.securityClearance) {
-            return (0, response_utils_1.sendErrorResponse)(res, "User not found", 400);
-        }
-        // 🔐 Token versioning
-        if (user.tokenVersion !== payload.tokenVersion) {
-            return (0, response_utils_1.sendErrorResponse)(res, "Session expired", 401);
-        }
-        // 🧱 Role enforcement
-        if (!allowedRoles.includes(user.securityClearance.role)) {
-            return (0, response_utils_1.sendErrorResponse)(res, "Access denied", 403);
-        }
-        // Attach user to request (same as before)
-        req.userId = user.id;
-        req.firstName = user.firstName;
-        req.lastName = user.lastName;
-        req.scRole = user.securityClearance.role;
-        req.scLevel = user.securityClearance.level;
-        req.tokenVersion = user.tokenVersion;
-        next();
-    }
-    catch (error) {
-        console.error("Authentication error:", error);
-        next(error);
-    }
-};
-exports.checkAdminAuthentication = checkAdminAuthentication;

package/dist/middlewares/users/index.d.ts

@@ -0,0 +1 @@
+export { checkUserAuthentication } from "./auth.users.middlewares";

package/dist/middlewares/users/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkUserAuthentication = void 0;
+var auth_users_middlewares_1 = require("./auth.users.middlewares");
+Object.defineProperty(exports, "checkUserAuthentication", { enumerable: true, get: function () { return auth_users_middlewares_1.checkUserAuthentication; } });

package/dist/validations/admin.devicePayment.validations.d.ts

@@ -38,49 +38,49 @@ export declare const listPlansSchema: z.ZodObject<{
         sortBy: z.ZodOptional<z.ZodEnum<["createdAt", "updatedAt", "nextInstallmentDueAt", "paidAmount", "outstandingAmount"]>>;
         sortOrder: z.ZodOptional<z.ZodEnum<["ASC", "DESC"]>>;
     }, "strip", z.ZodTypeAny, {
-        page: number;
         limit: number;
-        status?: "ACTIVE" | "COMPLETED" | "DEFAULTED" | "CANCELLED" | undefined;
+        page: number;
+        search?: string | undefined;
         userId?: string | undefined;
+        status?: "ACTIVE" | "DEFAULTED" | "COMPLETED" | "CANCELLED" | undefined;
+        sortBy?: "createdAt" | "updatedAt" | "paidAmount" | "outstandingAmount" | "nextInstallmentDueAt" | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
         deviceId?: string | undefined;
         isOverdue?: "true" | "false" | undefined;
-        search?: string | undefined;
-        sortBy?: "createdAt" | "updatedAt" | "nextInstallmentDueAt" | "paidAmount" | "outstandingAmount" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
     }, {
-        status?: "ACTIVE" | "COMPLETED" | "DEFAULTED" | "CANCELLED" | undefined;
+        search?: string | undefined;
+        limit?: string | undefined;
         userId?: string | undefined;
+        status?: "ACTIVE" | "DEFAULTED" | "COMPLETED" | "CANCELLED" | undefined;
         page?: string | undefined;
-        limit?: string | undefined;
+        sortBy?: "createdAt" | "updatedAt" | "paidAmount" | "outstandingAmount" | "nextInstallmentDueAt" | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
         deviceId?: string | undefined;
         isOverdue?: "true" | "false" | undefined;
-        search?: string | undefined;
-        sortBy?: "createdAt" | "updatedAt" | "nextInstallmentDueAt" | "paidAmount" | "outstandingAmount" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
     query: {
-        page: number;
         limit: number;
-        status?: "ACTIVE" | "COMPLETED" | "DEFAULTED" | "CANCELLED" | undefined;
+        page: number;
+        search?: string | undefined;
         userId?: string | undefined;
+        status?: "ACTIVE" | "DEFAULTED" | "COMPLETED" | "CANCELLED" | undefined;
+        sortBy?: "createdAt" | "updatedAt" | "paidAmount" | "outstandingAmount" | "nextInstallmentDueAt" | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
         deviceId?: string | undefined;
         isOverdue?: "true" | "false" | undefined;
-        search?: string | undefined;
-        sortBy?: "createdAt" | "updatedAt" | "nextInstallmentDueAt" | "paidAmount" | "outstandingAmount" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
     };
 }, {
     query: {
-        status?: "ACTIVE" | "COMPLETED" | "DEFAULTED" | "CANCELLED" | undefined;
+        search?: string | undefined;
+        limit?: string | undefined;
         userId?: string | undefined;
+        status?: "ACTIVE" | "DEFAULTED" | "COMPLETED" | "CANCELLED" | undefined;
         page?: string | undefined;
-        limit?: string | undefined;
+        sortBy?: "createdAt" | "updatedAt" | "paidAmount" | "outstandingAmount" | "nextInstallmentDueAt" | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
         deviceId?: string | undefined;
         isOverdue?: "true" | "false" | undefined;
-        search?: string | undefined;
-        sortBy?: "createdAt" | "updatedAt" | "nextInstallmentDueAt" | "paidAmount" | "outstandingAmount" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
     };
 }>;
 export declare const getPlanSchema: z.ZodObject<{
@@ -112,10 +112,10 @@ export declare const getUserPlansSchema: z.ZodObject<{
         status: z.ZodOptional<z.ZodEnum<["ACTIVE", "COMPLETED", "DEFAULTED", "CANCELLED"]>>;
         includeCompleted: z.ZodOptional<z.ZodEnum<["true", "false"]>>;
     }, "strip", z.ZodTypeAny, {
-        status?: "ACTIVE" | "COMPLETED" | "DEFAULTED" | "CANCELLED" | undefined;
+        status?: "ACTIVE" | "DEFAULTED" | "COMPLETED" | "CANCELLED" | undefined;
         includeCompleted?: "true" | "false" | undefined;
     }, {
-        status?: "ACTIVE" | "COMPLETED" | "DEFAULTED" | "CANCELLED" | undefined;
+        status?: "ACTIVE" | "DEFAULTED" | "COMPLETED" | "CANCELLED" | undefined;
         includeCompleted?: "true" | "false" | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
@@ -123,7 +123,7 @@ export declare const getUserPlansSchema: z.ZodObject<{
         userId: string;
     };
     query?: {
-        status?: "ACTIVE" | "COMPLETED" | "DEFAULTED" | "CANCELLED" | undefined;
+        status?: "ACTIVE" | "DEFAULTED" | "COMPLETED" | "CANCELLED" | undefined;
         includeCompleted?: "true" | "false" | undefined;
     } | undefined;
 }, {
@@ -131,7 +131,7 @@ export declare const getUserPlansSchema: z.ZodObject<{
         userId: string;
     };
     query?: {
-        status?: "ACTIVE" | "COMPLETED" | "DEFAULTED" | "CANCELLED" | undefined;
+        status?: "ACTIVE" | "DEFAULTED" | "COMPLETED" | "CANCELLED" | undefined;
         includeCompleted?: "true" | "false" | undefined;
     } | undefined;
 }>;
@@ -177,21 +177,21 @@ export declare const limitedUpdateSchema: z.ZodObject<{
         pricingId?: string | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
-    params: {
-        id: string;
-    };
     body: {
         userId?: string | undefined;
         pricingId?: string | undefined;
     };
-}, {
     params: {
         id: string;
     };
+}, {
     body: {
         userId?: string | undefined;
         pricingId?: string | undefined;
     };
+    params: {
+        id: string;
+    };
 }>;
 export declare const recordPaymentSchema: z.ZodObject<{
     params: z.ZodObject<{
@@ -209,33 +209,33 @@ export declare const recordPaymentSchema: z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         amount: number;
         provider: "mtn_momo" | "airtel_money";
-        providerReference?: string | undefined;
         metadata?: Record<string, any> | undefined;
+        providerReference?: string | undefined;
     }, {
         amount: number;
         provider: "mtn_momo" | "airtel_money";
-        providerReference?: string | undefined;
         metadata?: Record<string, any> | undefined;
+        providerReference?: string | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
-    params: {
-        id: string;
-    };
     body: {
         amount: number;
         provider: "mtn_momo" | "airtel_money";
-        providerReference?: string | undefined;
         metadata?: Record<string, any> | undefined;
+        providerReference?: string | undefined;
     };
-}, {
     params: {
         id: string;
     };
+}, {
     body: {
         amount: number;
         provider: "mtn_momo" | "airtel_money";
-        providerReference?: string | undefined;
         metadata?: Record<string, any> | undefined;
+        providerReference?: string | undefined;
+    };
+    params: {
+        id: string;
     };
 }>;
 export declare const deletePlanSchema: z.ZodObject<{

package/dist/validations/admin.devices.validations.d.ts

@@ -4,21 +4,21 @@ export declare const createDeviceSchema: z.ZodObject<{
         serialNumber: z.ZodString;
         productId: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        serialNumber: string;
         productId: string;
-    }, {
         serialNumber: string;
+    }, {
         productId: string;
+        serialNumber: string;
     }>;
 }, "strip", z.ZodTypeAny, {
     body: {
-        serialNumber: string;
         productId: string;
+        serialNumber: string;
     };
 }, {
     body: {
-        serialNumber: string;
         productId: string;
+        serialNumber: string;
     };
 }>;
 export declare const bulkCreateDevicesSchema: z.ZodObject<{
@@ -65,23 +65,23 @@ export declare const updateDeviceSchema: z.ZodObject<{
         dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | null | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
-    params: {
-        id: string;
-    };
     body: {
         status?: "locked" | "unlocked" | "disabled" | undefined;
         serialNumber?: string | undefined;
         dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | null | undefined;
     };
-}, {
     params: {
         id: string;
     };
+}, {
     body: {
         status?: "locked" | "unlocked" | "disabled" | undefined;
         serialNumber?: string | undefined;
         dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | null | undefined;
     };
+    params: {
+        id: string;
+    };
 }>;
 export declare const getDeviceSchema: z.ZodObject<{
     params: z.ZodObject<{
@@ -113,53 +113,53 @@ export declare const getDevicesSchema: z.ZodObject<{
         sortBy: z.ZodOptional<z.ZodEnum<["serialNumber", "status", "createdAt", "updatedAt"]>>;
         sortOrder: z.ZodOptional<z.ZodEnum<["ASC", "DESC"]>>;
     }, "strip", z.ZodTypeAny, {
+        search?: string | undefined;
+        limit?: number | undefined;
         status?: "locked" | "unlocked" | "disabled" | undefined;
+        page?: number | undefined;
+        sortBy?: "createdAt" | "updatedAt" | "status" | "serialNumber" | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
         productId?: string | undefined;
         dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | undefined;
-        page?: number | undefined;
-        limit?: number | undefined;
         isPermanentlyUnlocked?: "true" | "false" | undefined;
         isAssigned?: "true" | "false" | undefined;
-        search?: string | undefined;
-        sortBy?: "status" | "serialNumber" | "createdAt" | "updatedAt" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
     }, {
+        search?: string | undefined;
+        limit?: string | undefined;
         status?: "locked" | "unlocked" | "disabled" | undefined;
+        page?: string | undefined;
+        sortBy?: "createdAt" | "updatedAt" | "status" | "serialNumber" | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
         productId?: string | undefined;
         dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | undefined;
-        page?: string | undefined;
-        limit?: string | undefined;
         isPermanentlyUnlocked?: "true" | "false" | undefined;
         isAssigned?: "true" | "false" | undefined;
-        search?: string | undefined;
-        sortBy?: "status" | "serialNumber" | "createdAt" | "updatedAt" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
     query: {
+        search?: string | undefined;
+        limit?: number | undefined;
         status?: "locked" | "unlocked" | "disabled" | undefined;
+        page?: number | undefined;
+        sortBy?: "createdAt" | "updatedAt" | "status" | "serialNumber" | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
         productId?: string | undefined;
         dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | undefined;
-        page?: number | undefined;
-        limit?: number | undefined;
         isPermanentlyUnlocked?: "true" | "false" | undefined;
         isAssigned?: "true" | "false" | undefined;
-        search?: string | undefined;
-        sortBy?: "status" | "serialNumber" | "createdAt" | "updatedAt" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
     };
 }, {
     query: {
+        search?: string | undefined;
+        limit?: string | undefined;
         status?: "locked" | "unlocked" | "disabled" | undefined;
+        page?: string | undefined;
+        sortBy?: "createdAt" | "updatedAt" | "status" | "serialNumber" | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
         productId?: string | undefined;
         dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | undefined;
-        page?: string | undefined;
-        limit?: string | undefined;
         isPermanentlyUnlocked?: "true" | "false" | undefined;
         isAssigned?: "true" | "false" | undefined;
-        search?: string | undefined;
-        sortBy?: "status" | "serialNumber" | "createdAt" | "updatedAt" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
     };
 }>;
 export declare const deleteDeviceSchema: z.ZodObject<{
@@ -242,19 +242,19 @@ export declare const disableDeviceSchema: z.ZodObject<{
         reason: string;
     }>;
 }, "strip", z.ZodTypeAny, {
-    params: {
-        id: string;
-    };
     body: {
         reason: string;
     };
-}, {
     params: {
         id: string;
     };
+}, {
     body: {
         reason: string;
     };
+    params: {
+        id: string;
+    };
 }>;
 export declare const makePermanentSchema: z.ZodObject<{
     params: z.ZodObject<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vr-commons",
-  "version": "1.0.99",
+  "version": "1.0.101",
   "description": "Shared functions package",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/dist/validations/user.management.validations.d.ts

@@ -1,56 +0,0 @@
-import { z } from "zod";
-export declare const upgradeToRiderSchema: z.ZodObject<{
-    params: z.ZodObject<{
-        userId: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        userId: string;
-    }, {
-        userId: string;
-    }>;
-    body: z.ZodEffects<z.ZodObject<{
-        jacketId: z.ZodString;
-        nationalId: z.ZodString;
-        phoneNumber: z.ZodEffects<z.ZodString, string, string>;
-        plateNumber: z.ZodOptional<z.ZodString>;
-    }, "strip", z.ZodTypeAny, {
-        phoneNumber: string;
-        nationalId: string;
-        jacketId: string;
-        plateNumber?: string | undefined;
-    }, {
-        phoneNumber: string;
-        nationalId: string;
-        jacketId: string;
-        plateNumber?: string | undefined;
-    }>, {
-        phoneNumber: string;
-        nationalId: string;
-        jacketId: string;
-        plateNumber?: string | undefined;
-    }, {
-        phoneNumber: string;
-        nationalId: string;
-        jacketId: string;
-        plateNumber?: string | undefined;
-    }>;
-}, "strip", z.ZodTypeAny, {
-    params: {
-        userId: string;
-    };
-    body: {
-        phoneNumber: string;
-        nationalId: string;
-        jacketId: string;
-        plateNumber?: string | undefined;
-    };
-}, {
-    params: {
-        userId: string;
-    };
-    body: {
-        phoneNumber: string;
-        nationalId: string;
-        jacketId: string;
-        plateNumber?: string | undefined;
-    };
-}>;

package/dist/validations/user.management.validations.js

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.upgradeToRiderSchema = void 0;
-const zod_1 = require("zod");
-const auth_validations_1 = require("./auth.validations");
-const nationalIdRegex = /^[A-Z0-9]{5,20}$/i;
-const jacketIdRegex = /^[A-Z0-9]{5,20}$/i;
-const plateNumberRegex = /^[A-Z0-9]{3,10}$/i;
-exports.upgradeToRiderSchema = zod_1.z.object({
-    params: zod_1.z.object({
-        userId: zod_1.z.string().uuid("Invalid user ID format"),
-    }),
-    body: zod_1.z
-        .object({
-        jacketId: zod_1.z
-            .string()
-            .regex(jacketIdRegex, "Jacket ID must be alphanumeric, 5-20 characters")
-            .min(5, "Jacket ID must be at least 5 characters")
-            .max(20, "Jacket ID cannot exceed 20 characters"),
-        nationalId: zod_1.z
-            .string()
-            .regex(nationalIdRegex, "National ID must be alphanumeric, 5-20 characters")
-            .min(5, "National ID must be at least 5 characters")
-            .max(20, "National ID cannot exceed 20 characters"),
-        phoneNumber: zod_1.z
-            .string()
-            .regex(auth_validations_1.phoneRegex, "Invalid phone number format. Use format: +250788123456")
-            .refine((phone) => phone === phone, "Phone number verification required"),
-        plateNumber: zod_1.z
-            .string()
-            .regex(plateNumberRegex, "Plate number must be alphanumeric, 3-10 characters")
-            .min(3, "Plate number must be at least 3 characters")
-            .max(10, "Plate number cannot exceed 10 characters")
-            .optional(),
-    })
-        .refine((data) => data.phoneNumber, {
-        message: "Phone number is required",
-        path: ["phoneNumber"],
-    }),
-});

package/dist/validations/users.operation.validations.d.ts

@@ -1,152 +0,0 @@
-import { z } from "zod";
-export declare const updateUserSchema: z.ZodObject<{
-    params: z.ZodObject<{
-        id: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        id: string;
-    }, {
-        id: string;
-    }>;
-    body: z.ZodObject<{
-        firstName: z.ZodOptional<z.ZodString>;
-        lastName: z.ZodOptional<z.ZodString>;
-        phoneNumber: z.ZodOptional<z.ZodString>;
-        jacketId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-        email: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-        plateNumber: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-        nationalId: z.ZodOptional<z.ZodString>;
-    }, "strip", z.ZodTypeAny, {
-        firstName?: string | undefined;
-        lastName?: string | undefined;
-        phoneNumber?: string | undefined;
-        jacketId?: string | null | undefined;
-        email?: string | null | undefined;
-        plateNumber?: string | null | undefined;
-        nationalId?: string | undefined;
-    }, {
-        firstName?: string | undefined;
-        lastName?: string | undefined;
-        phoneNumber?: string | undefined;
-        jacketId?: string | null | undefined;
-        email?: string | null | undefined;
-        plateNumber?: string | null | undefined;
-        nationalId?: string | undefined;
-    }>;
-}, "strip", z.ZodTypeAny, {
-    params: {
-        id: string;
-    };
-    body: {
-        firstName?: string | undefined;
-        lastName?: string | undefined;
-        phoneNumber?: string | undefined;
-        jacketId?: string | null | undefined;
-        email?: string | null | undefined;
-        plateNumber?: string | null | undefined;
-        nationalId?: string | undefined;
-    };
-}, {
-    params: {
-        id: string;
-    };
-    body: {
-        firstName?: string | undefined;
-        lastName?: string | undefined;
-        phoneNumber?: string | undefined;
-        jacketId?: string | null | undefined;
-        email?: string | null | undefined;
-        plateNumber?: string | null | undefined;
-        nationalId?: string | undefined;
-    };
-}>;
-export declare const getUserSchema: z.ZodObject<{
-    params: z.ZodObject<{
-        id: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        id: string;
-    }, {
-        id: string;
-    }>;
-}, "strip", z.ZodTypeAny, {
-    params: {
-        id: string;
-    };
-}, {
-    params: {
-        id: string;
-    };
-}>;
-export declare const getUsersSchema: z.ZodObject<{
-    query: z.ZodObject<{
-        page: z.ZodOptional<z.ZodEffects<z.ZodString, number, string>>;
-        limit: z.ZodOptional<z.ZodEffects<z.ZodString, number, string>>;
-        search: z.ZodOptional<z.ZodString>;
-        isActive: z.ZodOptional<z.ZodEnum<["true", "false"]>>;
-        isSuspended: z.ZodOptional<z.ZodEnum<["true", "false"]>>;
-        isDeactivated: z.ZodOptional<z.ZodEnum<["true", "false"]>>;
-        securityClearanceId: z.ZodOptional<z.ZodString>;
-        sortBy: z.ZodOptional<z.ZodEnum<["createdAt", "firstName", "lastName", "phoneNumber"]>>;
-        sortOrder: z.ZodOptional<z.ZodEnum<["ASC", "DESC"]>>;
-    }, "strip", z.ZodTypeAny, {
-        page?: number | undefined;
-        limit?: number | undefined;
-        search?: string | undefined;
-        isActive?: "true" | "false" | undefined;
-        isSuspended?: "true" | "false" | undefined;
-        isDeactivated?: "true" | "false" | undefined;
-        securityClearanceId?: string | undefined;
-        sortBy?: "firstName" | "lastName" | "phoneNumber" | "createdAt" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
-    }, {
-        page?: string | undefined;
-        limit?: string | undefined;
-        search?: string | undefined;
-        isActive?: "true" | "false" | undefined;
-        isSuspended?: "true" | "false" | undefined;
-        isDeactivated?: "true" | "false" | undefined;
-        securityClearanceId?: string | undefined;
-        sortBy?: "firstName" | "lastName" | "phoneNumber" | "createdAt" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
-    }>;
-}, "strip", z.ZodTypeAny, {
-    query: {
-        page?: number | undefined;
-        limit?: number | undefined;
-        search?: string | undefined;
-        isActive?: "true" | "false" | undefined;
-        isSuspended?: "true" | "false" | undefined;
-        isDeactivated?: "true" | "false" | undefined;
-        securityClearanceId?: string | undefined;
-        sortBy?: "firstName" | "lastName" | "phoneNumber" | "createdAt" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
-    };
-}, {
-    query: {
-        page?: string | undefined;
-        limit?: string | undefined;
-        search?: string | undefined;
-        isActive?: "true" | "false" | undefined;
-        isSuspended?: "true" | "false" | undefined;
-        isDeactivated?: "true" | "false" | undefined;
-        securityClearanceId?: string | undefined;
-        sortBy?: "firstName" | "lastName" | "phoneNumber" | "createdAt" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
-    };
-}>;
-export declare const deleteUserSchema: z.ZodObject<{
-    params: z.ZodObject<{
-        id: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        id: string;
-    }, {
-        id: string;
-    }>;
-}, "strip", z.ZodTypeAny, {
-    params: {
-        id: string;
-    };
-}, {
-    params: {
-        id: string;
-    };
-}>;

package/dist/validations/users.operation.validations.js

@@ -1,72 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteUserSchema = exports.getUsersSchema = exports.getUserSchema = exports.updateUserSchema = void 0;
-const zod_1 = require("zod");
-const auth_validations_1 = require("./auth.validations");
-// Base user schema
-const userBaseSchema = {
-    firstName: zod_1.z
-        .string()
-        .min(2, "First name must be at least 2 characters")
-        .max(100),
-    lastName: zod_1.z
-        .string()
-        .min(2, "Last name must be at least 2 characters")
-        .max(100),
-    phoneNumber: zod_1.z.string().regex(auth_validations_1.phoneRegex, "Invalid phone number format"),
-    jacketId: zod_1.z.string().max(100).nullable().optional(),
-    email: zod_1.z.string().email("Invalid email format").nullable().optional(),
-    password: zod_1.z
-        .string()
-        .min(6, "Password must be at least 6 characters")
-        .nullable()
-        .optional(),
-    plateNumber: zod_1.z.string().max(100).nullable().optional(),
-    nationalId: zod_1.z
-        .string()
-        .min(5, "National ID must be at least 5 characters")
-        .max(100),
-};
-// Update user schema
-exports.updateUserSchema = zod_1.z.object({
-    params: zod_1.z.object({
-        id: zod_1.z.string().uuid("Invalid user ID"),
-    }),
-    body: zod_1.z.object({
-        firstName: userBaseSchema.firstName.optional(),
-        lastName: userBaseSchema.lastName.optional(),
-        phoneNumber: userBaseSchema.phoneNumber.optional(),
-        jacketId: userBaseSchema.jacketId,
-        email: userBaseSchema.email,
-        plateNumber: userBaseSchema.plateNumber,
-        nationalId: userBaseSchema.nationalId.optional(),
-    }),
-});
-// Get user by ID schema
-exports.getUserSchema = zod_1.z.object({
-    params: zod_1.z.object({
-        id: zod_1.z.string().uuid("Invalid user ID"),
-    }),
-});
-// Get all users schema (with pagination)
-exports.getUsersSchema = zod_1.z.object({
-    query: zod_1.z.object({
-        page: zod_1.z.string().regex(/^\d+$/).transform(Number).optional(),
-        limit: zod_1.z.string().regex(/^\d+$/).transform(Number).optional(),
-        search: zod_1.z.string().optional(),
-        isActive: zod_1.z.enum(["true", "false"]).optional(),
-        isSuspended: zod_1.z.enum(["true", "false"]).optional(),
-        isDeactivated: zod_1.z.enum(["true", "false"]).optional(),
-        securityClearanceId: zod_1.z.string().uuid().optional(),
-        sortBy: zod_1.z
-            .enum(["createdAt", "firstName", "lastName", "phoneNumber"])
-            .optional(),
-        sortOrder: zod_1.z.enum(["ASC", "DESC"]).optional(),
-    }),
-});
-// Delete user schema
-exports.deleteUserSchema = zod_1.z.object({
-    params: zod_1.z.object({
-        id: zod_1.z.string().uuid("Invalid user ID"),
-    }),
-});