npm - vr-commons - Versions diffs - 1.0.187 → 1.0.189 - Mend

vr-commons 1.0.187 → 1.0.189

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/dist/constants/regex.constants.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import { DEVICE_SERIAL_PREFIXES, DEVICE_PAIR_ID_REGEX, DEVICE_PAIR_ID_SUFFIX_REGEX, DEVICE_SERIAL_NUMBER_REGEX } from "vr-models";
 /** Shared regular expressions used across validation and utility modules. */
 export declare const PHONE_NUMBER_REGEX: RegExp;
 export declare const LOCAL_RWANDA_PHONE_NUMBER_REGEX: RegExp;
@@ -9,8 +10,7 @@ export declare const FOUR_DIGIT_PIN_REGEX: RegExp;
 export declare const JACKET_ID_REGEX: RegExp;
 export declare const PLATE_NUMBER_REGEX: RegExp;
 export declare const RWANDA_PLATE_NUMBER_REGEX: RegExp;
-export declare const DEVICE_SERIAL_NUMBER_REGEX: RegExp;
-export declare const DEVICE_PAIR_ID_REGEX: RegExp;
+export { DEVICE_SERIAL_PREFIXES, DEVICE_SERIAL_NUMBER_REGEX, DEVICE_PAIR_ID_REGEX, DEVICE_PAIR_ID_SUFFIX_REGEX, };
 export declare const ISO_DATE_REGEX: RegExp;
 export declare const DAY_MONTH_YEAR_REGEX: RegExp;
 export declare const DAY_MONTH_YEAR_SLASH_REGEX: RegExp;

package/dist/constants/regex.constants.js CHANGED Viewed

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BEARER_TOKEN_PREFIX_REGEX = exports.NUMERIC_STRING_REGEX = exports.ISO_DATE_SLASH_REGEX = exports.DAY_MONTH_YEAR_SLASH_REGEX = exports.DAY_MONTH_YEAR_REGEX = exports.ISO_DATE_REGEX = exports.DEVICE_PAIR_ID_REGEX = exports.DEVICE_SERIAL_NUMBER_REGEX = exports.RWANDA_PLATE_NUMBER_REGEX = exports.PLATE_NUMBER_REGEX = exports.JACKET_ID_REGEX = exports.FOUR_DIGIT_PIN_REGEX = exports.RIDER_PIN_REGEX = exports.STRONG_PASSWORD_REGEX = exports.PASSWORD_REGEX = exports.EMAIL_ADDRESS_REGEX = exports.LOCAL_RWANDA_PHONE_NUMBER_REGEX = exports.PHONE_NUMBER_REGEX = void 0;
+exports.BEARER_TOKEN_PREFIX_REGEX = exports.NUMERIC_STRING_REGEX = exports.ISO_DATE_SLASH_REGEX = exports.DAY_MONTH_YEAR_SLASH_REGEX = exports.DAY_MONTH_YEAR_REGEX = exports.ISO_DATE_REGEX = exports.DEVICE_PAIR_ID_SUFFIX_REGEX = exports.DEVICE_PAIR_ID_REGEX = exports.DEVICE_SERIAL_NUMBER_REGEX = exports.DEVICE_SERIAL_PREFIXES = exports.RWANDA_PLATE_NUMBER_REGEX = exports.PLATE_NUMBER_REGEX = exports.JACKET_ID_REGEX = exports.FOUR_DIGIT_PIN_REGEX = exports.RIDER_PIN_REGEX = exports.STRONG_PASSWORD_REGEX = exports.PASSWORD_REGEX = exports.EMAIL_ADDRESS_REGEX = exports.LOCAL_RWANDA_PHONE_NUMBER_REGEX = exports.PHONE_NUMBER_REGEX = void 0;
+const vr_models_1 = require("vr-models");
+Object.defineProperty(exports, "DEVICE_SERIAL_PREFIXES", { enumerable: true, get: function () { return vr_models_1.DEVICE_SERIAL_PREFIXES; } });
+Object.defineProperty(exports, "DEVICE_PAIR_ID_REGEX", { enumerable: true, get: function () { return vr_models_1.DEVICE_PAIR_ID_REGEX; } });
+Object.defineProperty(exports, "DEVICE_PAIR_ID_SUFFIX_REGEX", { enumerable: true, get: function () { return vr_models_1.DEVICE_PAIR_ID_SUFFIX_REGEX; } });
+Object.defineProperty(exports, "DEVICE_SERIAL_NUMBER_REGEX", { enumerable: true, get: function () { return vr_models_1.DEVICE_SERIAL_NUMBER_REGEX; } });
 /** Shared regular expressions used across validation and utility modules. */
 exports.PHONE_NUMBER_REGEX = /^\+250(78|79|73|72)[0-9]{7}$/;
 exports.LOCAL_RWANDA_PHONE_NUMBER_REGEX = /^(078|079|072|073)\d{7}$/;
@@ -14,8 +19,6 @@ exports.JACKET_ID_REGEX = /^JKT-\d{9}$/;
 // centralized until the product requirements choose one canonical plate format.
 exports.PLATE_NUMBER_REGEX = /^[A-Z0-9]{3,10}$/i;
 exports.RWANDA_PLATE_NUMBER_REGEX = /^R[ABCDEFGHIJKLMNPQRSTUVWXYZ]\s?\d{3}\s?[ABCDEFGHIJKLMNPQRSTUVWXYZ]$/;
-exports.DEVICE_SERIAL_NUMBER_REGEX = /^(VBRD|VIBERIDE)-(PASSENGER|RIDER)-([A-Z]{2}\d{3}[A-Z])$/;
-exports.DEVICE_PAIR_ID_REGEX = /^[A-NP-Z]{2}[0-9]{3}[A-NP-Z]{1}$/;
 exports.ISO_DATE_REGEX = /^\d{4}-\d{2}-\d{2}$/;
 exports.DAY_MONTH_YEAR_REGEX = /^\d{2}-\d{2}-\d{4}$/;
 exports.DAY_MONTH_YEAR_SLASH_REGEX = /^\d{2}\/\d{2}\/\d{4}$/;

package/dist/middlewares/index.d.ts CHANGED Viewed

@@ -3,3 +3,4 @@ export { checkUserAuthentication } from "./users/users.auth.middleware";
 export { checkIsUserBanned, checkIsUserSuspended, checkUserAccountStatus, } from "./shared/shared.account.middleware";
 export { errorHandler } from "./shared/shared.errorHandler.middleware";
 export { loadAppRuntimeConfig } from "./shared/shared.appSpecs.middleware";
+export { clearAppVersionMinimumsCache, enforceMinimumMobileAppVersion, } from "./shared/shared.appVersion.middleware";

package/dist/middlewares/index.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadAppRuntimeConfig = exports.errorHandler = exports.checkUserAccountStatus = exports.checkIsUserSuspended = exports.checkIsUserBanned = exports.checkUserAuthentication = exports.checkAdminAuthentication = void 0;
+exports.enforceMinimumMobileAppVersion = exports.clearAppVersionMinimumsCache = exports.loadAppRuntimeConfig = exports.errorHandler = exports.checkUserAccountStatus = exports.checkIsUserSuspended = exports.checkIsUserBanned = exports.checkUserAuthentication = exports.checkAdminAuthentication = void 0;
 var admin_auth_middleware_1 = require("./admin/admin.auth.middleware");
 Object.defineProperty(exports, "checkAdminAuthentication", { enumerable: true, get: function () { return admin_auth_middleware_1.checkAdminAuthentication; } });
 var users_auth_middleware_1 = require("./users/users.auth.middleware");
@@ -13,3 +13,6 @@ var shared_errorHandler_middleware_1 = require("./shared/shared.errorHandler.mid
 Object.defineProperty(exports, "errorHandler", { enumerable: true, get: function () { return shared_errorHandler_middleware_1.errorHandler; } });
 var shared_appSpecs_middleware_1 = require("./shared/shared.appSpecs.middleware");
 Object.defineProperty(exports, "loadAppRuntimeConfig", { enumerable: true, get: function () { return shared_appSpecs_middleware_1.loadAppRuntimeConfig; } });
+var shared_appVersion_middleware_1 = require("./shared/shared.appVersion.middleware");
+Object.defineProperty(exports, "clearAppVersionMinimumsCache", { enumerable: true, get: function () { return shared_appVersion_middleware_1.clearAppVersionMinimumsCache; } });
+Object.defineProperty(exports, "enforceMinimumMobileAppVersion", { enumerable: true, get: function () { return shared_appVersion_middleware_1.enforceMinimumMobileAppVersion; } });

package/dist/middlewares/shared/shared.appVersion.middleware.d.ts ADDED Viewed

@@ -0,0 +1,9 @@
+import { NextFunction, Request, Response } from "express";
+/** Clear this process's cached app-version policy after an AppSpecs update. */
+export declare function clearAppVersionMinimumsCache(appName?: string): void;
+/**
+ * Enforce the platform-specific minimum app version/build for requests that
+ * explicitly identify as Viberide mobile. Requests from Postman, tests, and
+ * other clients without X-App-Client pass through unchanged.
+ */
+export declare function enforceMinimumMobileAppVersion(appName?: string): (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/dist/middlewares/shared/shared.appVersion.middleware.js ADDED Viewed

@@ -0,0 +1,175 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.clearAppVersionMinimumsCache = clearAppVersionMinimumsCache;
+exports.enforceMinimumMobileAppVersion = enforceMinimumMobileAppVersion;
+const vr_models_1 = require("vr-models");
+const MOBILE_APP_CLIENT = "VIBERIDE-MOBILE-APP";
+const DEFAULT_APP_NAME = "VIBERIDE-MOBILE-APP";
+const CACHE_TTL_MS = 30_000;
+const minimumsCache = new Map();
+const minimumsLoads = new Map();
+function nullableString(value) {
+    return typeof value === "string" && value.trim() ? value.trim() : null;
+}
+async function loadVersionMinimums(appName) {
+    const cached = minimumsCache.get(appName);
+    if (cached && cached.expiresAt > Date.now())
+        return cached.value;
+    const pending = minimumsLoads.get(appName);
+    if (pending)
+        return pending;
+    const load = (async () => {
+        const specs = await vr_models_1.AppSpecs.getByAppName(appName);
+        const value = {
+            androidVersion: nullableString(specs?.minimumAndroidAppVersion),
+            androidBuild: typeof specs?.minimumAndroidAppBuild === "number"
+                ? specs.minimumAndroidAppBuild
+                : null,
+            iosVersion: nullableString(specs?.minimumIosAppVersion),
+            iosBuild: nullableString(specs?.minimumIosAppBuild),
+            forceUpdateMessage: nullableString(specs?.forceUpdateMessage),
+        };
+        minimumsCache.set(appName, { value, expiresAt: Date.now() + CACHE_TTL_MS });
+        return value;
+    })();
+    minimumsLoads.set(appName, load);
+    try {
+        return await load;
+    }
+    finally {
+        if (minimumsLoads.get(appName) === load)
+            minimumsLoads.delete(appName);
+    }
+}
+/** Clear this process's cached app-version policy after an AppSpecs update. */
+function clearAppVersionMinimumsCache(appName) {
+    if (appName)
+        minimumsCache.delete(appName);
+    else
+        minimumsCache.clear();
+}
+function parseDottedNumbers(value) {
+    if (!/^\d+(?:\.\d+)*$/.test(value))
+        return null;
+    const parts = value.split(".").map(Number);
+    return parts.every(Number.isSafeInteger) ? parts : null;
+}
+function compareDottedNumbers(left, right) {
+    const leftParts = parseDottedNumbers(left);
+    const rightParts = parseDottedNumbers(right);
+    if (!leftParts || !rightParts)
+        return null;
+    const length = Math.max(leftParts.length, rightParts.length);
+    for (let index = 0; index < length; index += 1) {
+        const leftPart = leftParts[index] ?? 0;
+        const rightPart = rightParts[index] ?? 0;
+        if (leftPart !== rightPart)
+            return leftPart < rightPart ? -1 : 1;
+    }
+    return 0;
+}
+function compareBuild(platform, current, minimum) {
+    if (platform === "android") {
+        if (!/^\d+$/.test(current) || !/^\d+$/.test(minimum))
+            return null;
+        const currentNumber = Number(current);
+        const minimumNumber = Number(minimum);
+        if (!Number.isSafeInteger(currentNumber) || !Number.isSafeInteger(minimumNumber))
+            return null;
+        return currentNumber === minimumNumber ? 0 : currentNumber < minimumNumber ? -1 : 1;
+    }
+    return compareDottedNumbers(current, minimum);
+}
+function compareAppVersion(current, minimum) {
+    const currentParts = parseDottedNumbers(current);
+    const minimumParts = parseDottedNumbers(minimum);
+    if (!currentParts || !minimumParts || currentParts.length !== 3 || minimumParts.length !== 3) {
+        return null;
+    }
+    return compareDottedNumbers(current, minimum);
+}
+/**
+ * Enforce the platform-specific minimum app version/build for requests that
+ * explicitly identify as Viberide mobile. Requests from Postman, tests, and
+ * other clients without X-App-Client pass through unchanged.
+ */
+function enforceMinimumMobileAppVersion(appName = DEFAULT_APP_NAME) {
+    return async (req, res, next) => {
+        const appClient = req.get("X-App-Client")?.trim() || null;
+        const platformHeader = req.get("X-App-Platform")?.trim().toLowerCase() || null;
+        const appVersion = req.get("X-App-Version")?.trim() || null;
+        const appBuild = req.get("X-App-Build")?.trim() || null;
+        // Log only app metadata; never dump authorization or other request headers.
+        console.info("[APP VERSION REQUEST]", { appClient, platform: platformHeader, appVersion, appBuild });
+        if (appClient?.toUpperCase() !== MOBILE_APP_CLIENT) {
+            next();
+            return;
+        }
+        if ((platformHeader !== "android" && platformHeader !== "ios") ||
+            !appVersion ||
+            !appBuild) {
+            res.status(400).json({
+                success: false,
+                code: "INVALID_APP_VERSION_HEADERS",
+                message: "The mobile app version headers are missing or invalid.",
+            });
+            return;
+        }
+        const platform = platformHeader;
+        const parsedVersion = parseDottedNumbers(appVersion);
+        const parsedBuild = platform === "android"
+            ? /^\d+$/.test(appBuild) && Number.isSafeInteger(Number(appBuild))
+            : parseDottedNumbers(appBuild) !== null;
+        if (!parsedVersion || parsedVersion.length !== 3 || !parsedBuild) {
+            res.status(400).json({
+                success: false,
+                code: "INVALID_APP_VERSION_HEADERS",
+                message: "The mobile app version headers are missing or invalid.",
+            });
+            return;
+        }
+        try {
+            const minimums = await loadVersionMinimums(appName);
+            const minimumVersion = platform === "android"
+                ? minimums.androidVersion
+                : minimums.iosVersion;
+            const minimumBuildValue = platform === "android"
+                ? minimums.androidBuild
+                : minimums.iosBuild;
+            const minimumBuild = minimumBuildValue === null ? null : String(minimumBuildValue);
+            const versionComparison = minimumVersion
+                ? compareAppVersion(appVersion, minimumVersion)
+                : null;
+            const buildComparison = minimumBuild
+                ? compareBuild(platform, appBuild, minimumBuild)
+                : null;
+            if (versionComparison === null && minimumVersion) {
+                throw new Error(`Invalid configured minimum ${platform} app version: ${minimumVersion}`);
+            }
+            if (buildComparison === null && minimumBuild) {
+                throw new Error(`Invalid configured minimum ${platform} app build: ${minimumBuild}`);
+            }
+            const belowVersion = versionComparison !== null && versionComparison < 0;
+            const belowBuild = buildComparison !== null && buildComparison < 0;
+            if (belowVersion || belowBuild) {
+                res.status(426).json({
+                    success: false,
+                    code: "APP_UPDATE_REQUIRED",
+                    message: minimums.forceUpdateMessage || "Please update Viberide to continue.",
+                    data: {
+                        platform,
+                        minimumAppVersion: minimumVersion,
+                        minimumAppBuild: minimumBuild,
+                        currentAppVersion: appVersion,
+                        currentAppBuild: appBuild,
+                    },
+                });
+                return;
+            }
+            next();
+        }
+        catch (error) {
+            next(error);
+        }
+    };
+}

package/dist/utils/admin/admin.devices.utils.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 import { Device, UserRole } from "vr-models";
+import type { DeviceSerialPrefix, DeviceSerialRole } from "vr-models";
 import { Transaction } from "sequelize";
 import { DeviceResetOptions, DeviceResetResult, StockChangeResult } from "../shared/shared.types";
 export declare const stockUtil: {
@@ -56,11 +57,8 @@ export declare const stockUtil: {
         transaction?: Transaction;
         actorId?: string;
     }): Promise<StockChangeResult>;
-    /**
-     * Generate serial number from pair ID and dedication
-     * Format: VIBERIDE-{RIDER|PASSENGER}-{pairId}
-     */
-    generateSerialNumber(pairId: string, dedication: string): string;
+    /** Generate a device serial from a raw suffix or namespaced pair ID. */
+    generateSerialNumber(pairId: string, dedication: DeviceSerialRole, serialPrefix?: DeviceSerialPrefix): string;
     /**
      * Validate pair ID format
      * No letter 'O' to avoid confusion with 0

package/dist/utils/admin/admin.devices.utils.js CHANGED Viewed

@@ -14,11 +14,8 @@ const isValidUUID = (str) => {
  * Extract dedication from serial number
  */
 const extractDedicationFromSerial = (serialNumber) => {
-    if (serialNumber.includes("RIDER"))
-        return "RIDER";
-    if (serialNumber.includes("PASSENGER"))
-        return "PASSENGER";
-    return "N/A";
+    const match = vr_models_1.SERIAL_PATTERN.exec(serialNumber);
+    return match ? match[2] : "N/A";
 };
 // ==================== HELPER FUNCTIONS ====================
 function buildWhereClause(condition) {
@@ -393,12 +390,18 @@ exports.stockUtil = {
             actorType: actorType,
         });
     },
-    /**
-     * Generate serial number from pair ID and dedication
-     * Format: VIBERIDE-{RIDER|PASSENGER}-{pairId}
-     */
-    generateSerialNumber(pairId, dedication) {
-        return `VIBERIDE-${dedication}-${pairId}`;
+    /** Generate a device serial from a raw suffix or namespaced pair ID. */
+    generateSerialNumber(pairId, dedication, serialPrefix = "VIBERIDE") {
+        const pairMatch = vr_models_1.PAIR_ID_PATTERN.exec(pairId);
+        if (!pairMatch) {
+            throw new Error(`Invalid pair ID format: ${pairId}`);
+        }
+        const resolvedPrefix = (pairMatch[1] || serialPrefix);
+        const serialNumber = `${resolvedPrefix}-${dedication}-${pairMatch[2]}`;
+        if (!vr_models_1.SERIAL_PATTERN.test(serialNumber)) {
+            throw new Error(`Invalid device serial format: ${serialNumber}`);
+        }
+        return serialNumber;
     },
     /**
      * Validate pair ID format

package/dist/validations/admin/admin.devicePayments.validations.js CHANGED Viewed

@@ -61,10 +61,10 @@ exports.replacePlanDevicesSchema = zod_1.z.object({
         id: zod_1.z.string().uuid("Invalid payment plan ID"),
     }),
     body: zod_1.z.object({
-        replacementPrefix: zod_1.z.enum(["VBRD", "VIBERIDE"]),
+        replacementPrefix: zod_1.z.enum(vr_models_1.DEVICE_SERIAL_PREFIXES),
         replacementPairID: zod_1.z
             .string()
-            .regex(regex_constants_1.DEVICE_PAIR_ID_REGEX, "Invalid pair ID format"),
+            .regex(regex_constants_1.DEVICE_PAIR_ID_SUFFIX_REGEX, "Invalid pair ID format"),
     }),
 });
 // ==================== UPDATE ====================

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

@@ -73,7 +73,7 @@ export declare const getDevicesSchema: z.ZodObject<{
         page?: number | undefined;
         sortBy?: "createdAt" | "updatedAt" | "status" | "serialNumber" | undefined;
         sortOrder?: "DESC" | "ASC" | undefined;
-        dedicatedUser?: "RIDER" | "PASSENGER" | "N/A" | undefined;
+        dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | undefined;
         isPermanentlyUnlocked?: "true" | "false" | undefined;
         isAssigned?: "true" | "false" | undefined;
     }, {
@@ -84,7 +84,7 @@ export declare const getDevicesSchema: z.ZodObject<{
         page?: string | undefined;
         sortBy?: "createdAt" | "updatedAt" | "status" | "serialNumber" | undefined;
         sortOrder?: "DESC" | "ASC" | undefined;
-        dedicatedUser?: "RIDER" | "PASSENGER" | "N/A" | undefined;
+        dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | undefined;
         isPermanentlyUnlocked?: "true" | "false" | undefined;
         isAssigned?: "true" | "false" | undefined;
     }>;
@@ -97,7 +97,7 @@ export declare const getDevicesSchema: z.ZodObject<{
         page?: number | undefined;
         sortBy?: "createdAt" | "updatedAt" | "status" | "serialNumber" | undefined;
         sortOrder?: "DESC" | "ASC" | undefined;
-        dedicatedUser?: "RIDER" | "PASSENGER" | "N/A" | undefined;
+        dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | undefined;
         isPermanentlyUnlocked?: "true" | "false" | undefined;
         isAssigned?: "true" | "false" | undefined;
     };
@@ -110,7 +110,7 @@ export declare const getDevicesSchema: z.ZodObject<{
         page?: string | undefined;
         sortBy?: "createdAt" | "updatedAt" | "status" | "serialNumber" | undefined;
         sortOrder?: "DESC" | "ASC" | undefined;
-        dedicatedUser?: "RIDER" | "PASSENGER" | "N/A" | undefined;
+        dedicatedUser?: "PASSENGER" | "RIDER" | "N/A" | undefined;
         isPermanentlyUnlocked?: "true" | "false" | undefined;
         isAssigned?: "true" | "false" | undefined;
     };

package/dist/validations/admin/admin.devices.validations.js CHANGED Viewed

@@ -4,11 +4,14 @@ exports.customDeviceResetSchema = exports.triggerDeviceResetSchema = exports.che
 const zod_1 = require("zod");
 const vr_models_1 = require("vr-models");
 const regex_constants_1 = require("../../constants/regex.constants");
-// ✅ Pair ID format: 2 letters + 3 numbers + 1 letter
-// Example: AA001A, AB123B, XZ999Z
-// No letter 'O' to avoid confusion with 0
+// Supports both the raw registration suffix and the persisted namespaced key.
 exports.PAIR_ID_REGEX = regex_constants_1.DEVICE_PAIR_ID_REGEX;
-const PAIR_ID_ERROR = "Pair ID must be 6 characters: 2 letters (A-Z, excluding O) + 3 digits + 1 letter (A-Z, excluding O). Example: AA001A";
+const PAIR_ID_ERROR = "Pair ID must be a six-character suffix or a namespaced ID such as VBRD-AA001A or VIBERIDE-AA001A";
+const PAIR_ID_SUFFIX_ERROR = "Pair ID suffix must be 6 characters: 2 letters (excluding O) + 3 digits + 1 letter (excluding O). Example: AA001A";
+const pairIdFilterSchema = zod_1.z.union([
+    zod_1.z.string().regex(exports.PAIR_ID_REGEX, PAIR_ID_ERROR),
+    zod_1.z.array(zod_1.z.string().regex(exports.PAIR_ID_REGEX, PAIR_ID_ERROR)),
+]);
 // ✅ Helper to remove duplicates and return unique pair IDs
 const deduplicatePairIds = (pairIds) => {
     return [...new Set(pairIds)];
@@ -21,10 +24,10 @@ exports.createDevicePairsSchema = zod_1.z.object({
         .object({
         productId: zod_1.z.string().uuid("Invalid product ID"),
         pairIds: zod_1.z
-            .array(zod_1.z.string().regex(exports.PAIR_ID_REGEX, PAIR_ID_ERROR))
+            .array(zod_1.z.string().regex(regex_constants_1.DEVICE_PAIR_ID_SUFFIX_REGEX, PAIR_ID_SUFFIX_ERROR))
             .min(1, "At least one pair ID required")
             .max(100, "Cannot create more than 100 pairs at once"),
-        serialPrefix: zod_1.z.enum(["VBRD", "VIBERIDE"]).default("VIBERIDE"),
+        serialPrefix: zod_1.z.enum(vr_models_1.DEVICE_SERIAL_PREFIXES).default("VIBERIDE"),
     })
         .transform((data) => {
         // ✅ Remove duplicates and keep unique pair IDs
@@ -169,8 +172,8 @@ exports.customDeviceResetSchema = zod_1.z.object({
             status: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
             excludeStatus: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
             isPermanentlyUnlocked: zod_1.z.boolean().optional(),
-            pairId: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
-            excludePairIds: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
+            pairId: pairIdFilterSchema.optional(),
+            excludePairIds: pairIdFilterSchema.optional(),
             productId: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
             dedicatedUser: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
             createdBefore: zod_1.z.string().datetime().optional(),

package/dist/validations/admin/admin.eventLogs.validations.d.ts CHANGED Viewed

@@ -28,7 +28,7 @@ export declare const listEventLogsSchema: z.ZodObject<{
         lastName?: string | undefined;
         fromDate?: string | undefined;
         toDate?: string | undefined;
-        actorType?: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN" | undefined;
+        actorType?: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN" | undefined;
         actorId?: string | undefined;
         action?: string | undefined;
         entity?: string | undefined;
@@ -44,7 +44,7 @@ export declare const listEventLogsSchema: z.ZodObject<{
         fromDate?: string | undefined;
         toDate?: string | undefined;
         sortOrder?: "DESC" | "ASC" | undefined;
-        actorType?: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN" | undefined;
+        actorType?: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN" | undefined;
         actorId?: string | undefined;
         action?: string | undefined;
         entity?: string | undefined;
@@ -61,7 +61,7 @@ export declare const listEventLogsSchema: z.ZodObject<{
         fromDate?: string | undefined;
         toDate?: string | undefined;
         sortOrder?: "DESC" | "ASC" | undefined;
-        actorType?: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN" | undefined;
+        actorType?: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN" | undefined;
         actorId?: string | undefined;
         action?: string | undefined;
         entity?: string | undefined;
@@ -82,7 +82,7 @@ export declare const listEventLogsSchema: z.ZodObject<{
         fromDate?: string | undefined;
         toDate?: string | undefined;
         sortOrder?: "DESC" | "ASC" | undefined;
-        actorType?: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN" | undefined;
+        actorType?: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN" | undefined;
         actorId?: string | undefined;
         action?: string | undefined;
         entity?: string | undefined;

package/dist/validations/shared/shared.appSpecs.validations.d.ts CHANGED Viewed

@@ -9,6 +9,11 @@ export declare const createAppSpecsSchema: z.ZodObject<{
         developmentBaseUrl: z.ZodString;
         stagingBaseUrl: z.ZodString;
         productionBaseUrl: z.ZodString;
+        minimumAndroidAppVersion: z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodString>>, string | null | undefined, unknown>;
+        minimumAndroidAppBuild: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        minimumIosAppVersion: z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodString>>, string | null | undefined, unknown>;
+        minimumIosAppBuild: z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodString>>, string | null | undefined, unknown>;
+        forceUpdateMessage: z.ZodOptional<z.ZodNullable<z.ZodString>>;
         runtimeConfig: z.ZodOptional<z.ZodObject<{
             googleWebClientId: z.ZodOptional<z.ZodString>;
             paidAccessActivated: z.ZodOptional<z.ZodBoolean>;
@@ -326,11 +331,11 @@ export declare const createAppSpecsSchema: z.ZodObject<{
                 identifierPattern: z.ZodEffects<z.ZodString, string, string>;
             }, "strip", z.ZodTypeAny, {
                 prefixes: string[];
-                roles: ("PASSENGER" | "RIDER" | "AGENT" | "ADMIN")[];
+                roles: ("ADMIN" | "PASSENGER" | "RIDER" | "AGENT")[];
                 identifierPattern: string;
             }, {
                 prefixes: string[];
-                roles: ("PASSENGER" | "RIDER" | "AGENT" | "ADMIN")[];
+                roles: ("ADMIN" | "PASSENGER" | "RIDER" | "AGENT")[];
                 identifierPattern: string;
             }>>;
             bleBatches: z.ZodOptional<z.ZodArray<z.ZodObject<{
@@ -391,14 +396,12 @@ export declare const createAppSpecsSchema: z.ZodObject<{
                 paymentPlansPageSize?: number | undefined;
                 maximumPageSize?: number | undefined;
             }>>;
-            minimumAppVersion: z.ZodOptional<z.ZodString>;
-            forceUpdateMessage: z.ZodOptional<z.ZodNullable<z.ZodString>>;
         }, "strip", z.ZodTypeAny, {
-            googleWebClientId?: string | undefined;
-            paidAccessActivated?: boolean | undefined;
             passengerAccess?: {
                 mode: "FREE" | "PAID";
             } | undefined;
+            paidAccessActivated?: boolean | undefined;
+            googleWebClientId?: string | undefined;
             speedGovernor?: {
                 isActive: boolean;
                 weeklySchedule: {
@@ -450,7 +453,7 @@ export declare const createAppSpecsSchema: z.ZodObject<{
             } | undefined;
             serialNumber?: {
                 prefixes: string[];
-                roles: ("PASSENGER" | "RIDER" | "AGENT" | "ADMIN")[];
+                roles: ("ADMIN" | "PASSENGER" | "RIDER" | "AGENT")[];
                 identifierPattern: string;
             } | undefined;
             bleBatches?: {
@@ -475,14 +478,12 @@ export declare const createAppSpecsSchema: z.ZodObject<{
                 paymentPlansPageSize?: number | undefined;
                 maximumPageSize?: number | undefined;
             } | undefined;
-            minimumAppVersion?: string | undefined;
-            forceUpdateMessage?: string | null | undefined;
         }, {
-            googleWebClientId?: string | undefined;
-            paidAccessActivated?: boolean | undefined;
             passengerAccess?: {
                 mode: "FREE" | "PAID";
             } | undefined;
+            paidAccessActivated?: boolean | undefined;
+            googleWebClientId?: string | undefined;
             speedGovernor?: {
                 isActive: boolean;
                 weeklySchedule: {
@@ -534,7 +535,7 @@ export declare const createAppSpecsSchema: z.ZodObject<{
             } | undefined;
             serialNumber?: {
                 prefixes: string[];
-                roles: ("PASSENGER" | "RIDER" | "AGENT" | "ADMIN")[];
+                roles: ("ADMIN" | "PASSENGER" | "RIDER" | "AGENT")[];
                 identifierPattern: string;
             } | undefined;
             bleBatches?: {
@@ -559,8 +560,6 @@ export declare const createAppSpecsSchema: z.ZodObject<{
                 paymentPlansPageSize?: number | undefined;
                 maximumPageSize?: number | undefined;
             } | undefined;
-            minimumAppVersion?: string | undefined;
-            forceUpdateMessage?: string | null | undefined;
         }>>;
         privacyPolicy: z.ZodOptional<z.ZodNullable<z.ZodString>>;
         privacyPolicyVersion: z.ZodOptional<z.ZodNullable<z.ZodString>>;
@@ -606,14 +605,19 @@ export declare const createAppSpecsSchema: z.ZodObject<{
         enableMomoPayPayment: boolean;
         enableAirtelMoneyPayment: boolean;
         isUnderMaintenance: boolean;
+        minimumAndroidAppVersion?: string | null | undefined;
+        minimumAndroidAppBuild?: number | null | undefined;
+        minimumIosAppVersion?: string | null | undefined;
+        minimumIosAppBuild?: string | null | undefined;
         appShortName?: string | null | undefined;
         appDescription?: string | null | undefined;
+        forceUpdateMessage?: string | null | undefined;
         runtimeConfig?: {
-            googleWebClientId?: string | undefined;
-            paidAccessActivated?: boolean | undefined;
             passengerAccess?: {
                 mode: "FREE" | "PAID";
             } | undefined;
+            paidAccessActivated?: boolean | undefined;
+            googleWebClientId?: string | undefined;
             speedGovernor?: {
                 isActive: boolean;
                 weeklySchedule: {
@@ -665,7 +669,7 @@ export declare const createAppSpecsSchema: z.ZodObject<{
             } | undefined;
             serialNumber?: {
                 prefixes: string[];
-                roles: ("PASSENGER" | "RIDER" | "AGENT" | "ADMIN")[];
+                roles: ("ADMIN" | "PASSENGER" | "RIDER" | "AGENT")[];
                 identifierPattern: string;
             } | undefined;
             bleBatches?: {
@@ -690,8 +694,6 @@ export declare const createAppSpecsSchema: z.ZodObject<{
                 paymentPlansPageSize?: number | undefined;
                 maximumPageSize?: number | undefined;
             } | undefined;
-            minimumAppVersion?: string | undefined;
-            forceUpdateMessage?: string | null | undefined;
         } | undefined;
         privacyPolicy?: string | null | undefined;
         privacyPolicyVersion?: string | null | undefined;
@@ -719,16 +721,21 @@ export declare const createAppSpecsSchema: z.ZodObject<{
         developmentBaseUrl: string;
         stagingBaseUrl: string;
         productionBaseUrl: string;
+        minimumAndroidAppVersion?: unknown;
+        minimumAndroidAppBuild?: number | null | undefined;
+        minimumIosAppVersion?: unknown;
+        minimumIosAppBuild?: unknown;
         appShortName?: string | null | undefined;
         appDescription?: string | null | undefined;
         appDefaultLanguage?: string | undefined;
         appSupportedLanguages?: string[] | undefined;
+        forceUpdateMessage?: string | null | undefined;
         runtimeConfig?: {
-            googleWebClientId?: string | undefined;
-            paidAccessActivated?: boolean | undefined;
             passengerAccess?: {
                 mode: "FREE" | "PAID";
             } | undefined;
+            paidAccessActivated?: boolean | undefined;
+            googleWebClientId?: string | undefined;
             speedGovernor?: {
                 isActive: boolean;
                 weeklySchedule: {
@@ -780,7 +787,7 @@ export declare const createAppSpecsSchema: z.ZodObject<{
             } | undefined;
             serialNumber?: {
                 prefixes: string[];
-                roles: ("PASSENGER" | "RIDER" | "AGENT" | "ADMIN")[];
+                roles: ("ADMIN" | "PASSENGER" | "RIDER" | "AGENT")[];
                 identifierPattern: string;
             } | undefined;
             bleBatches?: {
@@ -805,8 +812,6 @@ export declare const createAppSpecsSchema: z.ZodObject<{
                 paymentPlansPageSize?: number | undefined;
                 maximumPageSize?: number | undefined;
             } | undefined;
-            minimumAppVersion?: string | undefined;
-            forceUpdateMessage?: string | null | undefined;
         } | undefined;
         privacyPolicy?: string | null | undefined;
         privacyPolicyVersion?: string | null | undefined;
@@ -854,14 +859,19 @@ export declare const createAppSpecsSchema: z.ZodObject<{
         enableMomoPayPayment: boolean;
         enableAirtelMoneyPayment: boolean;
         isUnderMaintenance: boolean;
+        minimumAndroidAppVersion?: string | null | undefined;
+        minimumAndroidAppBuild?: number | null | undefined;
+        minimumIosAppVersion?: string | null | undefined;
+        minimumIosAppBuild?: string | null | undefined;
         appShortName?: string | null | undefined;
         appDescription?: string | null | undefined;
+        forceUpdateMessage?: string | null | undefined;
         runtimeConfig?: {
-            googleWebClientId?: string | undefined;
-            paidAccessActivated?: boolean | undefined;
             passengerAccess?: {
                 mode: "FREE" | "PAID";
             } | undefined;
+            paidAccessActivated?: boolean | undefined;
+            googleWebClientId?: string | undefined;
             speedGovernor?: {
                 isActive: boolean;
                 weeklySchedule: {
@@ -913,7 +923,7 @@ export declare const createAppSpecsSchema: z.ZodObject<{
             } | undefined;
             serialNumber?: {
                 prefixes: string[];
-                roles: ("PASSENGER" | "RIDER" | "AGENT" | "ADMIN")[];
+                roles: ("ADMIN" | "PASSENGER" | "RIDER" | "AGENT")[];
                 identifierPattern: string;
             } | undefined;
             bleBatches?: {
@@ -938,8 +948,6 @@ export declare const createAppSpecsSchema: z.ZodObject<{
                 paymentPlansPageSize?: number | undefined;
                 maximumPageSize?: number | undefined;
             } | undefined;
-            minimumAppVersion?: string | undefined;
-            forceUpdateMessage?: string | null | undefined;
         } | undefined;
         privacyPolicy?: string | null | undefined;
         privacyPolicyVersion?: string | null | undefined;
@@ -969,16 +977,21 @@ export declare const createAppSpecsSchema: z.ZodObject<{
         developmentBaseUrl: string;
         stagingBaseUrl: string;
         productionBaseUrl: string;
+        minimumAndroidAppVersion?: unknown;
+        minimumAndroidAppBuild?: number | null | undefined;
+        minimumIosAppVersion?: unknown;
+        minimumIosAppBuild?: unknown;
         appShortName?: string | null | undefined;
         appDescription?: string | null | undefined;
         appDefaultLanguage?: string | undefined;
         appSupportedLanguages?: string[] | undefined;
+        forceUpdateMessage?: string | null | undefined;
         runtimeConfig?: {
-            googleWebClientId?: string | undefined;
-            paidAccessActivated?: boolean | undefined;
             passengerAccess?: {
                 mode: "FREE" | "PAID";
             } | undefined;
+            paidAccessActivated?: boolean | undefined;
+            googleWebClientId?: string | undefined;
             speedGovernor?: {
                 isActive: boolean;
                 weeklySchedule: {
@@ -1030,7 +1043,7 @@ export declare const createAppSpecsSchema: z.ZodObject<{
             } | undefined;
             serialNumber?: {
                 prefixes: string[];
-                roles: ("PASSENGER" | "RIDER" | "AGENT" | "ADMIN")[];
+                roles: ("ADMIN" | "PASSENGER" | "RIDER" | "AGENT")[];
                 identifierPattern: string;
             } | undefined;
             bleBatches?: {
@@ -1055,8 +1068,6 @@ export declare const createAppSpecsSchema: z.ZodObject<{
                 paymentPlansPageSize?: number | undefined;
                 maximumPageSize?: number | undefined;
             } | undefined;
-            minimumAppVersion?: string | undefined;
-            forceUpdateMessage?: string | null | undefined;
         } | undefined;
         privacyPolicy?: string | null | undefined;
         privacyPolicyVersion?: string | null | undefined;
@@ -1098,6 +1109,10 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
         id: string;
     }>;
     body: z.ZodObject<{
+        minimumAndroidAppVersion: z.ZodOptional<z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodString>>, string | null | undefined, unknown>>;
+        minimumAndroidAppBuild: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodNumber>>>;
+        minimumIosAppVersion: z.ZodOptional<z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodString>>, string | null | undefined, unknown>>;
+        minimumIosAppBuild: z.ZodOptional<z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodString>>, string | null | undefined, unknown>>;
         appShortName: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodString>>>;
         appDescription: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodString>>>;
         appDefaultLanguage: z.ZodOptional<z.ZodDefault<z.ZodString>>;
@@ -1105,6 +1120,7 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
         developmentBaseUrl: z.ZodOptional<z.ZodString>;
         stagingBaseUrl: z.ZodOptional<z.ZodString>;
         productionBaseUrl: z.ZodOptional<z.ZodString>;
+        forceUpdateMessage: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodString>>>;
         runtimeConfig: z.ZodOptional<z.ZodOptional<z.ZodObject<{
             googleWebClientId: z.ZodOptional<z.ZodString>;
             paidAccessActivated: z.ZodOptional<z.ZodBoolean>;
@@ -1422,11 +1438,11 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
                 identifierPattern: z.ZodEffects<z.ZodString, string, string>;
             }, "strip", z.ZodTypeAny, {
                 prefixes: string[];
-                roles: ("PASSENGER" | "RIDER" | "AGENT" | "ADMIN")[];
+                roles: ("ADMIN" | "PASSENGER" | "RIDER" | "AGENT")[];
                 identifierPattern: string;
             }, {
                 prefixes: string[];
-                roles: ("PASSENGER" | "RIDER" | "AGENT" | "ADMIN")[];
+                roles: ("ADMIN" | "PASSENGER" | "RIDER" | "AGENT")[];
                 identifierPattern: string;
             }>>;
             bleBatches: z.ZodOptional<z.ZodArray<z.ZodObject<{
@@ -1487,14 +1503,12 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
                 paymentPlansPageSize?: number | undefined;
                 maximumPageSize?: number | undefined;
             }>>;
-            minimumAppVersion: z.ZodOptional<z.ZodString>;
-            forceUpdateMessage: z.ZodOptional<z.ZodNullable<z.ZodString>>;
         }, "strip", z.ZodTypeAny, {
-            googleWebClientId?: string | undefined;
-            paidAccessActivated?: boolean | undefined;
             passengerAccess?: {
                 mode: "FREE" | "PAID";
             } | undefined;
+            paidAccessActivated?: boolean | undefined;
+            googleWebClientId?: string | undefined;
             speedGovernor?: {
                 isActive: boolean;
                 weeklySchedule: {
@@ -1546,7 +1560,7 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
             } | undefined;
             serialNumber?: {
                 prefixes: string[];
-                roles: ("PASSENGER" | "RIDER" | "AGENT" | "ADMIN")[];
+                roles: ("ADMIN" | "PASSENGER" | "RIDER" | "AGENT")[];
                 identifierPattern: string;
             } | undefined;
             bleBatches?: {
@@ -1571,14 +1585,12 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
                 paymentPlansPageSize?: number | undefined;
                 maximumPageSize?: number | undefined;
             } | undefined;
-            minimumAppVersion?: string | undefined;
-            forceUpdateMessage?: string | null | undefined;
         }, {
-            googleWebClientId?: string | undefined;
-            paidAccessActivated?: boolean | undefined;
             passengerAccess?: {
                 mode: "FREE" | "PAID";
             } | undefined;
+            paidAccessActivated?: boolean | undefined;
+            googleWebClientId?: string | undefined;
             speedGovernor?: {
                 isActive: boolean;
                 weeklySchedule: {
@@ -1630,7 +1642,7 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
             } | undefined;
             serialNumber?: {
                 prefixes: string[];
-                roles: ("PASSENGER" | "RIDER" | "AGENT" | "ADMIN")[];
+                roles: ("ADMIN" | "PASSENGER" | "RIDER" | "AGENT")[];
                 identifierPattern: string;
             } | undefined;
             bleBatches?: {
@@ -1655,8 +1667,6 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
                 paymentPlansPageSize?: number | undefined;
                 maximumPageSize?: number | undefined;
             } | undefined;
-            minimumAppVersion?: string | undefined;
-            forceUpdateMessage?: string | null | undefined;
         }>>>;
         privacyPolicy: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodString>>>;
         privacyPolicyVersion: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodString>>>;
@@ -1688,6 +1698,10 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
         maintenanceStartAt: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodString>>>;
         maintenanceEndAt: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodString>>>;
     }, "strip", z.ZodTypeAny, {
+        minimumAndroidAppVersion?: string | null | undefined;
+        minimumAndroidAppBuild?: number | null | undefined;
+        minimumIosAppVersion?: string | null | undefined;
+        minimumIosAppBuild?: string | null | undefined;
         appShortName?: string | null | undefined;
         appDescription?: string | null | undefined;
         appDefaultLanguage?: string | undefined;
@@ -1695,12 +1709,13 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
         developmentBaseUrl?: string | undefined;
         stagingBaseUrl?: string | undefined;
         productionBaseUrl?: string | undefined;
+        forceUpdateMessage?: string | null | undefined;
         runtimeConfig?: {
-            googleWebClientId?: string | undefined;
-            paidAccessActivated?: boolean | undefined;
             passengerAccess?: {
                 mode: "FREE" | "PAID";
             } | undefined;
+            paidAccessActivated?: boolean | undefined;
+            googleWebClientId?: string | undefined;
             speedGovernor?: {
                 isActive: boolean;
                 weeklySchedule: {
@@ -1752,7 +1767,7 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
             } | undefined;
             serialNumber?: {
                 prefixes: string[];
-                roles: ("PASSENGER" | "RIDER" | "AGENT" | "ADMIN")[];
+                roles: ("ADMIN" | "PASSENGER" | "RIDER" | "AGENT")[];
                 identifierPattern: string;
             } | undefined;
             bleBatches?: {
@@ -1777,8 +1792,6 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
                 paymentPlansPageSize?: number | undefined;
                 maximumPageSize?: number | undefined;
             } | undefined;
-            minimumAppVersion?: string | undefined;
-            forceUpdateMessage?: string | null | undefined;
         } | undefined;
         privacyPolicy?: string | null | undefined;
         privacyPolicyVersion?: string | null | undefined;
@@ -1810,6 +1823,10 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
         maintenanceStartAt?: string | null | undefined;
         maintenanceEndAt?: string | null | undefined;
     }, {
+        minimumAndroidAppVersion?: unknown;
+        minimumAndroidAppBuild?: number | null | undefined;
+        minimumIosAppVersion?: unknown;
+        minimumIosAppBuild?: unknown;
         appShortName?: string | null | undefined;
         appDescription?: string | null | undefined;
         appDefaultLanguage?: string | undefined;
@@ -1817,12 +1834,13 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
         developmentBaseUrl?: string | undefined;
         stagingBaseUrl?: string | undefined;
         productionBaseUrl?: string | undefined;
+        forceUpdateMessage?: string | null | undefined;
         runtimeConfig?: {
-            googleWebClientId?: string | undefined;
-            paidAccessActivated?: boolean | undefined;
             passengerAccess?: {
                 mode: "FREE" | "PAID";
             } | undefined;
+            paidAccessActivated?: boolean | undefined;
+            googleWebClientId?: string | undefined;
             speedGovernor?: {
                 isActive: boolean;
                 weeklySchedule: {
@@ -1874,7 +1892,7 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
             } | undefined;
             serialNumber?: {
                 prefixes: string[];
-                roles: ("PASSENGER" | "RIDER" | "AGENT" | "ADMIN")[];
+                roles: ("ADMIN" | "PASSENGER" | "RIDER" | "AGENT")[];
                 identifierPattern: string;
             } | undefined;
             bleBatches?: {
@@ -1899,8 +1917,6 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
                 paymentPlansPageSize?: number | undefined;
                 maximumPageSize?: number | undefined;
             } | undefined;
-            minimumAppVersion?: string | undefined;
-            forceUpdateMessage?: string | null | undefined;
         } | undefined;
         privacyPolicy?: string | null | undefined;
         privacyPolicyVersion?: string | null | undefined;
@@ -1933,10 +1949,11 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
         maintenanceEndAt?: string | null | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
-    params: {
-        id: string;
-    };
     body: {
+        minimumAndroidAppVersion?: string | null | undefined;
+        minimumAndroidAppBuild?: number | null | undefined;
+        minimumIosAppVersion?: string | null | undefined;
+        minimumIosAppBuild?: string | null | undefined;
         appShortName?: string | null | undefined;
         appDescription?: string | null | undefined;
         appDefaultLanguage?: string | undefined;
@@ -1944,12 +1961,13 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
         developmentBaseUrl?: string | undefined;
         stagingBaseUrl?: string | undefined;
         productionBaseUrl?: string | undefined;
+        forceUpdateMessage?: string | null | undefined;
         runtimeConfig?: {
-            googleWebClientId?: string | undefined;
-            paidAccessActivated?: boolean | undefined;
             passengerAccess?: {
                 mode: "FREE" | "PAID";
             } | undefined;
+            paidAccessActivated?: boolean | undefined;
+            googleWebClientId?: string | undefined;
             speedGovernor?: {
                 isActive: boolean;
                 weeklySchedule: {
@@ -2001,7 +2019,7 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
             } | undefined;
             serialNumber?: {
                 prefixes: string[];
-                roles: ("PASSENGER" | "RIDER" | "AGENT" | "ADMIN")[];
+                roles: ("ADMIN" | "PASSENGER" | "RIDER" | "AGENT")[];
                 identifierPattern: string;
             } | undefined;
             bleBatches?: {
@@ -2026,8 +2044,6 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
                 paymentPlansPageSize?: number | undefined;
                 maximumPageSize?: number | undefined;
             } | undefined;
-            minimumAppVersion?: string | undefined;
-            forceUpdateMessage?: string | null | undefined;
         } | undefined;
         privacyPolicy?: string | null | undefined;
         privacyPolicyVersion?: string | null | undefined;
@@ -2059,11 +2075,15 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
         maintenanceStartAt?: string | null | undefined;
         maintenanceEndAt?: string | null | undefined;
     };
-}, {
     params: {
         id: string;
     };
+}, {
     body: {
+        minimumAndroidAppVersion?: unknown;
+        minimumAndroidAppBuild?: number | null | undefined;
+        minimumIosAppVersion?: unknown;
+        minimumIosAppBuild?: unknown;
         appShortName?: string | null | undefined;
         appDescription?: string | null | undefined;
         appDefaultLanguage?: string | undefined;
@@ -2071,12 +2091,13 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
         developmentBaseUrl?: string | undefined;
         stagingBaseUrl?: string | undefined;
         productionBaseUrl?: string | undefined;
+        forceUpdateMessage?: string | null | undefined;
         runtimeConfig?: {
-            googleWebClientId?: string | undefined;
-            paidAccessActivated?: boolean | undefined;
             passengerAccess?: {
                 mode: "FREE" | "PAID";
             } | undefined;
+            paidAccessActivated?: boolean | undefined;
+            googleWebClientId?: string | undefined;
             speedGovernor?: {
                 isActive: boolean;
                 weeklySchedule: {
@@ -2128,7 +2149,7 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
             } | undefined;
             serialNumber?: {
                 prefixes: string[];
-                roles: ("PASSENGER" | "RIDER" | "AGENT" | "ADMIN")[];
+                roles: ("ADMIN" | "PASSENGER" | "RIDER" | "AGENT")[];
                 identifierPattern: string;
             } | undefined;
             bleBatches?: {
@@ -2153,8 +2174,6 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
                 paymentPlansPageSize?: number | undefined;
                 maximumPageSize?: number | undefined;
             } | undefined;
-            minimumAppVersion?: string | undefined;
-            forceUpdateMessage?: string | null | undefined;
         } | undefined;
         privacyPolicy?: string | null | undefined;
         privacyPolicyVersion?: string | null | undefined;
@@ -2186,6 +2205,9 @@ export declare const updateAppSpecsSchema: z.ZodObject<{
         maintenanceStartAt?: string | null | undefined;
         maintenanceEndAt?: string | null | undefined;
     };
+    params: {
+        id: string;
+    };
 }>;
 export declare const listAppSpecsSchema: z.ZodObject<{
     query: z.ZodObject<{
@@ -2195,33 +2217,33 @@ export declare const listAppSpecsSchema: z.ZodObject<{
         sortBy: z.ZodOptional<z.ZodEnum<["appName", "createdAt", "updatedAt"]>>;
         sortOrder: z.ZodOptional<z.ZodEnum<["ASC", "DESC"]>>;
     }, "strip", z.ZodTypeAny, {
-        page: number;
         limit: number;
+        page: number;
         search?: string | undefined;
-        sortBy?: "appName" | "createdAt" | "updatedAt" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
+        sortBy?: "createdAt" | "updatedAt" | "appName" | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
     }, {
-        page?: string | undefined;
-        limit?: string | undefined;
         search?: string | undefined;
-        sortBy?: "appName" | "createdAt" | "updatedAt" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
+        limit?: string | undefined;
+        page?: string | undefined;
+        sortBy?: "createdAt" | "updatedAt" | "appName" | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
     query: {
-        page: number;
         limit: number;
+        page: number;
         search?: string | undefined;
-        sortBy?: "appName" | "createdAt" | "updatedAt" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
+        sortBy?: "createdAt" | "updatedAt" | "appName" | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
     };
 }, {
     query: {
-        page?: string | undefined;
-        limit?: string | undefined;
         search?: string | undefined;
-        sortBy?: "appName" | "createdAt" | "updatedAt" | undefined;
-        sortOrder?: "ASC" | "DESC" | undefined;
+        limit?: string | undefined;
+        page?: string | undefined;
+        sortBy?: "createdAt" | "updatedAt" | "appName" | undefined;
+        sortOrder?: "DESC" | "ASC" | undefined;
     };
 }>;
 export declare const getAppSpecsSchema: z.ZodObject<{

package/dist/validations/shared/shared.appSpecs.validations.js CHANGED Viewed

@@ -27,6 +27,8 @@ const speedGovernorSchema = zod_1.z.object({
     weeklySchedule: speedGovernorWeeklyScheduleSchema,
     exceptions: zod_1.z.array(zod_1.z.string().trim().min(1).max(100)).optional(),
 });
+const optionalAppVersion = zod_1.z.preprocess((value) => typeof value === "string" && value.trim() === "" ? null : value, zod_1.z.string().regex(/^\d+\.\d+\.\d+$/, "Use MAJOR.MINOR.PATCH format").nullable().optional());
+const optionalIosBuild = zod_1.z.preprocess((value) => typeof value === "string" && value.trim() === "" ? null : value, zod_1.z.string().regex(/^\d+(?:\.\d+)*$/, "Use a numeric iOS build number").max(50).nullable().optional());
 const appSpecsBaseSchema = {
     // App Identity
     appName: zod_1.z.string().min(1).max(100),
@@ -39,6 +41,11 @@ const appSpecsBaseSchema = {
     developmentBaseUrl: zod_1.z.string().url(),
     stagingBaseUrl: zod_1.z.string().url(),
     productionBaseUrl: zod_1.z.string().url(),
+    minimumAndroidAppVersion: optionalAppVersion,
+    minimumAndroidAppBuild: zod_1.z.number().int().min(1).max(2100000000).nullable().optional(),
+    minimumIosAppVersion: optionalAppVersion,
+    minimumIosAppBuild: optionalIosBuild,
+    forceUpdateMessage: zod_1.z.string().max(1000).nullable().optional(),
     runtimeConfig: zod_1.z.object({
         googleWebClientId: zod_1.z.string().max(255).optional(),
         paidAccessActivated: zod_1.z.boolean().optional(),
@@ -78,8 +85,6 @@ const appSpecsBaseSchema = {
             paymentPlansPageSize: zod_1.z.number().int().min(1).max(100).optional(),
             maximumPageSize: zod_1.z.number().int().min(1).max(100).optional(),
         }).optional(),
-        minimumAppVersion: zod_1.z.string().max(30).optional(),
-        forceUpdateMessage: zod_1.z.string().nullable().optional(),
     }).optional(),
     // Legal Documents
     privacyPolicy: zod_1.z.string().nullable().optional(),

package/dist/validations/shared/shared.auth.validations.d.ts CHANGED Viewed

@@ -98,7 +98,7 @@ export declare const registerSchema: z.ZodObject<{
         firstName: string;
         lastName: string;
         password: string;
-        role: "RIDER" | "PASSENGER";
+        role: "PASSENGER" | "RIDER";
         contactValue: string;
         gender?: "male" | "female" | undefined;
         birthDate?: number | undefined;
@@ -113,14 +113,14 @@ export declare const registerSchema: z.ZodObject<{
         birthDate?: number | undefined;
         birthMonth?: number | undefined;
         birthYear?: number | undefined;
-        role?: "RIDER" | "PASSENGER" | undefined;
+        role?: "PASSENGER" | "RIDER" | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
     body: {
         firstName: string;
         lastName: string;
         password: string;
-        role: "RIDER" | "PASSENGER";
+        role: "PASSENGER" | "RIDER";
         contactValue: string;
         gender?: "male" | "female" | undefined;
         birthDate?: number | undefined;
@@ -137,7 +137,7 @@ export declare const registerSchema: z.ZodObject<{
         birthDate?: number | undefined;
         birthMonth?: number | undefined;
         birthYear?: number | undefined;
-        role?: "RIDER" | "PASSENGER" | undefined;
+        role?: "PASSENGER" | "RIDER" | undefined;
     };
 }>;
 export declare const riderPasswordRegex: RegExp;
@@ -362,7 +362,7 @@ export declare const createUserSchema: z.ZodObject<{
         firstName: string;
         lastName: string;
         password: string;
-        role: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN";
+        role: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN";
         contactValue: string;
         jacketId?: string | undefined;
         plateNumber?: string | undefined;
@@ -374,7 +374,7 @@ export declare const createUserSchema: z.ZodObject<{
         firstName: string;
         lastName: string;
         password: string;
-        role: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN";
+        role: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN";
         contactValue: string;
         jacketId?: string | undefined;
         plateNumber?: string | undefined;
@@ -388,7 +388,7 @@ export declare const createUserSchema: z.ZodObject<{
         firstName: string;
         lastName: string;
         password: string;
-        role: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN";
+        role: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN";
         contactValue: string;
         jacketId?: string | undefined;
         plateNumber?: string | undefined;
@@ -402,7 +402,7 @@ export declare const createUserSchema: z.ZodObject<{
         firstName: string;
         lastName: string;
         password: string;
-        role: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN";
+        role: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN";
         contactValue: string;
         jacketId?: string | undefined;
         plateNumber?: string | undefined;

package/dist/validations/shared/shared.profiles.validations.d.ts CHANGED Viewed

@@ -26,7 +26,7 @@ export declare const createUserSchema: z.ZodObject<{
         birthDate: number;
         birthMonth: number;
         birthYear: number;
-        role: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN";
+        role: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN";
         contactValue: string;
         jacketId?: string | null | undefined;
         password?: string | undefined;
@@ -38,7 +38,7 @@ export declare const createUserSchema: z.ZodObject<{
         birthDate: number;
         birthMonth: number;
         birthYear: number;
-        role: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN";
+        role: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN";
         contactValue: string;
         jacketId?: string | null | undefined;
         password?: string | undefined;
@@ -50,7 +50,7 @@ export declare const createUserSchema: z.ZodObject<{
         birthDate: number;
         birthMonth: number;
         birthYear: number;
-        role: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN";
+        role: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN";
         contactValue: string;
         jacketId?: string | null | undefined;
         password?: string | undefined;
@@ -62,7 +62,7 @@ export declare const createUserSchema: z.ZodObject<{
         birthDate: number;
         birthMonth: number;
         birthYear: number;
-        role: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN";
+        role: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN";
         contactValue: string;
         jacketId?: string | null | undefined;
         password?: string | undefined;
@@ -83,7 +83,7 @@ export declare const createUserSchema: z.ZodObject<{
         birthDate: number;
         birthMonth: number;
         birthYear: number;
-        role: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN";
+        role: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN";
         contactValue: string;
         jacketId?: string | null | undefined;
         password?: string | undefined;
@@ -100,7 +100,7 @@ export declare const createUserSchema: z.ZodObject<{
         birthDate: number;
         birthMonth: number;
         birthYear: number;
-        role: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN";
+        role: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN";
         contactValue: string;
         jacketId?: string | null | undefined;
         password?: string | undefined;
@@ -303,7 +303,7 @@ export declare const getAllUsersSchema: z.ZodObject<{
         gender?: "male" | "female" | undefined;
         isActive?: boolean | undefined;
         isDeactivated?: boolean | undefined;
-        role?: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN" | undefined;
+        role?: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN" | undefined;
         page?: number | undefined;
         contactType?: "EMAIL" | "PHONE" | "WHATSAPP" | undefined;
         startDate?: string | undefined;
@@ -315,7 +315,7 @@ export declare const getAllUsersSchema: z.ZodObject<{
         gender?: "male" | "female" | undefined;
         isActive?: "true" | "false" | undefined;
         isDeactivated?: "true" | "false" | undefined;
-        role?: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN" | undefined;
+        role?: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN" | undefined;
         page?: string | undefined;
         contactType?: "EMAIL" | "PHONE" | "WHATSAPP" | undefined;
         startDate?: string | undefined;
@@ -338,7 +338,7 @@ export declare const getAllUsersSchema: z.ZodObject<{
         gender?: "male" | "female" | undefined;
         isActive?: boolean | undefined;
         isDeactivated?: boolean | undefined;
-        role?: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN" | undefined;
+        role?: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN" | undefined;
         page?: number | undefined;
         contactType?: "EMAIL" | "PHONE" | "WHATSAPP" | undefined;
         startDate?: string | undefined;
@@ -355,7 +355,7 @@ export declare const getAllUsersSchema: z.ZodObject<{
         gender?: "male" | "female" | undefined;
         isActive?: "true" | "false" | undefined;
         isDeactivated?: "true" | "false" | undefined;
-        role?: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN" | undefined;
+        role?: "ADMIN" | "PASSENGER" | "RIDER" | "AGENT" | "SUPER_ADMIN" | undefined;
         page?: string | undefined;
         contactType?: "EMAIL" | "PHONE" | "WHATSAPP" | undefined;
         startDate?: string | undefined;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "vr-commons",
-  "version": "1.0.187",
+  "version": "1.0.189",
   "description": "Shared functions package",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -103,7 +103,7 @@
     "rimraf": "^5.0.5",
     "streamifier": "^0.1.1",
     "typescript": "^5.3.3",
-    "vr-models": "^1.0.109",
+    "vr-models": "^1.0.119",
     "zod": "^3.25.20"
   },
   "dependencies": {