vr-commons 1.0.113 → 1.0.114

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

@@ -1,43 +1,47 @@
 import { z } from "zod";
 export declare const phoneRegex: RegExp;
+export declare const emailRegex: RegExp;
 export declare const passwordRegex: RegExp;
+export declare const strongPasswordRegex: RegExp;
+export declare const detectContactType: (value: string) => "EMAIL" | "PHONE" | "WHATSAPP" | "UNKNOWN";
+export declare const validateContactValue: (value: string) => boolean;
 export declare const userLoginSchema: z.ZodObject<{
     body: z.ZodObject<{
-        email: z.ZodString;
+        contactValue: z.ZodEffects<z.ZodString, string, string>;
         password: z.ZodString;
     }, "strip", z.ZodTypeAny, {
         password: string;
-        email: string;
+        contactValue: string;
     }, {
         password: string;
-        email: string;
+        contactValue: string;
     }>;
 }, "strip", z.ZodTypeAny, {
     body: {
         password: string;
-        email: string;
+        contactValue: string;
     };
 }, {
     body: {
         password: string;
-        email: string;
+        contactValue: string;
     };
 }>;
 export declare const forgotPasswordSchema: z.ZodObject<{
     body: z.ZodObject<{
-        email: z.ZodString;
+        contactValue: z.ZodEffects<z.ZodString, string, string>;
     }, "strip", z.ZodTypeAny, {
-        email: string;
+        contactValue: string;
     }, {
-        email: string;
+        contactValue: string;
     }>;
 }, "strip", z.ZodTypeAny, {
     body: {
-        email: string;
+        contactValue: string;
     };
 }, {
     body: {
-        email: string;
+        contactValue: string;
     };
 }>;
 export declare const changePasswordSchema: z.ZodObject<{
@@ -83,143 +87,281 @@ export declare const registerSchema: z.ZodObject<{
     body: z.ZodObject<{
         firstName: z.ZodString;
         lastName: z.ZodString;
-        phoneNumber: z.ZodString;
-        email: z.ZodOptional<z.ZodString>;
+        contactValue: z.ZodEffects<z.ZodString, string, string>;
         password: z.ZodString;
+        role: z.ZodDefault<z.ZodOptional<z.ZodEnum<["PASSENGER", "RIDER"]>>>;
+        gender: z.ZodOptional<z.ZodEnum<["male", "female"]>>;
+        birthDate: z.ZodOptional<z.ZodNumber>;
+        birthMonth: z.ZodOptional<z.ZodNumber>;
+        birthYear: z.ZodOptional<z.ZodNumber>;
     }, "strict", z.ZodTypeAny, {
         firstName: string;
         lastName: string;
         password: string;
-        phoneNumber: string;
-        email?: string | undefined;
+        role: "RIDER" | "PASSENGER";
+        contactValue: string;
+        gender?: "male" | "female" | undefined;
+        birthDate?: number | undefined;
+        birthMonth?: number | undefined;
+        birthYear?: number | undefined;
     }, {
         firstName: string;
         lastName: string;
         password: string;
-        phoneNumber: string;
-        email?: string | undefined;
+        contactValue: string;
+        gender?: "male" | "female" | undefined;
+        birthDate?: number | undefined;
+        birthMonth?: number | undefined;
+        birthYear?: number | undefined;
+        role?: "RIDER" | "PASSENGER" | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
     body: {
         firstName: string;
         lastName: string;
         password: string;
-        phoneNumber: string;
-        email?: string | undefined;
+        role: "RIDER" | "PASSENGER";
+        contactValue: string;
+        gender?: "male" | "female" | undefined;
+        birthDate?: number | undefined;
+        birthMonth?: number | undefined;
+        birthYear?: number | undefined;
     };
 }, {
     body: {
         firstName: string;
         lastName: string;
         password: string;
-        phoneNumber: string;
-        email?: string | undefined;
+        contactValue: string;
+        gender?: "male" | "female" | undefined;
+        birthDate?: number | undefined;
+        birthMonth?: number | undefined;
+        birthYear?: number | undefined;
+        role?: "RIDER" | "PASSENGER" | undefined;
     };
 }>;
 export declare const riderLoginSchema: z.ZodObject<{
     body: z.ZodObject<{
-        phoneNumber: z.ZodString;
-        nationalId: z.ZodString;
+        contactValue: z.ZodEffects<z.ZodString, string, string>;
+        password: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        phoneNumber: string;
-        nationalId: string;
+        password: string;
+        contactValue: string;
     }, {
-        phoneNumber: string;
-        nationalId: string;
+        password: string;
+        contactValue: 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;
+        password: string;
+        contactValue: string;
     };
-    query?: {} | undefined;
     params?: {} | undefined;
+    query?: {} | undefined;
     headers?: {} | undefined;
 }, {
     body: {
-        phoneNumber: string;
-        nationalId: string;
+        password: string;
+        contactValue: string;
     };
-    query?: {} | undefined;
     params?: {} | undefined;
+    query?: {} | undefined;
     headers?: {} | undefined;
 }>;
 export declare const requestOtpSchema: z.ZodObject<{
     body: z.ZodObject<{
-        phoneNumber: z.ZodString;
+        contactValue: z.ZodEffects<z.ZodString, string, string>;
     }, "strip", z.ZodTypeAny, {
-        phoneNumber: string;
+        contactValue: string;
     }, {
-        phoneNumber: string;
+        contactValue: string;
     }>;
 }, "strip", z.ZodTypeAny, {
     body: {
-        phoneNumber: string;
+        contactValue: string;
     };
 }, {
     body: {
-        phoneNumber: string;
+        contactValue: string;
     };
 }>;
 export declare const verifyOtpSchema: z.ZodObject<{
     body: z.ZodEffects<z.ZodObject<{
-        phoneNumber: z.ZodString;
+        contactValue: z.ZodEffects<z.ZodString, string, string>;
         otp: z.ZodString;
         firstName: z.ZodOptional<z.ZodString>;
         lastName: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
+        contactValue: string;
         otp: string;
-        phoneNumber: string;
         firstName?: string | undefined;
         lastName?: string | undefined;
     }, {
+        contactValue: string;
         otp: string;
-        phoneNumber: string;
         firstName?: string | undefined;
         lastName?: string | undefined;
     }>, {
+        contactValue: string;
         otp: string;
-        phoneNumber: string;
         firstName?: string | undefined;
         lastName?: string | undefined;
     }, {
+        contactValue: string;
         otp: string;
-        phoneNumber: string;
         firstName?: string | undefined;
         lastName?: string | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
     body: {
+        contactValue: string;
         otp: string;
-        phoneNumber: string;
         firstName?: string | undefined;
         lastName?: string | undefined;
     };
 }, {
     body: {
+        contactValue: string;
         otp: string;
-        phoneNumber: string;
         firstName?: string | undefined;
         lastName?: string | undefined;
     };
 }>;
 export declare const resendOtpSchema: z.ZodObject<{
     body: z.ZodObject<{
-        phoneNumber: z.ZodString;
+        contactValue: z.ZodEffects<z.ZodString, string, string>;
+    }, "strip", z.ZodTypeAny, {
+        contactValue: string;
+    }, {
+        contactValue: string;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    body: {
+        contactValue: string;
+    };
+}, {
+    body: {
+        contactValue: string;
+    };
+}>;
+export declare const createUserSchema: z.ZodObject<{
+    body: z.ZodObject<{
+        firstName: z.ZodString;
+        lastName: z.ZodString;
+        contactValue: z.ZodEffects<z.ZodString, string, string>;
+        password: z.ZodString;
+        role: z.ZodEnum<["PASSENGER", "RIDER", "AGENT", "ADMIN", "SUPER_ADMIN"]>;
+        gender: z.ZodOptional<z.ZodEnum<["male", "female"]>>;
+        birthDate: z.ZodOptional<z.ZodNumber>;
+        birthMonth: z.ZodOptional<z.ZodNumber>;
+        birthYear: z.ZodOptional<z.ZodNumber>;
+        jacketId: z.ZodOptional<z.ZodString>;
+        plateNumber: z.ZodOptional<z.ZodString>;
+    }, "strip", z.ZodTypeAny, {
+        firstName: string;
+        lastName: string;
+        password: string;
+        role: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN";
+        contactValue: string;
+        jacketId?: string | undefined;
+        plateNumber?: string | undefined;
+        gender?: "male" | "female" | undefined;
+        birthDate?: number | undefined;
+        birthMonth?: number | undefined;
+        birthYear?: number | undefined;
+    }, {
+        firstName: string;
+        lastName: string;
+        password: string;
+        role: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN";
+        contactValue: string;
+        jacketId?: string | undefined;
+        plateNumber?: string | undefined;
+        gender?: "male" | "female" | undefined;
+        birthDate?: number | undefined;
+        birthMonth?: number | undefined;
+        birthYear?: number | undefined;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    body: {
+        firstName: string;
+        lastName: string;
+        password: string;
+        role: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN";
+        contactValue: string;
+        jacketId?: string | undefined;
+        plateNumber?: string | undefined;
+        gender?: "male" | "female" | undefined;
+        birthDate?: number | undefined;
+        birthMonth?: number | undefined;
+        birthYear?: number | undefined;
+    };
+}, {
+    body: {
+        firstName: string;
+        lastName: string;
+        password: string;
+        role: "RIDER" | "PASSENGER" | "ADMIN" | "AGENT" | "SUPER_ADMIN";
+        contactValue: string;
+        jacketId?: string | undefined;
+        plateNumber?: string | undefined;
+        gender?: "male" | "female" | undefined;
+        birthDate?: number | undefined;
+        birthMonth?: number | undefined;
+        birthYear?: number | undefined;
+    };
+}>;
+export declare const updateContactSchema: z.ZodObject<{
+    body: z.ZodObject<{
+        contactValue: z.ZodEffects<z.ZodString, string, string>;
+    }, "strip", z.ZodTypeAny, {
+        contactValue: string;
+    }, {
+        contactValue: string;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    body: {
+        contactValue: string;
+    };
+}, {
+    body: {
+        contactValue: string;
+    };
+}>;
+export declare const addContactSchema: z.ZodObject<{
+    body: z.ZodObject<{
+        contactValue: z.ZodEffects<z.ZodString, string, string>;
+        type: z.ZodOptional<z.ZodEnum<["EMAIL", "PHONE", "WHATSAPP"]>>;
     }, "strip", z.ZodTypeAny, {
-        phoneNumber: string;
+        contactValue: string;
+        type?: "EMAIL" | "PHONE" | "WHATSAPP" | undefined;
     }, {
-        phoneNumber: string;
+        contactValue: string;
+        type?: "EMAIL" | "PHONE" | "WHATSAPP" | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
     body: {
-        phoneNumber: string;
+        contactValue: string;
+        type?: "EMAIL" | "PHONE" | "WHATSAPP" | undefined;
     };
 }, {
     body: {
-        phoneNumber: string;
+        contactValue: string;
+        type?: "EMAIL" | "PHONE" | "WHATSAPP" | undefined;
     };
 }>;
+export type UserLoginSchema = z.infer<typeof userLoginSchema>;
+export type ForgotPasswordSchema = z.infer<typeof forgotPasswordSchema>;
+export type ChangePasswordSchema = z.infer<typeof changePasswordSchema>;
+export type RefreshTokenSchema = z.infer<typeof refreshTokenSchema>;
+export type RegisterSchema = z.infer<typeof registerSchema>;
+export type RiderLoginSchema = z.infer<typeof riderLoginSchema>;
+export type RequestOtpSchema = z.infer<typeof requestOtpSchema>;
+export type VerifyOtpSchema = z.infer<typeof verifyOtpSchema>;
+export type ResendOtpSchema = z.infer<typeof resendOtpSchema>;
+export type CreateUserSchema = z.infer<typeof createUserSchema>;
+export type UpdateContactSchema = z.infer<typeof updateContactSchema>;
+export type AddContactSchema = z.infer<typeof addContactSchema>;

package/dist/validations/auth.validations.js

@@ -1,35 +1,72 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resendOtpSchema = exports.verifyOtpSchema = exports.requestOtpSchema = exports.riderLoginSchema = exports.registerSchema = exports.refreshTokenSchema = exports.changePasswordSchema = exports.forgotPasswordSchema = exports.userLoginSchema = exports.passwordRegex = exports.phoneRegex = void 0;
+exports.addContactSchema = exports.updateContactSchema = exports.createUserSchema = exports.resendOtpSchema = exports.verifyOtpSchema = exports.requestOtpSchema = exports.riderLoginSchema = exports.registerSchema = exports.refreshTokenSchema = exports.changePasswordSchema = exports.forgotPasswordSchema = exports.userLoginSchema = exports.validateContactValue = exports.detectContactType = exports.strongPasswordRegex = exports.passwordRegex = exports.emailRegex = exports.phoneRegex = void 0;
 // src/validations/auth.schema.ts
 const zod_1 = require("zod");
+// ==================== REGEX PATTERNS ====================
 exports.phoneRegex = /^\+250(78|79|73|72)[0-9]{7}$/;
+exports.emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
 exports.passwordRegex = /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{6,}$/;
+exports.strongPasswordRegex = /^(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&#^()_\-+=])[A-Za-z\d@$!%*?&#^()_\-+=]{8,}$/;
+// ==================== CONTACT VALIDATION HELPERS ====================
+const detectContactType = (value) => {
+    if (!value)
+        return "UNKNOWN";
+    // Check if it's an email
+    if (exports.emailRegex.test(value)) {
+        return "EMAIL";
+    }
+    // Check if it's a phone number
+    if (exports.phoneRegex.test(value)) {
+        return "PHONE";
+    }
+    return "UNKNOWN";
+};
+exports.detectContactType = detectContactType;
+const validateContactValue = (value) => {
+    return exports.emailRegex.test(value) || exports.phoneRegex.test(value);
+};
+exports.validateContactValue = validateContactValue;
 // ==================== ADMIN AUTH VALIDATIONS ====================
+// Login with contact (email or phone)
 exports.userLoginSchema = zod_1.z.object({
     body: zod_1.z.object({
-        email: zod_1.z.string().email(),
-        password: zod_1.z.string().min(6),
+        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...)",
+        }),
+        password: zod_1.z.string().min(6, "Password must be at least 6 characters"),
     }),
 });
+// Forgot password with contact (email or phone)
 exports.forgotPasswordSchema = 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, exports.validateContactValue)(val), {
+            message: "Invalid contact value. Must be a valid email or Rwandan phone number (+250...)",
+        }),
     }),
 });
+// Change password (authenticated users)
 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"),
+            .regex(exports.strongPasswordRegex, "Password must be at least 8 characters, include 1 uppercase letter, 1 number and 1 symbol"),
     }),
 });
+// Refresh token
 exports.refreshTokenSchema = zod_1.z.object({
     body: zod_1.z.object({
         refreshToken: zod_1.z.string().min(1, "Refresh token is required"),
     }),
 });
+// Register new user (public registration)
 exports.registerSchema = zod_1.z.object({
     body: zod_1.z
         .object({
@@ -41,39 +78,60 @@ exports.registerSchema = zod_1.z.object({
             .string()
             .min(2, "Last name must be at least 2 characters")
             .max(50, "Last name too long"),
-        phoneNumber: zod_1.z.string().regex(exports.phoneRegex, "Invalid phone number format"),
-        email: zod_1.z.string().email("Invalid email format").optional(),
+        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...)",
+        }),
         password: zod_1.z
             .string()
-            .regex(exports.passwordRegex, "Password must be at least 6 characters with at least one letter and one number"),
+            .regex(exports.strongPasswordRegex, "Password must be at least 8 characters, include 1 uppercase letter, 1 number and 1 symbol"),
+        role: zod_1.z.enum(["PASSENGER", "RIDER"]).optional().default("PASSENGER"),
+        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(),
+        birthYear: zod_1.z.number().min(1900).max(new Date().getFullYear()).optional(),
     })
         .strict(),
 });
 // ==================== USER (RIDER/PASSENGER) AUTH VALIDATIONS ====================
+// Rider login with contact
 exports.riderLoginSchema = zod_1.z.object({
     body: zod_1.z.object({
-        phoneNumber: zod_1.z
+        contactValue: 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"),
+            .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"),
     }),
     query: zod_1.z.object({}).optional(),
     params: zod_1.z.object({}).optional(),
     headers: zod_1.z.object({}).optional(),
 });
+// Request OTP (for phone verification)
 exports.requestOtpSchema = zod_1.z.object({
     body: zod_1.z.object({
-        phoneNumber: zod_1.z
+        contactValue: zod_1.z
             .string()
-            .regex(exports.phoneRegex, "Invalid phone number format. Use format: +250788123456"),
+            .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...)",
+        }),
     }),
 });
+// Verify OTP with contact
 exports.verifyOtpSchema = zod_1.z.object({
     body: zod_1.z
         .object({
-        phoneNumber: zod_1.z.string().regex(exports.phoneRegex, "Invalid phone number format"),
+        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...)",
+        }),
         otp: zod_1.z.string().length(6, "OTP must be 6 digits"),
         firstName: zod_1.z
             .string()
@@ -87,14 +145,71 @@ exports.verifyOtpSchema = zod_1.z.object({
             .optional(),
     })
         .refine((data) => {
+        // If firstName and lastName are provided, they must be valid
+        if (data.firstName || data.lastName) {
+            return data.firstName && data.lastName;
+        }
         return true;
     }, {
-        message: "First name and last name are required for new users",
+        message: "Both first name and last name are required for new users",
         path: ["firstName", "lastName"],
     }),
 });
+// Resend OTP
 exports.resendOtpSchema = zod_1.z.object({
     body: zod_1.z.object({
-        phoneNumber: zod_1.z.string().regex(exports.phoneRegex, "Invalid phone number format"),
+        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...)",
+        }),
+    }),
+});
+// ==================== ADDITIONAL SCHEMAS ====================
+// For administrators to create users
+exports.createUserSchema = zod_1.z.object({
+    body: zod_1.z.object({
+        firstName: zod_1.z.string().min(2).max(50),
+        lastName: zod_1.z.string().min(2).max(50),
+        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...)",
+        }),
+        password: zod_1.z
+            .string()
+            .regex(exports.strongPasswordRegex, "Password must be at least 8 characters, include 1 uppercase letter, 1 number and 1 symbol"),
+        role: zod_1.z.enum(["PASSENGER", "RIDER", "AGENT", "ADMIN", "SUPER_ADMIN"]),
+        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(),
+        birthYear: zod_1.z.number().min(1900).max(new Date().getFullYear()).optional(),
+        jacketId: zod_1.z.string().optional(),
+        plateNumber: zod_1.z.string().optional(),
+    }),
+});
+// For users to update their own contact
+exports.updateContactSchema = 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...)",
+        }),
+    }),
+});
+// For users to add a new contact
+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(),
     }),
 });