vr-commons 1.0.112 → 1.0.114

package/dist/middlewares/auth.users.middlewares.js

@@ -21,7 +21,7 @@ const checkUserAuthentication = (allowedRoles) => async (req, res, next) => {
         }
         catch (error) {
             if (error instanceof jsonwebtoken_1.default.TokenExpiredError) {
-                return (0, response_utils_1.sendErrorResponse)(res, "Token expired. Please re-verify your phone.", 401);
+                return (0, response_utils_1.sendErrorResponse)(res, "Token expired. Please re-verify your Email/Phone", 401);
             }
             return (0, response_utils_1.sendErrorResponse)(res, "Token invalid", 401);
         }
@@ -40,7 +40,7 @@ const checkUserAuthentication = (allowedRoles) => async (req, res, next) => {
         }
         // 🔐 Token versioning (logout all devices)
         if (user.tokenVersion !== payload.tokenVersion) {
-            return (0, response_utils_1.sendErrorResponse)(res, "Session expired. Please re-verify your phone.", 401);
+            return (0, response_utils_1.sendErrorResponse)(res, "Session expired. Please re-verify your Email/Phone", 401);
         }
         // 🧱 Role enforcement
         if (!allowedRoles.includes(user.securityClearance.role)) {

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

@@ -11,8 +11,7 @@ export interface BaseUserProfile {
     id: string;
     firstName: string;
     lastName: string;
-    primaryPhone: string;
-    email: string | null;
+    primaryContact: string;
     gender: "male" | "female";
     birthDate: number | null;
     birthMonth: number | null;

package/dist/utils/profiles.utils.js

@@ -24,8 +24,7 @@ const formatUserProfile = (user, viewerType = "ADMIN", options = {}) => {
         id: user.id,
         firstName: user.firstName,
         lastName: user.lastName,
-        primaryPhone: user.primaryPhone?.phoneNumber,
-        email: user.email,
+        primaryContact: user.primaryContact?.contactValue,
         gender: user.gender || "male",
         birthDate: user.birthDate || null,
         birthMonth: user.birthMonth || null,
@@ -394,11 +393,11 @@ const validateUniqueFields = async (fields, excludeUserId) => {
     const errors = [];
     // Check phone number (in PhoneContact table)
     if (fields.phoneNumber) {
-        const phoneWhere = { phoneNumber: fields.phoneNumber, isActive: true };
+        const phoneWhere = { conactValue: fields.phoneNumber, isActive: true };
         if (excludeUserId) {
             phoneWhere.userId = { [sequelize_1.Op.ne]: excludeUserId };
         }
-        const existingPhone = await vr_models_1.PhoneContact.findOne({
+        const existingPhone = await vr_models_1.Contact.findOne({
             where: phoneWhere,
             include: [{ model: vr_models_1.User, as: "user", attributes: ["id"] }],
         });

package/dist/validations/account.validations.d.ts

@@ -1,6 +1,9 @@
 import { z } from "zod";
 export declare const phoneRegex: RegExp;
+export declare const emailRegex: 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 updateProfileSchema: z.ZodObject<{
     body: z.ZodObject<{
         firstName: z.ZodOptional<z.ZodString>;
@@ -28,6 +31,40 @@ export declare const updateProfileSchema: z.ZodObject<{
         plateNumber?: string | 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 changeEmailSchema: z.ZodObject<{
+    body: z.ZodObject<{
+        newEmail: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        newEmail: string;
+    }, {
+        newEmail: string;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    body: {
+        newEmail: string;
+    };
+}, {
+    body: {
+        newEmail: string;
+    };
+}>;
 export declare const requestPhoneChangeSchema: z.ZodObject<{
     body: z.ZodObject<{
         newPhoneNumber: z.ZodString;
@@ -67,6 +104,113 @@ export declare const verifyPhoneChangeSchema: z.ZodObject<{
         newPhoneOtp: string;
     };
 }>;
+export declare const verifyEmailChangeSchema: z.ZodObject<{
+    body: z.ZodObject<{
+        emailOtp: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        emailOtp: string;
+    }, {
+        emailOtp: string;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    body: {
+        emailOtp: string;
+    };
+}, {
+    body: {
+        emailOtp: string;
+    };
+}>;
+export declare const addContactSchema: z.ZodObject<{
+    body: z.ZodObject<{
+        contactValue: z.ZodEffects<z.ZodString, string, string>;
+        type: z.ZodEffects<z.ZodOptional<z.ZodEnum<["EMAIL", "PHONE", "WHATSAPP"]>>, "EMAIL" | "PHONE" | "WHATSAPP" | undefined, "EMAIL" | "PHONE" | "WHATSAPP" | undefined>;
+    }, "strip", z.ZodTypeAny, {
+        contactValue: string;
+        type?: "EMAIL" | "PHONE" | "WHATSAPP" | undefined;
+    }, {
+        contactValue: string;
+        type?: "EMAIL" | "PHONE" | "WHATSAPP" | undefined;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    body: {
+        contactValue: string;
+        type?: "EMAIL" | "PHONE" | "WHATSAPP" | undefined;
+    };
+}, {
+    body: {
+        contactValue: string;
+        type?: "EMAIL" | "PHONE" | "WHATSAPP" | undefined;
+    };
+}>;
+export declare const deleteContactSchema: z.ZodObject<{
+    params: z.ZodObject<{
+        contactId: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        contactId: string;
+    }, {
+        contactId: string;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    params: {
+        contactId: string;
+    };
+}, {
+    params: {
+        contactId: string;
+    };
+}>;
+export declare const setPrimaryContactSchema: z.ZodObject<{
+    params: z.ZodObject<{
+        contactId: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        contactId: string;
+    }, {
+        contactId: string;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    params: {
+        contactId: string;
+    };
+}, {
+    params: {
+        contactId: string;
+    };
+}>;
+export declare const verifyContactSchema: z.ZodObject<{
+    params: z.ZodObject<{
+        contactId: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        contactId: string;
+    }, {
+        contactId: string;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    params: {
+        contactId: string;
+    };
+}, {
+    params: {
+        contactId: string;
+    };
+}>;
+export declare const confirmVerificationSchema: z.ZodObject<{
+    body: z.ZodObject<{
+        otp: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        otp: string;
+    }, {
+        otp: string;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    body: {
+        otp: string;
+    };
+}, {
+    body: {
+        otp: string;
+    };
+}>;
 export declare const deleteAccountSchema: z.ZodObject<{
     body: z.ZodObject<{
         confirmation: z.ZodLiteral<"DELETE">;
@@ -111,3 +255,90 @@ export declare const changePasswordSchema: z.ZodObject<{
         newPassword: string;
     };
 }>;
+export declare const loginSchema: z.ZodObject<{
+    body: z.ZodObject<{
+        contactValue: z.ZodEffects<z.ZodString, string, string>;
+        password: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        password: string;
+        contactValue: string;
+    }, {
+        password: string;
+        contactValue: string;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    body: {
+        password: string;
+        contactValue: string;
+    };
+}, {
+    body: {
+        password: string;
+        contactValue: string;
+    };
+}>;
+export declare const forgotPasswordSchema: 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 resetPasswordSchema: z.ZodEffects<z.ZodObject<{
+    body: z.ZodObject<{
+        newPassword: z.ZodString;
+        confirmPassword: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        newPassword: string;
+        confirmPassword: string;
+    }, {
+        newPassword: string;
+        confirmPassword: string;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    body: {
+        newPassword: string;
+        confirmPassword: string;
+    };
+}, {
+    body: {
+        newPassword: string;
+        confirmPassword: string;
+    };
+}>, {
+    body: {
+        newPassword: string;
+        confirmPassword: string;
+    };
+}, {
+    body: {
+        newPassword: string;
+        confirmPassword: string;
+    };
+}>;
+export type UpdateProfileSchema = z.infer<typeof updateProfileSchema>;
+export type UpdateContactSchema = z.infer<typeof updateContactSchema>;
+export type ChangeEmailSchema = z.infer<typeof changeEmailSchema>;
+export type RequestPhoneChangeSchema = z.infer<typeof requestPhoneChangeSchema>;
+export type VerifyPhoneChangeSchema = z.infer<typeof verifyPhoneChangeSchema>;
+export type VerifyEmailChangeSchema = z.infer<typeof verifyEmailChangeSchema>;
+export type AddContactSchema = z.infer<typeof addContactSchema>;
+export type DeleteContactSchema = z.infer<typeof deleteContactSchema>;
+export type SetPrimaryContactSchema = z.infer<typeof setPrimaryContactSchema>;
+export type VerifyContactSchema = z.infer<typeof verifyContactSchema>;
+export type ConfirmVerificationSchema = z.infer<typeof confirmVerificationSchema>;
+export type DeleteAccountSchema = z.infer<typeof deleteAccountSchema>;
+export type ChangePasswordSchema = z.infer<typeof changePasswordSchema>;
+export type LoginSchema = z.infer<typeof loginSchema>;
+export type ForgotPasswordSchema = z.infer<typeof forgotPasswordSchema>;
+export type ResetPasswordSchema = z.infer<typeof resetPasswordSchema>;

package/dist/validations/account.validations.js

@@ -1,11 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.changePasswordSchema = exports.deleteAccountSchema = exports.verifyPhoneChangeSchema = exports.requestPhoneChangeSchema = exports.updateProfileSchema = exports.strongPasswordRegex = exports.phoneRegex = void 0;
+exports.resetPasswordSchema = exports.forgotPasswordSchema = exports.loginSchema = exports.changePasswordSchema = exports.deleteAccountSchema = exports.confirmVerificationSchema = exports.verifyContactSchema = exports.setPrimaryContactSchema = exports.deleteContactSchema = exports.addContactSchema = exports.verifyEmailChangeSchema = exports.verifyPhoneChangeSchema = exports.requestPhoneChangeSchema = exports.changeEmailSchema = exports.updateContactSchema = exports.updateProfileSchema = exports.validateContactValue = exports.detectContactType = exports.strongPasswordRegex = exports.emailRegex = exports.phoneRegex = void 0;
 // src/modules/account/validations/account.schema.ts
 const zod_1 = require("zod");
+// ==================== REGEX PATTERNS ====================
 exports.phoneRegex = /^\+250(78|79|73|72)[0-9]{7}$/;
+exports.emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
 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";
+    // 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;
+// ==================== SCHEMAS ====================
 exports.updateProfileSchema = zod_1.z.object({
     body: zod_1.z.object({
         firstName: zod_1.z.string().min(2).max(50).optional(),
@@ -16,18 +38,91 @@ exports.updateProfileSchema = zod_1.z.object({
             .optional(),
     }),
 });
+// Schema for updating contact (email or phone)
+exports.updateContactSchema = zod_1.z.object({
+    body: zod_1.z.object({
+        contactValue: zod_1.z
+            .string()
+            .min(1, "Contact value is required")
+            .refine((val) => (0, exports.validateContactValue)(val), {
+            message: "Invalid contact value. Must be a valid email or Rwandan phone number (+250...)",
+        }),
+    }),
+});
+// Schema for changing email specifically
+exports.changeEmailSchema = zod_1.z.object({
+    body: zod_1.z.object({
+        newEmail: zod_1.z
+            .string()
+            .email("Invalid email format")
+            .min(1, "Email is required"),
+    }),
+});
+// Schema for changing phone number specifically
 exports.requestPhoneChangeSchema = zod_1.z.object({
     body: zod_1.z.object({
-        newPhoneNumber: zod_1.z.string().regex(exports.phoneRegex, "Invalid phone number format"),
+        newPhoneNumber: zod_1.z
+            .string()
+            .regex(exports.phoneRegex, "Invalid phone number format. Must be a valid Rwandan phone number (+250...)"),
     }),
 });
-// Updated validation schema
+// Schema for verifying phone change with OTP
 exports.verifyPhoneChangeSchema = zod_1.z.object({
     body: zod_1.z.object({
         oldPhoneOtp: zod_1.z.string().length(6, "Old phone OTP must be 6 digits"),
         newPhoneOtp: zod_1.z.string().length(6, "New phone OTP must be 6 digits"),
     }),
 });
+// Schema for verifying email change with OTP
+exports.verifyEmailChangeSchema = zod_1.z.object({
+    body: zod_1.z.object({
+        emailOtp: zod_1.z.string().length(6, "Email OTP must be 6 digits"),
+    }),
+});
+// Schema for adding new contact
+exports.addContactSchema = zod_1.z.object({
+    body: zod_1.z.object({
+        contactValue: zod_1.z
+            .string()
+            .min(1, "Contact value 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()
+            .refine((val) => {
+            if (!val)
+                return true;
+            return true;
+        }, { message: "Invalid contact type" }),
+    }),
+});
+// Schema for deleting a contact
+exports.deleteContactSchema = zod_1.z.object({
+    params: zod_1.z.object({
+        contactId: zod_1.z.string().uuid("Invalid contact ID"),
+    }),
+});
+// Schema for making a contact primary
+exports.setPrimaryContactSchema = zod_1.z.object({
+    params: zod_1.z.object({
+        contactId: zod_1.z.string().uuid("Invalid contact ID"),
+    }),
+});
+// Schema for verifying contact (sending OTP)
+exports.verifyContactSchema = zod_1.z.object({
+    params: zod_1.z.object({
+        contactId: zod_1.z.string().uuid("Invalid contact ID"),
+    }),
+});
+// Schema for confirming contact verification with OTP
+exports.confirmVerificationSchema = zod_1.z.object({
+    body: zod_1.z.object({
+        otp: zod_1.z.string().length(6, "OTP must be 6 digits"),
+    }),
+});
+// Schema for deleting account
 exports.deleteAccountSchema = zod_1.z.object({
     body: zod_1.z.object({
         confirmation: zod_1.z.literal("DELETE", {
@@ -36,6 +131,7 @@ exports.deleteAccountSchema = zod_1.z.object({
         reason: zod_1.z.string().max(500).optional(),
     }),
 });
+// Schema for changing password
 exports.changePasswordSchema = zod_1.z.object({
     body: zod_1.z.object({
         oldPassword: zod_1.z.string().min(1, "Old password is required"),
@@ -44,3 +140,40 @@ exports.changePasswordSchema = zod_1.z.object({
             .regex(exports.strongPasswordRegex, "Password must be at least 8 characters, include 1 uppercase letter, 1 number and 1 symbol"),
     }),
 });
+// Schema for login with contact
+exports.loginSchema = 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...)",
+        }),
+        password: zod_1.z.string().min(1, "Password is required"),
+    }),
+});
+// Schema for forgot password
+exports.forgotPasswordSchema = 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...)",
+        }),
+    }),
+});
+// Schema for reset password
+exports.resetPasswordSchema = zod_1.z
+    .object({
+    body: zod_1.z.object({
+        newPassword: zod_1.z
+            .string()
+            .regex(exports.strongPasswordRegex, "Password must be at least 8 characters, include 1 uppercase letter, 1 number and 1 symbol"),
+        confirmPassword: zod_1.z.string(),
+    }),
+})
+    .refine((data) => data.body.newPassword === data.body.confirmPassword, {
+    message: "Passwords do not match",
+    path: ["confirmPassword"],
+});