@social-mail/social-mail-web-server 1.7.355 → 1.7.357

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.7.355",
+  "version": "1.7.357",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",
@@ -21,8 +21,8 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.717.0",
     "@azure/storage-blob": "^12.25.0",
-    "@entity-access/entity-access": "^1.0.405",
-    "@entity-access/server-pages": "^1.1.416",
+    "@entity-access/entity-access": "^1.0.407",
+    "@entity-access/server-pages": "^1.1.417",
     "@ffmpeg/core-mt": "^0.12.6",
     "@ffmpeg/ffmpeg": "^0.12.10",
     "@ffmpeg/util": "^0.12.1",

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

@@ -28,6 +28,18 @@ export default class HostedDomainEvents extends AuthenticatedEvents<HostedDomain
     @Inject
     private context: WorkflowContext;
 
+    @ExternalQuery
+    async hosted(query: IEntityQuery<HostedDomain>) {
+        if (this.verify) {
+            this.sessionUser.ensureLoggedIn();
+        }
+        if (this.sessionUser.isAdmin) {
+            return query;
+        }
+        const { userID } = this.sessionUser;
+        return query.where({ userID }, (p) => (x) => x.domainUsers.some((d) => d.userID === p.userID));
+    }
+
     @ExternalInvoke
     async deleteDomain (entity: HostedDomain, password: string) {
 

package/src/server/services/app-temp-file/AppTempFileService.ts

@@ -48,8 +48,9 @@ export default class AppTempFileService {
             .where({rootID, path: `${path}%`, pathLength: path.length }, (p) => (x) =>
                 x.rootID === p.rootID
                 && Sql.text.like(x.path, p.path)
-                && !Sql.text.includes("/", Sql.text.substring(x.path, p.pathLength ))
+                && !Sql.text.includes(Sql.text.substring(x.path, p.pathLength), "/")
             )
+            .trace(console.log)
             .toArray();
 
         for (const child of children) {
@@ -156,8 +157,7 @@ export default class AppTempFileService {
 
         // if transform
         // do the transform here...
-        let contentType = mime.contentType(name) || "application/octet-stream";
-        contentType = contentType.split(":")[0];
+        const contentType = mime.lookup(name) || "application/octet-stream";
         if (/\/html$/i.test(contentType)) {
             localFile = await this.transformFile(localFile, transform);
         }