@social-mail/social-mail-web-server 1.8.67 → 1.8.72

package/dist/wwwroot/routes/social-mail/site/signup/post.d.ts

@@ -7,9 +7,10 @@ import EmailAddressService from "../../../../../server/services/EmailAddressServ
 import CaptchaService from "../../../../../server/services/captcha/CaptchaService.js";
 import WebSiteContentService from "../../../../../server/services/files/WebSiteContentService.js";
 import OtpToUserService from "../../../../../server/services/user/otp-to-user/OtpToUserService.js";
+import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
+import EmailVerificationService from "../../../../../server/services/user/email-verification/EmailVerificationService.js";
 export interface ISignup {
     userID: number;
-    password: string;
     name: string;
     phoneNumber: string;
     emailAddress: string;
@@ -31,6 +32,8 @@ export default class ExternalSignup extends Page {
     otpService: OtpToUserService;
     db: SocialMailContext;
     websiteService: WebSiteContentService;
+    sessionSecurity: SessionSecurity;
+    evs: EmailVerificationService;
     run(): Promise<import("@entity-access/server-pages/dist/Content.js").default>;
 }
 //# sourceMappingURL=post.d.ts.map

package/dist/wwwroot/routes/social-mail/site/signup/post.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/social-mail/site/signup/post.tsx"],"names":[],"mappings":"AAGA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAG5D,OAAO,iBAAiB,MAAM,kDAAkD,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,sDAAsD,CAAC;AAC3F,OAAO,iBAAiB,MAAM,2DAA2D,CAAC;AAC1F,OAAO,aAAa,MAAM,iDAAiD,CAAC;AAC5E,OAAO,mBAAmB,MAAM,uDAAuD,CAAC;AACxF,OAAO,cAAc,MAAM,0DAA0D,CAAC;AACtF,OAAO,qBAAqB,MAAM,+DAA+D,CAAC;AAClG,OAAO,gBAAgB,MAAM,qEAAqE,CAAC;AAEnG,MAAM,WAAW,OAAO;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACpC,KAAK,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAClC,KAAK,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACvC,QAAQ,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;CAC3C;AAED;;GAEG;AAIH,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,IAAI;IAG5C,cAAc,EAAE,cAAc,CAAC;IAG/B,aAAa,EAAE,aAAa,CAAC;IAG7B,mBAAmB,EAAE,mBAAmB,CAAC;IAGzC,UAAU,EAAE,gBAAgB,CAAC;IAG7B,EAAE,EAAE,iBAAiB,CAAC;IAGtB,cAAc,EAAE,qBAAqB,CAAC;IAEhC,GAAG;CAgKZ"}
+{"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/social-mail/site/signup/post.tsx"],"names":[],"mappings":"AAGA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAG5D,OAAO,iBAAiB,MAAM,kDAAkD,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,sDAAsD,CAAC;AAC3F,OAAO,iBAAiB,MAAM,2DAA2D,CAAC;AAC1F,OAAO,aAAa,MAAM,iDAAiD,CAAC;AAC5E,OAAO,mBAAmB,MAAM,uDAAuD,CAAC;AACxF,OAAO,cAAc,MAAM,0DAA0D,CAAC;AACtF,OAAO,qBAAqB,MAAM,+DAA+D,CAAC;AAClG,OAAO,gBAAgB,MAAM,qEAAqE,CAAC;AACnG,OAAO,eAAe,MAAM,8DAA8D,CAAC;AAC3F,OAAO,wBAAwB,MAAM,oFAAoF,CAAC;AAE1H,MAAM,WAAW,OAAO;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACpC,KAAK,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAClC,KAAK,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACvC,QAAQ,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;CAC3C;AAED;;GAEG;AAIH,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,IAAI;IAG5C,cAAc,EAAE,cAAc,CAAC;IAG/B,aAAa,EAAE,aAAa,CAAC;IAG7B,mBAAmB,EAAE,mBAAmB,CAAC;IAGzC,UAAU,EAAE,gBAAgB,CAAC;IAG7B,EAAE,EAAE,iBAAiB,CAAC;IAGtB,cAAc,EAAE,qBAAqB,CAAC;IAGtC,eAAe,EAAE,eAAe,CAAC;IAGjC,GAAG,EAAE,wBAAwB,CAAC;IAExB,GAAG;CAyLZ"}

package/dist/wwwroot/routes/social-mail/site/signup/post.js

@@ -19,6 +19,8 @@ import EmailAddressService from "../../../../../server/services/EmailAddressServ
 import CaptchaService from "../../../../../server/services/captcha/CaptchaService.js";
 import WebSiteContentService from "../../../../../server/services/files/WebSiteContentService.js";
 import OtpToUserService from "../../../../../server/services/user/otp-to-user/OtpToUserService.js";
+import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
+import EmailVerificationService from "../../../../../server/services/user/email-verification/EmailVerificationService.js";
 /**
  * External Signup is used for signing up for Blog or Store.
  */
@@ -28,19 +30,40 @@ let ExternalSignup = class ExternalSignup extends Page {
         db.verifyFilters = false;
         db.raiseEvents = false;
         const model = this.body;
-        model.emailAddress = model.email.verifyAddresses;
-        model.phoneNumber = model.phone.verifyAddresses;
+        // first verify captcha...
         const w = await this.websiteService.getWebSite(this.request.hostName);
         const storeID = w.folderID;
         if (!storeID) {
             throw new EntityAccessError(`Signup not allowed`);
         }
-        model.password = model.password?.trim();
         if (!model.emailAddress) {
             throw new EntityAccessError("Email is required");
         }
         model.phoneNumber = `+${model.phoneNumber.replace(/[^0-9]/g, "")}`;
-        // check if phone number already exists...
+        let verificationGenerated = false;
+        if (!model.phone.verificationID) {
+            verificationGenerated = true;
+            // generate new one...
+            const vp = await this.otpService.create({ phone: model.phone.phone });
+            model.phone.verificationID = vp.id;
+            const v = await db.verificationTokens.where(vp, (p) => (x) => x.verificationID === p.id).first();
+            // inject public key
+            await this.sessionSecurity.injectPublicKey(v);
+            model.phone.accessCode = v.accessCode;
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-expect-error
+            model.phone.$key = v.$key;
+        }
+        if (!model.email.verificationID) {
+            verificationGenerated = true;
+            const v = await this.evs.create({ email: model.emailAddress, ipAddress: this.request.remoteIPAddress });
+            model.email.verificationID = v.verificationID;
+            // @ts-expect-error unknown fields
+            model.email.$key = v.$key;
+        }
+        if (verificationGenerated) {
+            return this.json(model);
+        }
         for (const v1 of [model.captcha, model.email, model.phone]) {
             const { verificationID, accessCode } = v1;
             const vr = await db.verificationTokens.statements.select({}, { verificationID, accessCode });
@@ -62,9 +85,9 @@ let ExternalSignup = class ExternalSignup extends Page {
         if (exists) {
             throw new EntityAccessError(`Phone number is already registered.`);
         }
-        model.password = randomUUID();
+        const password = randomUUID();
         const passwordSalt = this.cryptoService.generateSalt();
-        const passwordHash = this.cryptoService.hash(passwordSalt, model.password);
+        const passwordHash = this.cryptoService.hash(passwordSalt, password);
         const dateCreated = DateTime.now;
         const phoneNumberE64 = model.phoneNumber;
         const name = model.name;
@@ -178,6 +201,14 @@ __decorate([
     Inject,
     __metadata("design:type", WebSiteContentService)
 ], ExternalSignup.prototype, "websiteService", void 0);
+__decorate([
+    Inject,
+    __metadata("design:type", SessionSecurity)
+], ExternalSignup.prototype, "sessionSecurity", void 0);
+__decorate([
+    Inject,
+    __metadata("design:type", EmailVerificationService)
+], ExternalSignup.prototype, "evs", void 0);
 ExternalSignup = __decorate([
     Prepare.parseJsonBody,
     Prepare.authorize

package/dist/wwwroot/routes/social-mail/site/signup/post.js.map

@@ -1 +1 @@
-{"version":3,"file":"post.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/social-mail/site/signup/post.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"post.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/social-mail/site/signup/post.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.8.67",
+  "version": "1.8.72",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",
@@ -22,7 +22,8 @@
     "@aws-sdk/client-s3": "^3.717.0",
     "@azure/storage-blob": "^12.25.0",
     "@entity-access/entity-access": "^1.0.499",
-    "@entity-access/server-pages": "^1.1.504",
+    "@entity-access/server-pages": "^1.1.506",
+    "@paypal/paypal-server-sdk": "^1.0.0",
     "@peculiar/asn1-schema": "^2.3.15",
     "@social-mail/shared": "^1.0.29",
     "@socket.io/cluster-adapter": "^0.2.2",

package/src/common/globalEnv.ts

@@ -66,6 +66,7 @@ export const globalEnv = {
     parentApiToken: process.env.SOCIAL_MAIL_PARENT_API_TOKEN,
     forceHttp1: false,
     isTestMode,
+    isLocalTestMode: process.env.SOCIAL_MAIL_LOCAL_TEST || false,
     puppeteer: {
         port: process.env.SOCIAL_MAIL_PUPPETEER_PORT || 8123,
         host: process.env.SOCIAL_MAIL_PUPPETEER_HOST || "puppeteer",

package/src/reports/wwwroot/routes/social-mail/reports/api/entity/invoke/[entityName]/[methodName]/index.tsx

@@ -1,4 +1,4 @@
-import Index from "@entity-access/server-pages/dist/routes/api/entity/invoke/[entityName]/[methodName]/post.js";
+import Index from "@entity-access/server-pages/dist/routes/api/entity/run/[entity]/[methodName]/index.js";
 import Inject from "@entity-access/entity-access/dist/di/di.js";
 import ReportDbContext from "../../../../../../../../../model/ReportDbContext.js";
 

package/src/server/model/entities/VerificationToken.ts

@@ -34,6 +34,9 @@ export default class VerificationToken {
     @Column({ default: () => Sql.date.addMinutes(Sql.date.now(), 15)})
     expiry: DateTime;
 
+    @Column({ dataType: "Char", length: 200, nullable: true})
+    email: string;
+
     @Column({ dataType: "Char", length: 20, nullable: true})
     phone: string;
 

package/src/server/model/events/VerificationTokenEvents.ts

@@ -23,6 +23,7 @@ import OtpToUserService from "../../services/user/otp-to-user/OtpToUserService.j
 import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
 import EncryptionService from "../../services/encryption/EncryptionService.js";
 import { TempFileResult } from "@entity-access/server-pages/dist/Content.js";
+import EmailVerificationService from "../../services/user/email-verification/EmailVerificationService.js";
 
 export default class VerificationTokenEvents extends AuthenticatedEvents<VerificationToken> {
 
@@ -41,6 +42,9 @@ export default class VerificationTokenEvents extends AuthenticatedEvents<Verific
     @Inject
     captchaService: CaptchaService;
 
+    @Inject
+    evs: EmailVerificationService;
+
     @ExternalInvoke
     async updatePhone(entity: VerificationToken, phone: string) {
         const { db } = this;
@@ -105,15 +109,10 @@ export default class VerificationTokenEvents extends AuthenticatedEvents<Verific
     // }
 
     @ExternalInvoke
-    async resendCode(entity: VerificationToken, id, accessCode: string) {
-        if(entity.verificationID !== id || entity.accessCode !== accessCode) {
-            throw new EntityAccessError("Invalid id/access code");
-        }
+    async resendCode(entity: VerificationToken) {
         switch(entity.type) {
             case "email":
-                const db = ServiceProvider.resolve(this, SocialMailContext);
-                const entry = db.changeSet.getEntry(entity);
-                await this.sendVerificationEmail(entity, entry);
+                await this.evs.send(entity);
                 break;
             case "sms-to-user":
                 const sp = ServiceProvider.resolve(this, OtpToUserService);
@@ -128,13 +127,11 @@ export default class VerificationTokenEvents extends AuthenticatedEvents<Verific
     }
 
     @ExternalInvoke
-    async verifyCode(entity: VerificationToken, id: number, accessCode: string, code: string) {
-        if(entity.verificationID !== id || entity.accessCode !== accessCode) {
-            throw new EntityAccessError("Invalid id/access code");
-        }
-
+    async verifyCode(entity: VerificationToken, code: string) {
         const db = ServiceProvider.resolve(this, SocialMailContext);
 
+        const id = entity.verificationID;
+
         switch(entity.type) {
             case "captcha":
                 if(entity.code !== code) {
@@ -152,8 +149,6 @@ export default class VerificationTokenEvents extends AuthenticatedEvents<Verific
                 if(entity.code !== code) {
                     throw new EntityAccessError("Invalid code");
                 }
-                const address = await db.verificationTokenAddresses.where({ id }, (p) => (x) => x.verificationID === p.id)
-                    .first();
 
                 const ws = ServiceProvider.resolve(this, WebSiteContentService);
                 const page = ServiceProvider.resolve(this, Page as any) as Page;
@@ -161,8 +156,9 @@ export default class VerificationTokenEvents extends AuthenticatedEvents<Verific
                 if(page?.request?.hostName) {
                     const w = await ws.getWebSite(page.request.hostName);
                     if (w) {
+                        const { email } = entity;
                         webSiteFolderID = w.folderID;
-                        const user = await db.users.where({ webSiteFolderID, email: address.address }, (p) => (x) =>
+                        const user = await db.users.where({ webSiteFolderID, email }, (p) => (x) =>
                                 x.storeAccount.storeID === p.webSiteFolderID
                                     && x.storeAccount.emails.some((e) =>
                                         e.emailAddress.emailAddress === p.email
@@ -311,11 +307,13 @@ export default class VerificationTokenEvents extends AuthenticatedEvents<Verific
                 console.log(`Email Code is ${entity.code}`);
                 entity.accessCode = randomUUID();
 
-                entity.addresses = [
-                    db.verificationTokenAddresses.add({
-                        address: entity.verifyAddresses
-                    })
-                ];
+                if (!entity.email) {
+                    entity.addresses = [
+                        db.verificationTokenAddresses.add({
+                            address: entity.verifyAddresses
+                        })
+                    ];
+                }
 
                 break;
             // case "sms":
@@ -356,7 +354,7 @@ export default class VerificationTokenEvents extends AuthenticatedEvents<Verific
         // we need to make sure we are sending email..
         switch(entity.type) {
             case "email":
-                await this.sendVerificationEmail(entity, entry);
+                await this.evs.send(entity);
                 break;
             case "sms-to-user":
                 if (entity.phone) {
@@ -366,37 +364,6 @@ export default class VerificationTokenEvents extends AuthenticatedEvents<Verific
         }
     }
 
-    async sendVerificationEmail(entity: VerificationToken, entry: ChangeEntry<VerificationToken>) {
-        if (entity.type !== "email") {
-            throw new EntityAccessError(`Invalid verification type`);
-        }
-        const db = ServiceProvider.resolve(this, SocialMailContext);
-        await entry.loadNavigationAsync((x) => x.addresses);
-
-        const senderEmail = globalEnv.senderEmailForNotification;
-        if (!senderEmail) {
-            throw new EntityAccessError(`Sender for Notification is not set, cannot send email.`);
-        }
-
-        const textBody = `Social Mail Verification Code for your request is ${entity.code}`;
-        const htmlBody = `<pre>Social Mail Verification Code for<br/>your request is ${entity.code}</pre>`;
-
-        const ms = ServiceProvider.resolve(this, MailService);
-
-        const eas = ServiceProvider.resolve(this, EmailAddressService);
-        const hosted = await eas.getHostedMailboxID(senderEmail);
-
-        await ms.sendNotificationEmail(`notify-email-${entity.verificationID}-${Date.now().toFixed(0)}`, {
-            from: senderEmail,
-            fromName: "Social Mail Verification Code",
-            subject: "Social Mail Verification Code",
-            htmlBody,
-            textBody,
-            to: entity.addresses[0].address,
-            external: !hosted
-        });
-    }
-
     preJson(entity: VerificationToken): VerificationToken {
         entity.externalID = void 0;
         const { code, verificationID } = entity;

package/src/server/seed/seed.ts

@@ -44,6 +44,10 @@ export default async function seed() {
 
         if (!migrated) {
             // using fast start
+            // const configService = scope.resolve(DBConfig);
+            if (globalEnv.isLocalTestMode) {
+                await seedUI(scope.resolve(DBConfig));
+            }
             return;
         }
 

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

@@ -5,7 +5,7 @@ export default async function seedUI(config: DBConfig) {
     await config.saveVersion(UIPackageConfig, {
         package: "@social-mail/social-mail-client",
         view: "dist/web/AppIndex",
-        version: "1.8.237"
+        version: "1.8.244"
     });
 
     await config.saveVersion(WebComponentsPackageConfig, {

package/src/server/services/store/gateways/paypal.tsx

@@ -1,87 +1,169 @@
-import Inject from "@entity-access/entity-access/dist/di/di.js";
+import Inject, { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
 import { StoreJournal } from "../../../model/entities/StoreJournal.js";
 import StorePaymentAttempt from "../../../model/entities/StorePaymentAttempt.js";
 import StorePaymentGateway from "../../../model/entities/StorePaymentGateway.js";
 import EncryptionService from "../../encryption/EncryptionService.js";
 import LedgerPaymentGateway from "../LedgerPaymentGateway.js";
-import FetchBuilder from "@web-atoms/fetch-builder";
 import SocialMailContext from "../../../model/SocialMailContext.js";
-import Content from "@entity-access/server-pages/dist/Content.js";
-import HtmlDocument from "@entity-access/server-pages/dist/html/HtmlDocument.js";
-import XNode from "@entity-access/server-pages/dist/html/XNode.js";
+import { CaptureStatus, CheckoutPaymentIntent, Client, Environment, OrdersController, OrderStatus, PayeePaymentMethodPreference, PaypalExperienceLandingPage, PaypalExperienceUserAction } from "@paypal/paypal-server-sdk";
+import TimedCache from "@entity-access/entity-access/dist/common/cache/TimedCache.js";
+
+@RegisterSingleton
+class PaypalClientCache {
+
+    cache = new TimedCache<any, Client>();
+
+    @Inject
+    ecs: EncryptionService;
+
+    getClient(gateway: StorePaymentGateway) {
+        return this.cache.getOrCreate(gateway.accountID, gateway, (k, p) => {
+            const secret = this.ecs.secure.decrypt(p.encryptedSecret);
+
+            return new Client({
+                environment: gateway.url ? Environment.Sandbox : Environment.Production,
+                clientCredentialsAuthCredentials: {
+                    oAuthClientId: gateway.clientID,
+                    oAuthClientSecret: secret
+                }
+            });
+        })
+    }
+
+}
 
 export default class extends LedgerPaymentGateway {
 
     @Inject
     ecs: EncryptionService;
 
+    @Inject
+    pc: PaypalClientCache;
+
     @Inject
     db: SocialMailContext;
 
 
     async createPayment(host: string, gateway: StorePaymentGateway, order: StoreJournal, pa: StorePaymentAttempt) {
 
-        const secret = this.ecs.secure.decrypt(gateway.encryptedSecret);
-
         const pID = this.ecs.general.encrypt(pa.attemptID.toString());
 
         const items = await this.db.storeJournalLineItems.where(order, (p) => (x) => x.journalID === p.journalID)
             .include((x) => x.itemPrice.storeItem)
             .toArray();
 
-        const { emailAddress: { emailAddress: email_address}} = await this.db.storeAccountEmails
+        const client = this.pc.getClient(gateway);
+
+        const { emailAddress: { emailAddress: emailAddress}} = await this.db.storeAccountEmails
             .where(order, (p) => (x) => x.accountID === p.buyerID)
             .include((x) => x.emailAddress)
             .first();
 
-        const pr = await FetchBuilder.url("https://api-m.paypal.com")
-            .post("/v2/checkout/orders")
-            .header("Authorization", `Bearer ${Buffer.from(`${gateway.clientID}:${secret}`).toString("base64")}`)
-            .jsonBody({
-                intent: "CAPTURE",
-                payment_source: {
-                    paypal: {
-                        experience_context: {
-                            payment_method_preference: "IMMEDIATE_PAYMENT_REQUIRED",
-                            payment_method_selected: "PAYPAL",
-                            brand_name: host,
-                            landing_page: "LOGIN",
-                            user_action: "PAY_NOW",
-                            return_url: `https://${host}/store/checkout-callback/${pID}`,
-                            cancel_url: `https://${host}/store/checkout-callback/${pID}`,
+        const orders = new OrdersController(client);
+
+        const currencyCode = items[0].itemPrice.currency;
+
+        const returnUrl = `https://${host}/store/checkout-callback/${pID}`;
+        const cancelUrl = `https://${host}/store/checkout-callback/${pID}`;
+
+
+        const pr = await orders.createOrder({
+                body: {
+                    intent: CheckoutPaymentIntent.Capture,
+                    paymentSource: {
+                        paypal: {
+                            experienceContext: {
+                                paymentMethodPreference: PayeePaymentMethodPreference.ImmediatePaymentRequired,
+                                brandName: host,
+                                landingPage: PaypalExperienceLandingPage.NoPreference,
+                                userAction: PaypalExperienceUserAction.PayNow,
+                                returnUrl,
+                                cancelUrl,
+                            },
+                            emailAddress
+                        }
+                    },
+                    // applicationContext: {
+                    //     brandName: host,
+                    //     paymentMethod: {
+                    //         payeePreferred: PayeePaymentMethodPreference.Unrestricted,
+                    //     },
+                    //     landingPage: OrderApplicationContextLandingPage.Billing,
+                    //     userAction: OrderApplicationContextUserAction.PayNow,
+                    //     returnUrl,
+                    //     cancelUrl,
+                    // },
+                    purchaseUnits: [{
+                        invoiceId: `${order.journalID}`,
+                        referenceId: `${order.journalID}`,
+                        amount: {
+                            currencyCode,
+                            value: order.total.toString(2),
+                            breakdown: {
+                                itemTotal: {
+                                    currencyCode,
+                                    value: order.total.toString(2)
+                                }
+                            }
                         },
-                        email_address
-                    }
-                },
-                purchase_units: [{
-                    invoice_id: `${order.journalID}`,
-                    reference_id: `${order.journalID}`,
-                    amount: order.total,
-                    items: items.map((x) => ({
-                        name: x.item.name,
-                        quantity: x.quantity || 1,
-                        currency: x.itemPrice.currency,
-                        unit_amount: (Number(x.total) / x.quantity).toFixed(2),
-
-                    }))
-                }]
-            }).asJson();
-
-        const link = pr.links.find((x) => x.rel === "payer-action");
-
-        return Content.html(<HtmlDocument>
-            <head>
-                <title>Preparing Paypal Order</title>
-            </head>
-            <body>
-                <script>
-                    location.href = {JSON.stringify(link.href)};
-                </script>
-            </body>
-        </HtmlDocument>);
+                        items: items.map((x) => ({
+                            name: x.item.name,
+                            quantity: Number(`${x.quantity || 1}`).toFixed(0),
+                            currency: x.itemPrice.currency,
+                            unitAmount: {
+                                currencyCode,
+                                value: (Number(x.total) / x.quantity).toFixed(2)
+                            },
+                        }))
+                    }]
+                }
+            });
+
+        const link = pr.result.links.find((x) => x.rel === "payer-action");
+
+        pa.externalID = pr.result.id;
+
+        await this.db.storePaymentAttempts.statements.update({ externalID: pa.externalID }, { attemptID: pa.attemptID });
+
+        return {
+            url: link.href
+        };
+
+        // return Content.html(<HtmlDocument>
+        //     <head>
+        //         <title>Preparing Paypal Order</title>
+        //     </head>
+        //     <body>
+        //         <script>
+        //             location.href = {JSON.stringify(link.href)};
+        //         </script>
+        //     </body>
+        // </HtmlDocument>);
     }
-    isSuccessful(pa: StorePaymentAttempt) {
-        throw new Error("Method not implemented.");
+
+    async isSuccessful(pa: StorePaymentAttempt) {
+
+        const { gateway, externalID: id } = pa;
+
+        const client = this.pc.getClient(gateway);
+
+        const oc = new OrdersController(client);
+
+        let pr = await oc.getOrder({ id });
+
+        if (pr.result.status === OrderStatus.Approved) {
+            // let us capture...
+            pr = await oc.captureOrder({ id });
+        }
+
+        return pr.result
+            .purchaseUnits
+                .every((x) => x.payments
+                    .captures
+                        .every((c) => c.status === CaptureStatus.Completed));
+        // console.log(captures);
+
+        // throw new Error("Method not implemented.");
     }
 
 }

package/src/server/services/user/email-verification/EmailVerificationService.ts

@@ -0,0 +1,78 @@
+import Inject, { RegisterScoped, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import VerificationToken from "../../../model/entities/VerificationToken.js";
+import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
+import { globalEnv } from "../../../../common/globalEnv.js";
+import SocialMailContext from "../../../model/SocialMailContext.js";
+import EmailAddressService from "../../EmailAddressService.js";
+import MailService from "../../emails/MailService.js";
+import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
+import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
+
+@RegisterScoped
+export default class EmailVerificationService {
+
+    @Inject
+    db: SocialMailContext;
+
+    @Inject
+    eas: EmailAddressService;
+
+    @Inject
+    ms: MailService;
+
+    @Inject
+    sessionSecurity: SessionSecurity;
+
+    async create({ email, ipAddress }) {
+
+        let code = Date.now().toString();
+        code = code.substring(code.length-5);
+
+        console.log(`Email Code is ${code}`);
+
+        const v = await this.db.verificationTokens.statements.insert({
+            type: "email",
+            email,
+            code,
+            dateCreated: DateTime.now,
+            ipAddress
+        });
+
+        // send..
+        await this.send(v);
+
+        this.sessionSecurity.injectPublicKey(v);
+        v.code = void 0;
+        v.ipAddress = void 0;
+        return v;
+    }
+
+
+    async send(entity: VerificationToken) {
+        if (entity.type !== "email") {
+            throw new EntityAccessError(`Invalid verification type`);
+        }
+
+        const senderEmail = globalEnv.senderEmailForNotification;
+        if (!senderEmail) {
+            throw new EntityAccessError(`Sender for Notification is not set, cannot send email.`);
+        }
+
+        const textBody = `Social Mail Verification Code for your request is ${entity.code}`;
+        const htmlBody = `<pre>Social Mail Verification Code for<br/>your request is ${entity.code}</pre>`;
+
+        const { eas, ms } = this;
+
+        const hosted = await eas.getHostedMailboxID(senderEmail);
+
+        await ms.sendNotificationEmail(`notify-email-${entity.verificationID}-${Date.now().toFixed(0)}`, {
+            from: senderEmail,
+            fromName: "Social Mail Verification Code",
+            subject: "Social Mail Verification Code",
+            htmlBody,
+            textBody,
+            to: entity.email,
+            external: !hosted
+        });
+    }
+}