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

package/package.json

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

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.76"
+        version: "1.9.78"
     });
 
     await config.saveVersion(WebComponentsPackageConfig, {