@social-mail/social-mail-web-server 1.8.97 → 1.8.99

package/package.json

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

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

@@ -524,8 +524,15 @@ export default class AppFileEvents extends AuthenticatedEvents<AppFile> {
             const eDomain = this.encryptionService.general.encrypt(domain);
             fileContentID = this.encryptionService.general.encrypt(fileContentID.toString()) as any;
             postID = this.encryptionService.general.encrypt(postID.toString()) as any;
+
+            const isPublished = entity.email?.channelEmails?.some((x) => x.datePublished !== null);
+
             Object.defineProperty(entity, "postID", { value: postID, enumerable: true });
-            Object.defineProperty(entity, "url", { value: urlService.toChannelFileUrl({ eDomain, file: entity, postID }) , enumerable: true });
+            if (isPublished) {
+                Object.defineProperty(entity, "url", { value: urlService.toChannelFileUrl({ eDomain, file: entity, postID }) , enumerable: true });
+            } else {
+                Object.defineProperty(entity, "url", { value: `/social-mail/fd/view/${$key}/${fileContentID}/${entity.name}`, enumerable: true });
+            }
             // Object.defineProperty(entity, "downloadUrl", { value: `/social-mail/fd/download/${$key}/${fileContentID}/${entity.name}`, enumerable: true });
         } else {
             if (fileContentID) {

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

package/src/server/services/channels/ChannelUrlService.ts

@@ -41,7 +41,10 @@ export default class ChannelUrlService {
         if (/video/i.test(fo.file.contentType)) {
             return this.toWebMUrl(fo);
         }
-        return this.toImageUrl(fo);
+        if (/image/i.test(fo.file.contentType)) {
+            return this.toImageUrl(fo);
+        }
+        return this.toFileUrl(fo);
     }
 
     toImageUrl({
@@ -65,5 +68,15 @@ export default class ChannelUrlService {
         return `https://${globalEnv.cdnOrHost}/social-mail/c/e/${eDomain}/${method}/${cid}/${name}`;
     }
 
+    toFileUrl({
+        senderDomain = globalEnv.host,
+        eDomain = this.ecs.general.encrypt(senderDomain),
+        file,
+    }: IFileUrlOptions) {
+        const cid = this.ecs.general.encrypt(file.fileContentID.toString());
+        const method = "view";
+        const name = file.name;
+        return `https://${globalEnv.cdnOrHost}/social-mail/c/e/${eDomain}/${method}/${cid}/${name}`;
+    }
 
 }