@social-mail/social-mail-web-server 1.7.548 → 1.7.549

package/dist/wwwroot/routes/api/signed/get1.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=get1.d.ts.map

package/dist/wwwroot/routes/api/signed/get1.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get1.d.ts","sourceRoot":"","sources":["../../../../../src/wwwroot/routes/api/signed/get1.tsx"],"names":[],"mappings":""}

package/dist/wwwroot/routes/api/signed/get1.js

@@ -0,0 +1,68 @@
+// import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+// import SocialMailContext from "../../../../server/model/SocialMailContext.js";
+// import TempFileService from "../../../../server/storage/TempFileService.js";
+// import ImageConverterService from "../../../../server/services/image-converter/ImageConverterService.js";
+// import { TempFileResult } from "@entity-access/server-pages/dist/Content.js";
+// import Page from "@entity-access/server-pages/dist/Page.js";
+// import CacheService from "../../../../server/services/cache/CacheService.js";
+// import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
+// import FileConversionService from "../../../../server/services/convert/FileConversionService.js";
+// import AppFile from "../../../../server/model/entities/AppFile.js";
+export {};
+// export default class extends Page {
+//     @Inject
+//     private tfs: TempFileService;
+//     @Inject
+//     private cacheService: CacheService;
+//     @Inject
+//     private db: SocialMailContext;
+//     @Inject
+//     private signerService: SignerService;
+//     async run() {
+//         const type = this.childPath[0];
+//         // we will not convert as BigInt might have loss of data
+//         const fileID = this.childPath[1] as unknown as number;
+//         const fileContentID = this.childPath[2] as unknown as number;
+//         const signature = this.childPath[3];
+//         const expiry = this.childPath[4];
+//         // verify hash ....
+//         this.signerService.signer<AppFile>().verify({ appFileID: fileID , fileContentID }, signature, expiry);
+//         this.db.verifyFilters = true;
+//         const fc = await this.db.appFiles
+//             .where({ fileID, fileContentID },
+//                 (p) => (x) => x.fileContentID === p.fileContentID
+//                     && x.appFileID === p.fileID)
+//             .include((x) => x.fileContent)
+//             .firstOrFail();
+//         this.db.verifyFilters = false;
+//         this.db.raiseEvents = false;
+//         this.cacheControl = "public, max-age=2592000, immutable";
+//         let file = await this.tfs.downloadFileContent(fc.fileContent, fc);
+//         const key = this.request.path;
+//         const ttl = TimeSpan.fromDays(30);
+//         // transform here...
+//         if (/^(size|jpg|png|webp|gif|face\-circle)\(/i.test(type)) {
+//             file = await this.cacheService.get({ key, ttl, factory: async () => {
+//                 // resize...
+//                 const ics = ServiceProvider.resolve(this, ImageConverterService);
+//                 return await ics.transform(type, file, this.childPath[this.childPath.length-1] );
+//             } });
+//         } else if (/^(pdf|html|webm)$/i.test(type)) {
+//             file = await this.cacheService.get({ key, ttl, factory: async () => {
+//                 const ics = ServiceProvider.resolve(this, FileConversionService);
+//                 return await ics[type.toLowerCase()](file, this.childPath[this.childPath.length-1] );
+//             } });
+//         }
+//         return new TempFileResult(
+//             file,
+//             {
+//                 contentDisposition: type === "download"
+//                     ? "attachment"
+//                     : "inline",
+//                 immutable: true,
+//                 etag: false
+//             }
+//         );
+//     }
+// }
+//# sourceMappingURL=get1.js.map

package/dist/wwwroot/routes/api/signed/get1.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get1.js","sourceRoot":"","sources":["../../../../../src/wwwroot/routes/api/signed/get1.tsx"],"names":[],"mappings":"AAAA,wFAAwF;AACxF,iFAAiF;AACjF,+EAA+E;AAC/E,4GAA4G;AAC5G,gFAAgF;AAChF,+DAA+D;AAC/D,gFAAgF;AAChF,8EAA8E;AAC9E,oGAAoG;AACpG,sEAAsE;;AAEtE,sCAAsC;AAEtC,cAAc;AACd,oCAAoC;AAEpC,cAAc;AACd,0CAA0C;AAE1C,cAAc;AACd,qCAAqC;AAErC,cAAc;AACd,4CAA4C;AAE5C,oBAAoB;AAEpB,0CAA0C;AAC1C,mEAAmE;AACnE,iEAAiE;AACjE,wEAAwE;AACxE,+CAA+C;AAC/C,4CAA4C;AAE5C,8BAA8B;AAC9B,iHAAiH;AAEjH,wCAAwC;AACxC,4CAA4C;AAC5C,gDAAgD;AAChD,oEAAoE;AACpE,mDAAmD;AACnD,6CAA6C;AAC7C,8BAA8B;AAC9B,yCAAyC;AACzC,uCAAuC;AACvC,oEAAoE;AACpE,6EAA6E;AAE7E,yCAAyC;AAEzC,6CAA6C;AAE7C,+BAA+B;AAC/B,uEAAuE;AACvE,oFAAoF;AACpF,+BAA+B;AAC/B,oFAAoF;AACpF,oGAAoG;AACpG,oBAAoB;AACpB,wDAAwD;AACxD,oFAAoF;AACpF,oFAAoF;AACpF,wGAAwG;AACxG,oBAAoB;AACpB,YAAY;AAEZ,qCAAqC;AACrC,oBAAoB;AACpB,gBAAgB;AAChB,0DAA0D;AAC1D,qCAAqC;AACrC,kCAAkC;AAClC,mCAAmC;AACnC,8BAA8B;AAC9B,gBAAgB;AAChB,aAAa;AACb,QAAQ;AACR,IAAI"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.7.548",
+  "version": "1.7.549",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",
@@ -22,7 +22,7 @@
     "@aws-sdk/client-s3": "^3.717.0",
     "@azure/storage-blob": "^12.25.0",
     "@entity-access/entity-access": "^1.0.433",
-    "@entity-access/server-pages": "^1.1.439",
+    "@entity-access/server-pages": "^1.1.441",
     "@ffmpeg/core-mt": "^0.12.6",
     "@ffmpeg/ffmpeg": "^0.12.10",
     "@ffmpeg/util": "^0.12.1",

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

@@ -1,13 +1,10 @@
 import Column from "@entity-access/entity-access/dist/decorators/Column.js";
 import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js";
 import Table from "@entity-access/entity-access/dist/decorators/Table.js";
-import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import { JsonProperty, ReadOnlyJsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
-import SignerService from "../../services/SignerService.js";
 import AppFile from "./AppFile.js";
-import Contact from "./Contact.js";
 import type { StoreInsight } from "./StoreInsight.js";
 import { StoreItemFolder } from "./StoreItemFolder.js";
 import type { StoreItemPrice } from "./StoreItemPrice.js";
@@ -16,7 +13,6 @@ import type { StoreItemTax } from "./StoreItemTax.js";
 import type { StoreJournalLineItem } from "./StoreJournalLineItem.js";
 import { StoreAccount } from "./StoreAccount.js";
 import type { StoreMediaFile } from "./StoreMediaFile.js";
-import Page from "@entity-access/server-pages/dist/Page.js";
 import WebSite from "./WebSite.js";
 import type StoreCoupon from "./StoreCoupon.js";
 import type WebHook from "./WebHook.js";

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

@@ -2,12 +2,9 @@ import CheckConstraint from "@entity-access/entity-access/dist/decorators/CheckC
 import Column from "@entity-access/entity-access/dist/decorators/Column.js";
 import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js";
 import Table from "@entity-access/entity-access/dist/decorators/Table.js";
-import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import { ReadOnlyJsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
-import SignerService from "../../services/SignerService.js";
 import AppFile from "./AppFile.js";
 import { StoreItem } from "./StoreItem.js";
-import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 
 @Table("StoreMediaFiles")
 @CheckConstraint({

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

@@ -11,15 +11,19 @@ import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import StoreTagCountService from "../../services/store/StoreTagCountService.js";
 import StoreFileService from "../../services/StoreFileService.js";
 import EncryptionService from "../../services/encryption/EncryptionService.js";
-import SignerService from "../../services/SignerService.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
+import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
 
 const till = new DateTime(DateTime.today.year + 2, 1, 1);
 
 export default class StoreItemEvents extends AuthenticatedEvents<StoreItem> {
 
     @Inject
-    private encryptionService: EncryptionService;
+    encryptionService: EncryptionService;
+
+    @Inject
+    sessionSecurity: SessionSecurity;
+
 
     @ExternalQuery
     storeQuery() {
@@ -117,11 +121,7 @@ export default class StoreItemEvents extends AuthenticatedEvents<StoreItem> {
 
     preJson(entity: StoreItem): StoreItem {
         entity.publicFolderID = this.encryptionService.general.encrypt(entity.storeID.toString());
-        const ss = ServiceProvider.resolve(this, SignerService);
-        const page = ServiceProvider.resolve(this, Page as any) as Page;
-        const host = page?.request?.hostName ?? "";
-        const { signature, expiry } = ss.signer().sign({ storeItemID: entity.storeItemID, host }, { till });
-        entity.signed = signature + "/" + expiry;
+        this.sessionSecurity.injectPublicKey(entity);
         return entity;
     }
 

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

@@ -4,60 +4,21 @@ import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAc
 import { StoreMediaFile } from "../entities/StoreMediaFile.js";
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
-import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
-import SignerService from "../../services/SignerService.js";
+import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import AppFile from "../entities/AppFile.js";
 import SocialMailContext from "../SocialMailContext.js";
 import ExternalQuery from "@entity-access/server-pages/dist/decorators/ExternalQuery.js";
 import Page from "@entity-access/server-pages/dist/Page.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import EncryptionService from "../../services/encryption/EncryptionService.js";
+import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
 
 const till = new DateTime(DateTime.today.year + 2, 1, 1);
 
 export default class StoreMediaFileEvents extends AuthenticatedEvents<StoreMediaFile> {
 
-    @ExternalQuery
-    siteQuery(publicFolderID) {
-
-        if (!publicFolderID) {
-            throw new EntityAccessError(`publicFolderID is required`);
-        }
-
-        const ecs = ServiceProvider.resolve(this, EncryptionService);
-        const root = ecs.general.decrypt(publicFolderID);
-
-        const rootPath = root + "/%";
-
-        const db = ServiceProvider.resolve(this, SocialMailContext);
-        const q = db.storeMediaFiles.where({ rootPath }, (p) => (x) =>
-            Sql.text.like(x.appFile.path, p.rootPath)
-        );
-        return q;
-    }
-
-    @ExternalQuery
-    storeQuery(storeItemID, signed) {
-
-        if (!storeItemID) {
-            throw new EntityAccessError(`storeItemID is required`);
-        }
-        if (!signed) {
-            throw new EntityAccessError(`signed is required`);
-        }
-
-        const page = ServiceProvider.resolve(this, Page as any) as Page;
-        const host = page.request.host;
-
-        const ss = ServiceProvider.resolve(this, SignerService);
-        const [ signature, expiry ] = signed.split("/");
-
-        ss.signer().verify({ storeItemID, host }, signature, expiry);
-
-        const db = ServiceProvider.resolve(this, SocialMailContext);
-        const q = db.storeMediaFiles.where({ host, storeItemID }, (p) => (x) => x.storeItemID === p.storeItemID);
-        return q;
-    }
+    @Inject
+    sessionSecurity: SessionSecurity;
 
     filter(query: IEntityQuery<StoreMediaFile>) {
         if (!this.verify) {
@@ -112,9 +73,10 @@ export default class StoreMediaFileEvents extends AuthenticatedEvents<StoreMedia
     }
 
     preJson(entity: StoreMediaFile): StoreMediaFile {
-        const ss = ServiceProvider.resolve(this, SignerService);
-        const { signature, expiry } = ss.signer<AppFile>().sign({ appFileID: entity.appFileID, fileContentID: entity.fileContentID }, { till });
-        entity.signed = signature + "/" + expiry;
+        this.sessionSecurity.injectPublicKey(entity);
+        // const ss = ServiceProvider.resolve(this, SignerService);
+        // const { signature, expiry } = ss.signer<AppFile>().sign({ appFileID: entity.appFileID, fileContentID: entity.fileContentID }, { till });
+        // entity.signed = signature + "/" + expiry;
         return entity;
     }
 }

package/src/server/services/SignerService.ts

@@ -1,49 +1,49 @@
-import { RegisterSingleton, RegisterTransient } from "@entity-access/entity-access/dist/di/di.js";
-import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
-import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
-import { globalEnv } from "../../common/globalEnv.js";
-import crypto, { sign } from "node:crypto";
-import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
-import { Base36 } from "../../common/Base36.js";
+// import { RegisterSingleton, RegisterTransient } from "@entity-access/entity-access/dist/di/di.js";
+// import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
+// import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
+// import { globalEnv } from "../../common/globalEnv.js";
+// import crypto, { sign } from "node:crypto";
+// import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
+// import { Base36 } from "../../common/Base36.js";
 
-@RegisterTransient
-export default class SignerService {
+// @RegisterTransient
+// export default class SignerService {
 
-    public signer<T = any>() {
-        return {
-            sign: (data: Partial<T>, { ttl = TimeSpan.fromDays(365), till }: { ttl?: TimeSpan, till?: DateTime } = {}) => {
-                till ??= DateTime.now.add(ttl);
-                const expiry = Math.ceil(till.msSinceEpoch).toString(36);
-                const signature = this.signInternal(data, expiry);
-                return { signature, expiry };
-            },
-            verify: (data: Partial<T>, signature, expiry) => {
-                const date = DateTime.from(Base36.decode(expiry));
-                if (date.msSinceEpoch < Date.now()) {
-                    throw new EntityAccessError("Signature expired");
-                }
-                const s1 = this.signInternal(data, expiry);
-                if (s1 !== signature) {
-                    throw new EntityAccessError("Invalid signature");
-                }
-            }
-        };
-    }
+//     public signer<T = any>() {
+//         return {
+//             sign: (data: Partial<T>, { ttl = TimeSpan.fromDays(365), till }: { ttl?: TimeSpan, till?: DateTime } = {}) => {
+//                 till ??= DateTime.now.add(ttl);
+//                 const expiry = Math.ceil(till.msSinceEpoch).toString(36);
+//                 const signature = this.signInternal(data, expiry);
+//                 return { signature, expiry };
+//             },
+//             verify: (data: Partial<T>, signature, expiry) => {
+//                 const date = DateTime.from(Base36.decode(expiry));
+//                 if (date.msSinceEpoch < Date.now()) {
+//                     throw new EntityAccessError("Signature expired");
+//                 }
+//                 const s1 = this.signInternal(data, expiry);
+//                 if (s1 !== signature) {
+//                     throw new EntityAccessError("Invalid signature");
+//                 }
+//             }
+//         };
+//     }
 
-    private signInternal(data: any, expiry: any) {
+//     private signInternal(data: any, expiry: any) {
 
-        const keys = Object.keys(data).sort((a, b) => a.localeCompare(b));
-        const finalObject = {};
-        for (const iterator of keys) {
-            finalObject[iterator] = data[iterator];
-        }
-        const key = `social-mail-${JSON.stringify(finalObject)}-${globalEnv.secretKey}-${globalEnv.serverID}-${expiry}`;
-        const sha256 = crypto.createHash("sha256");
-        let signature = sha256.update(key).digest("base64url");
-        const lastIndex = signature.lastIndexOf("=");
-        if (lastIndex !== -1) {
-            signature = signature.substring(0, lastIndex);
-        }
-        return signature;
-    }
-}
+//         const keys = Object.keys(data).sort((a, b) => a.localeCompare(b));
+//         const finalObject = {};
+//         for (const iterator of keys) {
+//             finalObject[iterator] = data[iterator];
+//         }
+//         const key = `social-mail-${JSON.stringify(finalObject)}-${globalEnv.secretKey}-${globalEnv.serverID}-${expiry}`;
+//         const sha256 = crypto.createHash("sha256");
+//         let signature = sha256.update(key).digest("base64url");
+//         const lastIndex = signature.lastIndexOf("=");
+//         if (lastIndex !== -1) {
+//             signature = signature.substring(0, lastIndex);
+//         }
+//         return signature;
+//     }
+// }

package/src/wwwroot/routes/api/signed/get1.tsx

@@ -0,0 +1,79 @@
+// import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+// import SocialMailContext from "../../../../server/model/SocialMailContext.js";
+// import TempFileService from "../../../../server/storage/TempFileService.js";
+// import ImageConverterService from "../../../../server/services/image-converter/ImageConverterService.js";
+// import { TempFileResult } from "@entity-access/server-pages/dist/Content.js";
+// import Page from "@entity-access/server-pages/dist/Page.js";
+// import CacheService from "../../../../server/services/cache/CacheService.js";
+// import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
+// import FileConversionService from "../../../../server/services/convert/FileConversionService.js";
+// import AppFile from "../../../../server/model/entities/AppFile.js";
+
+// export default class extends Page {
+
+//     @Inject
+//     private tfs: TempFileService;
+
+//     @Inject
+//     private cacheService: CacheService;
+
+//     @Inject
+//     private db: SocialMailContext;
+
+//     @Inject
+//     private signerService: SignerService;
+
+//     async run() {
+
+//         const type = this.childPath[0];
+//         // we will not convert as BigInt might have loss of data
+//         const fileID = this.childPath[1] as unknown as number;
+//         const fileContentID = this.childPath[2] as unknown as number;
+//         const signature = this.childPath[3];
+//         const expiry = this.childPath[4];
+
+//         // verify hash ....
+//         this.signerService.signer<AppFile>().verify({ appFileID: fileID , fileContentID }, signature, expiry);
+
+//         this.db.verifyFilters = true;
+//         const fc = await this.db.appFiles
+//             .where({ fileID, fileContentID },
+//                 (p) => (x) => x.fileContentID === p.fileContentID
+//                     && x.appFileID === p.fileID)
+//             .include((x) => x.fileContent)
+//             .firstOrFail();
+//         this.db.verifyFilters = false;
+//         this.db.raiseEvents = false;
+//         this.cacheControl = "public, max-age=2592000, immutable";
+//         let file = await this.tfs.downloadFileContent(fc.fileContent, fc);
+
+//         const key = this.request.path;
+
+//         const ttl = TimeSpan.fromDays(30);
+
+//         // transform here...
+//         if (/^(size|jpg|png|webp|gif|face\-circle)\(/i.test(type)) {
+//             file = await this.cacheService.get({ key, ttl, factory: async () => {
+//                 // resize...
+//                 const ics = ServiceProvider.resolve(this, ImageConverterService);
+//                 return await ics.transform(type, file, this.childPath[this.childPath.length-1] );
+//             } });
+//         } else if (/^(pdf|html|webm)$/i.test(type)) {
+//             file = await this.cacheService.get({ key, ttl, factory: async () => {
+//                 const ics = ServiceProvider.resolve(this, FileConversionService);
+//                 return await ics[type.toLowerCase()](file, this.childPath[this.childPath.length-1] );
+//             } });
+//         }
+
+//         return new TempFileResult(
+//             file,
+//             {
+//                 contentDisposition: type === "download"
+//                     ? "attachment"
+//                     : "inline",
+//                 immutable: true,
+//                 etag: false
+//             }
+//         );
+//     }
+// }

package/dist/wwwroot/routes/api/signed/get.d.ts

@@ -1,10 +0,0 @@
-import { TempFileResult } from "@entity-access/server-pages/dist/Content.js";
-import Page from "@entity-access/server-pages/dist/Page.js";
-export default class extends Page {
-    private tfs;
-    private cacheService;
-    private db;
-    private signerService;
-    run(): Promise<TempFileResult>;
-}
-//# sourceMappingURL=get.d.ts.map

package/dist/wwwroot/routes/api/signed/get.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../src/wwwroot/routes/api/signed/get.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAO5D,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,OAAO,CAAC,GAAG,CAAkB;IAG7B,OAAO,CAAC,YAAY,CAAe;IAGnC,OAAO,CAAC,EAAE,CAAoB;IAG9B,OAAO,CAAC,aAAa,CAAgB;IAE/B,GAAG;CAqDZ"}

package/dist/wwwroot/routes/api/signed/get.js

@@ -1,81 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
-import SocialMailContext from "../../../../server/model/SocialMailContext.js";
-import TempFileService from "../../../../server/storage/TempFileService.js";
-import ImageConverterService from "../../../../server/services/image-converter/ImageConverterService.js";
-import { TempFileResult } from "@entity-access/server-pages/dist/Content.js";
-import Page from "@entity-access/server-pages/dist/Page.js";
-import CacheService from "../../../../server/services/cache/CacheService.js";
-import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
-import FileConversionService from "../../../../server/services/convert/FileConversionService.js";
-import SignerService from "../../../../server/services/SignerService.js";
-export default class default_1 extends Page {
-    async run() {
-        const type = this.childPath[0];
-        // we will not convert as BigInt might have loss of data
-        const fileID = this.childPath[1];
-        const fileContentID = this.childPath[2];
-        const signature = this.childPath[3];
-        const expiry = this.childPath[4];
-        // verify hash ....
-        this.signerService.signer().verify({ appFileID: fileID, fileContentID }, signature, expiry);
-        this.db.verifyFilters = true;
-        const fc = await this.db.appFiles
-            .where({ fileID, fileContentID }, (p) => (x) => x.fileContentID === p.fileContentID
-            && x.appFileID === p.fileID)
-            .include((x) => x.fileContent)
-            .firstOrFail();
-        this.db.verifyFilters = false;
-        this.db.raiseEvents = false;
-        this.cacheControl = "public, max-age=2592000, immutable";
-        let file = await this.tfs.downloadFileContent(fc.fileContent, fc);
-        const key = this.request.path;
-        const ttl = TimeSpan.fromDays(30);
-        // transform here...
-        if (/^(size|jpg|png|webp|gif|face\-circle)\(/i.test(type)) {
-            file = await this.cacheService.get({ key, ttl, factory: async () => {
-                    // resize...
-                    const ics = ServiceProvider.resolve(this, ImageConverterService);
-                    return await ics.transform(type, file, this.childPath[this.childPath.length - 1]);
-                } });
-        }
-        else if (/^(pdf|html|webm)$/i.test(type)) {
-            file = await this.cacheService.get({ key, ttl, factory: async () => {
-                    const ics = ServiceProvider.resolve(this, FileConversionService);
-                    return await ics[type.toLowerCase()](file, this.childPath[this.childPath.length - 1]);
-                } });
-        }
-        return new TempFileResult(file, {
-            contentDisposition: type === "download"
-                ? "attachment"
-                : "inline",
-            immutable: true,
-            etag: false
-        });
-    }
-}
-__decorate([
-    Inject,
-    __metadata("design:type", TempFileService)
-], default_1.prototype, "tfs", void 0);
-__decorate([
-    Inject,
-    __metadata("design:type", CacheService)
-], default_1.prototype, "cacheService", void 0);
-__decorate([
-    Inject,
-    __metadata("design:type", SocialMailContext)
-], default_1.prototype, "db", void 0);
-__decorate([
-    Inject,
-    __metadata("design:type", SignerService)
-], default_1.prototype, "signerService", void 0);
-//# sourceMappingURL=get.js.map

package/dist/wwwroot/routes/api/signed/get.js.map

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

package/src/wwwroot/routes/api/signed/get.tsx

@@ -1,80 +0,0 @@
-import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
-import SocialMailContext from "../../../../server/model/SocialMailContext.js";
-import TempFileService from "../../../../server/storage/TempFileService.js";
-import ImageConverterService from "../../../../server/services/image-converter/ImageConverterService.js";
-import { TempFileResult } from "@entity-access/server-pages/dist/Content.js";
-import Page from "@entity-access/server-pages/dist/Page.js";
-import CacheService from "../../../../server/services/cache/CacheService.js";
-import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
-import FileConversionService from "../../../../server/services/convert/FileConversionService.js";
-import SignerService from "../../../../server/services/SignerService.js";
-import AppFile from "../../../../server/model/entities/AppFile.js";
-
-export default class extends Page {
-
-    @Inject
-    private tfs: TempFileService;
-
-    @Inject
-    private cacheService: CacheService;
-
-    @Inject
-    private db: SocialMailContext;
-
-    @Inject
-    private signerService: SignerService;
-
-    async run() {
-
-        const type = this.childPath[0];
-        // we will not convert as BigInt might have loss of data
-        const fileID = this.childPath[1] as unknown as number;
-        const fileContentID = this.childPath[2] as unknown as number;
-        const signature = this.childPath[3];
-        const expiry = this.childPath[4];
-
-        // verify hash ....
-        this.signerService.signer<AppFile>().verify({ appFileID: fileID , fileContentID }, signature, expiry);
-
-        this.db.verifyFilters = true;
-        const fc = await this.db.appFiles
-            .where({ fileID, fileContentID },
-                (p) => (x) => x.fileContentID === p.fileContentID
-                    && x.appFileID === p.fileID)
-            .include((x) => x.fileContent)
-            .firstOrFail();
-        this.db.verifyFilters = false;
-        this.db.raiseEvents = false;
-        this.cacheControl = "public, max-age=2592000, immutable";
-        let file = await this.tfs.downloadFileContent(fc.fileContent, fc);
-
-        const key = this.request.path;
-
-        const ttl = TimeSpan.fromDays(30);
-
-        // transform here...
-        if (/^(size|jpg|png|webp|gif|face\-circle)\(/i.test(type)) {
-            file = await this.cacheService.get({ key, ttl, factory: async () => {
-                // resize...
-                const ics = ServiceProvider.resolve(this, ImageConverterService);
-                return await ics.transform(type, file, this.childPath[this.childPath.length-1] );
-            } });
-        } else if (/^(pdf|html|webm)$/i.test(type)) {
-            file = await this.cacheService.get({ key, ttl, factory: async () => {
-                const ics = ServiceProvider.resolve(this, FileConversionService);
-                return await ics[type.toLowerCase()](file, this.childPath[this.childPath.length-1] );
-            } });
-        }
-
-        return new TempFileResult(
-            file,
-            {
-                contentDisposition: type === "download"
-                    ? "attachment"
-                    : "inline",
-                immutable: true,
-                etag: false
-            }
-        );
-    }
-}