@konplit-services/common 1.9.0 → 1.10.0

package/build/events/accounts-events/interfaces/index.d.ts

@@ -4,3 +4,5 @@ export * from "./permission-created.interface";
 export * from "./permission-removed.interface";
 export * from "./user-created.interface";
 export * from "./user-updated.interface";
+export * from "./twofa-created.interface";
+export * from "./twofa-updated.interface";

package/build/events/accounts-events/interfaces/index.js

@@ -20,3 +20,5 @@ __exportStar(require("./permission-created.interface"), exports);
 __exportStar(require("./permission-removed.interface"), exports);
 __exportStar(require("./user-created.interface"), exports);
 __exportStar(require("./user-updated.interface"), exports);
+__exportStar(require("./twofa-created.interface"), exports);
+__exportStar(require("./twofa-updated.interface"), exports);

package/build/events/accounts-events/interfaces/twofa-created.interface.d.ts

@@ -0,0 +1,16 @@
+import { TwoFAType } from "../../../helper";
+import { StreamEvent, StreamName, Subjects } from "../../subjects";
+export interface TWOFACreatedEvent {
+    subject: Subjects.TwoFACreated;
+    streamName: StreamName.name;
+    streamEvents: StreamEvent.Event;
+    data: {
+        id: string;
+        accountId?: string;
+        userId: string;
+        isTwoFactor?: boolean;
+        twoFactorType?: TwoFAType;
+        twoFactorSecret?: string;
+        version?: number;
+    };
+}

package/build/events/accounts-events/interfaces/twofa-created.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/build/events/accounts-events/interfaces/twofa-updated.interface.d.ts

@@ -0,0 +1,16 @@
+import { TwoFAType } from "../../../helper";
+import { StreamEvent, StreamName, Subjects } from "../../subjects";
+export interface TWOFAUpdatedEvent {
+    subject: Subjects.TwoFAUpdated;
+    streamName: StreamName.name;
+    streamEvents: StreamEvent.Event;
+    data: {
+        id: string;
+        accountId?: string;
+        userId: string;
+        isTwoFactor?: boolean;
+        twoFactorType?: TwoFAType;
+        twoFactorSecret?: string;
+        version?: number;
+    };
+}

package/build/events/accounts-events/interfaces/twofa-updated.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/build/events/subjects.d.ts

@@ -7,6 +7,8 @@ export declare enum StreamName {
 export declare enum Subjects {
     AccountCreated = "events.account.created",
     AccountUpdated = "events.account.updated",
+    TwoFACreated = "events.two.fa.created",
+    TwoFAUpdated = "events.two.fa.updated",
     UserCreated = "events.user.created",
     UserUpdated = "events.user.updated",
     MerchantCreated = "events.merchant.created",

package/build/events/subjects.js

@@ -14,6 +14,8 @@ var Subjects;
     // Accounts Subjects
     Subjects["AccountCreated"] = "events.account.created";
     Subjects["AccountUpdated"] = "events.account.updated";
+    Subjects["TwoFACreated"] = "events.two.fa.created";
+    Subjects["TwoFAUpdated"] = "events.two.fa.updated";
     //users
     Subjects["UserCreated"] = "events.user.created";
     Subjects["UserUpdated"] = "events.user.updated";

package/build/helper/index.d.ts

@@ -53,3 +53,4 @@ export * from "./subaccount";
 export * from "./remove-query-properties";
 export * from "./ussd";
 export * from "./phone-validator";
+export * from "./token-validation";

package/build/helper/index.js

@@ -71,3 +71,4 @@ __exportStar(require("./remove-query-properties"), exports);
 __exportStar(require("./ussd"), exports);
 //validation
 __exportStar(require("./phone-validator"), exports);
+__exportStar(require("./token-validation"), exports);

package/build/helper/money.d.ts

@@ -42,10 +42,5 @@ export declare const subtractMoney: (a: ReturnType<typeof dinero>, b: ReturnType
  */
 export declare const multiplyMoney: (a: ReturnType<typeof dinero>, factor: number) => import("dinero.js").Dinero<number>;
 export declare const divideMoney: (money: ReturnType<typeof dinero>, divisor: number) => import("dinero.js").Dinero<number>;
-/**
- * Convert a decimal string or number (₦) to minor units (kobo).
- * Example: "4543.367487363" → 454337n (₦4543.37)
- * Example: 4543.37 → 454337n
- */
-export declare const toSmalletUnit: (value: string | number, exponent?: number) => bigint;
+export declare const toSmalletUnit: (naira: number | string) => number;
 export {};

package/build/helper/money.js

@@ -87,17 +87,10 @@ const divideMoney = (money, divisor) => {
     return (0, exports.createMoney)(result);
 };
 exports.divideMoney = divideMoney;
-/**
- * Convert a decimal string or number (₦) to minor units (kobo).
- * Example: "4543.367487363" → 454337n (₦4543.37)
- * Example: 4543.37 → 454337n
- */
-const toSmalletUnit = (value, exponent = 2) => {
-    const strValue = value.toString();
-    const [integer, fraction = ""] = strValue.split(".");
-    const paddedFraction = (fraction + "0".repeat(exponent)).slice(0, exponent);
-    const minorStr = integer + paddedFraction;
-    return BigInt(minorStr);
+const toSmalletUnit = (naira) => {
+    if (typeof naira === "string") {
+        naira = parseFloat(naira);
+    }
+    return Math.round(naira * 100);
 };
 exports.toSmalletUnit = toSmalletUnit;
-const value = Number((0, exports.toSmalletUnit)("4543.367487363")); // 454337n

package/build/helper/token-validation.d.ts

@@ -0,0 +1,5 @@
+export declare enum TokenValidationType {
+    settlement = "settlement",
+    transafer = "transafer",
+    login = "login"
+}

package/build/helper/token-validation.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TokenValidationType = void 0;
+var TokenValidationType;
+(function (TokenValidationType) {
+    TokenValidationType["settlement"] = "settlement";
+    TokenValidationType["transafer"] = "transafer";
+    TokenValidationType["login"] = "login";
+})(TokenValidationType || (exports.TokenValidationType = TokenValidationType = {}));

package/build/middlewares/current-user.js

@@ -25,20 +25,21 @@ const currentUser = (req, res, next) => __awaiter(void 0, void 0, void 0, functi
             const token = req.headers["authorization"].split(" ")[1];
             const payload = yield Jwt_1.JWT.verifyToken(token);
             // Add this debug logic:
-            const now = Math.floor(Date.now() / 1000); // Current time in seconds
-            const timeElapsed = (now - payload.iat);
-            const timeRemaining = payload.exp - now;
-            const tokenLifetime = payload.exp - payload.iat;
-            console.log({
-                issuedAt: new Date(payload.iat * 1000).toISOString(),
-                expiresAt: new Date(payload.exp * 1000).toISOString(),
-                timeElapsed,
-                timeRemaining,
-                tokenLifetime,
-            });
+            // const now = Math.floor(Date.now() / 1000); // Current time in seconds
+            //const timeElapsed = (now - payload.iat!) as number;
+            // const timeRemaining = payload.exp! - now;
+            // const tokenLifetime = payload.exp! - payload.iat!;
+            // console.log({
+            //   issuedAt: new Date(payload.iat! * 1000).toISOString(),
+            //   expiresAt: new Date(payload.exp! * 1000).toISOString(),
+            //   timeElapsed,
+            //   timeRemaining,
+            //   tokenLifetime,
+            // });
             if (payload.type !== Jwt_1.JWTType.ACCESS) {
                 throw new notAuthorized_1.NotAuthorizedError(language_1.lang.not_authorized, error_codes_1.error_codes.INVALID_AUTHORIZATION);
             }
+            // Check if token found in redis the token is revoked
             const isValidToken = yield base_1.redisWrapper.isTokenRevoked((0, constants_1.checkRevokedToken)(payload.id, token));
             if (isValidToken) {
                 throw new notAuthorized_1.NotAuthorizedError(language_1.lang.not_authorized, error_codes_1.error_codes.INVALID_AUTHORIZATION);

package/build/middlewares/index.d.ts

@@ -9,3 +9,4 @@ export * from "./mono-webhook";
 export * from "./request-log";
 export * from "./rate-limit";
 export * from "./transaction-session";
+export * from "./token-validation-session";

package/build/middlewares/index.js

@@ -25,3 +25,4 @@ __exportStar(require("./mono-webhook"), exports);
 __exportStar(require("./request-log"), exports);
 __exportStar(require("./rate-limit"), exports);
 __exportStar(require("./transaction-session"), exports);
+__exportStar(require("./token-validation-session"), exports);

package/build/middlewares/token-validation-session.d.ts

@@ -0,0 +1,10 @@
+import { NextFunction, Request, Response } from "express";
+import { TOKEN_VALIDATION_JWT_DATA } from "../services/Jwt";
+declare global {
+    namespace Express {
+        interface Request {
+            twoFaData: TOKEN_VALIDATION_JWT_DATA;
+        }
+    }
+}
+export declare const TwoFactorSessionValidation: (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/build/middlewares/token-validation-session.js

@@ -0,0 +1,44 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TwoFactorSessionValidation = void 0;
+const Jwt_1 = require("../services/Jwt");
+const notAuthorized_1 = require("../errors/notAuthorized");
+const error_codes_1 = require("../helper/errorCodes/error-codes");
+const app_configs_1 = require("../app.configs");
+const helper_1 = require("../helper");
+const redis_1 = require("../redis");
+const TwoFactorSessionValidation = (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!req.headers["k-2fa-session"]) {
+        throw new notAuthorized_1.NotAuthorizedError("k-2fa-session token not provided", error_codes_1.error_codes.INVALID_AUTHORIZATION);
+    }
+    try {
+        if (req.headers["k-2fa-session"]) {
+            const token = req.headers["k-2fa-session"];
+            const payload = yield Jwt_1.JWT.verify2FAToken(token);
+            // Check if token found in redis the token is revoked
+            const isValidToken = yield redis_1.redisWrapper.isTokenRevoked((0, redis_1.checkRevokedToken)(payload.userId, token));
+            if (isValidToken) {
+                throw new notAuthorized_1.NotAuthorizedError(helper_1.lang.not_authorized, error_codes_1.error_codes.INVALID_AUTHORIZATION);
+            }
+            yield redis_1.redisWrapper.isTokenRevoked((0, redis_1.setsetRevokedToken)(payload.userId, token));
+            req.twoFaData = payload;
+        }
+        return next();
+    }
+    catch (error) {
+        if (app_configs_1.appConfigs.getNODE_ENV() !== "production") {
+            console.log("failed to process 2fa token");
+        }
+        throw new notAuthorized_1.NotAuthorizedError("Invalid twofa session please restart the process again", error_codes_1.error_codes.INVALID_AUTHORIZATION);
+    }
+});
+exports.TwoFactorSessionValidation = TwoFactorSessionValidation;

package/build/redis/constants/index.d.ts

@@ -1,6 +1,8 @@
 export declare const REDIS_REPOSITORY = "RedisRepository";
 export declare const setVerificationCode: (email: string) => string;
 export declare const getVerificationCode: (email: string) => string;
+export declare const setSettlementAuthCode: (email: string) => string;
+export declare const getSettlementAuthCode: (email: string) => string;
 export declare const setTransferCode: (id: string, code: string) => string;
 export declare const getTransferCode: (id: string, code: string) => string;
 export declare const getPermissions: (id: string) => string;

package/build/redis/constants/index.js

@@ -1,11 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setTransferToken = exports.checkTransferToken = exports.setsetRevokedToken = exports.checkRevokedToken = exports.setPermissions = exports.getPermissions = exports.getTransferCode = exports.setTransferCode = exports.getVerificationCode = exports.setVerificationCode = exports.REDIS_REPOSITORY = void 0;
+exports.setTransferToken = exports.checkTransferToken = exports.setsetRevokedToken = exports.checkRevokedToken = exports.setPermissions = exports.getPermissions = exports.getTransferCode = exports.setTransferCode = exports.getSettlementAuthCode = exports.setSettlementAuthCode = exports.getVerificationCode = exports.setVerificationCode = exports.REDIS_REPOSITORY = void 0;
 exports.REDIS_REPOSITORY = "RedisRepository";
 const setVerificationCode = (email) => `${email}-verification`;
 exports.setVerificationCode = setVerificationCode;
 const getVerificationCode = (email) => `${email}-verification`;
 exports.getVerificationCode = getVerificationCode;
+const setSettlementAuthCode = (email) => `${email}-settlement-auth`;
+exports.setSettlementAuthCode = setSettlementAuthCode;
+const getSettlementAuthCode = (email) => `${email}-settlement-auth`;
+exports.getSettlementAuthCode = getSettlementAuthCode;
 const setTransferCode = (id, code) => `${id}-${code}-transfer`;
 exports.setTransferCode = setTransferCode;
 const getTransferCode = (id, code) => `${id}-${code}-transfer`;

package/build/services/Jwt.d.ts

@@ -1,5 +1,5 @@
 import { SignOptions } from "jsonwebtoken";
-import { Usage, USER_TYPES } from "../helper";
+import { TokenValidationType, Usage, USER_TYPES } from "../helper";
 export declare enum JWTType {
     REFRESH = "REFRESH",
     ACCESS = "ACCESS"
@@ -12,6 +12,7 @@ export interface JWT_Data {
     userType: USER_TYPES;
     accountId?: string;
     adminId?: string;
+    fullName?: string;
     iat?: number;
     exp?: number;
 }
@@ -34,6 +35,12 @@ export interface SUBSCRIPTION_JWT_DATA {
     iat?: string;
     exp?: number;
 }
+export interface TOKEN_VALIDATION_JWT_DATA {
+    userId: string;
+    type: TokenValidationType;
+    iat?: string;
+    exp?: number;
+}
 export declare class JWT {
     static getToken(data: JWT_Data, options?: SignOptions): Promise<string>;
     static verifyToken(token: string): Promise<JWT_Data>;
@@ -41,4 +48,6 @@ export declare class JWT {
     static verifyTransactionToken(token: string): Promise<TRANSACTION_JWT_DATA>;
     static getSubscriptionToken(data: SUBSCRIPTION_JWT_DATA, options?: SignOptions): Promise<string>;
     static verifySubscriptionToken(token: string): Promise<SUBSCRIPTION_JWT_DATA>;
+    static get2FAToken(data: TOKEN_VALIDATION_JWT_DATA, options?: SignOptions): Promise<string>;
+    static verify2FAToken(token: string): Promise<TOKEN_VALIDATION_JWT_DATA>;
 }

package/build/services/Jwt.js

@@ -24,6 +24,7 @@ var JWTType;
 const secret = process.env.JWT_KEY;
 const transactionSecret = process.env.TRANSACTION_JWT_KEY;
 const subscriptionSecret = process.env.SUBSCRIPTION_JWT_KEY;
+const twoFactorSecret = process.env.SUBSCRIPTION_JWT_KEY;
 class JWT {
     static getToken(data_1) {
         return __awaiter(this, arguments, void 0, function* (data, options = {}) {
@@ -73,5 +74,21 @@ class JWT {
             });
         });
     }
+    static get2FAToken(data_1) {
+        return __awaiter(this, arguments, void 0, function* (data, options = {}) {
+            return signAsync(data, twoFactorSecret, options);
+        });
+    }
+    static verify2FAToken(token) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => {
+                jsonwebtoken_1.default.verify(token, twoFactorSecret, function (err, decoded) {
+                    if (err)
+                        reject(err);
+                    resolve(decoded);
+                });
+            });
+        });
+    }
 }
 exports.JWT = JWT;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konplit-services/common",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",