@social-mail/social-mail-web-server 1.7.60 → 1.7.63

package/dist/wwwroot/routes/social-mail/user/password/reset/post.d.ts

@@ -0,0 +1,24 @@
+import Page from "@entity-access/server-pages/dist/Page.js";
+import SocialMailContext from "../../../../../../server/model/SocialMailContext.js";
+import CryptoService from "../../../../../../server/services/CryptoService.js";
+import EmailAddressService from "../../../../../../server/services/EmailAddressService.js";
+import CaptchaService from "../../../../../../server/services/captcha/CaptchaService.js";
+import { IVerification } from "../../../../../../server/services/captcha/IVerification.js";
+import ExternalOtpInService from "../../../../../../server/services/external-otp-in/ExternalOtpInService.js";
+export interface ISignup {
+    username: string;
+    userID: number;
+    phoneNumber: string;
+    captcha: IVerification;
+    phone: IVerification;
+    password: string;
+}
+export default class extends Page {
+    captchaService: CaptchaService;
+    cryptoService: CryptoService;
+    emailAddressService: EmailAddressService;
+    ois: ExternalOtpInService;
+    db: SocialMailContext;
+    run(): Promise<import("@entity-access/server-pages/dist/Content.js").default>;
+}
+//# sourceMappingURL=post.d.ts.map

package/dist/wwwroot/routes/social-mail/user/password/reset/post.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/user/password/reset/post.tsx"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAE5D,OAAO,iBAAiB,MAAM,qDAAqD,CAAC;AACpF,OAAO,aAAa,MAAM,oDAAoD,CAAC;AAC/E,OAAO,mBAAmB,MAAM,0DAA0D,CAAC;AAC3F,OAAO,cAAc,MAAM,6DAA6D,CAAC;AACzF,OAAO,EAAE,aAAa,EAAE,MAAM,4DAA4D,CAAC;AAC3F,OAAO,oBAAoB,MAAM,2EAA2E,CAAC;AAE7G,MAAM,WAAW,OAAO;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,aAAa,CAAC;IACvB,KAAK,EAAE,aAAa,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;CACpB;AAGD,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,cAAc,EAAE,cAAc,CAAC;IAG/B,aAAa,EAAE,aAAa,CAAC;IAG7B,mBAAmB,EAAE,mBAAmB,CAAC;IAGzC,GAAG,EAAE,oBAAoB,CAAC;IAI1B,EAAE,EAAE,iBAAiB,CAAC;IAEhB,GAAG;CAwFZ"}

package/dist/wwwroot/routes/social-mail/user/password/reset/post.js

@@ -0,0 +1,109 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
+import Inject from "@entity-access/entity-access/dist/di/di.js";
+import Page from "@entity-access/server-pages/dist/Page.js";
+import { Prepare } from "@entity-access/server-pages/dist/decorators/Prepare.js";
+import SocialMailContext from "../../../../../../server/model/SocialMailContext.js";
+import CryptoService from "../../../../../../server/services/CryptoService.js";
+import EmailAddressService from "../../../../../../server/services/EmailAddressService.js";
+import CaptchaService from "../../../../../../server/services/captcha/CaptchaService.js";
+import ExternalOtpInService from "../../../../../../server/services/external-otp-in/ExternalOtpInService.js";
+let default_1 = class extends Page {
+    async run() {
+        const { db } = this;
+        db.verifyFilters = false;
+        db.raiseEvents = false;
+        const model = this.body;
+        model.username = model.username?.trim();
+        if (!model.username) {
+            throw new EntityAccessError("Username is required");
+        }
+        const [username, domain] = model.username.split("@");
+        model.username = username?.trim()?.toLocaleLowerCase()?.replace(/[\.\-]/g, "") + "@" + domain;
+        model.phoneNumber = `+${model.phoneNumber.replace(/[^0-9]/g, "")}`;
+        // console.log(model);
+        // verify captcha...
+        await this.captchaService.verify(model.captcha);
+        const user = await db.users.where(model, (p) => (x) => x.userName === p.username)
+            .first();
+        if (!user) {
+            throw new EntityAccessError(`Username ${model.username} not found, make sure it is complete email address.`);
+        }
+        if (!model.phone.id) {
+            // check if phone exists...
+            const phone = await db.userAuthFactors
+                .where(model, (p) => (x) => x.user.userName === p.username
+                && x.phoneNumber === p.phoneNumber)
+                .first();
+            if (!phone) {
+                throw new EntityAccessError(`No phone number is associated with this user, please contact us at support@neurospeech.com .`);
+            }
+            if (!model.phone.id) {
+                const v = await this.ois.create([model.phoneNumber]);
+                model.phone.id = v.verificationID;
+                model.phone.code = v.accessCode;
+                model.phone.smsConfig = v.externalConfig;
+                return this.json(model);
+            }
+        }
+        if (model.phone.id) {
+            // verify...
+            const v = await db.verificationTokens.statements.select({}, { verificationID: model.phone.id });
+            if (!v.verified) {
+                return this.json(model);
+            }
+            model.phone.verified = "true";
+        }
+        if (!model.password) {
+            return this.json(model);
+        }
+        if (model.password.length < 7) {
+            throw new EntityAccessError("Password is cannot be less than 7 characters");
+        }
+        if (/\s/i.test(model.password)) {
+            throw new EntityAccessError("Password must not any whitespace characters");
+        }
+        const passwordSalt = this.cryptoService.generateSalt();
+        const passwordHash = this.cryptoService.hash(passwordSalt, model.password);
+        model.userID = user.userID;
+        await db.users.where(user, (p) => (x) => x.userID === p.userID)
+            .update({ passwordSalt, passwordHash }, (p) => (x) => ({
+            passwordHash: p.passwordHash,
+            passwordSalt: p.passwordSalt
+        }));
+        return this.json(model);
+    }
+};
+__decorate([
+    Inject,
+    __metadata("design:type", CaptchaService)
+], default_1.prototype, "captchaService", void 0);
+__decorate([
+    Inject,
+    __metadata("design:type", CryptoService)
+], default_1.prototype, "cryptoService", void 0);
+__decorate([
+    Inject,
+    __metadata("design:type", EmailAddressService)
+], default_1.prototype, "emailAddressService", void 0);
+__decorate([
+    Inject,
+    __metadata("design:type", ExternalOtpInService)
+], default_1.prototype, "ois", void 0);
+__decorate([
+    Inject,
+    __metadata("design:type", SocialMailContext)
+], default_1.prototype, "db", void 0);
+default_1 = __decorate([
+    Prepare.parseJsonBody
+], default_1);
+export default default_1;
+//# sourceMappingURL=post.js.map

package/dist/wwwroot/routes/social-mail/user/password/reset/post.js.map

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

package/dist/wwwroot/routes/social-mail/user/signup/get.d.ts

@@ -0,0 +1,5 @@
+import Page from "@entity-access/server-pages/dist/Page.js";
+export default class extends Page {
+    run(): Promise<import("@entity-access/server-pages/dist/Content.js").default>;
+}
+//# sourceMappingURL=get.d.ts.map

package/dist/wwwroot/routes/social-mail/user/signup/get.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/social-mail/user/signup/get.tsx"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAG5D,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAEvB,GAAG;CAGZ"}

package/dist/wwwroot/routes/social-mail/user/signup/get.js

@@ -0,0 +1,8 @@
+import Page from "@entity-access/server-pages/dist/Page.js";
+import { renderUIClient } from "../../../../../server/services/ui/renderUIClient.js";
+export default class extends Page {
+    async run() {
+        return renderUIClient(this, "dist/public/users/signup/SignupPage");
+    }
+}
+//# sourceMappingURL=get.js.map

package/dist/wwwroot/routes/social-mail/user/signup/get.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/social-mail/user/signup/get.tsx"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,qDAAqD,CAAC;AAErF,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAE7B,KAAK,CAAC,GAAG;QACL,OAAO,cAAc,CAAC,IAAI,EAAE,qCAAqC,CAAC,CAAC;IACvE,CAAC;CACJ"}

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

@@ -1,36 +1,28 @@
 import Page from "@entity-access/server-pages/dist/Page.js";
 import SocialMailContext from "../../../../../server/model/SocialMailContext.js";
+import VerificationToken from "../../../../../server/model/entities/VerificationToken.js";
 import CryptoService from "../../../../../server/services/CryptoService.js";
 import EmailAddressService from "../../../../../server/services/EmailAddressService.js";
 import CaptchaService from "../../../../../server/services/captcha/CaptchaService.js";
 import ExternalOtpInService from "../../../../../server/services/external-otp-in/ExternalOtpInService.js";
-import WebSiteService from "../../../../../server/services/files/WebSiteService.js";
-import { StoreAccountAddress } from "../../../../../server/model/entities/StoreAddress.js";
-import VerificationToken from "../../../../../server/model/entities/VerificationToken.js";
 export interface ISignup {
     userID: number;
+    username: string;
+    emailAddress: string;
     password: string;
     name: string;
     phoneNumber: string;
-    emailAddress: string;
     isdCode?: string;
     country: string;
     captcha: Partial<VerificationToken>;
     phone: Partial<VerificationToken>;
-    email: Partial<VerificationToken>;
-    billing?: Partial<StoreAccountAddress>;
-    shipping?: Partial<StoreAccountAddress>;
 }
-/**
- * External Signup is used for signing up for Blog or Store.
- */
-export default class ExternalSignup extends Page {
+export default class extends Page {
     captchaService: CaptchaService;
     cryptoService: CryptoService;
     emailAddressService: EmailAddressService;
     ois: ExternalOtpInService;
     db: SocialMailContext;
-    websiteService: WebSiteService;
     run(): Promise<import("@entity-access/server-pages/dist/Content.js").default>;
 }
 //# sourceMappingURL=post.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/social-mail/user/signup/post.tsx"],"names":[],"mappings":"AAGA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAE5D,OAAO,iBAAiB,MAAM,kDAAkD,CAAC;AACjF,OAAO,aAAa,MAAM,iDAAiD,CAAC;AAC5E,OAAO,mBAAmB,MAAM,uDAAuD,CAAC;AACxF,OAAO,cAAc,MAAM,0DAA0D,CAAC;AAEtF,OAAO,oBAAoB,MAAM,wEAAwE,CAAC;AAG1G,OAAO,cAAc,MAAM,wDAAwD,CAAC;AACpF,OAAO,EAAE,mBAAmB,EAAE,MAAM,sDAAsD,CAAC;AAC3F,OAAO,iBAAiB,MAAM,2DAA2D,CAAC;AAE1F,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,GAAG,EAAE,oBAAoB,CAAC;IAG1B,EAAE,EAAE,iBAAiB,CAAC;IAGtB,cAAc,EAAE,cAAc,CAAC;IAEzB,GAAG;CAgKZ"}
+{"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/social-mail/user/signup/post.tsx"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAK5D,OAAO,iBAAiB,MAAM,kDAAkD,CAAC;AACjF,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,oBAAoB,MAAM,wEAAwE,CAAC;AAE1G,MAAM,WAAW,OAAO;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,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;CACrC;AAiBD,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,cAAc,EAAE,cAAc,CAAC;IAG/B,aAAa,EAAE,aAAa,CAAC;IAG7B,mBAAmB,EAAE,mBAAmB,CAAC;IAGzC,GAAG,EAAE,oBAAoB,CAAC;IAG1B,EAAE,EAAE,iBAAiB,CAAC;IAEhB,GAAG;CAiJZ"}

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

@@ -7,89 +7,103 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import Inject from "@entity-access/entity-access/dist/di/di.js";
-import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import Page from "@entity-access/server-pages/dist/Page.js";
 import { Prepare } from "@entity-access/server-pages/dist/decorators/Prepare.js";
+import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
+import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
+import { readFileSync } from "fs";
 import SocialMailContext from "../../../../../server/model/SocialMailContext.js";
 import CryptoService from "../../../../../server/services/CryptoService.js";
 import EmailAddressService from "../../../../../server/services/EmailAddressService.js";
 import CaptchaService from "../../../../../server/services/captcha/CaptchaService.js";
 import ExternalOtpInService from "../../../../../server/services/external-otp-in/ExternalOtpInService.js";
-import { randomUUID } from "crypto";
-import WebSiteService from "../../../../../server/services/files/WebSiteService.js";
-/**
- * External Signup is used for signing up for Blog or Store.
- */
-let ExternalSignup = class ExternalSignup extends Page {
+const ensureUsername = (name) => {
+    const json = JSON.parse(readFileSync("./content/json/bad-names.json", "utf8"));
+    if (json.reserved.includes(name)) {
+        throw new EntityAccessError("Username is reserved.");
+    }
+    for (const iterator of json.partial) {
+        if (name.includes(iterator)) {
+            throw new EntityAccessError("Username is not acceptable.");
+        }
+    }
+};
+let default_1 = class extends Page {
     async run() {
         const { db } = this;
         db.verifyFilters = false;
         db.raiseEvents = false;
         const model = this.body;
-        model.emailAddress = model.email.verifyAddresses;
-        model.phoneNumber = model.phone.verifyAddresses;
-        const w = await this.websiteService.get(this.request.hostName);
-        const storeID = w.folderID;
-        if (!storeID) {
-            throw new EntityAccessError(`Signup not allowed`);
+        model.emailAddress = model.emailAddress.trim().toLowerCase();
+        const [username, domain] = model.emailAddress.split("@", 2);
+        model.username = username;
+        if (!/\p{Letter}[\p{Letter}\.\-0-9]{0,50}/iu.test(username)) {
+            throw new EntityAccessError(`Invalid email address`);
         }
         model.password = model.password?.trim();
-        if (!model.emailAddress) {
-            throw new EntityAccessError("Email is required");
+        model.username = model.username?.trim()?.toLowerCase();
+        if (!model.username) {
+            throw new EntityAccessError("Username is required");
+        }
+        ensureUsername(model.username);
+        if (!model.password) {
+            throw new EntityAccessError("Password is required");
+        }
+        if (model.password.length < 7) {
+            throw new EntityAccessError("Password is cannot be less than 7 characters");
+        }
+        if (/\s/i.test(model.password)) {
+            throw new EntityAccessError("Password must not any whitespace characters");
         }
         model.phoneNumber = `+${model.phoneNumber.replace(/[^0-9]/g, "")}`;
+        // console.log(model);
         // check if phone number already exists...
-        for (const v1 of [model.captcha, model.email, model.phone]) {
+        for (const v1 of [model.captcha, model.phone]) {
             const { verificationID, accessCode } = v1;
             const vr = await db.verificationTokens.statements.select({}, { verificationID, accessCode });
             if (!vr.verified) {
                 throw new EntityAccessError(`Verification ${vr?.type} ${verificationID} is incomplete`);
             }
         }
-        const { emailAddress, phoneNumber } = model;
-        const emailExists = await db.storeAccountEmails.where({ emailAddress, storeID }, (p) => (x) => x.emailAddress.emailAddress === p.emailAddress
-            && x.storeAccount.storeID === p.storeID)
+        const hostedDomain = await this.emailAddressService.getHostedDomain(domain);
+        if (!hostedDomain || !hostedDomain.allowSignup) {
+            throw new EntityAccessError(`Signup for email address ${model.emailAddress} not allowed for domain ${domain}`);
+        }
+        const emailAddress = model.emailAddress;
+        const user = await db.mailboxes.where({ emailAddress }, (p) => (x) => x.emailAddress.emailAddress === p.emailAddress)
             .some();
-        if (emailExists) {
+        if (user) {
             throw new EntityAccessError(`Email address already exists.`);
         }
         // check if phone exists...
-        const exists = await db.storeAccountPhones
-            .where({ phoneNumber, storeID }, (p) => (x) => x.phoneNumberE64 === p.phoneNumber
-            && x.storeAccount.storeID === p.storeID).some();
+        const exists = await db.users
+            .where(model, (p) => (x) => x.uniquePhoneNumber === p.phoneNumber)
+            .some();
         if (exists) {
             throw new EntityAccessError(`Phone number is already registered.`);
         }
-        model.password = randomUUID();
         const passwordSalt = this.cryptoService.generateSalt();
         const passwordHash = this.cryptoService.hash(passwordSalt, model.password);
         const dateCreated = DateTime.now;
         const phoneNumberE64 = model.phoneNumber;
         const name = model.name;
-        let billingAddress;
-        let shippingAddress;
-        const addresses = [];
-        if (model.billing?.title) {
-            billingAddress = db.storeAccountAddresses.add(model.billing);
-            addresses.push(billingAddress);
-        }
-        if (model.shipping?.title) {
-            shippingAddress = db.storeAccountAddresses.add(model.shipping);
-            addresses.push(shippingAddress);
-        }
-        const emailAddressID = await this.emailAddressService.getId(model.emailAddress, model.name);
+        const mailboxID = await this.emailAddressService.getId(emailAddress, name);
+        const { domainID } = hostedDomain;
         // create user...
         const account = db.users.add({
-            /** This is to make customer user unique per store */
-            userName: storeID + ":" + model.emailAddress,
+            userName: model.emailAddress,
             displayName: name,
             passwordSalt,
             passwordHash,
             multiFactor: false,
             dateUpdated: dateCreated,
-            isExternal: true,
+            uniquePhoneNumber: phoneNumberE64,
+            roles: [
+                db.userRoles.add({
+                    roleName: "User"
+                })
+            ],
             authFactors: [
                 db.userAuthFactors.add({
                     phoneNumber: phoneNumberE64,
@@ -97,57 +111,37 @@ let ExternalSignup = class ExternalSignup extends Page {
                     method: "otp-in",
                     dateUpdated: dateCreated
                 })
-            ]
-        });
-        const contact = db.storeAccounts.add({
-            dateCreated,
-            user: account,
-            storeID,
-            /** This is important as name must be unique in the ledger */
-            name: `${model.name}(${emailAddressID})`,
-            head: "Customer",
-            emails: [
-                db.storeAccountEmails.add({
-                    emailAddressID
-                })
             ],
-            phones: [
-                db.storeAccountPhones.add({
-                    phoneNumberE64
+            userMailboxes: [
+                db.userMailboxes.add({
+                    mailbox: db.mailboxes.add({
+                        mailboxID,
+                        domainID,
+                        uniqueAddress: model.username.replace(/[\-\.]/g, "") + "@" + hostedDomain.domain.name,
+                        maxStorage: 1024 * 1024 * 1024
+                    })
                 })
-            ],
-            addresses
+            ]
         });
         await db.saveChanges();
-        if (billingAddress) {
-            contact.billingAddressID = billingAddress.addressID;
-        }
-        if (shippingAddress) {
-            contact.shippingAddressID = shippingAddress.addressID;
-        }
-        if (addresses.length) {
-            await db.saveChanges();
-        }
-        // Todo: delete captcha
-        const userID = model.userID = account.userID;
-        // lets login here...
-        const dateUpdated = DateTime.now;
-        const start = dateUpdated;
-        const expiry = dateUpdated.addDays(30);
-        // create login session...
-        const loginSession = await db.loginSessions.statements.insert({
-            userID,
-            dateUpdated,
+        // todo pending delete
+        // await this.captchaService.delete(model.captcha as any);
+        model.userID = account.userID;
+        const start = DateTime.now;
+        // add login cookie..
+        const expiry = start.addDays(30);
+        model.userID = account.userID;
+        const session = await db.loginSessions.statements.insert({
+            userID: account.userID,
             start,
             expiry,
-            invalid: false,
-            verificationID: model.phone.verificationID,
-            status: "created"
+            status: "created",
+            invalid: false
         });
         await this.sessionUser.setAuthCookie({
-            userID: loginSession.userID,
-            id: loginSession.sessionID,
-            expiry: expiry.asJSDate,
+            userID: session.userID,
+            id: session.sessionID,
+            expiry: session.expiry.asJSDate,
             version: "1.1",
             active: true
         });
@@ -157,30 +151,25 @@ let ExternalSignup = class ExternalSignup extends Page {
 __decorate([
     Inject,
     __metadata("design:type", CaptchaService)
-], ExternalSignup.prototype, "captchaService", void 0);
+], default_1.prototype, "captchaService", void 0);
 __decorate([
     Inject,
     __metadata("design:type", CryptoService)
-], ExternalSignup.prototype, "cryptoService", void 0);
+], default_1.prototype, "cryptoService", void 0);
 __decorate([
     Inject,
     __metadata("design:type", EmailAddressService)
-], ExternalSignup.prototype, "emailAddressService", void 0);
+], default_1.prototype, "emailAddressService", void 0);
 __decorate([
     Inject,
     __metadata("design:type", ExternalOtpInService)
-], ExternalSignup.prototype, "ois", void 0);
+], default_1.prototype, "ois", void 0);
 __decorate([
     Inject,
     __metadata("design:type", SocialMailContext)
-], ExternalSignup.prototype, "db", void 0);
-__decorate([
-    Inject,
-    __metadata("design:type", WebSiteService)
-], ExternalSignup.prototype, "websiteService", void 0);
-ExternalSignup = __decorate([
-    Prepare.parseJsonBody,
-    Prepare.authorize
-], ExternalSignup);
-export default ExternalSignup;
+], default_1.prototype, "db", void 0);
+default_1 = __decorate([
+    Prepare.parseJsonBody
+], default_1);
+export default default_1;
 //# sourceMappingURL=post.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"post.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/social-mail/user/signup/post.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAC9F,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,wDAAwD,CAAC;AACjF,OAAO,iBAAiB,MAAM,kDAAkD,CAAC;AACjF,OAAO,aAAa,MAAM,iDAAiD,CAAC;AAC5E,OAAO,mBAAmB,MAAM,uDAAuD,CAAC;AACxF,OAAO,cAAc,MAAM,0DAA0D,CAAC;AAEtF,OAAO,oBAAoB,MAAM,wEAAwE,CAAC;AAC1G,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEpC,OAAO,cAAc,MAAM,wDAAwD,CAAC;AAmBpF;;GAEG;AAIY,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,IAAI;IAoB5C,KAAK,CAAC,GAAG;QAEL,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;QAEpB,EAAE,CAAC,aAAa,GAAG,KAAK,CAAC;QACzB,EAAE,CAAC,WAAW,GAAG,KAAK,CAAC;QAEvB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAe,CAAC;QAEnC,KAAK,CAAC,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,eAAe,CAAC;QACjD,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,eAAe,CAAC;QAEhD,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC/D,MAAM,OAAO,GAAG,CAAC,CAAC,QAAQ,CAAC;QAC3B,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,MAAM,IAAI,iBAAiB,CAAC,oBAAoB,CAAC,CAAC;QACtD,CAAC;QAED,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC;QACxC,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;YACtB,MAAM,IAAI,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;QACrD,CAAC;QAED,KAAK,CAAC,WAAW,GAAG,IAAI,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE,CAAC;QAEnE,0CAA0C;QAC1C,KAAI,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;YACxD,MAAM,EAAE,cAAc,EAAG,UAAU,EAAE,GAAG,EAAE,CAAC;YAC3C,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,kBAAkB,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,CAAC,CAAC;YAC7F,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;gBACf,MAAM,IAAI,iBAAiB,CAAC,gBAAgB,EAAE,EAAE,IAAI,IAAI,cAAc,gBAAgB,CAAC,CAAC;YAC5F,CAAC;QACL,CAAC;QAED,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;QAC5C,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,YAAY,EAAE,OAAO,EAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACrF,CAAC,CAAC,YAAY,CAAC,YAAY,KAAK,CAAC,CAAC,YAAY;eAC3C,CAAC,CAAC,YAAY,CAAC,OAAO,KAAK,CAAC,CAAC,OAAO,CAC1C;aACA,IAAI,EAAE,CAAC;QACZ,IAAI,WAAW,EAAE,CAAC;YACd,MAAM,IAAI,iBAAiB,CAAC,+BAA+B,CAAC,CAAC;QACjE,CAAC;QAED,2BAA2B;QAC3B,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,kBAAkB;aACrC,KAAK,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,KAAK,CAAC,CAAC,WAAW;eAC1E,CAAC,CAAC,YAAY,CAAC,OAAO,KAAK,CAAC,CAAC,OAAO,CAC1C,CAAC,IAAI,EAAE,CAAC;QAEb,IAAI,MAAM,EAAE,CAAC;YACT,MAAM,IAAI,iBAAiB,CAAC,qCAAqC,CAAC,CAAC;QACvE,CAAC;QAED,KAAK,CAAC,QAAQ,GAAG,UAAU,EAAE,CAAC;QAC9B,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC;QACvD,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAE3E,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC;QACjC,MAAM,cAAc,GAAG,KAAK,CAAC,WAAW,CAAC;QACzC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QAExB,IAAI,cAAmC,CAAC;QACxC,IAAI,eAAoC,CAAC;QACzC,MAAM,SAAS,GAAG,EAAE,CAAC;QACrB,IAAI,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;YACvB,cAAc,GAAG,EAAE,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC7D,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC;YACxB,eAAe,GAAG,EAAE,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC/D,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAE5F,iBAAiB;QACjB,MAAM,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC;YACzB,qDAAqD;YACrD,QAAQ,EAAE,OAAO,GAAG,GAAG,GAAG,KAAK,CAAC,YAAY;YAC5C,WAAW,EAAE,IAAI;YACjB,YAAY;YACZ,YAAY;YACZ,WAAW,EAAE,KAAK;YAClB,WAAW,EAAE,WAAW;YACxB,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE;gBACT,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC;oBACnB,WAAW,EAAE,cAAc;oBAC3B,QAAQ,EAAE,IAAI;oBACd,MAAM,EAAE,QAAQ;oBAChB,WAAW,EAAE,WAAW;iBAC3B,CAAC;aACL;SACJ,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC;YACjC,WAAW;YACX,IAAI,EAAE,OAAO;YACb,OAAO;YACP,6DAA6D;YAC7D,IAAI,EAAE,GAAG,KAAK,CAAC,IAAI,IAAI,cAAc,GAAG;YACxC,IAAI,EAAE,UAAU;YAChB,MAAM,EAAE;gBACJ,EAAE,CAAC,kBAAkB,CAAC,GAAG,CAAC;oBACtB,cAAc;iBACjB,CAAC;aACL;YACD,MAAM,EAAE;gBACJ,EAAE,CAAC,kBAAkB,CAAC,GAAG,CAAC;oBACtB,cAAc;iBACjB,CAAC;aACL;YACD,SAAS;SACZ,CAAC,CAAC;QAEH,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC;QAEvB,IAAI,cAAc,EAAE,CAAC;YACjB,OAAO,CAAC,gBAAgB,GAAG,cAAc,CAAC,SAAS,CAAC;QACxD,CAAC;QACD,IAAI,eAAe,EAAE,CAAC;YAClB,OAAO,CAAC,iBAAiB,GAAG,eAAe,CAAC,SAAS,CAAC;QAC1D,CAAC;QACD,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC;QAC3B,CAAC;QAED,uBAAuB;QAEvB,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAE7C,qBAAqB;QAErB,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC;QACjC,MAAM,KAAK,GAAG,WAAW,CAAC;QAC1B,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAEvC,0BAA0B;QAC1B,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC;YAC1D,MAAM;YACN,WAAW;YACX,KAAK;YACL,MAAM;YACN,OAAO,EAAE,KAAK;YACd,cAAc,EAAE,KAAK,CAAC,KAAK,CAAC,cAAqB;YACjD,MAAM,EAAE,SAAS;SACpB,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC;YACjC,MAAM,EAAE,YAAY,CAAC,MAAM;YAC3B,EAAE,EAAE,YAAY,CAAC,SAAS;YAC1B,MAAM,EAAE,MAAM,CAAC,QAAQ;YACvB,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,IAAI;SACf,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;CAEJ,CAAA;AAjLG;IADC,MAAM;8BACS,cAAc;sDAAC;AAG/B;IADC,MAAM;8BACQ,aAAa;qDAAC;AAG7B;IADC,MAAM;8BACc,mBAAmB;2DAAC;AAGzC;IADC,MAAM;8BACF,oBAAoB;2CAAC;AAG1B;IADC,MAAM;8BACH,iBAAiB;0CAAC;AAGtB;IADC,MAAM;8BACS,cAAc;sDAAC;AAlBd,cAAc;IAFlC,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;GACG,cAAc,CAoLlC;eApLoB,cAAc"}
+{"version":3,"file":"post.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/social-mail/user/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.7.60",
+  "version": "1.7.63",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",
@@ -32,7 +32,7 @@
     "@sunknudsen/totp": "^1.1.0",
     "@web-atoms/fetch-builder": "1.0.21",
     "acme-client": "^5.3.0",
-    "clamscan": "^2.2.1",
+    "clamscan": "^2.4.0",
     "console-log-colors": "^0.4.0",
     "dkim": "^0.8.0",
     "dns2": "^2.1.0",

package/src/common/globalEnv.ts

@@ -26,6 +26,7 @@ export const globalEnv = {
     cdn: process.env.SOCIAL_MAIL_CDN,
     path: process.env.SOCIAL_MAIL_PATH || "/",
     externalLogin: process.env.SOCIAL_MAIL_EXTERNAL_LOGIN,
+    signupEnabled: /^(true|yes)/i.test(process.env.SOCIAL_MAIL_SIGNUP_ENABLED),
     dns: {
         enabled: /^(true|yes)$/i.test(process.env.SOCIAL_MAIL_DNS_ENABLED),
         soa: (process.env.SOCIAL_MAIL_DNS_SOA || "admin.socialmail.in somewhere.com").split(/[\s\,\;]/g).map((txt: string) => txt.endsWith(".") ? txt : txt + "."),

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

@@ -43,6 +43,14 @@ export type userStatusType = typeof userStatuses[number];
         descending: false
     }]
 })
+@Index({
+    name: "IX_Unique_Users_PhoneNumber",
+    columns: [
+        { name: (x) => x.uniquePhoneNumber, descending: false }
+    ],
+    unique: true,
+    filter: (x) => x.uniquePhoneNumber !== null
+})
 export class User {
 
     @Column({ key: true, dataType: "BigInt" , generated: "identity" })
@@ -83,6 +91,11 @@ export class User {
     @ReadOnlyJsonProperty
     public storage: number;
 
+    /** This is for external user who can signup and can have only one unique phone number */
+    @Column({ dataType: "Char", length: 20, nullable: true })
+    @IgnoreJsonProperty
+    public uniquePhoneNumber: string;
+
     @Column({ dataType: "BigInt", default: () => 0 })
     public maxStorage: number;
 

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

@@ -1,10 +1,12 @@
 import EntityEvents, { ForeignKeyFilter } from "@entity-access/entity-access/dist/model/events/EntityEvents.js";
 import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
-import Inject from "@entity-access/entity-access/dist/di/di.js";
+import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
 import Domain from "../entities/Domain.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
+import ExternalQuery from "@entity-access/server-pages/dist/decorators/ExternalQuery.js";
+import SocialMailContext from "../SocialMailContext.js";
 
 export default class DomainEvents extends AuthenticatedEvents<Domain> {
 
@@ -19,6 +21,13 @@ export default class DomainEvents extends AuthenticatedEvents<Domain> {
         return query.where({ userID}, (p) => (x) => x.hostedDomain.domainUsers.some((u) => u.userID === p.userID));
     }
 
+
+    @ExternalQuery
+    forSignup() {
+        const db = ServiceProvider.resolve(this, SocialMailContext);
+        return db.domains.where(void 0, (p) => (x) =>  x.hostedDomain.allowSignup === true);
+    }
+
     modify(query: IEntityQuery<Domain>) {
         if (this.verify) {
             this.sessionUser.ensureLoggedIn();

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

@@ -9,6 +9,7 @@ import SocialMailContext from "../SocialMailContext.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import SyncDnsZoneRecordsWorkflow from "../../workflows/dns/SyncDnsZoneRecordsWorkflow.js";
 import WorkflowContext from "@entity-access/entity-access/dist/workflows/WorkflowContext.js";
+import ExternalQuery from "@entity-access/server-pages/dist/decorators/ExternalQuery.js";
 
 export default class HostedDomainEvents extends AuthenticatedEvents<HostedDomain> {
 

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

@@ -244,6 +244,11 @@ export default class UserEvents extends AuthenticatedEvents<User> {
     preJson(entity: User): User {
         entity.passwordHash = void 0;
         entity.passwordSalt = void 0;
+        if (!this.sessionUser.isAdmin) {
+           if (entity.userID !== this.sessionUser.userID) {
+                entity.uniquePhoneNumber = void 0;
+            }
+        }
         return entity;
     }