pangea-server 1.0.42 → 1.0.43

package/dist/router/app-router.class.d.ts

@@ -2,9 +2,9 @@ import { Router } from 'express';
 import { BaseAuth } from '../authentication';
 import type { AuthMap, AuthUsers } from '../authentication/authentication.types';
 import type { RouteValidator as Validator, RouteValidate as Validate } from '../validator/validator.types';
-import type { SetRouteArgs, AuthConfig } from './router.types';
+import type { SetRouteArgs, CallControllerConfig } from './router.types';
 type ApiMethod = 'get' | 'post' | 'put' | 'patch' | 'delete';
-export declare function getAppRouter<AM extends AuthMap, AU extends AuthUsers<AM>, BA extends BaseAuth<AM>>(authConfig: AuthConfig<AM, AU, BA>): {
+export declare function getAppRouter<AM extends AuthMap, AU extends AuthUsers<AM>, BA extends BaseAuth<AM>>(config: CallControllerConfig<AM, AU, BA>): {
     new (app: App, basePath: string): {
         router: Router;
         setRoute<V extends Validator>(method: ApiMethod, path: string, validate: Validate<V>, ...args: SetRouteArgs<V, AM, BA>): void;

package/dist/router/app-router.class.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAppRouter = void 0;
 const express_1 = require("express");
 const call_controller_1 = require("./call-controller");
-function getAppRouter(authConfig) {
+function getAppRouter(config) {
     return class AppRouter {
         constructor(app, basePath) {
             this.router = (0, express_1.Router)();
@@ -12,7 +12,7 @@ function getAppRouter(authConfig) {
         setRoute(method, path, validate, ...args) {
             const middlewares = args.slice(0, -1);
             const controller = args[args.length - 1];
-            this.router[method](path, ...middlewares, (0, call_controller_1.callController)(controller, validate, authConfig));
+            this.router[method](path, ...middlewares, (0, call_controller_1.callController)(controller, validate, config));
         }
         get(path, validate, ...args) {
             this.setRoute('get', path, validate, ...args);

package/dist/router/call-controller.d.ts

@@ -1,5 +1,5 @@
 import { BaseAuth } from '../authentication';
 import type { AuthMap, AuthUsers } from '../authentication/authentication.types';
 import type { RouteValidator, RouteValidate } from '../validator/validator.types';
-import type { Controller, AuthConfig } from './router.types';
-export declare function callController<V extends RouteValidator, AM extends AuthMap, AU extends AuthUsers<AM>, BA extends BaseAuth<AM>>(controller: Controller<V, AM, BA>, validate: RouteValidate<V>, authConfig: AuthConfig<AM, AU, BA>): (req: Req, res: Res) => Promise<void>;
+import type { Controller, CallControllerConfig } from './router.types';
+export declare function callController<V extends RouteValidator, AM extends AuthMap, AU extends AuthUsers<AM>, BA extends BaseAuth<AM>>(controller: Controller<V, AM, BA>, validate: RouteValidate<V>, config: CallControllerConfig<AM, AU, BA>): (req: Req, res: Res) => Promise<void>;

package/dist/router/call-controller.js

@@ -10,16 +10,17 @@ const database_1 = require("../database");
 const authentication_1 = require("../authentication");
 // validator
 const validate_request_1 = require("../validator/validate-request");
-function callController(controller, validate, authConfig) {
+function callController(controller, validate, config) {
+    const { authMap, authCtor, accessToken, businessCtor } = config;
     return async function (req, res) {
+        const headers = req.headers;
+        const xBusiness = headers['x-business'];
         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 tx = await (0, database_1.getDbClient)().transaction();
         const db = new database_1.Db(tx);
         try {
-            const { authMap, authCtor, accessToken } = authConfig;
+            const business = xBusiness && businessCtor ? await db.findOne(businessCtor, Number(xBusiness)) : undefined;
+            const ctx = { headers, ...inputs, file: req.file, files: req.files, business };
             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/router/router.types.d.ts

@@ -7,9 +7,10 @@ export type SetRouteArgs<V extends RouteValidator, AM extends AuthMap, BA extend
     ...Middleware[],
     Controller<V, AM, BA>
 ];
-export type AuthConfig<AM extends AuthMap, AU extends AuthUsers<AM>, BA extends BaseAuth<AM>> = {
+export type CallControllerConfig<AM extends AuthMap, AU extends AuthUsers<AM>, BA extends BaseAuth<AM>> = {
     authMap: AM;
     authCtor: AuthCtor<AM, AU, BA>;
     accessToken: AccessToken;
+    businessCtor?: BaseModelCtor;
 };
 export type SetRoutes = (app: App) => void;

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

@@ -1,4 +1,5 @@
 /// <reference types="multer" />
+import { BaseModel } from '../database';
 import type { Express, Request, Response, NextFunction } from 'express';
 import type { RouteValidator } from '../validator/validator.types';
 declare global {
@@ -8,7 +9,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 +17,7 @@ declare global {
         body: V['body'];
         file?: MulterFile;
         files?: MulterFile[];
+        business?: BaseModel;
     }
     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.43",
   "files": [
     "dist"
   ],