vr-commons 1.0.113 → 1.0.115

package/dist/validations/users.admin.validations.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resetPasswordSchema = exports.updateAdminSchema = exports.fireEmployeeSchema = exports.demoteAdminSchema = exports.promoteAdminSchema = exports.hireAdminSchema = exports.getUsersSchema = exports.getUserSchema = exports.deleteUserSchema = exports.updateRiderSchema = exports.upgradeToRiderSchema = void 0;
+exports.setUserPrimaryContactSchema = exports.deleteUserContactSchema = exports.verifyUserContactSchema = exports.addUserContactSchema = exports.bulkResetPasswordsSchema = exports.resetPasswordSchema = exports.updateAdminSchema = exports.fireEmployeeSchema = exports.demoteAdminSchema = exports.promoteAdminSchema = exports.hireAdminSchema = exports.getUsersSchema = exports.getUserSchema = exports.deleteUserSchema = exports.updateRiderSchema = exports.upgradeToRiderSchema = void 0;
 // src/validations/users.validations.ts
 const zod_1 = require("zod");
 const auth_validations_1 = require("./auth.validations");
@@ -10,15 +10,23 @@ const isValidBirthDate = (date, month, year) => {
     const maxDays = new Date(year, month, 0).getDate();
     return date >= 1 && date <= maxDays;
 };
-// Operations Schemas
+// ============================================================================
+// OPERATIONS SCHEMAS
+// ============================================================================
+// Upgrade Passenger to Rider
 exports.upgradeToRiderSchema = zod_1.z.object({
     params: zod_1.z.object({
         userId: zod_1.z.string().uuid("Invalid user ID format"),
     }),
     body: zod_1.z
         .object({
-        jacketId: zod_1.z.string().regex(profiles_validations_1.jacketIdRegex, "invalid jacket id"),
-        phoneNumber: zod_1.z.string().regex(auth_validations_1.phoneRegex, "Invalid phone number format"),
+        jacketId: zod_1.z.string().regex(profiles_validations_1.jacketIdRegex, "Invalid jacket ID format"),
+        contactValue: zod_1.z
+            .string()
+            .min(1, "Email or phone number is required")
+            .refine((val) => (0, auth_validations_1.validateContactValue)(val), {
+            message: "Invalid contact value. Must be a valid email or Rwandan phone number (+250...)",
+        }),
         plateNumber: zod_1.z.string().min(3).max(10).optional(),
         gender: zod_1.z.enum(["male", "female"], {
             errorMap: () => ({
@@ -36,6 +44,7 @@ exports.upgradeToRiderSchema = zod_1.z.object({
         path: ["birthDate"],
     }),
 });
+// Update Rider
 exports.updateRiderSchema = zod_1.z.object({
     params: zod_1.z.object({
         userId: zod_1.z.string().uuid("Invalid user ID format"),
@@ -44,10 +53,17 @@ exports.updateRiderSchema = zod_1.z.object({
         .object({
         firstName: zod_1.z.string().min(2).max(100).optional(),
         lastName: zod_1.z.string().min(2).max(100).optional(),
-        phoneNumber: zod_1.z.string().regex(auth_validations_1.phoneRegex).optional(),
-        jacketId: zod_1.z.string().min(5).max(20).optional(),
+        contactValue: zod_1.z
+            .string()
+            .refine((val) => (0, auth_validations_1.validateContactValue)(val), {
+            message: "Invalid contact value. Must be a valid email or Rwandan phone number (+250...)",
+        })
+            .optional(),
+        jacketId: zod_1.z
+            .string()
+            .regex(profiles_validations_1.jacketIdRegex, "Invalid jacket ID format")
+            .optional(),
         plateNumber: zod_1.z.string().min(3).max(10).optional(),
-        email: zod_1.z.string().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(),
@@ -73,16 +89,19 @@ exports.updateRiderSchema = zod_1.z.object({
         path: ["birthDate"],
     }),
 });
+// Delete User (Permanent)
 exports.deleteUserSchema = zod_1.z.object({
     params: zod_1.z.object({
         userId: zod_1.z.string().uuid("Invalid user ID format"),
     }),
 });
+// Get Single User
 exports.getUserSchema = zod_1.z.object({
     params: zod_1.z.object({
         userId: zod_1.z.string().uuid("Invalid user ID format"),
     }),
 });
+// Get All Users (with pagination)
 exports.getUsersSchema = zod_1.z.object({
     query: zod_1.z.object({
         page: zod_1.z.string().regex(/^\d+$/).transform(Number).optional(),
@@ -92,19 +111,29 @@ exports.getUsersSchema = zod_1.z.object({
         isDeactivated: zod_1.z.enum(["true", "false"]).optional(),
         role: zod_1.z.string().optional(),
         gender: zod_1.z.enum(["male", "female"]).optional(),
+        contactType: zod_1.z.enum(["EMAIL", "PHONE", "WHATSAPP"]).optional(),
         sortBy: zod_1.z.enum(["createdAt", "firstName", "lastName", "gender"]).optional(),
         sortOrder: zod_1.z.enum(["ASC", "DESC"]).optional(),
     }),
 });
-// Management Schemas
+// ============================================================================
+// MANAGEMENT SCHEMAS
+// ============================================================================
+// Hire Admin (Agent, Admin, Super Admin)
 exports.hireAdminSchema = zod_1.z.object({
     body: zod_1.z
         .object({
-        email: zod_1.z.string().email(),
+        contactValue: zod_1.z
+            .string()
+            .min(1, "Email or phone number is required")
+            .refine((val) => (0, auth_validations_1.validateContactValue)(val), {
+            message: "Invalid contact value. Must be a valid email or Rwandan phone number (+250...)",
+        }),
         firstName: zod_1.z.string().min(2).max(100),
         lastName: zod_1.z.string().min(2).max(100),
-        phoneNumber: zod_1.z.string().regex(auth_validations_1.phoneRegex),
-        password: zod_1.z.string().min(6),
+        password: zod_1.z
+            .string()
+            .regex(auth_validations_1.strongPasswordRegex, "Password must be at least 8 characters, include 1 uppercase letter, 1 number and 1 symbol"),
         role: zod_1.z.enum(["AGENT", "ADMIN", "SUPER_ADMIN"]),
         superAdminPassword: zod_1.z.string().optional(),
         gender: zod_1.z.enum(["male", "female"], {
@@ -133,6 +162,7 @@ exports.hireAdminSchema = zod_1.z.object({
         path: ["birthDate"],
     }),
 });
+// Promote Admin
 exports.promoteAdminSchema = zod_1.z.object({
     params: zod_1.z.object({
         userId: zod_1.z.string().uuid("Invalid user ID format"),
@@ -142,6 +172,7 @@ exports.promoteAdminSchema = zod_1.z.object({
         password: zod_1.z.string().optional(),
     }),
 });
+// Demote Admin
 exports.demoteAdminSchema = zod_1.z.object({
     params: zod_1.z.object({
         userId: zod_1.z.string().uuid("Invalid user ID format"),
@@ -150,14 +181,16 @@ exports.demoteAdminSchema = zod_1.z.object({
         targetRole: zod_1.z.enum(["AGENT", "ADMIN"]),
     }),
 });
+// Fire Employee
 exports.fireEmployeeSchema = zod_1.z.object({
     params: zod_1.z.object({
         userId: zod_1.z.string().uuid("Invalid user ID format"),
     }),
     body: zod_1.z.object({
-        reason: zod_1.z.string().min(1).optional(),
+        reason: zod_1.z.string().min(1, "Reason is required").optional(),
     }),
 });
+// Update Admin
 exports.updateAdminSchema = zod_1.z.object({
     params: zod_1.z.object({
         userId: zod_1.z.string().uuid("Invalid user ID format"),
@@ -166,7 +199,12 @@ exports.updateAdminSchema = zod_1.z.object({
         .object({
         firstName: zod_1.z.string().min(2).max(100).optional(),
         lastName: zod_1.z.string().min(2).max(100).optional(),
-        email: zod_1.z.string().email().optional(),
+        contactValue: zod_1.z
+            .string()
+            .refine((val) => (0, auth_validations_1.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(),
@@ -192,8 +230,62 @@ exports.updateAdminSchema = zod_1.z.object({
         path: ["birthDate"],
     }),
 });
+// Reset Password (Admin)
 exports.resetPasswordSchema = zod_1.z.object({
     params: zod_1.z.object({
         userId: zod_1.z.string().uuid("Invalid user ID format"),
     }),
 });
+// Bulk Reset Passwords (Super Admin only)
+exports.bulkResetPasswordsSchema = zod_1.z.object({
+    body: zod_1.z.object({
+        userIds: zod_1.z.array(zod_1.z.string().uuid("Invalid user ID format")).optional(),
+        allUsers: zod_1.z.boolean().optional(),
+    }),
+    headers: zod_1.z.object({
+        authorization: zod_1.z.string().regex(/^Bearer /, {
+            message: "Authorization header must start with 'Bearer '",
+        }),
+    }),
+});
+// ============================================================================
+// CONTACT MANAGEMENT SCHEMAS
+// ============================================================================
+// Add Contact to User (Admin)
+exports.addUserContactSchema = zod_1.z.object({
+    params: zod_1.z.object({
+        userId: zod_1.z.string().uuid("Invalid user ID format"),
+    }),
+    body: zod_1.z.object({
+        contactValue: zod_1.z
+            .string()
+            .min(1, "Email or phone number is required")
+            .refine((val) => (0, auth_validations_1.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(),
+        isVerified: zod_1.z.boolean().default(false).optional(),
+        isPrimary: zod_1.z.boolean().default(false).optional(),
+    }),
+});
+// Verify User Contact (Admin)
+exports.verifyUserContactSchema = zod_1.z.object({
+    params: zod_1.z.object({
+        userId: zod_1.z.string().uuid("Invalid user ID format"),
+        contactId: zod_1.z.string().uuid("Invalid contact ID format"),
+    }),
+});
+// Delete User Contact (Admin)
+exports.deleteUserContactSchema = zod_1.z.object({
+    params: zod_1.z.object({
+        userId: zod_1.z.string().uuid("Invalid user ID format"),
+        contactId: zod_1.z.string().uuid("Invalid contact ID format"),
+    }),
+});
+// Set Primary Contact (Admin)
+exports.setUserPrimaryContactSchema = zod_1.z.object({
+    params: zod_1.z.object({
+        userId: zod_1.z.string().uuid("Invalid user ID format"),
+        contactId: zod_1.z.string().uuid("Invalid contact ID format"),
+    }),
+});

package/package.json

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