vr-commons 1.0.19 → 1.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vr-commons",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "description": "Shared functions package",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -16,7 +16,7 @@
   },
   "scripts": {
     "clean": "rimraf dist",
-    "build": "tsc",
+    "build": "npm run clean && tsc",
     "pub:prepare": "npm run build && git add . && git commit -m \"Release preparation\" || true",
     "pub": "npm run pub:prepare && npm version patch && npm publish && git push --follow-tags"
   },

package/dist/index.d.ts

@@ -1,4 +0,0 @@
-export * from "./middlewares";
-export * from "./validations";
-export * from "./utils";
-export { validate } from "./validations/validate.validations";

package/dist/index.js

@@ -1,23 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validate = void 0;
-// Core Functionality
-__exportStar(require("./middlewares"), exports);
-__exportStar(require("./validations"), exports);
-__exportStar(require("./utils"), exports);
-var validate_validations_1 = require("./validations/validate.validations");
-Object.defineProperty(exports, "validate", { enumerable: true, get: function () { return validate_validations_1.validate; } });

package/dist/middlewares/auth.middlewares.d.ts

@@ -1,3 +0,0 @@
-import { Request, Response, NextFunction } from "express";
-import { UserRole } from "vr-models";
-export declare const checkUserAuthentication: (allowedRoles: UserRole[]) => (req: Request, res: Response, next: NextFunction) => Promise<Response<any, Record<string, any>> | undefined>;

package/dist/middlewares/auth.middlewares.js

@@ -1,57 +0,0 @@
-"use strict";
-// src/middlewares/auth/checkUserAuthentication.middleware.ts
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkUserAuthentication = void 0;
-const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
-const vr_models_1 = require("vr-models");
-const checkUserAuthentication = (allowedRoles) => async (req, res, next) => {
-    try {
-        const authHeader = req.headers.authorization;
-        if (!authHeader || !authHeader.startsWith("Bearer ")) {
-            return res.status(401).json({ message: "Missing or invalid token" });
-        }
-        const token = authHeader.split(" ")[1];
-        let payload;
-        try {
-            payload = jsonwebtoken_1.default.verify(token, process.env.JWT_SECRET);
-        }
-        catch {
-            return res.status(401).json({ message: "Token expired or invalid" });
-        }
-        const user = await vr_models_1.User.findOne({
-            where: { id: payload.userId },
-            include: [
-                {
-                    model: vr_models_1.SecurityClearance,
-                    as: "securityClearance"
-                }
-            ]
-        });
-        if (!user || !user.securityClearance) {
-            return res.status(401).json({ message: "User not found" });
-        }
-        // 🔐 Token versioning (logout all devices)
-        if (user.tokenVersion !== payload.tokenVersion) {
-            return res.status(401).json({ message: "Session expired" });
-        }
-        // 🧱 Role enforcement
-        if (!allowedRoles.includes(user.securityClearance.role)) {
-            return res.status(403).json({ message: "Access denied" });
-        }
-        // ✅ Extend req
-        req.userId = user.id;
-        req.firstName = user.firstName;
-        req.lastName = user.lastName;
-        req.scRole = user.securityClearance.role;
-        req.scLevel = user.securityClearance.level;
-        req.tokenVersion = user.tokenVersion;
-        next();
-    }
-    catch (error) {
-        next(error);
-    }
-};
-exports.checkUserAuthentication = checkUserAuthentication;

package/dist/middlewares/index.d.ts

@@ -1 +0,0 @@
-export { checkUserAuthentication } from "./auth.middlewares";

package/dist/middlewares/index.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkUserAuthentication = void 0;
-var auth_middlewares_1 = require("./auth.middlewares");
-Object.defineProperty(exports, "checkUserAuthentication", { enumerable: true, get: function () { return auth_middlewares_1.checkUserAuthentication; } });

package/dist/utils/account.utils.d.ts

@@ -1,9 +0,0 @@
-import { Transaction } from "sequelize";
-export declare const checkAccountDependencies: (userId: string, transaction?: any) => Promise<{
-    hasDependencies: boolean;
-    activeDevicePlans: number;
-    pendingPayments: number;
-    activeSubscriptions: number;
-    messages: string[];
-}>;
-export declare const hasActiveDependencies: (userId: string, transaction?: Transaction) => Promise<boolean>;

package/dist/utils/account.utils.js

@@ -1,46 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasActiveDependencies = exports.checkAccountDependencies = void 0;
-const vr_models_1 = require("vr-models");
-// Import other models as needed
-const checkAccountDependencies = async (userId, transaction) => {
-    const messages = [];
-    // 1. Check for active device payment plans
-    const activeDevicePlans = await vr_models_1.DevicePaymentPlan.count({
-        where: {
-            userId,
-            status: "ACTIVE", // Adjust based on your status enum
-        },
-        transaction,
-    });
-    if (activeDevicePlans > 0) {
-        messages.push(`You have ${activeDevicePlans} active device payment plan(s)`);
-    }
-    // 2. Check for pending payments
-    const pendingPayments = await vr_models_1.Transaction.count({
-        where: {
-            userId,
-            status: "PENDING", // Adjust based on your status enum
-        },
-        transaction,
-    });
-    if (pendingPayments > 0) {
-        messages.push(`You have ${pendingPayments} pending payment(s)`);
-    }
-    // 3. Add more checks as needed (subscriptions, etc.)
-    const hasDependencies = activeDevicePlans > 0 || pendingPayments > 0;
-    return {
-        hasDependencies,
-        activeDevicePlans,
-        pendingPayments,
-        activeSubscriptions: 0, // Implement if needed
-        messages,
-    };
-};
-exports.checkAccountDependencies = checkAccountDependencies;
-// Then update the hasActiveDependencies function in passengerUser.utils.ts:
-const hasActiveDependencies = async (userId, transaction) => {
-    const result = await (0, exports.checkAccountDependencies)(userId, transaction);
-    return result.hasDependencies;
-};
-exports.hasActiveDependencies = hasActiveDependencies;

package/dist/utils/authTokens.utils.d.ts

@@ -1,11 +0,0 @@
-import { UserRole } from "vr-models";
-export interface JWTPayload {
-    userId: string;
-    role: UserRole;
-    level: number;
-    tokenVersion: number;
-}
-export declare const generateAdminToken: (userId: string, role: UserRole, level: number, tokenVersion: number, expiresIn: number) => string;
-export declare const generatePassengerToken: (userId: string, role: UserRole, level: number, tokenVersion: number, expiresIn: number) => string;
-export declare const generateRiderToken: (userId: string, role: UserRole, level: number, tokenVersion: number, expiresIn: number) => string;
-export declare const verifyToken: (token: string) => Promise<JWTPayload>;

package/dist/utils/authTokens.utils.js

@@ -1,32 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyToken = exports.generateRiderToken = exports.generatePassengerToken = exports.generateAdminToken = void 0;
-const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
-const generateAdminToken = (userId, role, level, tokenVersion, expiresIn) => {
-    const payload = { userId, role, level, tokenVersion };
-    return jsonwebtoken_1.default.sign(payload, process.env.JWT_SECRET, {
-        expiresIn: expiresIn || Number(process.env.ADMIN_TOKEN_LIFE_SPAN)
-    });
-};
-exports.generateAdminToken = generateAdminToken;
-const generatePassengerToken = (userId, role, level, tokenVersion, expiresIn) => {
-    const payload = { userId, role, level, tokenVersion };
-    return jsonwebtoken_1.default.sign(payload, process.env.JWT_SECRET, {
-        expiresIn: expiresIn || Number(process.env.PASSENGER_TOKEN_LIFE_SPAN)
-    });
-};
-exports.generatePassengerToken = generatePassengerToken;
-const generateRiderToken = (userId, role, level, tokenVersion, expiresIn) => {
-    const payload = { userId, role, level, tokenVersion };
-    return jsonwebtoken_1.default.sign(payload, process.env.JWT_SECRET, {
-        expiresIn: expiresIn || Number(process.env.RIDER_TOKEN_LIFE_SPAN)
-    });
-};
-exports.generateRiderToken = generateRiderToken;
-const verifyToken = async (token) => {
-    return jsonwebtoken_1.default.verify(token, process.env.JWT_SECRET);
-};
-exports.verifyToken = verifyToken;

package/dist/utils/eventLog.utils.d.ts

@@ -1,13 +0,0 @@
-import { EventAction, EventActorType } from "vr-models";
-interface LogEventInput {
-    actorId?: string | null;
-    actorType?: EventActorType;
-    action: EventAction;
-    entity: string;
-    entityId?: string | null;
-    metadata?: Record<string, any>;
-    ipAddress?: string | null;
-    userAgent?: string | null;
-}
-export declare const logEvent: ({ actorId, actorType, action, entity, entityId, metadata, ipAddress, userAgent }: LogEventInput) => Promise<void>;
-export {};

package/dist/utils/eventLog.utils.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.logEvent = void 0;
-const vr_models_1 = require("vr-models");
-const logEvent = async ({ actorId = null, actorType = "SYSTEM", action, entity, entityId = null, metadata = {}, ipAddress = null, userAgent = null }) => {
-    try {
-        await vr_models_1.EventLog.create({
-            actorId,
-            actorType,
-            action,
-            entity,
-            entityId,
-            metadata,
-            ipAddress,
-            userAgent
-        });
-    }
-    catch (err) {
-        console.log("Error Logging event ::::::", err);
-    }
-};
-exports.logEvent = logEvent;

package/dist/utils/index.d.ts

@@ -1,4 +0,0 @@
-export { checkAccountDependencies, hasActiveDependencies, } from "./account.utils";
-export { generateAdminToken, generatePassengerToken, generateRiderToken, verifyToken, } from "./authTokens.utils";
-export { logEvent } from "./eventLog.utils";
-export { sendSuccessResponse, sendErrorResponse } from "./response.utils";

package/dist/utils/index.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendErrorResponse = exports.sendSuccessResponse = exports.logEvent = exports.verifyToken = exports.generateRiderToken = exports.generatePassengerToken = exports.generateAdminToken = exports.hasActiveDependencies = exports.checkAccountDependencies = 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; } });
-var authTokens_utils_1 = require("./authTokens.utils");
-Object.defineProperty(exports, "generateAdminToken", { enumerable: true, get: function () { return authTokens_utils_1.generateAdminToken; } });
-Object.defineProperty(exports, "generatePassengerToken", { enumerable: true, get: function () { return authTokens_utils_1.generatePassengerToken; } });
-Object.defineProperty(exports, "generateRiderToken", { enumerable: true, get: function () { return authTokens_utils_1.generateRiderToken; } });
-Object.defineProperty(exports, "verifyToken", { enumerable: true, get: function () { return authTokens_utils_1.verifyToken; } });
-var eventLog_utils_1 = require("./eventLog.utils");
-Object.defineProperty(exports, "logEvent", { enumerable: true, get: function () { return eventLog_utils_1.logEvent; } });
-var response_utils_1 = require("./response.utils");
-Object.defineProperty(exports, "sendSuccessResponse", { enumerable: true, get: function () { return response_utils_1.sendSuccessResponse; } });
-Object.defineProperty(exports, "sendErrorResponse", { enumerable: true, get: function () { return response_utils_1.sendErrorResponse; } });

package/dist/utils/response.utils.d.ts

@@ -1,3 +0,0 @@
-import { Response } from "express";
-export declare const sendSuccessResponse: (res: Response, message: string, data?: any, statusCode?: number) => void;
-export declare const sendErrorResponse: (res: Response, message: string, statusCode?: number, error?: any) => void;

package/dist/utils/response.utils.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendErrorResponse = exports.sendSuccessResponse = void 0;
-// Success response
-const sendSuccessResponse = (res, message, data = null, statusCode = 200) => {
-    res.status(statusCode).json({
-        success: true,
-        message,
-        data
-    });
-};
-exports.sendSuccessResponse = sendSuccessResponse;
-// Error response
-const sendErrorResponse = (res, message, statusCode = 400, error = null) => {
-    console.error("Error sent to client::::::", error);
-    res.status(statusCode).json({
-        success: false,
-        message,
-        error: error?.message || error
-    });
-};
-exports.sendErrorResponse = sendErrorResponse;

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

@@ -1,32 +0,0 @@
-import { z } from "zod";
-export declare const userLoginSchema: z.ZodObject<{
-    body: z.ZodObject<{
-        phoneNumber: z.ZodString;
-        nationalId: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        phoneNumber: string;
-        nationalId: string;
-    }, {
-        phoneNumber: string;
-        nationalId: 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;
-    };
-    query?: {} | undefined;
-    params?: {} | undefined;
-    headers?: {} | undefined;
-}, {
-    body: {
-        phoneNumber: string;
-        nationalId: string;
-    };
-    query?: {} | undefined;
-    params?: {} | undefined;
-    headers?: {} | undefined;
-}>;

package/dist/validations/auth.validations.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.userLoginSchema = void 0;
-const zod_1 = require("zod");
-exports.userLoginSchema = zod_1.z.object({
-    body: zod_1.z.object({
-        phoneNumber: 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")
-    }),
-    query: zod_1.z.object({}).optional(),
-    params: zod_1.z.object({}).optional(),
-    headers: zod_1.z.object({}).optional()
-});

package/dist/validations/index.d.ts

@@ -1,2 +0,0 @@
-export { validate } from "./validate.validations";
-export { userLoginSchema } from "./auth.validations";

package/dist/validations/index.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.userLoginSchema = exports.validate = 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");
-Object.defineProperty(exports, "userLoginSchema", { enumerable: true, get: function () { return auth_validations_1.userLoginSchema; } });

package/dist/validations/validate.validations.d.ts

@@ -1,13 +0,0 @@
-import { Request, Response, NextFunction } from "express";
-import { AnyZodObject } from "zod";
-declare global {
-    namespace Express {
-        interface Request {
-            validatedQuery?: any;
-            validatedParams?: any;
-            validatedBody?: any;
-            validatedHeaders?: any;
-        }
-    }
-}
-export declare const validate: (schema: AnyZodObject) => (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/dist/validations/validate.validations.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validate = void 0;
-const zod_1 = require("zod");
-const validate = (schema) => async (req, res, next) => {
-    try {
-        // Validate all parts of the request against the schema
-        const result = await schema.parseAsync({
-            body: req.body,
-            query: req.query,
-            params: req.params,
-            headers: req.headers // Add headers to validation
-        });
-        // Store validated values in custom properties
-        req.validatedBody = result.body;
-        req.validatedQuery = result.query;
-        req.validatedParams = result.params;
-        req.validatedHeaders = result.headers;
-        // Only replace body (other parts should remain read-only)
-        req.body = result.body || req.body;
-        return next();
-    }
-    catch (error) {
-        console.error(" validate middleware function Error::::::", error);
-        if (error instanceof zod_1.ZodError) {
-            res.status(400).json({
-                status: "fail",
-                errors: error.errors.map((err) => ({
-                    path: err.path.join("."),
-                    message: err.message
-                }))
-            });
-            return;
-        }
-        next(error);
-    }
-};
-exports.validate = validate;