@social-mail/social-mail-web-server 1.5.270 → 1.5.271

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;CAkKZ"}
+{"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"}

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

@@ -80,24 +80,6 @@ let ExternalSignup = class ExternalSignup extends Page {
             addresses.push(shippingAddress);
         }
         const emailAddressID = await this.emailAddressService.getId(model.emailAddress, model.name);
-        const contact = db.storeAccounts.add({
-            dateCreated,
-            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
-                })
-            ],
-            addresses
-        });
         // create user...
         const account = db.users.add({
             /** This is to make customer user unique per store */
@@ -108,9 +90,6 @@ let ExternalSignup = class ExternalSignup extends Page {
             multiFactor: false,
             dateUpdated: dateCreated,
             isExternal: true,
-            customerAccounts: [
-                contact
-            ],
             authFactors: [
                 db.userAuthFactors.add({
                     phoneNumber: phoneNumberE64,
@@ -120,6 +99,25 @@ let ExternalSignup = class ExternalSignup extends Page {
                 })
             ]
         });
+        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
+                })
+            ],
+            addresses
+        });
         await db.saveChanges();
         if (billingAddress) {
             contact.billingAddressID = billingAddress.addressID;

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

package/dist/wwwroot/routes/store/buy/[productID]/get.js

@@ -27,7 +27,7 @@ let default_1 = class extends Page {
             if (!currency) {
                 currency = w.currency;
             }
-            const contact = await this.db.storeAccounts.where({ userID }, (p) => (x) => x.customerUserID === p.userID)
+            const contact = await this.db.storeAccounts.where({ userID }, (p) => (x) => x.accountID === p.userID)
                 .include((x) => x.addresses)
                 .first();
             // todo: optimization

package/dist/wwwroot/routes/store/buy/[productID]/get.js.map

@@ -1 +1 @@
-{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/store/buy/[productID]/get.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/store/buy/[productID]/get.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.5.270",
+  "version": "1.5.271",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",
@@ -21,8 +21,8 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.609.0",
     "@azure/storage-blob": "^12.25.0",
-    "@entity-access/entity-access": "^1.0.369",
-    "@entity-access/server-pages": "^1.1.325",
+    "@entity-access/entity-access": "^1.0.370",
+    "@entity-access/server-pages": "^1.1.327",
     "@ffmpeg/core-mt": "^0.12.6",
     "@ffmpeg/ffmpeg": "^0.12.10",
     "@ffmpeg/util": "^0.12.1",

package/src/server/model/SocialMailContextEvents.ts

@@ -84,7 +84,7 @@ import AccessToken from "./entities/AccessToken.js";
 import AccessTokenEvents from "./events/AccessTokenEvents.js";
 import StoreItemTagEvents from "./events/StoreItemTagEvents.js";
 import StoreInsightEvents from "./events/StoreInsightEvents.js";
-import StoreAccountEvents from "./events/StoreLedgerEvents.js";
+import StoreAccountEvents from "./events/StoreAccountEvents.js";
 import StoreJournalEvents from "./events/StoreJournalEvents.js";
 import StoreJournalEntryEvents from "./events/StoreJournalEntryEvents.js";
 import StoreJournalLineItemEvents from "./events/StoreJournalLineItemEvents.js";

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

@@ -1,7 +1,7 @@
 import CheckConstraint from "@entity-access/entity-access/dist/decorators/CheckConstraint.js";
 import Column from "@entity-access/entity-access/dist/decorators/Column.js";
 import Index from "@entity-access/entity-access/dist/decorators/Index.js";
-import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js";
+import { RelateTo, RelateToOne } from "@entity-access/entity-access/dist/decorators/Relate.js";
 import Table from "@entity-access/entity-access/dist/decorators/Table.js";
 import { StoreJournalEntry } from "./StoreJournalEntry.js";
 import { StoreItem } from "./StoreItem.js";
@@ -55,7 +55,15 @@ import type StorePaymentGateway from "./StorePaymentGateway.js";
 })
 export class StoreAccount {
 
-    @Column({ dataType: "BigInt", key: true, generated: "identity" })
+    @Column({ dataType: "BigInt", key: true})
+    @RelateToOne(User, {
+        property: (x) => x.user,
+        inverseProperty: (x) => x.storeAccount,
+        foreignKeyConstraint: {
+            name: "FC_StoreAccounts_Customer_UserID",
+            cascade: "restrict"
+        }
+    })
     public accountID: number;
 
     @Column({ dataType: "Char", length: 400, nullable: true })
@@ -83,17 +91,6 @@ export class StoreAccount {
     })
     public parentID: number;
 
-    @Column({ dataType: "BigInt", nullable: true })
-    @RelateTo(User, {
-        property: (x) => x.customerUser,
-        inverseProperty: (x) => x.customerAccounts,
-        foreignKeyConstraint: {
-            name: "FC_StoreAccounts_Customer_UserID",
-            cascade: "restrict"
-        }
-    })
-    public customerUserID: number;
-
     // @Column({ dataType: "BigInt", nullable: true })
     // @RelateTo({
     //     type: () => StoreItem,
@@ -133,7 +130,7 @@ export class StoreAccount {
     item: StoreItem;
     parent: StoreAccount;
 
-    customerUser: User;
+    user: User;
 
     children: StoreAccount[];
     entries: StoreJournalEntry[];

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

@@ -15,7 +15,7 @@ export type gatewayType = typeof gatewayTypeArray[number];
 
 @Table("StorePaymentGateways")
 @Index({
-    name: "IX_StorePaymentGatway_Default",
+    name: "IX_StorePaymentGateway_Default",
     columns: [
         { name: (x) => x.isGatewayActive, descending: true},
         { name: (x) => x.isDefault, descending: true},

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

@@ -148,7 +148,7 @@ export class User {
     // storeOrders: StoreBill[];
     closedEmails: Email[];
     hostedZones: HostedZoneUser[];
-    customerAccounts: StoreAccount[];
+    storeAccount: StoreAccount;
 
     // [GraphService.toGraph]() {
     //     return {

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

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

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.storeAccount.customerUserID === p.userID
+            x.accountID === p.userID
             || Sql.text.likeAny(x.storeAccount.store.folder.path, p.writeFileAccess)
         );
     }

package/src/server/model/events/{StoreLedgerEvents.ts → StoreAccountEvents.ts}

@@ -3,12 +3,19 @@ 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 { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import EncryptionService from "../../services/encryption/EncryptionService.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> {
 
+    @Inject
+    db?: SocialMailContext;
+
     filter(query: IEntityQuery<StoreAccount>) {
         if (!this.verify) {
             return query;
@@ -41,8 +48,31 @@ export default class StoreAccountEvents extends AuthenticatedEvents<StoreAccount
         return query;
     }
 
-    beforeInsert(entity: StoreAccount, entry: ChangeEntry<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;
+        }
     }
 
     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.storeAccount.customerUserID === p.userID
+            x.accountID === p.userID
             || Sql.text.likeAny(x.storeAccount.store.folder.path, p.writeFileAccess)
         );
     }

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

@@ -17,7 +17,7 @@ export default class StoreJournalEntryEvents extends AuthenticatedEvents<StoreJo
         }
         return query.where(sessionUser, (p) => (x) =>
             Sql.text.likeAny(x.journal.store.folder.path, p.writeFileAccess)
-            || x.journal.buyer.customerUserID === p.userID
+            || x.journal.buyerID === p.userID
         );
     }
 

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

@@ -25,7 +25,7 @@ export default class StoreJournalEvents extends AuthenticatedEvents<StoreJournal
         }
         return query.where(sessionUser, (p) => (x) =>
             Sql.text.likeAny(x.store.folder.path, p.writeFileAccess)
-            || x.buyer.customerUserID === p.userID
+            || x.buyerID === p.userID
         );
     }
 

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

@@ -17,7 +17,7 @@ export default class StoreJournalLineItemEvents extends AuthenticatedEvents<Stor
         }
         return query.where(sessionUser, (p) => (x) =>
             Sql.text.likeAny(x.journal.store.folder.path, p.writeFileAccess)
-            || x.journal.buyer.customerUserID === p.userID
+            || x.journal.buyerID === p.userID
         );
     }
 

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

@@ -76,13 +76,11 @@ export default class VerificationTokenEvents extends AuthenticatedEvents<Verific
                     if (w) {
                         webSiteFolderID = w.folderID;
                         const user = await db.users.where({ webSiteFolderID, email: address.address }, (p) => (x) =>
-                                x.customerAccounts.some((c) =>
-                                    c.storeID === p.webSiteFolderID
-                                    && c.emails.some((e) =>
+                                x.storeAccount.storeID === p.webSiteFolderID
+                                    && x.storeAccount.emails.some((e) =>
                                         e.emailAddress.emailAddress === p.email
                                     )
                                 )
-                            )
                             .first();
                         if (user) {
                             entity.userID = user.userID;
@@ -125,16 +123,23 @@ export default class VerificationTokenEvents extends AuthenticatedEvents<Verific
 
         const db = ServiceProvider.resolve(this, SocialMailContext);
 
+        const ws = ServiceProvider.resolve(this, WebSiteService);
+        const page = ServiceProvider.resolve(this, Page as any) as Page;
+
+        const w = await ws.get(page.request.hostName);
+
+        const storeID = w.folderID;
+
         const addresses = [];
         for(const a of await db.verificationTokenAddresses.where(entity, (p) => (x) => x.verificationID === p.verificationID).toArray()) {
             addresses.push(a.address);
         }
 
-        const { userID } = await db.users.where({ addresses }, (p) => (x) =>
-            x.customerAccounts.some((c) =>
-                c.emails.some((e) => Sql.in(e.emailAddress.emailAddress, p.addresses))
-                || c.phones.some((e) => Sql.in(e.phoneNumberE64, p.addresses))
-            ))
+        const { userID } = await db.users.where({ storeID, addresses }, (p) => (x) =>
+            x.storeAccount.storeID === p.storeID
+            && x.storeAccount.emails.some((e) => Sql.in(e.emailAddress.emailAddress, p.addresses))
+                || x.storeAccount.phones.some((e) => Sql.in(e.phoneNumberE64, p.addresses))
+            )
             .firstOrFail();
 
         await db.verificationTokens.statements.update({ verified: true }, { verificationID: entity.verificationID });

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

@@ -3,7 +3,7 @@ import semver from "semver";
 
 export default async function seedUI(config: DBConfig) {
 
-    const version = "1.2.668";
+    const version = "1.2.669";
 
     const existing = await config.getValue(UIPackageConfig, false);
     if (existing) {

package/src/server/services/accounts/chart-of-accounts/ChartOfAccounts.ts

@@ -19,7 +19,7 @@ export default class ChartOfAccounts {
             parentID,
             storeID,
             name,
-            customerUserID: customerID,
+            accountID: customerID,
             head,
         });
     }

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

@@ -77,10 +77,9 @@ export default class ExternalOtpInService {
             const va = await this.db.verificationTokenAddresses.statements.select({} , { verificationID });
             if (va) {
                 const user = await this.db.users.where({ siteID: v.webSiteFolderID, phone: va.address }, (p) => (x) =>
-                    x.customerAccounts.some((c) =>
-                        c.storeID === p.siteID
-                        && c.phones.some((e) => e.phoneNumberE64 === p.phone)
-                    ))
+                    x.storeAccount.storeID === p.siteID
+                    && x.storeAccount.phones.some((e) => e.phoneNumberE64 === p.phone)
+                    )
                     .first();
                 if (user) {
                     userID = user.userID;

package/src/wwwroot/routes/social-mail/user/signup/post.tsx

@@ -132,25 +132,6 @@ export default class ExternalSignup extends Page {
 
         const emailAddressID = await this.emailAddressService.getId(model.emailAddress, model.name);
 
-        const contact = db.storeAccounts.add({
-            dateCreated,
-            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
-                })
-            ],
-            addresses
-        });
-
         // create user...
         const account = db.users.add({
             /** This is to make customer user unique per store */
@@ -161,9 +142,6 @@ export default class ExternalSignup extends Page {
             multiFactor: false,
             dateUpdated: dateCreated,
             isExternal: true,
-            customerAccounts:[
-                contact
-            ],
             authFactors: [
                 db.userAuthFactors.add({
                     phoneNumber: phoneNumberE64,
@@ -174,6 +152,26 @@ export default class ExternalSignup extends Page {
             ]
         });
 
+        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
+                })
+            ],
+            addresses
+        });
+
         await db.saveChanges();
 
         if (billingAddress) {

package/src/wwwroot/routes/store/buy/[productID]/get.tsx

@@ -42,7 +42,7 @@ export default class extends Page {
                 currency = w.currency;
             }
 
-            const contact = await this.db.storeAccounts.where({userID }, (p) => (x) => x.customerUserID === p.userID)
+            const contact = await this.db.storeAccounts.where({userID }, (p) => (x) => x.accountID === p.userID)
                 .include((x) => x.addresses)
                 .first();
 

package/dist/server/model/events/StoreLedgerEvents.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"StoreLedgerEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/StoreLedgerEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAC/F,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,WAAW,MAAM,gEAAgE,CAAC;AAKzF,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,mBAAmB,CAAC,YAAY,CAAC;IAE7E,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC;IAaxC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC;IAIxC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC,YAAY,CAAC;IAWrE,aAAa,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,MAAM;IAIzE,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;IAInE,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;CAItE"}

package/dist/server/model/events/StoreLedgerEvents.js

@@ -1,38 +0,0 @@
-import AuthenticatedEvents from "./AuthenticatedEvents.js";
-import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
-import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
-export default class StoreAccountEvents extends AuthenticatedEvents {
-    filter(query) {
-        if (!this.verify) {
-            return query;
-        }
-        const { sessionUser } = this;
-        if (sessionUser.isAdmin) {
-            return query;
-        }
-        return query.where(sessionUser, (p) => (x) => Sql.text.likeAny(x.store.folder.path, p.writeFileAccess));
-    }
-    modify(query) {
-        return this.filter(query);
-    }
-    delete(query) {
-        if (!this.verify) {
-            return query;
-        }
-        const { sessionUser } = this;
-        if (sessionUser.isAdmin) {
-            return query;
-        }
-        throw new EntityAccessError("Only admin can delete the store.");
-    }
-    includeFilter(query, type, key) {
-        return query;
-    }
-    beforeInsert(entity, entry) {
-        this.sessionUser.ensureLoggedIn();
-    }
-    beforeUpdate(entity, entry) {
-        this.sessionUser.ensureLoggedIn();
-    }
-}
-//# sourceMappingURL=StoreLedgerEvents.js.map

package/dist/server/model/events/StoreLedgerEvents.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"StoreLedgerEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/StoreLedgerEvents.ts"],"names":[],"mappings":"AACA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAK9F,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAE/D,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,mBAAiC;IAE7E,MAAM,CAAC,KAAiC;QACpC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAC7B,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACzC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,eAAe,CAAC,CAC3D,CAAC;IACN,CAAC;IAED,MAAM,CAAC,KAAiC;QACpC,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,KAAiC;QACpC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAC7B,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,IAAI,iBAAiB,CAAC,kCAAkC,CAAC,CAAC;IACpE,CAAC;IAED,aAAa,CAAC,KAAiC,EAAE,IAAU,EAAE,GAAY;QACrE,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,YAAY,CAAC,MAAoB,EAAE,KAAgC;QAC/D,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;IACtC,CAAC;IAED,YAAY,CAAC,MAAoB,EAAE,KAAgC;QAC/D,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;IACtC,CAAC;CAEJ"}