pangea-server 1.0.42 → 1.0.44

package/dist/router/call-controller.js

@@ -11,15 +11,15 @@ const authentication_1 = require("../authentication");
 // validator
 const validate_request_1 = require("../validator/validate-request");
 function callController(controller, validate, authConfig) {
+    const { authMap, authCtor, accessToken } = authConfig;
     return async function (req, res) {
+        const headers = req.headers;
         const inputs = (0, validate_request_1.validateRequest)(validate, req);
-        const xBusiness = req.headers['x-business'];
-        const headers = { ...req.headers, 'x-business': xBusiness && Number(xBusiness) };
-        const ctx = { headers, file: req.file, files: req.files, ...inputs };
+        const businessId = headers['x-business'] ? Number(headers['x-business']) : undefined;
+        const ctx = { headers, ...inputs, file: req.file, files: req.files, businessId };
         const tx = await (0, database_1.getDbClient)().transaction();
         const db = new database_1.Db(tx);
         try {
-            const { authMap, authCtor, accessToken } = authConfig;
             const authUsers = await (0, authentication_1.getUsersFromToken)(headers.authorization, db, accessToken, authMap);
             const auth = new authCtor(authUsers);
             const result = await controller(ctx, db, auth);

package/dist/types/global.types.d.ts

@@ -8,7 +8,6 @@ declare global {
     type Next = NextFunction;
     type ReqHeaders = Record<string, string | undefined> & {
         'x-language': string;
-        'x-business'?: ModelId;
     };
     interface Ctx<V extends RouteValidator> {
         headers: ReqHeaders;
@@ -17,6 +16,7 @@ declare global {
         body: V['body'];
         file?: MulterFile;
         files?: MulterFile[];
+        businessId?: ModelId;
     }
     type MulterFile = Express.Multer.File;
     type UploadableImage = string | MulterFile;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pangea-server",
   "description": "",
-  "version": "1.0.42",
+  "version": "1.0.44",
   "files": [
     "dist"
   ],