@social-mail/social-mail-web-server 1.4.847 → 1.4.849

package/dist/wwwroot/routes/pg-i/phone-pe/create/index.d.ts

@@ -1,9 +1,7 @@
 import Page from "@entity-access/server-pages/dist/Page.js";
-import SocialMailContext from "../../../../../server/model/SocialMailContext.js";
-import StoreConfigService from "../../../../../server/services/store/StoreConfigService.js";
+import PhonePeGateway from "../../../../../server/services/payment-gateways/PhonePeGateway.js";
 export default class extends Page {
-    db: SocialMailContext;
-    configService: StoreConfigService;
+    gateway: PhonePeGateway;
     run(): Promise<import("@entity-access/server-pages/dist/Content.js").Redirect>;
 }
 //# sourceMappingURL=index.d.ts.map

package/dist/wwwroot/routes/pg-i/phone-pe/create/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/pg-i/phone-pe/create/index.tsx"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,iBAAiB,MAAM,kDAAkD,CAAC;AACjF,OAAO,kBAAkB,MAAM,4DAA4D,CAAC;AAK5F,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,EAAE,EAAE,iBAAiB,CAAC;IAGtB,aAAa,EAAE,kBAAkB,CAAC;IAE5B,GAAG;CA2EZ"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/pg-i/phone-pe/create/index.tsx"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,cAAc,MAAM,mEAAmE,CAAC;AAE/F,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,OAAO,EAAE,cAAc,CAAC;IAElB,GAAG;CASZ"}

package/dist/wwwroot/routes/pg-i/phone-pe/create/index.js

@@ -9,85 +9,17 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import Inject from "@entity-access/entity-access/dist/di/di.js";
 import Page from "@entity-access/server-pages/dist/Page.js";
-import SocialMailContext from "../../../../../server/model/SocialMailContext.js";
-import StoreConfigService from "../../../../../server/services/store/StoreConfigService.js";
-import { randomUUID } from "crypto";
-import { createHash } from "node:crypto";
+import PhonePeGateway from "../../../../../server/services/payment-gateways/PhonePeGateway.js";
 export default class default_1 extends Page {
     async run() {
-        const [itemPriceID] = this.childPath;
+        const [itemID, currency] = this.childPath;
         const host = this.request.hostName;
-        const q = this.db.storeItemPrices
-            .where({ itemPriceID, host }, (p) => (x) => x.priceID === p.itemPriceID);
-        // if (!this.sessionUser.isAdmin) {
-        //     q = q.where({ host }, (p) => (x) =>
-        //         x.storeItem.store.storeWebsites.some((w) => w.website.hosts.some((h) => h.host === p.host))
-        //     );
-        // }
-        const itemPrice = await q
-            .include((x) => [x.storeItem.variantFor, x.storeItem.sizeFor])
-            .firstOrFail();
-        let name = "phone-pe";
-        if (this.query.test) {
-            name = "phone-pe-test";
-        }
-        const config = await this.configService.getConfigs(itemPrice.storeItem.storeID, name);
-        const { merchantId, url, keyIndex, key } = config;
-        const merchantTransactionId = randomUUID().replaceAll("-", "");
-        const createRequest = {
-            merchantId,
-            merchantTransactionId,
-            merchantUserId: randomUUID().replaceAll("-", ""),
-            amount: itemPrice.amount * 100,
-            callbackUrl: `https://${host}/callbacks/phonepe-callback/${merchantTransactionId}`,
-            redirectUrl: `https://${host}/callbacks/phonepe-success/${merchantTransactionId}`,
-            paymentInstrument: {
-                type: "PAY_PAGE"
-            }
-        };
-        const { request, verify } = signRequest(keyIndex, key, JSON.stringify(createRequest));
-        const r = await fetch((url.endsWith("/") ? url.substring(1) : url) + "/pg/v1/pay", {
-            method: "POST",
-            headers: {
-                "x-verify": verify,
-                "content-type": "application/json"
-            },
-            body: JSON.stringify({ request })
-        });
-        if (r.status >= 300) {
-            throw new Error(await r.text());
-        }
-        const text = await r.text();
-        try {
-            const rs = JSON.parse(text);
-            if (rs.success) {
-                const redirectUrl = rs?.data?.instrumentResponse?.redirectInfo?.url;
-                if (redirectUrl) {
-                    return this.redirect(redirectUrl);
-                }
-            }
-            throw new Error("Failed");
-        }
-        catch (error) {
-            throw new Error(text);
-        }
+        const pr = await this.gateway.createPaymentLink({ itemID, currency, host, testMode: this.query.test });
+        return this.redirect(pr.url);
     }
 }
 __decorate([
     Inject,
-    __metadata("design:type", SocialMailContext)
-], default_1.prototype, "db", void 0);
-__decorate([
-    Inject,
-    __metadata("design:type", StoreConfigService)
-], default_1.prototype, "configService", void 0);
-function signRequest(id, salt, payload, path = "/pg/v1/pay") {
-    const request = Buffer.from(payload, "utf-8").toString("base64");
-    const signPayload = `${request}${path}${salt}`;
-    const sha256 = createHash("sha256").update(signPayload).digest("hex");
-    return {
-        request,
-        verify: `${sha256}###${id}`
-    };
-}
+    __metadata("design:type", PhonePeGateway)
+], default_1.prototype, "gateway", void 0);
 //# sourceMappingURL=index.js.map

package/dist/wwwroot/routes/pg-i/phone-pe/create/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/pg-i/phone-pe/create/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/pg-i/phone-pe/create/index.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,cAAc,MAAM,mEAAmE,CAAC;AAE/F,MAAM,CAAC,OAAO,gBAAO,SAAQ,IAAI;IAK7B,KAAK,CAAC,GAAG;QAEL,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAE,GAAG,IAAI,CAAC,SAAkB,CAAC;QAEpD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;QAEnC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QACvG,OAAO,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;CACJ;AAXG;IADC,MAAM;8BACE,cAAc;0CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.4.847",
+  "version": "1.4.849",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/server/seed/ui/seed-ui.ts

@@ -3,7 +3,7 @@ import semver from "semver";
 
 export default async function seedUI(config: DBConfig) {
 
-    const version = "1.2.322";
+    const version = "1.2.323";
 
     const existing = await config.getValue(UIPackageConfig, false);
     if (existing) {

package/src/server/services/payment-gateways/Gateway.ts

@@ -1,3 +1,7 @@
+import Inject from "@entity-access/entity-access/dist/di/di.js";
+import SocialMailContext from "../../model/SocialMailContext.js";
+import StoreConfigService from "../store/StoreConfigService.js";
+
 export interface IPaymentGatewayCreateRequest {
     storeID: number;
     userID: string;
@@ -19,10 +23,33 @@ export interface IPaymentGatewayGetResponse {
     success: boolean;
 }
 
-export interface IPaymentGateway {
+export abstract class PaymentGateway {
+
+    @Inject
+    configService: StoreConfigService;
+
+    @Inject
+    db: SocialMailContext;
+
+    async createPaymentLink({ itemID, host, testMode = false, currency = "USD"}) {
+        const { price, taxes } = await this.configService.getPrice(itemID, currency);
+        let total = price.amount;
+        for (const iterator of taxes) {
+            total += (price.amount*iterator.amount);
+        }
+
+        return this.create({
+            storeID: price.storeItem.storeID,
+            amount: total,
+            orderID: void 0,
+            userID: void 0,
+            host,
+            testMode
+        });
+    }
 
-    create(req:IPaymentGatewayCreateRequest): Promise<IPaymentGatewayCreateResponse>;
+    abstract create(req:IPaymentGatewayCreateRequest): Promise<IPaymentGatewayCreateResponse>;
 
-    get(req:IPaymentGatewayGetRequest): Promise<IPaymentGatewayGetResponse>;
+    abstract get(req:IPaymentGatewayGetRequest): Promise<IPaymentGatewayGetResponse>;
 
 }

package/src/server/services/payment-gateways/PhonePeGateway.ts

@@ -1,7 +1,7 @@
 import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
-import { IPaymentGateway, IPaymentGatewayCreateRequest, IPaymentGatewayCreateResponse, IPaymentGatewayGetRequest, IPaymentGatewayGetResponse } from "./Gateway.js";
+import { PaymentGateway, IPaymentGatewayCreateRequest, IPaymentGatewayCreateResponse, IPaymentGatewayGetRequest, IPaymentGatewayGetResponse } from "./Gateway.js";
 import StoreConfigService from "../store/StoreConfigService.js";
-import { createHash } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 
 const signRequest = (id: any, salt: any, payload: string, path = "/pg/v1/pay"): { request: any; verify: any; } => {
     const request = Buffer.from(payload, "utf-8").toString("base64");
@@ -15,14 +15,13 @@ const signRequest = (id: any, salt: any, payload: string, path = "/pg/v1/pay"):
 
 
 @RegisterScoped
-export default class PhonePeGateway implements IPaymentGateway {
-
-    @Inject
-    configService: StoreConfigService;
+export default class PhonePeGateway extends PaymentGateway {
 
     async create({ storeID, testMode, orderID, userID, amount, host }: IPaymentGatewayCreateRequest): Promise<IPaymentGatewayCreateResponse> {
 
-        const config = await this.getConfig(storeID, testMode);
+        const name = testMode ? "phone-pe-test" : "phone-pe";
+
+        const config = await this.configService.getConfigs(storeID, name);
 
         const {
             merchantId,
@@ -31,12 +30,12 @@ export default class PhonePeGateway implements IPaymentGateway {
             key
         } = config;
 
-        const merchantTransactionId = orderID;
+        const merchantTransactionId = orderID ?? randomUUID().replaceAll("-", "");
 
         const createRequest = {
             merchantId,
             merchantTransactionId,
-            merchantUserId: userID,
+            merchantUserId: userID ?? randomUUID().replaceAll("-", ""),
             amount: amount * 100,
             callbackUrl: `https://${host}/callbacks/phonepe-callback/${merchantTransactionId}`,
             redirectUrl: `https://${host}/callbacks/phonepe-success/${merchantTransactionId}`,
@@ -64,7 +63,7 @@ export default class PhonePeGateway implements IPaymentGateway {
             if (rs.success) {
             const redirectUrl = rs?.data?.instrumentResponse?.redirectInfo?.url;
                 if (redirectUrl) {
-                    return { url: redirectUrl };
+                    return redirectUrl;
                 }
             }
             throw new Error("Failed");

package/src/server/services/store/StoreConfigService.ts

@@ -5,6 +5,7 @@ import SocialMailContext from "../../model/SocialMailContext.js";
 import EncryptionService from "../encryption/EncryptionService.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import { chainToCamel } from "../../../common/chainToCamel.js";
+import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 
 @RegisterSingleton
 export default class StoreConfigService {
@@ -38,4 +39,26 @@ export default class StoreConfigService {
         ).first();
     }
 
+    @cacheFor()
+    async getPrice(itemID, currency) {
+        using scope = ServiceProvider.createScope(this);
+        const db = scope.resolve(SocialMailContext);
+
+        const now = DateTime.now;
+
+        const q = db.storeItemPrices.where({ currency, now }, (p) => (x) =>
+            x.currency === p.currency
+            && x.startDate as any <= Sql.cast.asDateTime(p.now)
+            && (x.endDate === null || x.endDate as any > p.now)
+        );
+
+        const price = await q.where({ itemID }, (p) => (x) => x.storeItemID === p.itemID)
+            .include((x) => x.storeItem)
+            .first();
+
+        const taxes = await q.where({ itemID} , (p) => (x) => x.storeItem.taxItems.some((ti) => ti.storeItemID === p.itemID))
+            .toArray();
+
+        return { price, taxes };
+    }
 }

package/src/wwwroot/routes/pg-i/phone-pe/create/index.tsx

@@ -1,102 +1,20 @@
 import Inject from "@entity-access/entity-access/dist/di/di.js";
 import Page from "@entity-access/server-pages/dist/Page.js";
-import SocialMailContext from "../../../../../server/model/SocialMailContext.js";
-import StoreConfigService from "../../../../../server/services/store/StoreConfigService.js";
-import { randomUUID } from "crypto";
-import { globalEnv } from "../../../../../common/globalEnv.js";
-import { createHash } from "node:crypto";
+import PhonePeGateway from "../../../../../server/services/payment-gateways/PhonePeGateway.js";
 
 export default class extends Page {
 
     @Inject
-    db: SocialMailContext;
-
-    @Inject
-    configService: StoreConfigService;
+    gateway: PhonePeGateway;
 
     async run() {
 
-        const [itemPriceID ] = this.childPath as any[];
-        const host = this.request.hostName;
-
-        const q = this.db.storeItemPrices
-            .where({ itemPriceID, host }, (p) => (x) =>
-                x.priceID === p.itemPriceID
-            );
-
-        // if (!this.sessionUser.isAdmin) {
-        //     q = q.where({ host }, (p) => (x) =>
-        //         x.storeItem.store.storeWebsites.some((w) => w.website.hosts.some((h) => h.host === p.host))
-        //     );
-        // }
-
-        const itemPrice = await q
-            .include((x) => [x.storeItem.variantFor, x.storeItem.sizeFor])
-            .firstOrFail();
-
-        let name = "phone-pe";
-        if (this.query.test) {
-            name = "phone-pe-test";
-        }
+        const [itemID, currency ] = this.childPath as any[];
 
-        const config = await this.configService.getConfigs(itemPrice.storeItem.storeID, name);
-
-        const {
-            merchantId,
-            url,
-            keyIndex,
-            key
-        } = config;
-
-        const merchantTransactionId = randomUUID().replaceAll("-", "");
-
-        const createRequest = {
-            merchantId,
-            merchantTransactionId,
-            merchantUserId: randomUUID().replaceAll("-", ""),
-            amount: itemPrice.amount * 100,
-            callbackUrl: `https://${host}/callbacks/phonepe-callback/${merchantTransactionId}`,
-            redirectUrl: `https://${host}/callbacks/phonepe-success/${merchantTransactionId}`,
-            paymentInstrument: {
-                type: "PAY_PAGE"
-            }
-        };
-
-        const { request, verify } = signRequest(keyIndex, key, JSON.stringify(createRequest));
+        const host = this.request.hostName;
 
-        const r = await fetch((url.endsWith("/") ? url.substring(1) : url) + "/pg/v1/pay", {
-            method: "POST",
-            headers: {
-                "x-verify": verify,
-                "content-type": "application/json"
-            },
-            body: JSON.stringify({ request })
-        });
-        if(r.status >= 300) {
-            throw new Error(await r.text());
-        }
-        const text = await r.text();
-        try {
-            const rs = JSON.parse(text);
-            if (rs.success) {
-            const redirectUrl = rs?.data?.instrumentResponse?.redirectInfo?.url;
-                if (redirectUrl) {
-                    return this.redirect(redirectUrl);
-                }
-            }
-            throw new Error("Failed");
-        } catch (error) {
-            throw new Error(text);
-        }
+        const pr = await this.gateway.createPaymentLink({ itemID, currency, host, testMode: this.query.test });
+        return this.redirect(pr.url);
     }
 }
 
-function signRequest(id: any, salt: any, payload: string, path = "/pg/v1/pay"): { request: any; verify: any; } {
-    const request = Buffer.from(payload, "utf-8").toString("base64");
-    const signPayload = `${request}${path}${salt}`;
-    const sha256 = createHash("sha256").update(signPayload).digest("hex");
-    return {
-        request,
-        verify: `${sha256}###${id}`
-    };
-}