@social-mail/social-mail-web-server 1.8.381 → 1.8.383

package/package.json

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

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

@@ -12,7 +12,7 @@ import MailboxContactEmail from "./MailboxContactEmail.js";
 import type ChannelEmail from "./ChannelEmail.js";
 import { User } from "./User.js";
 import type SubscriberActivity from "./SubscriberActivity.js";
-import { IgnoreJsonProperty, ReadOnlyJsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
+import { IgnoreJsonProperty, JsonProperty, ReadOnlyJsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
 import type EmailEngagement from "./EmailEngagement.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import { apiPath } from "../../../common/globalEnv.js";
@@ -262,6 +262,9 @@ export class Email {
     @ReadOnlyJsonProperty
     postID: string;
 
+    @JsonProperty()
+    public sanitizedHtml: string;
+
     public tempID: any;
 
     public mimeFile: EmailLog;

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

@@ -352,29 +352,7 @@ export default class EmailEvents extends AuthenticatedEvents<Email> {
         if (entity.htmlBody) {
             if (entity.status === "published")  {
                 entity.htmlBody = null;
-            } else {
-                const htmlService = ServiceProvider.resolve(this, HtmlSanitizer);
-                const encryptionService = ServiceProvider.resolve(this, EncryptionService);
-                const emailID = entity.emailID.toString();
-                let ei;
-                let prefix;
-                const { host, encryptionKey } = globalEnv.emailContentProxy;
-                if (host) {
-                    ei = encryptionService.global.encrypt(emailID.toString(), encryptionKey, host);
-                    prefix = `https://${host}/api/emails/d/${ei}/${emailID}/`;
-                } else {
-                    ei = encryptionService.general.encrypt(emailID.toString());
-                    prefix = `/api/emails/d/${ei}/${emailID}/`;
-                }
-                const result = htmlService.sanitizeExternalResources({
-                    html: entity.htmlBody,
-                    text: entity.textBody,
-                    prefix
-                });
-                entity.htmlBody = result.html;
-                entity.textBody = result.text;
             }
-
             // const blog = entity.status === "published"
             //     ? `@` + entity.senderName.split("@")[0]
             //     : "";

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

@@ -15,7 +15,7 @@ export default class StoreAccountEmailEvents extends AuthenticatedEvents<StoreAc
         }
 
         return query.where(this.sessionUser, (p) => (x) =>
-            x.accountID === p.userID
+            x.storeAccount.userID === p.userID
             || Sql.text.likeAny(x.storeAccount.store.folder.path, p.writeFileAccess)
         );
     }

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

@@ -3,12 +3,9 @@ import AuthenticatedEvents from "./AuthenticatedEvents.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import { StoreAccount } from "../entities/StoreAccount.js";
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
-import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import Inject from "@entity-access/entity-access/dist/di/di.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import SocialMailContext from "../SocialMailContext.js";
-import { randomUUID } from "crypto";
-import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
-import CryptoService from "../../services/CryptoService.js";
 
 export default class StoreAccountEvents extends AuthenticatedEvents<StoreAccount> {
 
@@ -24,7 +21,8 @@ export default class StoreAccountEvents extends AuthenticatedEvents<StoreAccount
             return query;
         }
         return query.where(sessionUser, (p) => (x) =>
-            Sql.text.likeAny(x.store.folder.path, p.writeFileAccess)
+            x.userID === p.userID
+            || Sql.text.likeAny(x.store.folder.path, p.writeFileAccess)
         );
     }
 
@@ -49,29 +47,7 @@ export default class StoreAccountEvents extends AuthenticatedEvents<StoreAccount
 
     async beforeInsert(entity: StoreAccount, entry: ChangeEntry<StoreAccount>) {
         this.sessionUser.ensureLoggedIn();
-
-        // create a user...
-        if (!(entity.user || entity.accountID)) {
-            const dateCreated = DateTime.now;
-
-            const password = randomUUID();
-
-            const cryptoService = ServiceProvider.resolve(this, CryptoService);
-
-            const passwordSalt = cryptoService.generateSalt();
-            const passwordHash = cryptoService.hash(passwordSalt, password);
-
-            const user = await this.db.users.statements.insert({
-                userName: randomUUID(),
-                displayName: entity.name,
-                passwordSalt,
-                passwordHash,
-                multiFactor: false,
-                dateUpdated: dateCreated,
-                isExternal: true
-            });
-            entity.accountID = user.userID;
-        }
+        entity.userID = this.sessionUser.userID;
     }
 
     beforeUpdate(entity: StoreAccount, entry: ChangeEntry<StoreAccount>) {

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

@@ -15,7 +15,7 @@ export default class StoreAccountPhoneEvents extends AuthenticatedEvents<StoreAc
         }
 
         return query.where(this.sessionUser, (p) => (x) =>
-            x.accountID === p.userID
+            x.storeAccount.userID === p.userID
             || Sql.text.likeAny(x.storeAccount.store.folder.path, p.writeFileAccess)
         );
     }

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

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