@entity-access/server-pages 1.0.42 → 1.1.2

package/src/index.d.ts

@@ -3,14 +3,14 @@ import type SessionUser from "./core/SessionUser.ts";
 export {};
 
 declare global {
-    namespace Express {
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        export interface Request {
-            /**
-             * user will always be set, even in case if it is an anonymous request.
-             * This is to track actual views.
-             */
-            user: SessionUser;
-        }
-    }
+    // namespace Express {
+    //     // eslint-disable-next-line @typescript-eslint/naming-convention
+    //     export interface Request {
+    //         /**
+    //          * user will always be set, even in case if it is an anonymous request.
+    //          * This is to track actual views.
+    //          */
+    //         user: SessionUser;
+    //     }
+    // }
 }

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

@@ -66,13 +66,21 @@ export default class CookieService {
     public clearCache = clearCache;
 
     async createSessionUserFromCookie(cookie: string, ip: string) {
-        const user = new SessionUser();
+        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/src/socket/SocketService.ts

@@ -61,8 +61,7 @@ export default abstract class SocketService {
                 try {
                     const cookieService = scope.resolve(CookieService);
                     const cookie = cookies[tokenService.authCookieName];
-                    const sessionUser = await cookieService.createSessionUserFromCookie(cookie, socket.handshake.address);
-                    scope.add(SessionUser, sessionUser);
+                    await cookieService.createSessionUserFromCookie(cookie, socket.handshake.address);
                     scope.add(Socket, socket);
                     const method = sns[methodName];
                     const types = method[injectServiceKeysSymbol] as any[];

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() {
-    
-}