vr-commons 1.0.48 → 1.0.49

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

@@ -1,3 +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<Response<any, Record<string, any>> | undefined>;
+export declare const checkUserAuthentication: (allowedRoles: UserRole[]) => (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/dist/middlewares/auth.middlewares.js

@@ -7,50 +7,76 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkUserAuthentication = void 0;
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const vr_models_1 = require("vr-models");
+const __1 = require("..");
 const checkUserAuthentication = (allowedRoles) => async (req, res, next) => {
     try {
         const authHeader = req.headers.authorization;
         if (!authHeader || !authHeader.startsWith("Bearer ")) {
-            return res.status(401).json({ message: "Missing or invalid token" });
+            return (0, __1.sendErrorResponse)(res, "Missing or invalid token", 401);
         }
         const token = authHeader.split(" ")[1];
         let payload;
         try {
             payload = jsonwebtoken_1.default.verify(token, process.env.JWT_SECRET);
         }
-        catch {
-            return res.status(401).json({ message: "Token expired or invalid" });
+        catch (error) {
+            if (error instanceof jsonwebtoken_1.default.TokenExpiredError) {
+                return (0, __1.sendErrorResponse)(res, "Token expired", 401);
+            }
+            return (0, __1.sendErrorResponse)(res, "Token invalid", 401);
+        }
+        // Validate that sessionId exists in payload
+        if (!payload.sessionId) {
+            return (0, __1.sendErrorResponse)(res, "Invalid token format: missing session", 401);
         }
         const user = await vr_models_1.User.findOne({
             where: { id: payload.userId },
             include: [
                 {
                     model: vr_models_1.SecurityClearance,
-                    as: "securityClearance"
-                }
-            ]
+                    as: "securityClearance",
+                },
+            ],
         });
+        // Check if user exists
         if (!user || !user.securityClearance) {
-            return res.status(401).json({ message: "User not found" });
+            return (0, __1.sendErrorResponse)(res, "User not found", 400);
+        }
+        // Check account moderation status
+        const moderation = await (0, __1.checkIsUserBannedOrSuspended)(user.id);
+        if (moderation.isRestricted) {
+            return (0, __1.sendErrorResponse)(res, "Restricted", 403, moderation);
         }
         // 🔐 Token versioning (logout all devices)
         if (user.tokenVersion !== payload.tokenVersion) {
-            return res.status(401).json({ message: "Session expired" });
+            return (0, __1.sendErrorResponse)(res, "Session expired - token version mismatch", 401);
         }
         // 🧱 Role enforcement
         if (!allowedRoles.includes(user.securityClearance.role)) {
-            return res.status(403).json({ message: "Access denied" });
+            return (0, __1.sendErrorResponse)(res, "Access denied", 403);
         }
-        // ✅ Extend req
+        // Reconstruct session from payload
+        const currentTime = Math.floor(Date.now() / 1000);
+        const session = {
+            sessionId: payload.sessionId,
+            startedAt: payload.iat ? payload.iat * 1000 : Date.now(), // Convert to ms if exists
+            expiresAt: payload.exp
+                ? payload.exp * 1000
+                : Date.now() + 15 * 60 * 1000, // Default 15min if no exp
+            userId: user.id,
+            tokenVersion: user.tokenVersion,
+        };
+        // ✅ Extend req with user info AND session
         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;
+        req.session = session;
         next();
     }
     catch (error) {
+        console.error("Authentication error:", error);
         next(error);
     }
 };

package/dist/utils/authTokens.utils.d.ts

@@ -1,11 +1,18 @@
 import { UserRole } from "vr-models";
 export interface JWTPayload {
     userId: string;
-    role: UserRole;
+    role: string;
     level: number;
     tokenVersion: number;
+    sessionId: string;
+    iat?: number;
+    exp?: number;
 }
-export declare const generateAdminToken: (userId: string, role: UserRole, level: number, tokenVersion: number, expiresIn: number) => string;
-export declare const generatePassengerToken: (userId: string, role: UserRole, level: number, tokenVersion: number, expiresIn: number) => string;
-export declare const generateRiderToken: (userId: string, role: UserRole, level: number, tokenVersion: number, expiresIn: number) => string;
+export declare const generateToken: (userId: string, role: UserRole, level: number, tokenVersion: number, sessionId: string, type: "ADMIN" | "PASSENGER" | "RIDER") => string;
+export declare const generateAdminToken: (userId: string, role: UserRole, level: number, tokenVersion: number, sessionId: string) => string;
+export declare const generatePassengerToken: (userId: string, role: UserRole, level: number, tokenVersion: number, sessionId: string) => string;
+export declare const generateRiderToken: (userId: string, role: UserRole, level: number, tokenVersion: number, sessionId: string) => string;
 export declare const verifyToken: (token: string) => Promise<JWTPayload>;
+export declare const shouldRefreshToken: (token: string) => boolean;
+export declare const getTokenTimeRemaining: (token: string) => number | null;
+export declare const formatTimeRemaining: (seconds: number) => string;

package/dist/utils/authTokens.utils.js

@@ -3,30 +3,115 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyToken = exports.generateRiderToken = exports.generatePassengerToken = exports.generateAdminToken = void 0;
+exports.formatTimeRemaining = exports.getTokenTimeRemaining = exports.shouldRefreshToken = exports.verifyToken = exports.generateRiderToken = exports.generatePassengerToken = exports.generateAdminToken = exports.generateToken = void 0;
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
-const generateAdminToken = (userId, role, level, tokenVersion, expiresIn) => {
-    const payload = { userId, role, level, tokenVersion };
+// Get token lifespan from env with fallback to 15 minutes (in seconds)
+const getTokenLifespan = (type) => {
+    const envVar = `${type}_TOKEN_LIFE_SPAN`;
+    const value = process.env[envVar];
+    if (value) {
+        const parsed = parseInt(value, 10);
+        if (!isNaN(parsed) && parsed > 0) {
+            return parsed;
+        }
+    }
+    // Default to 15 minutes (900 seconds)
+    console.warn(`⚠️  ${envVar} not set or invalid, using default 15 minutes (900 seconds)`);
+    return 900;
+};
+// Helper to ensure expiration is exactly 15 minutes from now
+const generateToken = (userId, role, level, tokenVersion, sessionId, type) => {
+    const payload = {
+        userId,
+        role,
+        level,
+        tokenVersion,
+        sessionId,
+    };
+    const expiresIn = getTokenLifespan(type);
+    console.log(`🔐 Generating ${type} token for user ${userId} with ${expiresIn}s expiry`);
     return jsonwebtoken_1.default.sign(payload, process.env.JWT_SECRET, {
-        expiresIn: expiresIn || Number(process.env.ADMIN_TOKEN_LIFE_SPAN)
+        expiresIn, // This ensures exp is set to (iat + expiresIn)
     });
 };
+exports.generateToken = generateToken;
+// Specific token generators
+const generateAdminToken = (userId, role, level, tokenVersion, sessionId) => {
+    return (0, exports.generateToken)(userId, role, level, tokenVersion, sessionId, "ADMIN");
+};
 exports.generateAdminToken = generateAdminToken;
-const generatePassengerToken = (userId, role, level, tokenVersion, expiresIn) => {
-    const payload = { userId, role, level, tokenVersion };
-    return jsonwebtoken_1.default.sign(payload, process.env.JWT_SECRET, {
-        expiresIn: expiresIn || Number(process.env.PASSENGER_TOKEN_LIFE_SPAN)
-    });
+const generatePassengerToken = (userId, role, level, tokenVersion, sessionId) => {
+    return (0, exports.generateToken)(userId, role, level, tokenVersion, sessionId, "PASSENGER");
 };
 exports.generatePassengerToken = generatePassengerToken;
-const generateRiderToken = (userId, role, level, tokenVersion, expiresIn) => {
-    const payload = { userId, role, level, tokenVersion };
-    return jsonwebtoken_1.default.sign(payload, process.env.JWT_SECRET, {
-        expiresIn: expiresIn || Number(process.env.RIDER_TOKEN_LIFE_SPAN)
-    });
+const generateRiderToken = (userId, role, level, tokenVersion, sessionId) => {
+    return (0, exports.generateToken)(userId, role, level, tokenVersion, sessionId, "RIDER");
 };
 exports.generateRiderToken = generateRiderToken;
+// Verify token and return payload with expiration info
 const verifyToken = async (token) => {
-    return jsonwebtoken_1.default.verify(token, process.env.JWT_SECRET);
+    try {
+        const decoded = jsonwebtoken_1.default.verify(token, process.env.JWT_SECRET);
+        // Log token expiration info for debugging
+        if (decoded.exp) {
+            const expiresIn = decoded.exp - Math.floor(Date.now() / 1000);
+            console.log(`🔍 Token expires in ${expiresIn} seconds`);
+            if (expiresIn < 300) {
+                // Less than 5 minutes
+                console.warn(`⚠️  Token expiring soon: ${expiresIn} seconds remaining`);
+            }
+        }
+        return decoded;
+    }
+    catch (error) {
+        if (error instanceof jsonwebtoken_1.default.TokenExpiredError) {
+            console.error("❌ Token expired at:", error.expiredAt);
+            throw new Error("Token has expired");
+        }
+        if (error instanceof jsonwebtoken_1.default.JsonWebTokenError) {
+            console.error("❌ Invalid token:", error.message);
+            throw new Error("Invalid token");
+        }
+        throw error;
+    }
 };
 exports.verifyToken = verifyToken;
+// Helper to check if token needs refresh (within 5 minutes of expiry)
+const shouldRefreshToken = (token) => {
+    try {
+        const decoded = jsonwebtoken_1.default.decode(token);
+        if (!decoded || !decoded.exp)
+            return false;
+        const now = Math.floor(Date.now() / 1000);
+        const timeUntilExpiry = decoded.exp - now;
+        const refreshThreshold = 300; // 5 minutes in seconds
+        return timeUntilExpiry < refreshThreshold && timeUntilExpiry > 0;
+    }
+    catch {
+        return false;
+    }
+};
+exports.shouldRefreshToken = shouldRefreshToken;
+// Get time remaining on token in seconds
+const getTokenTimeRemaining = (token) => {
+    try {
+        const decoded = jsonwebtoken_1.default.decode(token);
+        if (!decoded || !decoded.exp)
+            return null;
+        const now = Math.floor(Date.now() / 1000);
+        return Math.max(0, decoded.exp - now);
+    }
+    catch {
+        return null;
+    }
+};
+exports.getTokenTimeRemaining = getTokenTimeRemaining;
+// Format time remaining in a human-readable format
+const formatTimeRemaining = (seconds) => {
+    if (seconds < 60)
+        return `${seconds} seconds`;
+    if (seconds < 3600)
+        return `${Math.floor(seconds / 60)} minutes ${seconds % 60} seconds`;
+    return `${Math.floor(seconds / 3600)} hours ${Math.floor((seconds % 3600) / 60)} minutes`;
+};
+exports.formatTimeRemaining = formatTimeRemaining;

package/dist/utils/eventLog.utils.d.ts

@@ -1,4 +1,4 @@
-import { EventAction, UserRole } from "vr-models";
+import { EventAction, UserRole, SessionPayload } from "vr-models";
 import { Transaction } from "sequelize";
 interface LogEventInput {
     actorId?: string | null;
@@ -10,6 +10,7 @@ interface LogEventInput {
     ipAddress?: string | null;
     userAgent?: string | null;
     transaction?: Transaction;
+    session: SessionPayload;
 }
-export declare const logEvent: ({ actorId, actorType, action, entity, entityId, metadata, ipAddress, userAgent, transaction, }: LogEventInput) => Promise<void>;
+export declare const logEvent: ({ actorId, actorType, action, entity, entityId, metadata, ipAddress, userAgent, transaction, session, }: LogEventInput) => Promise<void>;
 export {};

package/dist/utils/eventLog.utils.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logEvent = void 0;
 const vr_models_1 = require("vr-models");
-const logEvent = async ({ actorId = null, actorType = "ADMIN", action, entity, entityId = null, metadata = {}, ipAddress = null, userAgent = null, transaction, // Optional transaction parameter
+const logEvent = async ({ actorId = null, actorType = "ADMIN", action, entity, entityId = null, metadata = {}, ipAddress = null, userAgent = null, transaction, session, // Required session parameter matching the model
  }) => {
     try {
         // Create event log with optional transaction
+        // session is passed directly as its own field, not inside metadata
         await vr_models_1.EventLog.create({
             actorId,
             actorType,
@@ -15,7 +16,8 @@ const logEvent = async ({ actorId = null, actorType = "ADMIN", action, entity, e
             metadata,
             ipAddress,
             userAgent,
-        }, { transaction }); // Pass transaction if provided
+            session, // Now passed as dedicated field matching the model
+        }, { transaction });
     }
     catch (err) {
         console.log("Error Logging event ::::::", err);

package/dist/validations/appeals.validations.d.ts

@@ -15,19 +15,19 @@ export declare const submitBanAppealSchema: z.ZodObject<{
         appealReason: string;
     }>;
 }, "strip", z.ZodTypeAny, {
-    params: {
-        banId: string;
-    };
     body: {
         appealReason: string;
     };
-}, {
     params: {
         banId: string;
     };
+}, {
     body: {
         appealReason: string;
     };
+    params: {
+        banId: string;
+    };
 }>;
 export declare const submitSuspensionAppealSchema: z.ZodObject<{
     params: z.ZodObject<{
@@ -45,17 +45,17 @@ export declare const submitSuspensionAppealSchema: z.ZodObject<{
         appealReason: string;
     }>;
 }, "strip", z.ZodTypeAny, {
-    params: {
-        suspensionId: string;
-    };
     body: {
         appealReason: string;
     };
-}, {
     params: {
         suspensionId: string;
     };
+}, {
     body: {
         appealReason: string;
     };
+    params: {
+        suspensionId: string;
+    };
 }>;

package/dist/validations/bans.validations.d.ts

@@ -32,19 +32,19 @@ export declare const getUserRestrictionsSchema: z.ZodObject<{
         includeResolved?: "true" | "false" | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
-    params: {
-        userId: string;
-    };
     query: {
         includeResolved?: "true" | "false" | undefined;
     };
-}, {
     params: {
         userId: string;
     };
+}, {
     query: {
         includeResolved?: "true" | "false" | undefined;
     };
+    params: {
+        userId: string;
+    };
 }>;
 export declare const createBanSchema: z.ZodObject<{
     params: z.ZodObject<{
@@ -58,26 +58,26 @@ export declare const createBanSchema: z.ZodObject<{
         reason: z.ZodString;
         isPermanent: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "strict", z.ZodTypeAny, {
-        isPermanent: boolean;
         reason: string;
+        isPermanent: boolean;
     }, {
         reason: string;
         isPermanent?: boolean | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
-    params: {
-        userId: string;
-    };
     body: {
-        isPermanent: boolean;
         reason: string;
+        isPermanent: boolean;
     };
-}, {
     params: {
         userId: string;
     };
+}, {
     body: {
         reason: string;
         isPermanent?: boolean | undefined;
     };
+    params: {
+        userId: string;
+    };
 }>;

package/dist/validations/moderation.validations.d.ts

@@ -14,81 +14,81 @@ export declare const listBansSchema: z.ZodObject<{
         sortBy: z.ZodOptional<z.ZodEnum<["bannedAt", "createdAt", "reason"]>>;
         sortOrder: z.ZodOptional<z.ZodEnum<["ASC", "DESC"]>>;
     }, "strip", z.ZodTypeAny, {
-        page: number;
         limit: number;
-        fromDate?: string | undefined;
-        toDate?: string | undefined;
-        status?: "active" | "revoked" | undefined;
+        page: number;
+        search?: string | undefined;
         userId?: string | undefined;
-        appealStatus?: "pending" | "approved" | "rejected" | undefined;
         isPermanent?: "true" | "false" | undefined;
-        search?: string | undefined;
+        appealStatus?: "pending" | "approved" | "rejected" | undefined;
+        status?: "active" | "revoked" | undefined;
         sortBy?: "bannedAt" | "createdAt" | "reason" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
-    }, {
         fromDate?: string | undefined;
         toDate?: string | undefined;
-        status?: "active" | "revoked" | undefined;
-        page?: string | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
+    }, {
+        search?: string | undefined;
         limit?: string | undefined;
         userId?: string | undefined;
-        appealStatus?: "pending" | "approved" | "rejected" | undefined;
         isPermanent?: "true" | "false" | undefined;
-        search?: string | undefined;
+        appealStatus?: "pending" | "approved" | "rejected" | undefined;
+        status?: "active" | "revoked" | undefined;
+        page?: string | undefined;
         sortBy?: "bannedAt" | "createdAt" | "reason" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
-    }>, {
-        page: number;
-        limit: number;
         fromDate?: string | undefined;
         toDate?: string | undefined;
-        status?: "active" | "revoked" | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
+    }>, {
+        limit: number;
+        page: number;
+        search?: string | undefined;
         userId?: string | undefined;
-        appealStatus?: "pending" | "approved" | "rejected" | undefined;
         isPermanent?: "true" | "false" | undefined;
-        search?: string | undefined;
+        appealStatus?: "pending" | "approved" | "rejected" | undefined;
+        status?: "active" | "revoked" | undefined;
         sortBy?: "bannedAt" | "createdAt" | "reason" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
-    }, {
         fromDate?: string | undefined;
         toDate?: string | undefined;
-        status?: "active" | "revoked" | undefined;
-        page?: string | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
+    }, {
+        search?: string | undefined;
         limit?: string | undefined;
         userId?: string | undefined;
-        appealStatus?: "pending" | "approved" | "rejected" | undefined;
         isPermanent?: "true" | "false" | undefined;
-        search?: string | undefined;
+        appealStatus?: "pending" | "approved" | "rejected" | undefined;
+        status?: "active" | "revoked" | undefined;
+        page?: string | undefined;
         sortBy?: "bannedAt" | "createdAt" | "reason" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
+        fromDate?: string | undefined;
+        toDate?: string | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
     query: {
-        page: number;
         limit: number;
-        fromDate?: string | undefined;
-        toDate?: string | undefined;
-        status?: "active" | "revoked" | undefined;
+        page: number;
+        search?: string | undefined;
         userId?: string | undefined;
-        appealStatus?: "pending" | "approved" | "rejected" | undefined;
         isPermanent?: "true" | "false" | undefined;
-        search?: string | undefined;
+        appealStatus?: "pending" | "approved" | "rejected" | undefined;
+        status?: "active" | "revoked" | undefined;
         sortBy?: "bannedAt" | "createdAt" | "reason" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
+        fromDate?: string | undefined;
+        toDate?: string | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
     };
 }, {
     query: {
-        fromDate?: string | undefined;
-        toDate?: string | undefined;
-        status?: "active" | "revoked" | undefined;
-        page?: string | undefined;
+        search?: string | undefined;
         limit?: string | undefined;
         userId?: string | undefined;
-        appealStatus?: "pending" | "approved" | "rejected" | undefined;
         isPermanent?: "true" | "false" | undefined;
-        search?: string | undefined;
+        appealStatus?: "pending" | "approved" | "rejected" | undefined;
+        status?: "active" | "revoked" | undefined;
+        page?: string | undefined;
         sortBy?: "bannedAt" | "createdAt" | "reason" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
+        fromDate?: string | undefined;
+        toDate?: string | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
     };
 }>;
 export declare const listSuspensionsSchema: z.ZodObject<{
@@ -105,75 +105,75 @@ export declare const listSuspensionsSchema: z.ZodObject<{
         sortBy: z.ZodOptional<z.ZodEnum<["startedAt", "endsAt", "createdAt", "reason"]>>;
         sortOrder: z.ZodOptional<z.ZodEnum<["ASC", "DESC"]>>;
     }, "strip", z.ZodTypeAny, {
-        page: number;
         limit: number;
-        fromDate?: string | undefined;
-        toDate?: string | undefined;
-        status?: "active" | "revoked" | "expired" | undefined;
+        page: number;
+        search?: string | undefined;
         userId?: string | undefined;
         appealStatus?: "pending" | "approved" | "rejected" | undefined;
-        search?: string | undefined;
-        sortBy?: "createdAt" | "reason" | "startedAt" | "endsAt" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
-    }, {
+        status?: "active" | "revoked" | "expired" | undefined;
+        sortBy?: "createdAt" | "reason" | "endsAt" | "startedAt" | undefined;
         fromDate?: string | undefined;
         toDate?: string | undefined;
-        status?: "active" | "revoked" | "expired" | undefined;
-        page?: string | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
+    }, {
+        search?: string | undefined;
         limit?: string | undefined;
         userId?: string | undefined;
         appealStatus?: "pending" | "approved" | "rejected" | undefined;
-        search?: string | undefined;
-        sortBy?: "createdAt" | "reason" | "startedAt" | "endsAt" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
-    }>, {
-        page: number;
-        limit: number;
+        status?: "active" | "revoked" | "expired" | undefined;
+        page?: string | undefined;
+        sortBy?: "createdAt" | "reason" | "endsAt" | "startedAt" | undefined;
         fromDate?: string | undefined;
         toDate?: string | undefined;
-        status?: "active" | "revoked" | "expired" | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
+    }>, {
+        limit: number;
+        page: number;
+        search?: string | undefined;
         userId?: string | undefined;
         appealStatus?: "pending" | "approved" | "rejected" | undefined;
-        search?: string | undefined;
-        sortBy?: "createdAt" | "reason" | "startedAt" | "endsAt" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
-    }, {
+        status?: "active" | "revoked" | "expired" | undefined;
+        sortBy?: "createdAt" | "reason" | "endsAt" | "startedAt" | undefined;
         fromDate?: string | undefined;
         toDate?: string | undefined;
-        status?: "active" | "revoked" | "expired" | undefined;
-        page?: string | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
+    }, {
+        search?: string | undefined;
         limit?: string | undefined;
         userId?: string | undefined;
         appealStatus?: "pending" | "approved" | "rejected" | undefined;
-        search?: string | undefined;
-        sortBy?: "createdAt" | "reason" | "startedAt" | "endsAt" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
+        status?: "active" | "revoked" | "expired" | undefined;
+        page?: string | undefined;
+        sortBy?: "createdAt" | "reason" | "endsAt" | "startedAt" | undefined;
+        fromDate?: string | undefined;
+        toDate?: string | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
     query: {
-        page: number;
         limit: number;
-        fromDate?: string | undefined;
-        toDate?: string | undefined;
-        status?: "active" | "revoked" | "expired" | undefined;
+        page: number;
+        search?: string | undefined;
         userId?: string | undefined;
         appealStatus?: "pending" | "approved" | "rejected" | undefined;
-        search?: string | undefined;
-        sortBy?: "createdAt" | "reason" | "startedAt" | "endsAt" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
+        status?: "active" | "revoked" | "expired" | undefined;
+        sortBy?: "createdAt" | "reason" | "endsAt" | "startedAt" | undefined;
+        fromDate?: string | undefined;
+        toDate?: string | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
     };
 }, {
     query: {
-        fromDate?: string | undefined;
-        toDate?: string | undefined;
-        status?: "active" | "revoked" | "expired" | undefined;
-        page?: string | undefined;
+        search?: string | undefined;
         limit?: string | undefined;
         userId?: string | undefined;
         appealStatus?: "pending" | "approved" | "rejected" | undefined;
-        search?: string | undefined;
-        sortBy?: "createdAt" | "reason" | "startedAt" | "endsAt" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
+        status?: "active" | "revoked" | "expired" | undefined;
+        page?: string | undefined;
+        sortBy?: "createdAt" | "reason" | "endsAt" | "startedAt" | undefined;
+        fromDate?: string | undefined;
+        toDate?: string | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
     };
 }>;
 export declare const revokeBanSchema: z.ZodObject<{
@@ -192,19 +192,19 @@ export declare const revokeBanSchema: z.ZodObject<{
         revocationReason?: string | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
-    params: {
-        banId: string;
-    };
     body: {
         revocationReason?: string | undefined;
     };
-}, {
     params: {
         banId: string;
     };
+}, {
     body: {
         revocationReason?: string | undefined;
     };
+    params: {
+        banId: string;
+    };
 }>;
 export declare const revokeSuspensionSchema: z.ZodObject<{
     params: z.ZodObject<{
@@ -222,19 +222,19 @@ export declare const revokeSuspensionSchema: z.ZodObject<{
         revocationReason?: string | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
-    params: {
-        suspensionId: string;
-    };
     body: {
         revocationReason?: string | undefined;
     };
-}, {
     params: {
         suspensionId: string;
     };
+}, {
     body: {
         revocationReason?: string | undefined;
     };
+    params: {
+        suspensionId: string;
+    };
 }>;
 export declare const extendSuspensionSchema: z.ZodObject<{
     params: z.ZodObject<{
@@ -261,21 +261,21 @@ export declare const extendSuspensionSchema: z.ZodObject<{
         extensionReason?: string | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
-    params: {
-        suspensionId: string;
-    };
     body: {
         newEndDate: string;
         extensionReason?: string | undefined;
     };
-}, {
     params: {
         suspensionId: string;
     };
+}, {
     body: {
         newEndDate: string;
         extensionReason?: string | undefined;
     };
+    params: {
+        suspensionId: string;
+    };
 }>;
 export declare const listPendingAppealsSchema: z.ZodObject<{
     query: z.ZodEffects<z.ZodObject<{
@@ -286,34 +286,34 @@ export declare const listPendingAppealsSchema: z.ZodObject<{
         fromDate: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
         toDate: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
     }, "strip", z.ZodTypeAny, {
-        page: number;
         limit: number;
+        page: number;
         type?: "ban" | "suspension" | undefined;
         fromDate?: string | undefined;
         toDate?: string | undefined;
     }, {
         type?: "ban" | "suspension" | undefined;
+        limit?: string | undefined;
+        page?: string | undefined;
         fromDate?: string | undefined;
         toDate?: string | undefined;
-        page?: string | undefined;
-        limit?: string | undefined;
     }>, {
-        page: number;
         limit: number;
+        page: number;
         type?: "ban" | "suspension" | undefined;
         fromDate?: string | undefined;
         toDate?: string | undefined;
     }, {
         type?: "ban" | "suspension" | undefined;
+        limit?: string | undefined;
+        page?: string | undefined;
         fromDate?: string | undefined;
         toDate?: string | undefined;
-        page?: string | undefined;
-        limit?: string | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
     query: {
-        page: number;
         limit: number;
+        page: number;
         type?: "ban" | "suspension" | undefined;
         fromDate?: string | undefined;
         toDate?: string | undefined;
@@ -321,10 +321,10 @@ export declare const listPendingAppealsSchema: z.ZodObject<{
 }, {
     query: {
         type?: "ban" | "suspension" | undefined;
+        limit?: string | undefined;
+        page?: string | undefined;
         fromDate?: string | undefined;
         toDate?: string | undefined;
-        page?: string | undefined;
-        limit?: string | undefined;
     };
 }>;
 export declare const reviewAppealSchema: z.ZodObject<{
@@ -349,23 +349,23 @@ export declare const reviewAppealSchema: z.ZodObject<{
         adminNotes?: string | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
-    params: {
-        banId?: string | undefined;
-        suspensionId?: string | undefined;
-    };
     body: {
         appealStatus: "approved" | "rejected";
         adminNotes?: string | undefined;
     };
-}, {
     params: {
         banId?: string | undefined;
         suspensionId?: string | undefined;
     };
+}, {
     body: {
         appealStatus: "approved" | "rejected";
         adminNotes?: string | undefined;
     };
+    params: {
+        banId?: string | undefined;
+        suspensionId?: string | undefined;
+    };
 }>;
 export declare const exportBansSchema: z.ZodObject<{
     query: z.ZodEffects<z.ZodObject<{

package/dist/validations/profiles.validations.d.ts

@@ -16,7 +16,7 @@ export declare const createUserSchema: z.ZodObject<{
         phoneNumber: string;
         password: string;
         nationalId: string;
-        role: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN";
+        role: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN";
         jacketId?: string | null | undefined;
         email?: string | null | undefined;
         plateNumber?: string | null | undefined;
@@ -26,7 +26,7 @@ export declare const createUserSchema: z.ZodObject<{
         phoneNumber: string;
         password: string;
         nationalId: string;
-        role: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN";
+        role: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN";
         jacketId?: string | null | undefined;
         email?: string | null | undefined;
         plateNumber?: string | null | undefined;
@@ -45,7 +45,7 @@ export declare const createUserSchema: z.ZodObject<{
         phoneNumber: string;
         password: string;
         nationalId: string;
-        role: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN";
+        role: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN";
         jacketId?: string | null | undefined;
         email?: string | null | undefined;
         plateNumber?: string | null | undefined;
@@ -60,7 +60,7 @@ export declare const createUserSchema: z.ZodObject<{
         phoneNumber: string;
         password: string;
         nationalId: string;
-        role: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN";
+        role: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN";
         jacketId?: string | null | undefined;
         email?: string | null | undefined;
         plateNumber?: string | null | undefined;
@@ -222,9 +222,9 @@ export declare const getAllUsersSchema: z.ZodObject<{
         limit?: number | undefined;
         isActive?: boolean | undefined;
         isSuspended?: boolean | undefined;
-        role?: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN" | undefined;
-        page?: number | undefined;
+        role?: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN" | undefined;
         isBanned?: boolean | undefined;
+        page?: number | undefined;
         startDate?: string | undefined;
         endDate?: string | undefined;
     }, {
@@ -233,9 +233,9 @@ export declare const getAllUsersSchema: z.ZodObject<{
         limit?: string | undefined;
         isActive?: "true" | "false" | undefined;
         isSuspended?: "true" | "false" | undefined;
-        role?: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN" | undefined;
-        page?: string | undefined;
+        role?: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN" | undefined;
         isBanned?: "true" | "false" | undefined;
+        page?: string | undefined;
         startDate?: string | undefined;
         endDate?: string | undefined;
         sortBy?: "firstName" | "lastLoginAt" | "createdAt" | undefined;
@@ -255,9 +255,9 @@ export declare const getAllUsersSchema: z.ZodObject<{
         limit?: number | undefined;
         isActive?: boolean | undefined;
         isSuspended?: boolean | undefined;
-        role?: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN" | undefined;
-        page?: number | undefined;
+        role?: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN" | undefined;
         isBanned?: boolean | undefined;
+        page?: number | undefined;
         startDate?: string | undefined;
         endDate?: string | undefined;
     };
@@ -271,9 +271,9 @@ export declare const getAllUsersSchema: z.ZodObject<{
         limit?: string | undefined;
         isActive?: "true" | "false" | undefined;
         isSuspended?: "true" | "false" | undefined;
-        role?: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN" | undefined;
-        page?: string | undefined;
+        role?: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN" | undefined;
         isBanned?: "true" | "false" | undefined;
+        page?: string | undefined;
         startDate?: string | undefined;
         endDate?: string | undefined;
         sortBy?: "firstName" | "lastLoginAt" | "createdAt" | undefined;

package/dist/validations/suspensions.validations.d.ts

@@ -35,21 +35,21 @@ export declare const getUserSuspensionsSchema: z.ZodObject<{
         includeResolved?: "true" | "false" | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
-    params: {
-        userId: string;
-    };
     query: {
         status?: "active" | "revoked" | "expired" | undefined;
         includeResolved?: "true" | "false" | undefined;
     };
-}, {
     params: {
         userId: string;
     };
+}, {
     query: {
         status?: "active" | "revoked" | "expired" | undefined;
         includeResolved?: "true" | "false" | undefined;
     };
+    params: {
+        userId: string;
+    };
 }>;
 export declare const createSuspensionSchema: z.ZodObject<{
     params: z.ZodObject<{
@@ -70,19 +70,19 @@ export declare const createSuspensionSchema: z.ZodObject<{
         endsAt: string;
     }>;
 }, "strip", z.ZodTypeAny, {
-    params: {
-        userId: string;
-    };
     body: {
         reason: string;
         endsAt: string;
     };
-}, {
     params: {
         userId: string;
     };
+}, {
     body: {
         reason: string;
         endsAt: string;
     };
+    params: {
+        userId: string;
+    };
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vr-commons",
-  "version": "1.0.48",
+  "version": "1.0.49",
   "description": "Shared functions package",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -98,7 +98,7 @@
     "@types/uuid": "^10.0.0",
     "axios": "^1.9.0",
     "date-fns": "^4.1.0",
-    "vr-models": "^1.0.26",
+    "vr-models": "^1.0.29",
     "rimraf": "^5.0.5",
     "typescript": "^5.3.3",
     "zod": "^3.25.20"