@entity-access/server-pages 1.0.43 → 1.1.3

package/src/decorators/Prepare.ts

@@ -0,0 +1,132 @@
+import busboy from "busboy";
+import { Writable } from "node:stream";
+import Page from "../Page.js";
+import TempFolder from "../core/TempFolder.js";
+import { LocalFile } from "../core/LocalFile.js";
+
+export const prepareSymbol = Symbol("Parse");
+
+
+export interface IFormData {
+    fields: { [key: string]: string};
+    files: LocalFile[];
+}
+
+const parseJsonBody = (page?): any => {
+
+    if (!page) {
+        return (target) => parseJsonBody(target);
+    }
+
+    if (!(page instanceof Page)) {
+        ((page as any)[prepareSymbol] ??= []).push(parseJsonBody);
+        return;
+    }
+
+    if (page.body) {
+        return;
+    }
+
+    return (async () => {
+
+        try {
+            let buffer = null as Buffer;
+            let encoding = page.request.headers["content-encoding"] ?? "utf-8";
+            const contentType = page.request.headers["content-type"];
+            if (!/\/json/i.test(contentType)) {
+                return {};
+            }
+            await new Promise<void>((resolve, reject) => {
+                page.request.pipe(new Writable({
+                    write(chunk, enc, callback) {
+                        encoding ||= enc;
+                        let b = typeof chunk === "string"
+                            ? Buffer.from(chunk)
+                            : chunk as Buffer;
+                        buffer = buffer
+                            ? Buffer.concat([buffer, b])
+                            : b;
+                        callback();
+                    },
+                    final(callback) {
+                        resolve();
+                        callback();
+                    },
+                }), { end: true });
+            });
+            const text = buffer.toString(encoding as any);
+            (page as any).body = (page.request as any).body = JSON.parse(text);
+        } catch (error) {
+            page.reportError(error);
+            (page as any).body = (page.request as any).body = {};
+        }
+    })();
+};
+
+const authorize = (page?): any => {
+    if (!page) {
+        return (target) => authorize(target);
+    }
+
+    if (!(page instanceof Page)) {
+        ((page as any)[prepareSymbol] ??= []).push(authorize);
+        return;
+    }
+
+    return page.sessionUser.authorize();
+};
+
+const parseForm = (page?): any => {
+    if (!page) {
+        return (target) => parseForm(target);
+    }
+
+    if (!(page instanceof Page)) {
+        ((page as any)[prepareSymbol] ??= []).push(parseForm);
+        return;
+    }
+
+    return (async () => {
+        const req = page.request;
+
+        let tempFolder: TempFolder;
+        const result: IFormData = {
+            fields: {},
+            files: []
+        };
+        try {
+            const bb = busboy({ headers: req.headers, defParamCharset: "utf8" });
+            const tasks = [];
+            await new Promise((resolve, reject) => {
+
+                bb.on("field", (name, value) => {
+                    result.fields[name] = value;
+                });
+
+                bb.on("file", (name, file, info) => {
+                    if (!tempFolder) {
+                        tempFolder = new TempFolder();
+                        req.disposables.push(tempFolder);
+                    }
+                    const tf = tempFolder.get(info.filename, info.mimeType);
+                    tasks.push(tf.writeAll(file).then(() => {
+                        result.files.push(tf);
+                    }));
+                });
+                bb.on("error", reject);
+                bb.on("close", resolve);
+                req.pipe(bb);
+            });
+            await Promise.all(tasks);
+        } catch (error) {
+            page.reportError(error);        
+        }
+        (page as any).form = (req as any).form = result;
+    })();
+};
+
+export const Prepare = {
+    parseJsonBody,
+    authorize,
+    parseForm
+};

package/src/routes/api/entity/index.tsx

@@ -5,9 +5,12 @@ import SchemaRegistry from "@entity-access/entity-access/dist/decorators/SchemaR
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import Page, { IRouteCheck } from "../../../Page.js";
 import GraphService from "../../../services/GraphService.js";
+import { Prepare } from "../../../decorators/Prepare.js";
 
 const added = Symbol("added");
 
+@Prepare.authorize
+@Prepare.parseJsonBody
 export default class extends Page {
 
     static canHandle(pageContext: IRouteCheck): boolean {
@@ -22,7 +25,7 @@ export default class extends Page {
         this.db.verifyFilters = true;
         this.db.raiseEvents = true;
 
-        const body = await this.asyncJsonBody;
+        const body = this.body;
 
         if (/delete/i.test(this.method)) {
             return this.delete(body);

package/src/routes/api/entity/model/get.tsx

@@ -2,6 +2,7 @@ import Inject from "@entity-access/entity-access/dist/di/di.js";
 import EntityContext from "@entity-access/entity-access/dist/model/EntityContext.js";
 import Page from "../../../../Page.js";
 import ModelService from "../../../../services/ModelService.js";
+import { Prepare } from "../../../../decorators/Prepare.js";
 
 export default class extends Page {
 
@@ -9,7 +10,6 @@ export default class extends Page {
     db: EntityContext;
 
     all() {
-
         return this.json(ModelService.getModel(this.db), 4);
     }
 

package/src/routes/api/entity/query/get.ts

@@ -2,7 +2,10 @@ import Inject from "@entity-access/entity-access/dist/di/di.js";
 import EntityContext from "@entity-access/entity-access/dist/model/EntityContext.js";
 import Page from "../../../../Page.js";
 import EntityAccessServer from "../../../../services/EntityAccessServer.js";
+import { Prepare } from "../../../../decorators/Prepare.js";
 
+@Prepare.authorize
+@Prepare.parseJsonBody
 export default class extends Page {
 
     @Inject
@@ -13,7 +16,7 @@ export default class extends Page {
         return this.json(await EntityAccessServer.query(this.db, {
             entity,
             ... this.query,
-            ... await this.asyncJsonBody
+            ... this.body
         }));
     }
 

package/src/services/CookieService.ts

@@ -67,12 +67,20 @@ export default class CookieService {
 
     async createSessionUserFromCookie(cookie: string, ip: string) {
         const user = ServiceProvider.resolve(this, SessionUser);
+        const ua = user as any;
+        ua.isAuthorized = true;
+        ua.authorize = () => null;
+        ua.sessionID = null;
+        ua.userID = null;
+        ua.userName = null;
+        ua.roles = [];
+        ua.expiry = null;
         try {
             user.ipAddress = ip;
             if (cookie) {
                 const userInfo = await this.getVerifiedUser(cookie);
                 if (userInfo?.sessionID) {
-                    user.sessionID = userInfo.sessionID;
+                    (user as any).sessionID = userInfo.sessionID;
                 }
                 if (userInfo?.userID) {
                     user[tagForCache] = userInfo;

package/dist/decorators/Authorize.d.ts

@@ -1,2 +0,0 @@
-export declare function Authorize(): void;
-//# sourceMappingURL=Authorize.d.ts.map

package/dist/decorators/Authorize.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Authorize.d.ts","sourceRoot":"","sources":["../../src/decorators/Authorize.ts"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,SAExB"}

package/dist/decorators/Authorize.js

@@ -1,3 +0,0 @@
-export function Authorize() {
-}
-//# sourceMappingURL=Authorize.js.map

package/dist/decorators/Authorize.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Authorize.js","sourceRoot":"","sources":["../../src/decorators/Authorize.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,SAAS;AAEzB,CAAC"}

package/src/decorators/Authorize.ts

@@ -1,3 +0,0 @@
-export function Authorize() {
-    
-}