vr-commons 1.0.85 → 1.0.86

package/dist/utils/profiles.utils.d.ts

@@ -150,8 +150,12 @@ export declare const getSortOrder: (sortBy?: string, order?: string) => any[];
  * Generate unique jacket ID
  */
 export declare const generateJacketId: () => Promise<string>;
+export interface ValidationError {
+    field: string;
+    message: string;
+}
 /**
- * Validate unique user fields
+ * Validate unique user fields (phone number is in PhoneContact table)
  */
 export declare const validateUniqueFields: (fields: {
     phoneNumber?: string;

package/dist/utils/profiles.utils.js

@@ -381,41 +381,62 @@ const generateJacketId = async () => {
     return jacketId;
 };
 exports.generateJacketId = generateJacketId;
-// ============================================================================
-// VALIDATION FUNCTIONS
-// ============================================================================
 /**
- * Validate unique user fields
+ * Validate unique user fields (phone number is in PhoneContact table)
  */
 const validateUniqueFields = async (fields, excludeUserId) => {
     const errors = [];
-    for (const [field, value] of Object.entries(fields)) {
-        if (!value)
-            continue;
-        const where = { [field]: value };
+    // Check phone number (in PhoneContact table)
+    if (fields.phoneNumber) {
+        const phoneWhere = { phoneNumber: fields.phoneNumber, isActive: true };
         if (excludeUserId) {
-            where.id = { [sequelize_1.Op.ne]: excludeUserId };
+            phoneWhere.userId = { [sequelize_1.Op.ne]: excludeUserId };
         }
-        const existing = await vr_models_1.User.findOne({ where });
-        if (existing) {
-            let message = "";
-            switch (field) {
-                case "phoneNumber":
-                    message = "Phone number already registered";
-                    break;
-                case "nationalId":
-                    message = "National ID already registered";
-                    break;
-                case "email":
-                    message = "Email already registered";
-                    break;
-                case "jacketId":
-                    message = "Jacket ID already taken";
-                    break;
-                default:
-                    message = `${field} already exists`;
-            }
-            errors.push({ field, message });
+        const existingPhone = await vr_models_1.PhoneContact.findOne({
+            where: phoneWhere,
+            include: [{ model: vr_models_1.User, as: "user", attributes: ["id"] }],
+        });
+        if (existingPhone && existingPhone.userId !== excludeUserId) {
+            errors.push({
+                field: "phoneNumber",
+                message: "Phone number already registered",
+            });
+        }
+    }
+    // Check nationalId (on User model)
+    if (fields.nationalId) {
+        const userWhere = { nationalId: fields.nationalId };
+        if (excludeUserId) {
+            userWhere.id = { [sequelize_1.Op.ne]: excludeUserId };
+        }
+        const existingUser = await vr_models_1.User.findOne({ where: userWhere });
+        if (existingUser) {
+            errors.push({
+                field: "nationalId",
+                message: "National ID already registered",
+            });
+        }
+    }
+    // Check email (on User model)
+    if (fields.email) {
+        const userWhere = { email: fields.email };
+        if (excludeUserId) {
+            userWhere.id = { [sequelize_1.Op.ne]: excludeUserId };
+        }
+        const existingUser = await vr_models_1.User.findOne({ where: userWhere });
+        if (existingUser) {
+            errors.push({ field: "email", message: "Email already registered" });
+        }
+    }
+    // Check jacketId (on User model)
+    if (fields.jacketId) {
+        const userWhere = { jacketId: fields.jacketId };
+        if (excludeUserId) {
+            userWhere.id = { [sequelize_1.Op.ne]: excludeUserId };
+        }
+        const existingUser = await vr_models_1.User.findOne({ where: userWhere });
+        if (existingUser) {
+            errors.push({ field: "jacketId", message: "Jacket ID already taken" });
         }
     }
     return errors;

package/dist/validations/auth.validations.d.ts

@@ -1,37 +1,6 @@
 import { z } from "zod";
 export declare const phoneRegex: RegExp;
 export declare const passwordRegex: RegExp;
-export declare const riderLoginSchema: z.ZodObject<{
-    body: z.ZodObject<{
-        phoneNumber: z.ZodString;
-        nationalId: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        phoneNumber: string;
-        nationalId: string;
-    }, {
-        phoneNumber: string;
-        nationalId: string;
-    }>;
-    query: z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>;
-    params: z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>;
-    headers: z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>;
-}, "strip", z.ZodTypeAny, {
-    body: {
-        phoneNumber: string;
-        nationalId: string;
-    };
-    params?: {} | undefined;
-    query?: {} | undefined;
-    headers?: {} | undefined;
-}, {
-    body: {
-        phoneNumber: string;
-        nationalId: string;
-    };
-    params?: {} | undefined;
-    query?: {} | undefined;
-    headers?: {} | undefined;
-}>;
 export declare const userLoginSchema: z.ZodObject<{
     body: z.ZodObject<{
         email: z.ZodString;
@@ -71,6 +40,28 @@ export declare const forgotPasswordSchema: z.ZodObject<{
         email: string;
     };
 }>;
+export declare const changePasswordSchema: z.ZodObject<{
+    body: z.ZodObject<{
+        oldPassword: z.ZodString;
+        newPassword: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        oldPassword: string;
+        newPassword: string;
+    }, {
+        oldPassword: string;
+        newPassword: string;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    body: {
+        oldPassword: string;
+        newPassword: string;
+    };
+}, {
+    body: {
+        oldPassword: string;
+        newPassword: string;
+    };
+}>;
 export declare const refreshTokenSchema: z.ZodObject<{
     body: z.ZodObject<{
         refreshToken: z.ZodString;
@@ -96,35 +87,66 @@ export declare const registerSchema: z.ZodObject<{
         email: z.ZodOptional<z.ZodString>;
         password: z.ZodString;
     }, "strict", z.ZodTypeAny, {
-        phoneNumber: string;
         password: string;
         firstName: string;
         lastName: string;
+        phoneNumber: string;
         email?: string | undefined;
     }, {
-        phoneNumber: string;
         password: string;
         firstName: string;
         lastName: string;
+        phoneNumber: string;
         email?: string | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
     body: {
-        phoneNumber: string;
         password: string;
         firstName: string;
         lastName: string;
+        phoneNumber: string;
         email?: string | undefined;
     };
 }, {
     body: {
-        phoneNumber: string;
         password: string;
         firstName: string;
         lastName: string;
+        phoneNumber: string;
         email?: string | undefined;
     };
 }>;
+export declare const riderLoginSchema: z.ZodObject<{
+    body: z.ZodObject<{
+        phoneNumber: z.ZodString;
+        nationalId: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        phoneNumber: string;
+        nationalId: string;
+    }, {
+        phoneNumber: string;
+        nationalId: string;
+    }>;
+    query: z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>;
+    params: z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>;
+    headers: z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>;
+}, "strip", z.ZodTypeAny, {
+    body: {
+        phoneNumber: string;
+        nationalId: string;
+    };
+    params?: {} | undefined;
+    query?: {} | undefined;
+    headers?: {} | undefined;
+}, {
+    body: {
+        phoneNumber: string;
+        nationalId: string;
+    };
+    params?: {} | undefined;
+    query?: {} | undefined;
+    headers?: {} | undefined;
+}>;
 export declare const requestOtpSchema: z.ZodObject<{
     body: z.ZodObject<{
         phoneNumber: z.ZodString;

package/dist/validations/auth.validations.js

@@ -1,22 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resendOtpSchema = exports.verifyOtpSchema = exports.requestOtpSchema = exports.registerSchema = exports.refreshTokenSchema = exports.forgotPasswordSchema = exports.userLoginSchema = exports.riderLoginSchema = exports.passwordRegex = exports.phoneRegex = void 0;
+exports.resendOtpSchema = exports.verifyOtpSchema = exports.requestOtpSchema = exports.riderLoginSchema = exports.registerSchema = exports.refreshTokenSchema = exports.changePasswordSchema = exports.forgotPasswordSchema = exports.userLoginSchema = exports.passwordRegex = exports.phoneRegex = void 0;
+// src/validations/auth.schema.ts
 const zod_1 = require("zod");
 exports.phoneRegex = /^\+250(78|79|73|72)[0-9]{7}$/;
 exports.passwordRegex = /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{6,}$/;
-exports.riderLoginSchema = zod_1.z.object({
-    body: zod_1.z.object({
-        phoneNumber: zod_1.z
-            .string()
-            .trim()
-            .min(10, "Phone number must be at least 10 digits")
-            .max(15, "Phone number must be at most 15 digits"),
-        nationalId: zod_1.z.string().min(16, "National ID must be atleast 16 digits"),
-    }),
-    query: zod_1.z.object({}).optional(),
-    params: zod_1.z.object({}).optional(),
-    headers: zod_1.z.object({}).optional(),
-});
+// ==================== ADMIN AUTH VALIDATIONS ====================
 exports.userLoginSchema = zod_1.z.object({
     body: zod_1.z.object({
         email: zod_1.z.string().email(),
@@ -28,6 +17,14 @@ exports.forgotPasswordSchema = zod_1.z.object({
         email: zod_1.z.string().email(),
     }),
 });
+exports.changePasswordSchema = zod_1.z.object({
+    body: zod_1.z.object({
+        oldPassword: zod_1.z.string().min(1, "Old password is required"),
+        newPassword: zod_1.z
+            .string()
+            .regex(exports.passwordRegex, "Password must be at least 6 characters with at least one letter and one number"),
+    }),
+});
 exports.refreshTokenSchema = zod_1.z.object({
     body: zod_1.z.object({
         refreshToken: zod_1.z.string().min(1, "Refresh token is required"),
@@ -52,6 +49,20 @@ exports.registerSchema = zod_1.z.object({
     })
         .strict(),
 });
+// ==================== USER (RIDER/PASSENGER) AUTH VALIDATIONS ====================
+exports.riderLoginSchema = zod_1.z.object({
+    body: zod_1.z.object({
+        phoneNumber: zod_1.z
+            .string()
+            .trim()
+            .min(10, "Phone number must be at least 10 digits")
+            .max(15, "Phone number must be at most 15 digits"),
+        nationalId: zod_1.z.string().min(16, "National ID must be atleast 16 digits"),
+    }),
+    query: zod_1.z.object({}).optional(),
+    params: zod_1.z.object({}).optional(),
+    headers: zod_1.z.object({}).optional(),
+});
 exports.requestOtpSchema = zod_1.z.object({
     body: zod_1.z.object({
         phoneNumber: zod_1.z
@@ -76,8 +87,6 @@ exports.verifyOtpSchema = zod_1.z.object({
             .optional(),
     })
         .refine((data) => {
-        // If it's a new user, firstName and lastName are required
-        // We'll check this in service by checking if user exists
         return true;
     }, {
         message: "First name and last name are required for new users",

package/dist/validations/devices.validations.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extendSessionSchema = exports.unlockDeviceSchema = void 0;
 const zod_1 = require("zod");
-const serialRegex = /^[A-Z0-9]{8,32}$/i;
+const serialRegex = /^[A-Z0-9]{8,24}$/i;
 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.85",
+  "version": "1.0.86",
   "description": "Shared functions package",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",