vr-commons 1.0.176 → 1.0.177

package/dist/validations/{profiles.validations.js → shared/shared.profiles.validations.js}

@@ -2,14 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setPrimaryContactSchema = exports.deleteContactSchema = exports.confirmVerificationSchema = exports.verifyContactSchema = exports.addContactSchema = exports.updateProfileSchema = exports.deleteAccountSchema = exports.deactivateAccountSchema = exports.updateRiderProfileSchema = exports.createRiderSchema = exports.updatePassengerProfileSchema = exports.passengerSignupSchema = exports.viewProfileSchema = exports.getAllUsersSchema = exports.updateUserProfileSchema = exports.getUserByIdSchema = exports.createUserSchema = exports.validateContactValue = exports.detectContactType = exports.strongPasswordRegex = exports.jacketIdRegex = exports.emailRegex = exports.phoneNumberRegex = void 0;
 const zod_1 = require("zod");
+const regex_constants_1 = require("../../constants/regex.constants");
 // ============================================================================
 // COMMON VALIDATIONS
 // ============================================================================
-exports.phoneNumberRegex = /^\+250(78|79|73|72)[0-9]{7}$/;
-exports.emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-exports.jacketIdRegex = /^JKT-\d{9}$/;
-const plateRegex = /^[A-Z0-9]{3,10}$/i;
-exports.strongPasswordRegex = /^(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&#^()_\-+=])[A-Za-z\d@$!%*?&#^()_\-+=]{8,}$/;
+exports.phoneNumberRegex = regex_constants_1.PHONE_NUMBER_REGEX;
+exports.emailRegex = regex_constants_1.EMAIL_ADDRESS_REGEX;
+exports.jacketIdRegex = regex_constants_1.JACKET_ID_REGEX;
+const plateRegex = regex_constants_1.PLATE_NUMBER_REGEX;
+exports.strongPasswordRegex = regex_constants_1.STRONG_PASSWORD_REGEX;
 // ============================================================================
 // CONTACT VALIDATION HELPERS
 // ============================================================================
@@ -89,7 +90,7 @@ exports.createUserSchema = zod_1.z.object({
         path: ["birthDate"],
     }),
     headers: zod_1.z.object({
-        authorization: zod_1.z.string().regex(/^Bearer /, {
+        authorization: zod_1.z.string().regex(regex_constants_1.BEARER_TOKEN_PREFIX_REGEX, {
             message: "Authorization header must start with 'Bearer '",
         }),
     }),
@@ -100,7 +101,7 @@ exports.getUserByIdSchema = zod_1.z.object({
         userId: zod_1.z.string().uuid("Invalid user ID format"),
     }),
     headers: zod_1.z.object({
-        authorization: zod_1.z.string().regex(/^Bearer /, {
+        authorization: zod_1.z.string().regex(regex_constants_1.BEARER_TOKEN_PREFIX_REGEX, {
             message: "Authorization header must start with 'Bearer '",
         }),
     }),
@@ -168,7 +169,7 @@ exports.updateUserProfileSchema = zod_1.z.object({
         path: ["birthDate"],
     }),
     headers: zod_1.z.object({
-        authorization: zod_1.z.string().regex(/^Bearer /, {
+        authorization: zod_1.z.string().regex(regex_constants_1.BEARER_TOKEN_PREFIX_REGEX, {
             message: "Authorization header must start with 'Bearer '",
         }),
     }),
@@ -176,8 +177,8 @@ exports.updateUserProfileSchema = zod_1.z.object({
 // Get All Users Schema (with pagination/filtering)
 exports.getAllUsersSchema = zod_1.z.object({
     query: zod_1.z.object({
-        page: zod_1.z.string().regex(/^\d+$/).default("1").transform(Number).optional(),
-        limit: zod_1.z.string().regex(/^\d+$/).default("20").transform(Number).optional(),
+        page: zod_1.z.string().regex(regex_constants_1.NUMERIC_STRING_REGEX).default("1").transform(Number).optional(),
+        limit: zod_1.z.string().regex(regex_constants_1.NUMERIC_STRING_REGEX).default("20").transform(Number).optional(),
         role: zod_1.z
             .enum(["RIDER", "PASSENGER", "AGENT", "ADMIN", "SUPER_ADMIN"])
             .optional(),
@@ -200,7 +201,7 @@ exports.getAllUsersSchema = zod_1.z.object({
         order: zod_1.z.enum(["asc", "desc"]).default("desc"),
     }),
     headers: zod_1.z.object({
-        authorization: zod_1.z.string().regex(/^Bearer /, {
+        authorization: zod_1.z.string().regex(regex_constants_1.BEARER_TOKEN_PREFIX_REGEX, {
             message: "Authorization header must start with 'Bearer '",
         }),
     }),
@@ -214,7 +215,7 @@ exports.viewProfileSchema = zod_1.z.object({
     body: zod_1.z.object({}).optional(),
     query: zod_1.z.object({}).optional(),
     headers: zod_1.z.object({
-        authorization: zod_1.z.string().regex(/^Bearer /, {
+        authorization: zod_1.z.string().regex(regex_constants_1.BEARER_TOKEN_PREFIX_REGEX, {
             message: "Authorization header must start with 'Bearer '",
         }),
     }),
@@ -321,7 +322,7 @@ exports.updatePassengerProfileSchema = zod_1.z.object({
         path: ["birthDate"],
     }),
     headers: zod_1.z.object({
-        authorization: zod_1.z.string().regex(/^Bearer /, {
+        authorization: zod_1.z.string().regex(regex_constants_1.BEARER_TOKEN_PREFIX_REGEX, {
             message: "Authorization header must start with 'Bearer '",
         }),
     }),
@@ -432,7 +433,7 @@ exports.updateRiderProfileSchema = zod_1.z.object({
     }),
     query: zod_1.z.object({}).optional(),
     headers: zod_1.z.object({
-        authorization: zod_1.z.string().regex(/^Bearer /, {
+        authorization: zod_1.z.string().regex(regex_constants_1.BEARER_TOKEN_PREFIX_REGEX, {
             message: "Authorization header must start with 'Bearer '",
         }),
     }),
@@ -453,7 +454,7 @@ exports.deactivateAccountSchema = zod_1.z.object({
             .optional(),
     }),
     headers: zod_1.z.object({
-        authorization: zod_1.z.string().regex(/^Bearer /, {
+        authorization: zod_1.z.string().regex(regex_constants_1.BEARER_TOKEN_PREFIX_REGEX, {
             message: "Authorization header must start with 'Bearer '",
         }),
     }),
@@ -471,7 +472,7 @@ exports.deleteAccountSchema = zod_1.z.object({
             .optional(),
     }),
     headers: zod_1.z.object({
-        authorization: zod_1.z.string().regex(/^Bearer /, {
+        authorization: zod_1.z.string().regex(regex_constants_1.BEARER_TOKEN_PREFIX_REGEX, {
             message: "Authorization header must start with 'Bearer '",
         }),
     }),
@@ -529,7 +530,7 @@ exports.addContactSchema = zod_1.z.object({
         type: zod_1.z.enum(["EMAIL", "PHONE", "WHATSAPP"]).optional(),
     }),
     headers: zod_1.z.object({
-        authorization: zod_1.z.string().regex(/^Bearer /, {
+        authorization: zod_1.z.string().regex(regex_constants_1.BEARER_TOKEN_PREFIX_REGEX, {
             message: "Authorization header must start with 'Bearer '",
         }),
     }),
@@ -540,7 +541,7 @@ exports.verifyContactSchema = zod_1.z.object({
         contactId: zod_1.z.string().uuid("Invalid contact ID format"),
     }),
     headers: zod_1.z.object({
-        authorization: zod_1.z.string().regex(/^Bearer /, {
+        authorization: zod_1.z.string().regex(regex_constants_1.BEARER_TOKEN_PREFIX_REGEX, {
             message: "Authorization header must start with 'Bearer '",
         }),
     }),
@@ -554,7 +555,7 @@ exports.confirmVerificationSchema = zod_1.z.object({
         contactId: zod_1.z.string().uuid("Invalid contact ID format"),
     }),
     headers: zod_1.z.object({
-        authorization: zod_1.z.string().regex(/^Bearer /, {
+        authorization: zod_1.z.string().regex(regex_constants_1.BEARER_TOKEN_PREFIX_REGEX, {
             message: "Authorization header must start with 'Bearer '",
         }),
     }),
@@ -565,7 +566,7 @@ exports.deleteContactSchema = zod_1.z.object({
         contactId: zod_1.z.string().uuid("Invalid contact ID format"),
     }),
     headers: zod_1.z.object({
-        authorization: zod_1.z.string().regex(/^Bearer /, {
+        authorization: zod_1.z.string().regex(regex_constants_1.BEARER_TOKEN_PREFIX_REGEX, {
             message: "Authorization header must start with 'Bearer '",
         }),
     }),
@@ -576,7 +577,7 @@ exports.setPrimaryContactSchema = zod_1.z.object({
         contactId: zod_1.z.string().uuid("Invalid contact ID format"),
     }),
     headers: zod_1.z.object({
-        authorization: zod_1.z.string().regex(/^Bearer /, {
+        authorization: zod_1.z.string().regex(regex_constants_1.BEARER_TOKEN_PREFIX_REGEX, {
             message: "Authorization header must start with 'Bearer '",
         }),
     }),

package/dist/validations/{devices.validations.js → users/users.devices.validations.js}

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extendSessionSchema = exports.unlockDeviceSchema = exports.serialRegex = void 0;
 const zod_1 = require("zod");
-exports.serialRegex = /^(VBRD|VIBERIDE)-(PASSENGER|RIDER)-([A-Z]{2}\d{3}[A-Z])$/;
+const regex_constants_1 = require("../../constants/regex.constants");
+exports.serialRegex = regex_constants_1.DEVICE_SERIAL_NUMBER_REGEX;
 exports.unlockDeviceSchema = zod_1.z.object({
     body: zod_1.z.object({
         deviceSerialNumber: zod_1.z

package/package.json

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

package/dist/middlewares/idempotency.middlewares.d.ts

@@ -1,3 +0,0 @@
-import { Request, Response, NextFunction } from "express";
-export declare const idempotencyMiddleware: (req: Request, res: Response, next: NextFunction) => Promise<void | Response<any, Record<string, any>>>;
-export declare const storeIdempotencyResponse: (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/dist/middlewares/idempotency.middlewares.js

@@ -1,74 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.storeIdempotencyResponse = exports.idempotencyMiddleware = void 0;
-const vr_models_1 = require("vr-models");
-const response_utils_1 = require("../utils/response.utils");
-const idempotencyMiddleware = async (req, res, next) => {
-    // Skip for GET requests
-    if (req.method === "GET") {
-        return next();
-    }
-    const idempotencyKey = req.headers["idempotency-key"];
-    if (!idempotencyKey) {
-        return (0, response_utils_1.sendErrorResponse)(res, "Idempotency-Key header is required", 400);
-    }
-    // Validate UUID format
-    const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-    if (!uuidRegex.test(idempotencyKey)) {
-        return (0, response_utils_1.sendErrorResponse)(res, "Idempotency-Key must be a valid UUID", 400);
-    }
-    try {
-        const existing = await vr_models_1.IdempotencyRecord.findOne({
-            where: { key: idempotencyKey },
-        });
-        if (existing && existing.isValid()) {
-            const response = existing.getResponse();
-            return res.status(response?.statusCode || 200).json(response?.body);
-        }
-        if (existing && existing.isExpired()) {
-            await vr_models_1.IdempotencyRecord.invalidate(idempotencyKey);
-        }
-        // Store original response methods
-        const originalJson = res.json.bind(res);
-        const originalStatus = res.status.bind(res);
-        res.json = function (body) {
-            res.locals.responseBody = body;
-            return originalJson(body);
-        };
-        res.status = function (code) {
-            res.locals.statusCode = code;
-            return originalStatus(code);
-        };
-        req.idempotencyKey = idempotencyKey;
-        next();
-    }
-    catch (error) {
-        console.error("Idempotency middleware error:", error);
-        next(error);
-    }
-};
-exports.idempotencyMiddleware = idempotencyMiddleware;
-// Store response after completion
-const storeIdempotencyResponse = async (req, res, next) => {
-    if (req.method === "GET" || !req.idempotencyKey) {
-        return next();
-    }
-    try {
-        const expiresAt = new Date();
-        expiresAt.setHours(expiresAt.getHours() + 24);
-        await vr_models_1.IdempotencyRecord.create({
-            key: req.idempotencyKey,
-            requestMethod: req.method,
-            requestPath: req.path,
-            requestParams: req.body,
-            responseStatusCode: res.locals.statusCode || 200,
-            responseBody: res.locals.responseBody || {},
-            expiresAt, // Add this
-        });
-    }
-    catch (error) {
-        console.error("Failed to store idempotency record:", error);
-    }
-    next();
-};
-exports.storeIdempotencyResponse = storeIdempotencyResponse;

package/dist/utils/deviceUtils.d.ts

@@ -1,2 +0,0 @@
-import { DeviceDedication } from "vr-models";
-export declare const extractDedicatedUserFromSerial: (serialNumber: string) => DeviceDedication;

package/dist/utils/deviceUtils.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractDedicatedUserFromSerial = void 0;
-const __1 = require("..");
-const extractDedicatedUserFromSerial = (serialNumber) => {
-    // Validate format first
-    const match = serialNumber.match(__1.serialRegex);
-    if (!match) {
-        console.warn(`Invalid serial number format: ${serialNumber}. Defaulting to N/A.`);
-        return "N/A";
-    }
-    // match[1] = VBRD or VIBERIDE (company)
-    // match[2] = PASSENGER or RIDER (dedicated user)
-    // match[3] = AA001A (serial)
-    const role = match[2];
-    if (role === "PASSENGER" || role === "RIDER") {
-        return role;
-    }
-    return "N/A";
-};
-exports.extractDedicatedUserFromSerial = extractDedicatedUserFromSerial;

package/dist/utils/session.utils.d.ts

@@ -1,6 +0,0 @@
-import { DeviceSessionPayload } from "vr-models";
-/**
- * Create a new device session (for BLE unlock)
- * This is separate from the long-lasting auth token
- */
-export declare const createDeviceSession: (userId: string, tokenVersion: number, deviceSerialNumber: string) => DeviceSessionPayload;

package/dist/utils/session.utils.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDeviceSession = void 0;
-const uuid_1 = require("uuid");
-// Session duration for device unlock sessions (12 minutes)
-const SESSION_DURATION = parseInt(process.env.DEVICE_SESSION_DURATION || "12") * 60 * 1000; // Convert minutes to milliseconds
-/**
- * Create a new device session (for BLE unlock)
- * This is separate from the long-lasting auth token
- */
-const createDeviceSession = (userId, tokenVersion, deviceSerialNumber) => {
-    const now = Date.now();
-    return {
-        sessionId: (0, uuid_1.v4)(),
-        startedAt: now,
-        expiresAt: now + SESSION_DURATION,
-        userId,
-        tokenVersion,
-        deviceSerialNumber,
-        minutesGranted: SESSION_DURATION,
-    };
-};
-exports.createDeviceSession = createDeviceSession;
-// Note: We no longer need session-related functions for auth tokens
-// since we're using a single 30-day token without session tracking

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

@@ -1,61 +0,0 @@
-import { z } from "zod";
-export declare const submitBanAppealSchema: z.ZodObject<{
-    params: z.ZodObject<{
-        banId: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        banId: string;
-    }, {
-        banId: string;
-    }>;
-    body: z.ZodObject<{
-        appealReason: z.ZodString;
-    }, "strict", z.ZodTypeAny, {
-        appealReason: string;
-    }, {
-        appealReason: string;
-    }>;
-}, "strip", z.ZodTypeAny, {
-    body: {
-        appealReason: string;
-    };
-    params: {
-        banId: string;
-    };
-}, {
-    body: {
-        appealReason: string;
-    };
-    params: {
-        banId: string;
-    };
-}>;
-export declare const submitSuspensionAppealSchema: z.ZodObject<{
-    params: z.ZodObject<{
-        suspensionId: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        suspensionId: string;
-    }, {
-        suspensionId: string;
-    }>;
-    body: z.ZodObject<{
-        appealReason: z.ZodString;
-    }, "strict", z.ZodTypeAny, {
-        appealReason: string;
-    }, {
-        appealReason: string;
-    }>;
-}, "strip", z.ZodTypeAny, {
-    body: {
-        appealReason: string;
-    };
-    params: {
-        suspensionId: string;
-    };
-}, {
-    body: {
-        appealReason: string;
-    };
-    params: {
-        suspensionId: string;
-    };
-}>;

package/dist/validations/appeals.validations.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.submitSuspensionAppealSchema = exports.submitBanAppealSchema = void 0;
-const zod_1 = require("zod");
-const uuidSchema = zod_1.z.string().uuid("Invalid ID format");
-exports.submitBanAppealSchema = zod_1.z.object({
-    params: zod_1.z.object({
-        banId: uuidSchema,
-    }),
-    body: zod_1.z
-        .object({
-        appealReason: zod_1.z
-            .string()
-            .min(10, "Appeal reason must be at least 10 characters")
-            .max(2000, "Appeal reason cannot exceed 2000 characters"),
-    })
-        .strict(),
-});
-exports.submitSuspensionAppealSchema = zod_1.z.object({
-    params: zod_1.z.object({
-        suspensionId: uuidSchema,
-    }),
-    body: zod_1.z
-        .object({
-        appealReason: zod_1.z
-            .string()
-            .min(10, "Appeal reason must be at least 10 characters")
-            .max(2000, "Appeal reason cannot exceed 2000 characters"),
-    })
-        .strict(),
-});

package/dist/validations/payinstallment.validations.d.ts

@@ -1,56 +0,0 @@
-import { z } from "zod";
-export declare const payInstallmentSchema: z.ZodObject<{
-    params: z.ZodObject<{
-        id: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        id: string;
-    }, {
-        id: string;
-    }>;
-    body: z.ZodObject<{
-        amount: z.ZodNumber;
-        provider: z.ZodDefault<z.ZodEnum<["AIRTEL_MONEY", "CASH", "MOMO_PAY"]>>;
-        providerReference: z.ZodString;
-        customerPhone: z.ZodString;
-        notes: z.ZodOptional<z.ZodString>;
-        metadata: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
-    }, "strip", z.ZodTypeAny, {
-        amount: number;
-        provider: "AIRTEL_MONEY" | "CASH" | "MOMO_PAY";
-        providerReference: string;
-        customerPhone: string;
-        notes?: string | undefined;
-        metadata?: Record<string, any> | undefined;
-    }, {
-        amount: number;
-        providerReference: string;
-        customerPhone: string;
-        provider?: "AIRTEL_MONEY" | "CASH" | "MOMO_PAY" | undefined;
-        notes?: string | undefined;
-        metadata?: Record<string, any> | undefined;
-    }>;
-}, "strip", z.ZodTypeAny, {
-    params: {
-        id: string;
-    };
-    body: {
-        amount: number;
-        provider: "AIRTEL_MONEY" | "CASH" | "MOMO_PAY";
-        providerReference: string;
-        customerPhone: string;
-        notes?: string | undefined;
-        metadata?: Record<string, any> | undefined;
-    };
-}, {
-    params: {
-        id: string;
-    };
-    body: {
-        amount: number;
-        providerReference: string;
-        customerPhone: string;
-        provider?: "AIRTEL_MONEY" | "CASH" | "MOMO_PAY" | undefined;
-        notes?: string | undefined;
-        metadata?: Record<string, any> | undefined;
-    };
-}>;

package/dist/validations/payinstallment.validations.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.payInstallmentSchema = void 0;
-const vr_models_1 = require("vr-models");
-const zod_1 = require("zod");
-const phoneRegex = /^\+250(78|79|73|72)[0-9]{7}$/;
-console.log("from vr-commons", vr_models_1.PAYMENT_PROVIDER);
-// src/modules/installments/validations/installments.validations.ts
-exports.payInstallmentSchema = zod_1.z.object({
-    params: zod_1.z.object({
-        id: zod_1.z.string().uuid("Invalid installment ID"),
-    }),
-    body: zod_1.z.object({
-        amount: zod_1.z.number().min(0.01, "Amount must be greater than 0"),
-        provider: zod_1.z.enum([...vr_models_1.PAYMENT_PROVIDER]).default("MOMO_PAY"),
-        providerReference: zod_1.z.string(),
-        customerPhone: zod_1.z
-            .string()
-            .regex(phoneRegex, "Invalid MTN Rwanda phone number"),
-        notes: zod_1.z.string().optional(),
-        metadata: zod_1.z.record(zod_1.z.any()).optional(),
-    }),
-});