@social-mail/social-mail-web-server 1.4.819 → 1.4.821

package/package.json

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

package/src/common/globalEnv.ts

@@ -27,6 +27,11 @@ export const globalEnv = {
     wildcardDomain: process.env.SOCIAL_MAIL_WILDCARD_DOMAIN,
     name: process.env.SOCIAL_MAIL_NAME || "Social Mail",
     secretKey: process.env.SOCIAL_MAIL_SECRET_KEY,
+    otpIn:{
+        host: process.env.SOCIAL_MAIL_OTP_IN_HOST,
+        key: process.env.SOCIAL_MAIL_OTP_IN_KEY,
+        secret: process.env.SOCIAL_MAIL_OTP_IN_SECRET,
+    },
     port,
     serverID: process.env.SOCIAL_MAIL_SERVER_ID,
     parentApiToken: process.env.SOCIAL_MAIL_PARENT_API_TOKEN,

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

@@ -99,7 +99,7 @@ export default class LoginSession {
     public oneTimePassword: string;
 
     @JsonProperty({ help: "SMS URL to Display"})
-    public smsConfig: { prefix: string, code: string, url: string }[];
+    public smsConfig: any;
 
     public user: User;
 

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

@@ -165,6 +165,9 @@ export default class Mailbox {
     @JsonProperty()
     public notify: boolean;
 
+    @JsonProperty()
+    public deleteVerificationID: string;
+
     public channelConfig: ChannelConfig;
 
     public domain: HostedDomain;

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

@@ -45,7 +45,10 @@ export default class MailboxContact {
     @Column({ key: true, dataType: "BigInt", order: 1 })
     @RelateTo(Mailbox,{
         property: (mt) => mt.mailbox,
-        inverseProperty: (mb) => mb.mailboxContacts
+        inverseProperty: (mb) => mb.mailboxContacts,
+        foreignKeyConstraint: {
+            cascade: "restrict"
+        }
     })
     public mailboxID: number;
 

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

@@ -26,7 +26,10 @@ export default class MailboxContactEmail {
     @Column({ key: true, dataType: "BigInt", order: 1})
     @RelateTo(Mailbox, {
         property: (mte) => mte.mailbox,
-        inverseProperty: (mb) => mb.threadEmails
+        inverseProperty: (mb) => mb.threadEmails,
+        foreignKeyConstraint: {
+            cascade: "restrict"
+        }
     })
     mailboxID: number;
 

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

@@ -10,7 +10,10 @@ export default class MailboxEmail {
     @Column({ dataType: "BigInt", key: true, order: 1 })
     @RelateTo(Mailbox, {
         property: (me) => me.mailbox,
-        inverseProperty: (m) => m.emails
+        inverseProperty: (m) => m.emails,
+        foreignKeyConstraint: {
+            cascade: "restrict"
+        }
     })
     mailboxID: number;
 

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

@@ -11,6 +11,8 @@ export default class AccessTokenEvents extends AuthenticatedEvents<AccessToken>
             this.sessionUser.ensureLoggedIn();
         }
 
+        entity.userID ??= this.sessionUser.userID;
+
         entity.secret = "sm-at-" + randomUUID().replaceAll("-", "");
         entity.displaySecret = entity.secret;
     }

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

@@ -18,6 +18,7 @@ import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import { randomUUID } from "crypto";
 import { AppStringHelper } from "../../../common/AppStringHelper.js";
 import IncomingSmsService from "../../services/incoming-sms/IncomingSmsService.js";
+import ExternalOtpInService from "../../services/external-otp-in/ExternalOtpInService.js";
 
 export default class LoginSessionEvents extends EntityEvents<LoginSession> {
 
@@ -140,9 +141,9 @@ export default class LoginSessionEvents extends EntityEvents<LoginSession> {
                     .toArray();
 
                 if (otpIn.length) {
-                    const code = entity.smsToken = AppStringHelper.last(DateTime.now.msSinceEpoch.toString(), 6);
-                    const idsCodes = otpIn.map((x) => x.isdCode.startsWith("+") ? x.isdCode : "+" + x.isdCode );
-                    entity.smsConfig = await ServiceProvider.resolve(this, IncomingSmsService).prepareCode(code, ... idsCodes);
+                    const idsCodes = otpIn.map((x) => x.phoneNumber );
+                    entity.smsConfig = await ServiceProvider.resolve(this, ExternalOtpInService).create(idsCodes);
+                    entity.smsToken = entity.smsConfig.id;
                 }
 
                 return;

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

@@ -13,6 +13,7 @@ import External from "@entity-access/server-pages/dist/decorators/External.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.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";
 
 export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
 
@@ -166,4 +167,44 @@ export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
         }
 
     }
+
+    async beforeDelete(entity: Mailbox, entry: ChangeEntry<Mailbox>) {
+        this.sessionUser.ensureIsAdmin();
+
+        const{ db } = this;
+
+        // if (!entity.deleteVerificationID) {
+        //     throw new EntityAccessError(`Delete operation not authorized`);
+        // }
+
+        // const [id, accessCode] = entity.deleteVerificationID.split(":") as any[];
+
+        // const v = await db.verificationTokens.statements.select({} , { verificationID: id, accessCode });
+        // if (!v) {
+        //     throw new EntityAccessError(`Delete operation not authorized`);
+        // }
+
+        await db.fileContents.asQuery()
+            .where(entity, (p) => (x) => x.appFiles.some((a) => a.email.mailboxes.some((m) => m.mailboxID === p.mailboxID)))
+            .update(void 0, (p) => (x) => ({
+                deleted: true
+            }));
+
+
+        await db.appFiles.asQuery()
+            .delete(entity, (p) => (x) => x.email.mailboxes.some((m) => m.mailboxID === p.mailboxID));
+
+
+        await db.emails.asQuery()
+            .delete(entity, (p) => (x) => x.mailboxes.some((m) => m.mailboxID === p.mailboxID));
+
+        await db.mailboxContactEmails.asQuery()
+            .delete(entity, (p) => (x) => x.mailboxID === p.mailboxID);
+
+        await db.mailboxContactTags.asQuery()
+            .delete(entity, (p) => (x) => x.mailboxID === p.mailboxID);
+
+        await db.mailboxEmails.asQuery()
+            .delete(entity, (p) => (x) => x.mailboxID === p.mailboxID);
+    }
 }

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

@@ -203,10 +203,19 @@ export default class UserEvents extends AuthenticatedEvents<User> {
         }
     }
 
+    async beforeDelete(entity: User, entry: ChangeEntry<User>) {
+        this.sessionUser.ensureIsAdmin();
+
+        const { db } = this;
+        await db.contactPhones.asQuery().delete(entity, (p) => (x) => x.contact.userID === p.userID);
+        await db.contacts.asQuery().delete(entity, (p) => (x) => x.userID === p.userID);
+    }
+
     private updatePassword(entity: User, password: string) {
         const passwordSalt = this.cryptoService.generateSalt();
         entity.passwordSalt = passwordSalt;
         entity.passwordHash = this.cryptoService.hash(entity.passwordSalt, password);
     }
 
+
 }

package/src/server/services/external-otp-in/ExternalOtpInService.ts

@@ -0,0 +1,36 @@
+import { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
+import { globalEnv } from "../../../common/globalEnv.js";
+
+const headers = {
+    authorization: `basic ${Buffer.from(`${globalEnv.otpIn.key}:${globalEnv.otpIn.secret}`).toString("base64")}`
+};
+
+const postHeaders = {
+    ... headers,
+    "content-type": "application/json",
+};
+
+@RegisterSingleton
+export default class ExternalOtpInService {
+
+    async create(phoneNumbers: string[]) {
+        const rs = await fetch(`https://${globalEnv.otpIn.host}/api/otp-in/create`, {
+            method: "POST",
+            headers: postHeaders,
+            body: JSON.stringify({
+                phoneNumbers
+            })
+        });
+        const { id, ui } = await rs.json();
+        return { id, ui };
+    }
+
+    async get(id) {
+        const rs = await fetch(`https://${globalEnv.otpIn.host}/api/otp-in/get/${id}`, {
+            method: "GET",
+            headers
+        });
+        const { success } = await rs.json();
+        return { success };
+    }
+}