@social-mail/social-mail-web-server 1.7.521 → 1.7.523

package/package.json

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

package/src/server/model/SocialMailContext.ts

@@ -78,6 +78,7 @@ import ThreadParticipant from "./entities/ThreadParticipant.js";
 import { WebSiteChannelDomain } from "./entities/WebSiteChannelDomain.js";
 import GeoIPBlock from "./entities/GeoIPBlock.js";
 import AppTempFile from "./entities/AppTempFile.js";
+import UserGroupMember from "./entities/UserGroupMember.js";
 
 @RegisterScoped
 export default class SocialMailContext extends EntityContext {
@@ -224,6 +225,8 @@ export default class SocialMailContext extends EntityContext {
 
     public users = this.model.register(User);
 
+    public userGroupMembers = this.model.register(UserGroupMember);
+
     public userPins = this.model.register(UserPin);
 
     public userPushSubscriptions = this.model.register(UserPushSubscription);

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

@@ -19,7 +19,7 @@ import type AccessToken from "./AccessToken.js";
 import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js";
 import type { HostedZoneUser } from "./HostedZone.js";
 import type { StoreAccount } from "./StoreAccount.js";
-import type UserGroupMembership from "./UserGroupMembership.js";
+import type UserGroupMember from "./UserGroupMember.js";
 
 export class ChangePassword {
 
@@ -190,8 +190,8 @@ export class User {
     closedEmails: Email[];
     hostedZones: HostedZoneUser[];
     storeAccount: StoreAccount;
-    groups: UserGroupMembership[];
-    groupMembers: UserGroupMembership[];
+    groups: UserGroupMember[];
+    groupMembers: UserGroupMember[];
 
     // [GraphService.toGraph]() {
     //     return {

package/src/server/model/entities/{UserGroupMembership.ts → UserGroupMember.ts}

@@ -1,8 +1,19 @@
 import Column from "@entity-access/entity-access/dist/decorators/Column.js";
-import { RelateTo, RelateToOne } from "@entity-access/entity-access/dist/decorators/Relate.js";
+import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js";
 import { User } from "./User.js";
+import Table from "@entity-access/entity-access/dist/decorators/Table.js";
 
-export default class UserGroupMembership {
+
+/**
+ * Every user should be member of it's own user Group. This will reduce
+ * query union. Queries will be smaller on runtime.
+ *
+ * So every query must only check group ownership and no longer need to check
+ * user ownership. Being both a key, one to one membership will also be
+ * restricted for single entry.
+ */
+@Table("UserGroupMembers")
+export default class UserGroupMember {
     @Column({ dataType: "BigInt", key: true })
     @RelateTo(User, {
         property: (x) => x.owner,
@@ -28,4 +39,4 @@ export default class UserGroupMembership {
     owner: User;
 
     group: User;
-}
+}

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

@@ -1,5 +1,5 @@
-import EntityEvents, { ForeignKeyFilter } from "@entity-access/entity-access/dist/model/events/EntityEvents.js";
-import AppFile, { AppFileAccess } from "../entities/AppFile.js";
+import { ForeignKeyFilter } from "@entity-access/entity-access/dist/model/events/EntityEvents.js";
+import AppFile from "../entities/AppFile.js";
 import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
@@ -17,7 +17,6 @@ import UpdateFolderSize from "../../workflows/storage/files/UpdateFolderSize.js"
 import FileAccessService from "../../services/files/FileAccessService.js";
 import WorkflowContext from "@entity-access/entity-access/dist/workflows/WorkflowContext.js";
 import ExternalQuery from "@entity-access/server-pages/dist/decorators/ExternalQuery.js";
-import CacheService from "../../services/cache/CacheService.js";
 import EmailLogService from "../../services/email-logs/EmailLogService.js";
 import Page from "@entity-access/server-pages/dist/Page.js";
 import StoreConfigService from "../../services/store/StoreConfigService.js";
@@ -27,11 +26,8 @@ import { Email } from "../entities/Email.js";
 import WebSite from "../entities/WebSite.js";
 import EncryptionService from "../../services/encryption/EncryptionService.js";
 import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
-import ExternalInvoke from "@entity-access/server-pages/dist/decorators/ExternalInvoke.js";
-import FileConversionService from "../../services/convert/FileConversionService.js";
-import { TempFileResult } from "@entity-access/server-pages/dist/Content.js";
 import ChannelEmail from "../entities/ChannelEmail.js";
-import Mailbox from "../entities/Mailbox.js";
+import FilePathService from "../../services/files/FilePathService.js";
 
 export default class AppFileEvents extends AuthenticatedEvents<AppFile> {
 
@@ -65,6 +61,9 @@ export default class AppFileEvents extends AuthenticatedEvents<AppFile> {
     @Inject
     sessionSecurity: SessionSecurity;
 
+    @Inject
+    fps: FilePathService;
+
     @ExternalQuery
     async storeItemFiles(folderID) {
         const page = ServiceProvider.resolve(this, Page as any) as Page;
@@ -419,7 +418,7 @@ export default class AppFileEvents extends AuthenticatedEvents<AppFile> {
                 await this.versionService.saveVersion(this.sessionUser, entity);
             }
         }
-        if (entry.isUpdated("parentID") || entry.isUpdated("fileSize")) {
+        if (entry.isUpdated("parentID")) {
             await this.updateFolderSize(entity);
         }
     }
@@ -537,14 +536,7 @@ export default class AppFileEvents extends AuthenticatedEvents<AppFile> {
         }
     }
 
-    private async updateFilePath(entity: AppFile) {
-        const { parentID, isFolder } = entity;
-        if (parentID) {
-            await this.db.appFiles.where(entity, (p) => (x) => x.appFileID === p.appFileID)
-                .update(void 0, (p) => (x) => ({ path: `${x.parent.path}${Sql.cast.asText(x.appFileID)}/` }));
-        } else if (isFolder) {
-            await this.db.appFiles.where(entity, (p) => (x) => x.appFileID === p.appFileID)
-                .update(void 0, (p) => (x) => ({ path: `${Sql.cast.asText(x.appFileID)}/` }));
-        }
+    private updateFilePath(entity: AppFile) {
+        return this.fps.update(entity);
     }
 }

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

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

package/src/server/services/UserInfoProvider.ts

@@ -12,12 +12,16 @@ export default class UserSessionProvider extends USP {
 
         /** The new scope will not interfere with existing DbContext for current request */
 
-        const scope = ServiceProvider.createScope(this);
+        using scope = ServiceProvider.createScope(this);
         const db = scope.resolve(SocialMailContext);
 
         const session = await db.loginSessions.where({ userID, sessionID }, (p) => (x) => x.userID === p.userID
             && x.sessionID === p.sessionID && x.invalid === false)
-            .include((x) => [x.user.roles, x.user.fileAccessList.forEach((f) => f.file)])
+            .include((x) => [
+                x.user.roles,
+                x.user.fileAccessList.forEach((f) => f.file),
+                // x.user.groups.forEach((g) => g.group.fileAccessList.forEach((gf) => gf.file))
+            ])
             .first();
         if (!session?.user) {
             return null;

package/src/server/services/files/FilePathService.ts

@@ -0,0 +1,36 @@
+import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
+import AppFile from "../../model/entities/AppFile.js";
+import SocialMailContext from "../../model/SocialMailContext.js";
+import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
+
+@RegisterScoped
+export default class FilePathService {
+
+    @Inject
+    db: SocialMailContext;
+
+    async update(entity: AppFile) {
+        const { parentID, isFolder } = entity;
+        if (parentID) {
+            await this.db.appFiles.where(entity, (p) => (x) => x.appFileID === p.appFileID)
+                .update(void 0, (p) => (x) => ({ path: `${x.parent.path}${Sql.cast.asText(x.appFileID)}/` }));
+
+        } else if (isFolder) {
+            await this.db.appFiles.where(entity, (p) => (x) => x.appFileID === p.appFileID)
+                .update(void 0, (p) => (x) => ({ path: `${Sql.cast.asText(x.appFileID)}/` }));
+        }
+
+        await this.db.appFiles.where(entity, (p) => (x) => x.parentID === p.appFileID)
+            .update(void 0, (p) => (x) => ({ path: `${x.parent.path}${Sql.cast.asText(x.appFileID)}/` }));
+
+        // do this for every folder
+        const childFolders = await this.db.appFiles.where(entity, (p) => (x) => x.parentID === p.appFileID && x.isFolder === true)
+            .toArray();
+
+        for (const folder of childFolders) {
+            await this.update(folder);
+        }
+
+    }
+
+}

package/dist/server/model/entities/UserGroupMembership.d.ts

@@ -1,8 +0,0 @@
-import { User } from "./User.js";
-export default class UserGroupMembership {
-    ownerID: number;
-    groupID: number;
-    owner: User;
-    group: User;
-}
-//# sourceMappingURL=UserGroupMembership.d.ts.map

package/dist/server/model/entities/UserGroupMembership.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"UserGroupMembership.d.ts","sourceRoot":"","sources":["../../../../src/server/model/entities/UserGroupMembership.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAUpC,OAAO,EAAE,MAAM,CAAC;IAWhB,OAAO,EAAE,MAAM,CAAC;IAEhB,KAAK,EAAE,IAAI,CAAC;IAEZ,KAAK,EAAE,IAAI,CAAC;CACf"}

package/dist/server/model/entities/UserGroupMembership.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"UserGroupMembership.js","sourceRoot":"","sources":["../../../../src/server/model/entities/UserGroupMembership.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,wDAAwD,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAe,MAAM,wDAAwD,CAAC;AAC/F,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,CAAC,OAAO,OAAO,mBAAmB;CA0BvC;AAhBG;IATC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;IACzC,QAAQ,CAAC,IAAI,EAAE;QACZ,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK;QACxB,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM;QAChC,oBAAoB,EAAE;YAClB,IAAI,EAAE,oCAAoC;YAC1C,OAAO,EAAE,QAAQ;SACpB;KACJ,CAAC;;oDACc;AAWhB;IATC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAC,CAAC;IACxC,QAAQ,CAAC,IAAI,EAAE;QACZ,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK;QACxB,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY;QACtC,oBAAoB,EAAE;YAClB,IAAI,EAAE,oCAAoC;YAC1C,OAAO,EAAE,QAAQ;SACpB;KACJ,CAAC;;oDACc"}