vr-commons 1.0.132 → 1.0.133

package/dist/utils/hierarchy.utils.d.ts

@@ -36,3 +36,13 @@ export declare function validateHierarchy(adminLevel: number, targetLevel: numbe
     allowed: boolean;
     message?: string;
 };
+/**
+ * Filter users based on hierarchical permissions using security clearance levels
+ * Pure function - no database calls
+ *
+ * @param currentUserLevel - The level of the requesting user (from securityClearance.level)
+ * @param users - Array of users to filter (must include securityClearance association)
+ * @param currentUserId - Optional: ID of the requesting user to always include them
+ * @returns Filtered array of users
+ */
+export declare const hierarchicalView: (currentUserLevel: number, users: any[], currentUserId?: string) => any[];

package/dist/utils/hierarchy.utils.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.hierarchicalView = void 0;
 exports.getUserLevel = getUserLevel;
 exports.isSuperior = isSuperior;
 exports.isSubordinate = isSubordinate;
@@ -92,3 +93,29 @@ function validateHierarchy(adminLevel, targetLevel, action, allowEqual = false)
     }
     return { allowed: false, message: `Cannot ${action} this user` };
 }
+// src/utils/hierarchical.util.ts
+/**
+ * Filter users based on hierarchical permissions using security clearance levels
+ * Pure function - no database calls
+ *
+ * @param currentUserLevel - The level of the requesting user (from securityClearance.level)
+ * @param users - Array of users to filter (must include securityClearance association)
+ * @param currentUserId - Optional: ID of the requesting user to always include them
+ * @returns Filtered array of users
+ */
+const hierarchicalView = (currentUserLevel, users, currentUserId) => {
+    // If current user is SUPER_ADMIN (level 4) or above, return all users
+    if (currentUserLevel >= 4) {
+        return users;
+    }
+    return users.filter((user) => {
+        const userLevel = user.securityClearance?.level ?? 0;
+        // Always include the current user themselves
+        if (currentUserId && user.id === currentUserId) {
+            return true;
+        }
+        // Only include users with lower level than current user
+        return userLevel < currentUserLevel;
+    });
+};
+exports.hierarchicalView = hierarchicalView;

package/dist/utils/index.d.ts

@@ -8,7 +8,7 @@ export { banUtil } from "./bans.utils";
 export { suspensionUtil } from "./suspension.utils";
 export { createDeviceSession } from "./session.utils";
 export { generateOTP, getOTPExpiry, getVerificationMethod, sendEmail, sendSMS, sendVerificationCode, detectContactType, validateContactValue, } from "./verification.utils";
-export { getUserLevel, isRankEqual, isSubordinate, isSubordinateOrEqual, isSuperior, isSuperiorOrEqual, validateHierarchy, } from "./hierarchy.utils";
+export { getUserLevel, isRankEqual, isSubordinate, isSubordinateOrEqual, isSuperior, isSuperiorOrEqual, validateHierarchy, hierarchicalView, } from "./hierarchy.utils";
 export { stockUtil } from "./admin.device.utils";
 export { cloudinaryUtil } from "./product.utils";
 export { DPP_OperationsUtil } from "./admin.devicePayment.utils";

package/dist/utils/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateContactValue = exports.detectContactType = exports.sendVerificationCode = exports.sendSMS = exports.sendEmail = exports.getVerificationMethod = exports.getOTPExpiry = exports.generateOTP = exports.createDeviceSession = exports.suspensionUtil = exports.banUtil = exports.hasHigherAuthority = exports.getModeratableRoles = exports.canModerateUser = exports.canModerate = exports.softDeleteUser = exports.hashPassword = exports.validatePassword = exports.validateUniqueFields = exports.generateJacketId = exports.getSortOrder = exports.generateEventSearchConditions = exports.generateUserSearchConditions = exports.findSecurityClearanceByRole = exports.getUsersByRole = exports.getUserById = exports.isAccountAccessible = exports.canModifyAccount = exports.hasAllPermissions = exports.hasAnyPermission = exports.hasPermission = exports.hasRole = exports.formatUserListResponse = exports.formatUserProfile = exports.sendErrorResponse = exports.sendSuccessResponse = exports.logEvent = exports.formatTimeRemaining = exports.getTokenTimeRemaining = exports.generateToken = exports.shouldRefreshToken = exports.verifyToken = exports.generateRiderToken = exports.generatePassengerToken = exports.generateAdminToken = exports.checkSuspensionStatus = exports.checkIsUserBannedOrSuspended = exports.checkBanStatus = exports.hasActiveDependencies = exports.checkAccountDependencies = void 0;
-exports.extractDedicatedUserFromSerial = exports.buildUserSearchConditions = exports.buildSearchConditions = exports.buildEventLogWhereClause = exports.formatEventLogs = exports.formatEventLog = exports.formatDeviceSession = exports.DPP_OperationsUtil = exports.cloudinaryUtil = exports.stockUtil = exports.validateHierarchy = exports.isSuperiorOrEqual = exports.isSuperior = exports.isSubordinateOrEqual = exports.isSubordinate = exports.isRankEqual = exports.getUserLevel = void 0;
+exports.extractDedicatedUserFromSerial = exports.buildUserSearchConditions = exports.buildSearchConditions = exports.buildEventLogWhereClause = exports.formatEventLogs = exports.formatEventLog = exports.formatDeviceSession = exports.DPP_OperationsUtil = exports.cloudinaryUtil = exports.stockUtil = exports.hierarchicalView = exports.validateHierarchy = exports.isSuperiorOrEqual = exports.isSuperior = exports.isSubordinateOrEqual = exports.isSubordinate = exports.isRankEqual = exports.getUserLevel = void 0;
 var account_utils_1 = require("./account.utils");
 Object.defineProperty(exports, "checkAccountDependencies", { enumerable: true, get: function () { return account_utils_1.checkAccountDependencies; } });
 Object.defineProperty(exports, "hasActiveDependencies", { enumerable: true, get: function () { return account_utils_1.hasActiveDependencies; } });
@@ -77,6 +77,7 @@ Object.defineProperty(exports, "isSubordinateOrEqual", { enumerable: true, get:
 Object.defineProperty(exports, "isSuperior", { enumerable: true, get: function () { return hierarchy_utils_1.isSuperior; } });
 Object.defineProperty(exports, "isSuperiorOrEqual", { enumerable: true, get: function () { return hierarchy_utils_1.isSuperiorOrEqual; } });
 Object.defineProperty(exports, "validateHierarchy", { enumerable: true, get: function () { return hierarchy_utils_1.validateHierarchy; } });
+Object.defineProperty(exports, "hierarchicalView", { enumerable: true, get: function () { return hierarchy_utils_1.hierarchicalView; } });
 var admin_device_utils_1 = require("./admin.device.utils");
 Object.defineProperty(exports, "stockUtil", { enumerable: true, get: function () { return admin_device_utils_1.stockUtil; } });
 var product_utils_1 = require("./product.utils");

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

@@ -346,6 +346,91 @@ export declare const resetPasswordSchema: z.ZodEffects<z.ZodObject<{
         confirmPassword: string;
     };
 }>;
+export declare const riderPasswordSchema: z.ZodDefault<z.ZodEffects<z.ZodString, string, string>>;
+export declare const registerRiderSchema: z.ZodObject<{
+    body: z.ZodEffects<z.ZodObject<{
+        firstName: z.ZodString;
+        lastName: z.ZodString;
+        phoneNumber: z.ZodString;
+        jacketId: z.ZodNullable<z.ZodOptional<z.ZodString>>;
+        plateNumber: z.ZodNullable<z.ZodOptional<z.ZodString>>;
+        gender: z.ZodEnum<["male", "female"]>;
+        birthDate: z.ZodNumber;
+        birthMonth: z.ZodNumber;
+        birthYear: z.ZodNumber;
+        password: z.ZodOptional<z.ZodDefault<z.ZodEffects<z.ZodString, string, string>>>;
+    }, "strip", z.ZodTypeAny, {
+        firstName: string;
+        lastName: string;
+        gender: "male" | "female";
+        birthDate: number;
+        birthMonth: number;
+        birthYear: number;
+        phoneNumber: string;
+        plateNumber?: string | null | undefined;
+        password?: string | undefined;
+        jacketId?: string | null | undefined;
+    }, {
+        firstName: string;
+        lastName: string;
+        gender: "male" | "female";
+        birthDate: number;
+        birthMonth: number;
+        birthYear: number;
+        phoneNumber: string;
+        plateNumber?: string | null | undefined;
+        password?: string | undefined;
+        jacketId?: string | null | undefined;
+    }>, {
+        firstName: string;
+        lastName: string;
+        gender: "male" | "female";
+        birthDate: number;
+        birthMonth: number;
+        birthYear: number;
+        phoneNumber: string;
+        plateNumber?: string | null | undefined;
+        password?: string | undefined;
+        jacketId?: string | null | undefined;
+    }, {
+        firstName: string;
+        lastName: string;
+        gender: "male" | "female";
+        birthDate: number;
+        birthMonth: number;
+        birthYear: number;
+        phoneNumber: string;
+        plateNumber?: string | null | undefined;
+        password?: string | undefined;
+        jacketId?: string | null | undefined;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    body: {
+        firstName: string;
+        lastName: string;
+        gender: "male" | "female";
+        birthDate: number;
+        birthMonth: number;
+        birthYear: number;
+        phoneNumber: string;
+        plateNumber?: string | null | undefined;
+        password?: string | undefined;
+        jacketId?: string | null | undefined;
+    };
+}, {
+    body: {
+        firstName: string;
+        lastName: string;
+        gender: "male" | "female";
+        birthDate: number;
+        birthMonth: number;
+        birthYear: number;
+        phoneNumber: string;
+        plateNumber?: string | null | undefined;
+        password?: string | undefined;
+        jacketId?: string | null | undefined;
+    };
+}>;
 export type UpdateProfileSchema = z.infer<typeof updateProfileSchema>;
 export type UpdateContactSchema = z.infer<typeof updateContactSchema>;
 export type ChangeEmailSchema = z.infer<typeof changeEmailSchema>;

package/dist/validations/account.validations.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.registerRiderSchema = exports.riderPasswordSchema = 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 ====================
@@ -191,3 +191,73 @@ exports.resetPasswordSchema = zod_1.z
     message: "Passwords do not match",
     path: ["confirmPassword"],
 });
+// Birth date validation helper
+const isValidBirthDate = (date, month, year) => {
+    const maxDays = new Date(year, month, 0).getDate();
+    return date >= 1 && date <= maxDays;
+};
+// Password: exactly 4 digits, NOT all the same digit
+// Examples: 1112 ✅, 1234 ✅, 5678 ✅, 1111 ❌, 3333 ❌
+exports.riderPasswordSchema = zod_1.z
+    .string()
+    .length(4, "Password must be exactly 4 digits")
+    .regex(/^\d{4}$/, "Password must contain only digits")
+    .refine((password) => {
+    // Check if all 4 digits are the same
+    const uniqueDigits = new Set(password.split("")).size;
+    return uniqueDigits > 1;
+}, {
+    message: "Password cannot have all 4 digits the same (e.g., 1112 is allowed, 1111 is not)",
+})
+    .default("1234");
+exports.registerRiderSchema = zod_1.z.object({
+    body: zod_1.z
+        .object({
+        firstName: zod_1.z
+            .string()
+            .min(2, "First name must be at least 2 characters")
+            .max(100, "First name cannot exceed 100 characters"),
+        lastName: zod_1.z
+            .string()
+            .min(2, "Last name must be at least 2 characters")
+            .max(100, "Last name cannot exceed 100 characters"),
+        phoneNumber: zod_1.z
+            .string()
+            .regex(exports.phoneRegex, "Invalid phone number format. Must be a valid Rwandan phone number (+250...) followed by 7 digits."),
+        jacketId: zod_1.z
+            .string()
+            .regex(/^JKT-\d{9}$/, "Jacket ID must be in format JKT-XXXXXXXXX")
+            .optional()
+            .nullable(),
+        plateNumber: zod_1.z
+            .string()
+            .max(20, "Plate number cannot exceed 20 characters")
+            .optional()
+            .nullable(),
+        gender: zod_1.z.enum(["male", "female"], {
+            errorMap: () => ({
+                message: "Gender must be either 'male' or 'female'",
+            }),
+        }),
+        birthDate: zod_1.z
+            .number()
+            .min(1, "Birth date must be between 1 and 31")
+            .max(31),
+        birthMonth: zod_1.z
+            .number()
+            .min(1, "Birth month must be between 1 and 12")
+            .max(12),
+        birthYear: zod_1.z
+            .number()
+            .min(1900, "Birth year must be between 1900 and current year")
+            .max(new Date().getFullYear(), "Birth year cannot be in the future"),
+        // Temporary password (optional, defaults to 1234)
+        password: exports.riderPasswordSchema.optional(),
+    })
+        .refine((data) => {
+        return isValidBirthDate(data.birthDate, data.birthMonth, data.birthYear);
+    }, {
+        message: "Invalid birth date. Please check day, month, and year.",
+        path: ["birthDate"],
+    }),
+});

package/dist/validations/index.d.ts

@@ -6,7 +6,7 @@ export { createAppSpecsSchema, updateAppSpecsSchema, listAppSpecsSchema, getActi
 export { listUserPaymentPlansSchema, getUserPaymentPlanSchema, } from "./devicePaymentPlan.validations";
 export { unlockDeviceSchema, extendSessionSchema, serialRegex, } from "./devices.validations";
 export { payInstallmentSchema } from "./payinstallment.validations";
-export { updateProfileSchema, requestPhoneChangeSchema, verifyPhoneChangeSchema, deleteAccountSchema, strongPasswordRegex, changePasswordSchema, } from "./account.validations";
+export { updateProfileSchema, requestPhoneChangeSchema, verifyPhoneChangeSchema, deleteAccountSchema, strongPasswordRegex, changePasswordSchema, riderPasswordSchema, registerRiderSchema, } from "./account.validations";
 export { updateAdminSchema, updateRiderSchema, deleteUserSchema, getUserSchema, getUsersSchema, hireAdminSchema, promoteAdminSchema, demoteAdminSchema, fireEmployeeSchema, upgradeToRiderSchema, resetPasswordSchema, } from "./users.admin.validations";
 export { createProductSchema, updateProductSchema, getProductSchema, getProductsSchema, deactivateProductSchema, activateProductSchema, deleteProductSchema, updateStockSchema, } from "./product.validations";
 export { createPricingSchema, updatePricingSchema, getPricingSchema, getPricingsSchema, deletePricingSchema, } from "./pricings.validations";

package/dist/validations/index.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAppSpecsSchema = exports.activateAppSpecsSchema = exports.getActiveAppSpecsSchema = exports.listAppSpecsSchema = exports.updateAppSpecsSchema = exports.createAppSpecsSchema = exports.exportBansSchema = exports.createSuspensionSchema = exports.createBanSchema = exports.extendSuspensionSchema = exports.revokeSuspensionSchema = exports.revokeBanSchema = exports.reviewAppealSchema = exports.listSuspensionsSchema = exports.listPendingAppealsSchema = exports.listBansSchema = exports.getUserBansSchema = exports.getUserSuspensionsSchema = exports.getSuspensionSchema = exports.getUserRestrictionsSchema = exports.getBanSchema = exports.submitSuspensionAppealSchema = exports.submitBanAppealSchema = exports.deactivateAccountSchema = exports.createRiderSchema = exports.updateRiderProfileSchema = exports.updatePassengerProfileSchema = exports.passengerSignupSchema = exports.viewProfileSchema = exports.getAllUsersSchema = exports.updateUserProfileSchema = exports.getUserByIdSchema = exports.createUserSchema = exports.googleLoginSchema = exports.completePassengerProfileSchema = exports.checkRiderAccountSchema = exports.setRiderPasswordSchema = exports.riderPasswordRegex = exports.passwordRegex = exports.emailRegex = exports.phoneRegex = exports.requestOtpSchema = exports.resendOtpSchema = exports.verifyOtpSchema = exports.registerSchema = exports.refreshTokenSchema = exports.userLoginSchema = exports.forgotPasswordSchema = exports.riderLoginSchema = exports.validate = void 0;
-exports.getDevicePlanSchema = exports.limitedUpdateSchema = exports.createPlanSchema = exports.createDeviceSchema = exports.makePermanentSchema = exports.disableDeviceSchema = exports.deleteDeviceSchema = exports.getDevicesSchema = exports.getDeviceSchema = exports.updateDeviceSchema = exports.adminUnlockDeviceSchema = exports.adminLockDeviceSchema = exports.bulkCreateDevicesSchema = exports.checkAvailabilitySchema = exports.deletePricingSchema = exports.getPricingsSchema = exports.getPricingSchema = exports.updatePricingSchema = exports.createPricingSchema = exports.updateStockSchema = exports.deleteProductSchema = exports.activateProductSchema = exports.deactivateProductSchema = exports.getProductsSchema = exports.getProductSchema = exports.updateProductSchema = exports.createProductSchema = exports.resetPasswordSchema = exports.upgradeToRiderSchema = exports.fireEmployeeSchema = exports.demoteAdminSchema = exports.promoteAdminSchema = exports.hireAdminSchema = exports.getUsersSchema = exports.getUserSchema = exports.deleteUserSchema = exports.updateRiderSchema = exports.updateAdminSchema = exports.changePasswordSchema = exports.strongPasswordRegex = exports.deleteAccountSchema = exports.verifyPhoneChangeSchema = exports.requestPhoneChangeSchema = exports.updateProfileSchema = exports.payInstallmentSchema = exports.serialRegex = exports.extendSessionSchema = exports.unlockDeviceSchema = exports.getUserPaymentPlanSchema = exports.listUserPaymentPlansSchema = void 0;
-exports.getEventLogSchema = exports.listEventLogsSchema = exports.deletePlanSchema = exports.recordPaymentSchema = exports.listPlansSchema = exports.getUserPlansSchema = exports.getPlanSchema = void 0;
+exports.createPlanSchema = exports.createDeviceSchema = exports.makePermanentSchema = exports.disableDeviceSchema = exports.deleteDeviceSchema = exports.getDevicesSchema = exports.getDeviceSchema = exports.updateDeviceSchema = exports.adminUnlockDeviceSchema = exports.adminLockDeviceSchema = exports.bulkCreateDevicesSchema = exports.checkAvailabilitySchema = exports.deletePricingSchema = exports.getPricingsSchema = exports.getPricingSchema = exports.updatePricingSchema = exports.createPricingSchema = exports.updateStockSchema = exports.deleteProductSchema = exports.activateProductSchema = exports.deactivateProductSchema = exports.getProductsSchema = exports.getProductSchema = exports.updateProductSchema = exports.createProductSchema = exports.resetPasswordSchema = exports.upgradeToRiderSchema = exports.fireEmployeeSchema = exports.demoteAdminSchema = exports.promoteAdminSchema = exports.hireAdminSchema = exports.getUsersSchema = exports.getUserSchema = exports.deleteUserSchema = exports.updateRiderSchema = exports.updateAdminSchema = exports.registerRiderSchema = exports.riderPasswordSchema = exports.changePasswordSchema = exports.strongPasswordRegex = exports.deleteAccountSchema = exports.verifyPhoneChangeSchema = exports.requestPhoneChangeSchema = exports.updateProfileSchema = exports.payInstallmentSchema = exports.serialRegex = exports.extendSessionSchema = exports.unlockDeviceSchema = exports.getUserPaymentPlanSchema = exports.listUserPaymentPlansSchema = void 0;
+exports.getEventLogSchema = exports.listEventLogsSchema = exports.deletePlanSchema = exports.recordPaymentSchema = exports.listPlansSchema = exports.getUserPlansSchema = exports.getPlanSchema = exports.getDevicePlanSchema = exports.limitedUpdateSchema = void 0;
 var validate_validations_1 = require("./validate.validations");
 Object.defineProperty(exports, "validate", { enumerable: true, get: function () { return validate_validations_1.validate; } });
 var auth_validations_1 = require("./auth.validations");
@@ -82,6 +82,8 @@ Object.defineProperty(exports, "verifyPhoneChangeSchema", { enumerable: true, ge
 Object.defineProperty(exports, "deleteAccountSchema", { enumerable: true, get: function () { return account_validations_1.deleteAccountSchema; } });
 Object.defineProperty(exports, "strongPasswordRegex", { enumerable: true, get: function () { return account_validations_1.strongPasswordRegex; } });
 Object.defineProperty(exports, "changePasswordSchema", { enumerable: true, get: function () { return account_validations_1.changePasswordSchema; } });
+Object.defineProperty(exports, "riderPasswordSchema", { enumerable: true, get: function () { return account_validations_1.riderPasswordSchema; } });
+Object.defineProperty(exports, "registerRiderSchema", { enumerable: true, get: function () { return account_validations_1.registerRiderSchema; } });
 var users_admin_validations_1 = require("./users.admin.validations");
 Object.defineProperty(exports, "updateAdminSchema", { enumerable: true, get: function () { return users_admin_validations_1.updateAdminSchema; } });
 Object.defineProperty(exports, "updateRiderSchema", { enumerable: true, get: function () { return users_admin_validations_1.updateRiderSchema; } });

package/package.json

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