vr-commons 1.0.112 → 1.0.114

package/dist/validations/profiles.validations.js

@@ -1,13 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.jacketIdRegex = exports.phoneNumberRegex = void 0;
+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");
 // ============================================================================
 // COMMON VALIDATIONS
 // ============================================================================
-exports.phoneNumberRegex = /^\+?[0-9]{10,15}$/;
+exports.phoneNumberRegex = /^\+250(78|79|73|72)[0-9]{7}$/;
+exports.emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
 exports.jacketIdRegex = /^JKT-\d{9}$/;
-const phoneRegex = /^\+250(78|79|73|72)[0-9]{7}$/;
+const plateRegex = /^[A-Z0-9]{3,10}$/i;
+exports.strongPasswordRegex = /^(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&#^()_\-+=])[A-Za-z\d@$!%*?&#^()_\-+=]{8,}$/;
+// ============================================================================
+// CONTACT VALIDATION HELPERS
+// ============================================================================
+const detectContactType = (value) => {
+    if (!value)
+        return "UNKNOWN";
+    if (exports.emailRegex.test(value)) {
+        return "EMAIL";
+    }
+    if (exports.phoneNumberRegex.test(value)) {
+        return "PHONE";
+    }
+    return "UNKNOWN";
+};
+exports.detectContactType = detectContactType;
+const validateContactValue = (value) => {
+    return exports.emailRegex.test(value) || exports.phoneNumberRegex.test(value);
+};
+exports.validateContactValue = validateContactValue;
 // Birth date validation helpers
 const isValidBirthDate = (date, month, year) => {
     const maxDays = new Date(year, month, 0).getDate();
@@ -28,25 +49,22 @@ exports.createUserSchema = zod_1.z.object({
             .string()
             .min(2, "Last name must be at least 2 characters")
             .max(100, "Last name cannot exceed 100 characters"),
-        phoneNumber: zod_1.z
+        contactValue: zod_1.z
             .string()
-            .regex(exports.phoneNumberRegex, "Phone number must be a valid Rwandan number (078/079/072/073) followed by 7 digits"),
-        email: zod_1.z
-            .string()
-            .email("Invalid email address")
-            .optional()
-            .nullable()
-            .or(zod_1.z.literal("")),
+            .min(1, "Email or phone number is required")
+            .refine((val) => (0, exports.validateContactValue)(val), {
+            message: "Invalid contact value. Must be a valid email or Rwandan phone number (+250...)",
+        }),
         password: zod_1.z
             .string()
-            .min(6, "Password must be at least 6 characters")
-            .max(100, "Password cannot exceed 100 characters")
+            .regex(exports.strongPasswordRegex, "Password must be at least 8 characters, include 1 uppercase letter, 1 number and 1 symbol")
             .optional(),
         role: zod_1.z.enum(["AGENT", "RIDER", "PASSENGER", "ADMIN", "SUPER_ADMIN"], {
             errorMap: () => ({ message: "Invalid role specified" }),
         }),
         plateNumber: zod_1.z
             .string()
+            .regex(plateRegex, "Invalid plate number format")
             .max(20, "Plate number cannot exceed 20 characters")
             .optional()
             .nullable(),
@@ -104,28 +122,23 @@ exports.updateUserProfileSchema = zod_1.z.object({
             .min(2, "Last name must be at least 2 characters")
             .max(100, "Last name cannot exceed 100 characters")
             .optional(),
-        email: zod_1.z
-            .string()
-            .email("Invalid email address")
-            .optional()
-            .nullable()
-            .or(zod_1.z.literal("")),
-        phoneNumber: zod_1.z
+        contactValue: zod_1.z
             .string()
-            .regex(exports.phoneNumberRegex, "Invalid phone number format")
+            .refine((val) => (0, exports.validateContactValue)(val), {
+            message: "Invalid contact value. Must be a valid email or Rwandan phone number (+250...)",
+        })
             .optional(),
         plateNumber: zod_1.z
             .string()
+            .regex(plateRegex, "Invalid plate number format")
             .max(20, "Plate number cannot exceed 20 characters")
             .optional()
             .nullable(),
         isActive: zod_1.z.boolean().optional(),
-        isSuspended: zod_1.z.boolean().optional(),
         isDeactivated: zod_1.z.boolean().optional(),
         password: zod_1.z
             .string()
-            .min(6, "Password must be at least 6 characters")
-            .max(100, "Password cannot exceed 100 characters")
+            .regex(exports.strongPasswordRegex, "Password must be at least 8 characters, include 1 uppercase letter, 1 number and 1 symbol")
             .optional(),
         gender: zod_1.z.enum(["male", "female"]).optional(),
         birthDate: zod_1.z.number().min(1).max(31).optional(),
@@ -172,15 +185,12 @@ exports.getAllUsersSchema = zod_1.z.object({
             .enum(["true", "false"])
             .transform((val) => val === "true")
             .optional(),
-        isSuspended: zod_1.z
-            .enum(["true", "false"])
-            .transform((val) => val === "true")
-            .optional(),
-        isBanned: zod_1.z
+        isDeactivated: zod_1.z
             .enum(["true", "false"])
             .transform((val) => val === "true")
             .optional(),
         gender: zod_1.z.enum(["male", "female"]).optional(),
+        contactType: zod_1.z.enum(["EMAIL", "PHONE", "WHATSAPP"]).optional(),
         search: zod_1.z.string().optional(),
         startDate: zod_1.z.string().optional(),
         endDate: zod_1.z.string().optional(),
@@ -224,27 +234,24 @@ exports.passengerSignupSchema = zod_1.z.object({
             .string()
             .min(2, "Last name must be at least 2 characters")
             .max(100, "Last name cannot exceed 100 characters"),
-        phoneNumber: zod_1.z
+        contactValue: zod_1.z
             .string()
-            .regex(exports.phoneNumberRegex, "Phone number must be a valid Rwandan number (078/079/072/073) followed by 7 digits"),
+            .min(1, "Email or phone number is required")
+            .refine((val) => (0, exports.validateContactValue)(val), {
+            message: "Invalid contact value. Must be a valid email or Rwandan phone number (+250...)",
+        }),
         jacketId: zod_1.z
             .string()
             .regex(exports.jacketIdRegex, "Jacket ID must be in format JKT-000000000")
             .optional(),
-        email: zod_1.z
-            .string()
-            .email("Invalid email address")
-            .optional()
-            .nullable()
-            .or(zod_1.z.literal("")),
         password: zod_1.z
             .string()
-            .min(6, "Password must be at least 6 characters")
-            .max(100, "Password cannot exceed 100 characters")
+            .regex(exports.strongPasswordRegex, "Password must be at least 8 characters, include 1 uppercase letter, 1 number and 1 symbol")
             .optional()
             .nullable(),
         plateNumber: zod_1.z
             .string()
+            .regex(plateRegex, "Invalid plate number format")
             .max(20, "Plate number cannot exceed 20 characters")
             .optional()
             .nullable(),
@@ -280,6 +287,12 @@ exports.updatePassengerProfileSchema = zod_1.z.object({
             .min(2, "Last name must be at least 2 characters")
             .max(100, "Last name cannot exceed 100 characters")
             .optional(),
+        contactValue: zod_1.z
+            .string()
+            .refine((val) => (0, exports.validateContactValue)(val), {
+            message: "Invalid contact value. Must be a valid email or Rwandan phone number (+250...)",
+        })
+            .optional(),
         gender: zod_1.z.enum(["male", "female"]).optional(),
         birthDate: zod_1.z.number().min(1).max(31).optional(),
         birthMonth: zod_1.z.number().min(1).max(12).optional(),
@@ -327,11 +340,15 @@ exports.createRiderSchema = zod_1.z.object({
             .string()
             .min(2, "Last name must be at least 2 characters")
             .max(100, "Last name cannot exceed 100 characters"),
-        phoneNumber: zod_1.z
+        contactValue: zod_1.z
             .string()
-            .regex(exports.phoneNumberRegex, "Phone number must be a valid Rwandan number (078/079/072/073) followed by 7 digits"),
+            .min(1, "Email or phone number is required")
+            .refine((val) => (0, exports.validateContactValue)(val), {
+            message: "Invalid contact value. Must be a valid email or Rwandan phone number (+250...)",
+        }),
         plateNumber: zod_1.z
             .string()
+            .regex(plateRegex, "Invalid plate number format")
             .max(20, "Plate number cannot exceed 20 characters"),
         jacketId: zod_1.z
             .string()
@@ -371,12 +388,15 @@ exports.updateRiderProfileSchema = zod_1.z.object({
             .min(2, "Last name must be at least 2 characters")
             .max(100, "Last name cannot exceed 100 characters")
             .optional(),
-        phoneNumber: zod_1.z
+        contactValue: zod_1.z
             .string()
-            .regex(exports.phoneNumberRegex, "Phone number must be a valid Rwandan number (078/079/072/073) followed by 7 digits")
+            .refine((val) => (0, exports.validateContactValue)(val), {
+            message: "Invalid contact value. Must be a valid email or Rwandan phone number (+250...)",
+        })
             .optional(),
         plateNumber: zod_1.z
             .string()
+            .regex(plateRegex, "Invalid plate number format")
             .max(20, "Plate number cannot exceed 20 characters")
             .optional(),
         jacketId: zod_1.z
@@ -456,16 +476,18 @@ exports.deleteAccountSchema = zod_1.z.object({
         }),
     }),
 });
+// Update Profile Schema (for users)
 exports.updateProfileSchema = zod_1.z.object({
     body: zod_1.z
         .object({
         firstName: zod_1.z.string().min(2).max(50).optional(),
         lastName: zod_1.z.string().min(2).max(50).optional(),
-        phoneNumber: zod_1.z
+        contactValue: zod_1.z
             .string()
-            .regex(phoneRegex, "Invalid phone number")
+            .refine((val) => (0, exports.validateContactValue)(val), {
+            message: "Invalid contact value. Must be a valid email or Rwandan phone number (+250...)",
+        })
             .optional(),
-        email: zod_1.z.string().email("Invalid email").optional(),
         gender: zod_1.z.enum(["male", "female"]).optional(),
         birthDate: zod_1.z.number().min(1).max(31).optional(),
         birthMonth: zod_1.z.number().min(1).max(12).optional(),
@@ -492,3 +514,70 @@ exports.updateProfileSchema = zod_1.z.object({
         path: ["birthDate"],
     }),
 });
+// ============================================================================
+// CONTACT MANAGEMENT SCHEMAS
+// ============================================================================
+// Add Contact Schema
+exports.addContactSchema = zod_1.z.object({
+    body: zod_1.z.object({
+        contactValue: zod_1.z
+            .string()
+            .min(1, "Email or phone number is required")
+            .refine((val) => (0, exports.validateContactValue)(val), {
+            message: "Invalid contact value. Must be a valid email or Rwandan phone number (+250...)",
+        }),
+        type: zod_1.z.enum(["EMAIL", "PHONE", "WHATSAPP"]).optional(),
+    }),
+    headers: zod_1.z.object({
+        authorization: zod_1.z.string().regex(/^Bearer /, {
+            message: "Authorization header must start with 'Bearer '",
+        }),
+    }),
+});
+// Verify Contact Schema (send OTP)
+exports.verifyContactSchema = zod_1.z.object({
+    params: 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 /, {
+            message: "Authorization header must start with 'Bearer '",
+        }),
+    }),
+});
+// Confirm Verification Schema
+exports.confirmVerificationSchema = zod_1.z.object({
+    body: zod_1.z.object({
+        otp: zod_1.z.string().length(6, "OTP must be 6 digits"),
+    }),
+    params: 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 /, {
+            message: "Authorization header must start with 'Bearer '",
+        }),
+    }),
+});
+// Delete Contact Schema
+exports.deleteContactSchema = zod_1.z.object({
+    params: 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 /, {
+            message: "Authorization header must start with 'Bearer '",
+        }),
+    }),
+});
+// Set Primary Contact Schema
+exports.setPrimaryContactSchema = zod_1.z.object({
+    params: 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 /, {
+            message: "Authorization header must start with 'Bearer '",
+        }),
+    }),
+});

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

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