axe-api 1.5.0-rc-2 → 1.5.0-rc-4

package/build/src/Handlers/Helpers.js

@@ -227,6 +227,11 @@ const getRelatedData = (version, data, withArray, model, modelList, database, ha
         }
         selectColumns = uniqueByMap(selectColumns);
         const foreignModelQuery = database(foreignModel.instance.table).select(selectColumns);
+        // Call the onBeforeQuery function if there is a defined one!
+        console.log("QUERRRRY", foreignModel.instance.table, definedRelation.options);
+        if (definedRelation.options.onBeforeQuery) {
+            yield definedRelation.options.onBeforeQuery(request, foreignModelQuery);
+        }
         // If the model is supported soft-delete we should check the data.
         if (foreignModel.instance.deletedAtColumn) {
             foreignModelQuery.whereNull(foreignModel.instance.deletedAtColumn);

package/build/src/Interfaces.d.ts

@@ -44,15 +44,15 @@ export interface IQueryConfig {
     limits: Array<IQueryLimitConfig[]>;
     defaults?: IQueryDefaultConfig;
 }
-export interface IRateLimitMiddleware {
-    name: string;
-    clientKey: string;
-    setResponseHeaders?: boolean;
-}
 export interface IRateLimitOptions {
     maxRequests: number;
     windowInSeconds: number;
 }
+export interface IRateLimitIdentifier extends IRateLimitOptions {
+    name: string;
+    clientKey: string;
+    setResponseHeaders?: boolean;
+}
 export interface IRateLimitConfig extends IRateLimitOptions {
     enabled: boolean;
     adaptor: AdaptorType;
@@ -402,6 +402,7 @@ export interface IElasticSearchParameters {
 }
 export interface IHasManyOptions {
     autoRouting: boolean;
+    onBeforeQuery?: (req: AxeRequest, query: Knex.QueryBuilder) => Promise<void>;
 }
 export interface IValidator {
     validate: (req: AxeRequest, model: IModelService, formData: any) => Promise<null | IValidationError>;

package/build/src/Middlewares/RateLimit/index.d.ts

@@ -1,5 +1,5 @@
 import { IncomingMessage, ServerResponse } from "http";
-import { AxeConfig, IRateLimitOptions, IContext, IRateLimitMiddleware } from "../../Interfaces";
+import { AxeConfig, IRateLimitOptions, IContext, IRateLimitIdentifier } from "../../Interfaces";
 export declare const setupRateLimitAdaptors: (config: AxeConfig) => Promise<void>;
 /**
  * Add a rate limit with the `IRateLimitOptions`
@@ -30,6 +30,6 @@ export declare const rateLimit: (options?: IRateLimitOptions) => (context: ICont
  * @param next NextFunction
  * @returns
  */
-export declare const createRateLimitter: (middleware: IRateLimitMiddleware, options: IRateLimitOptions, req: IncomingMessage, res: ServerResponse, next: any) => Promise<any>;
+export declare const createRateLimitter: (identifier: IRateLimitIdentifier, req: IncomingMessage, res: ServerResponse, next: any) => Promise<any>;
 declare const _default: (req: IncomingMessage, res: ServerResponse, next: any) => Promise<any>;
 export default _default;

package/build/src/Middlewares/RateLimit/index.js

@@ -105,7 +105,7 @@ const rateLimit = (options) => {
         context.res.original.setHeader("X-RateLimit-Remaining", isAllowed.remaining);
         // Sending an error message if there is an error
         if (isAllowed.success === false) {
-            Services_1.LogService.warn(`Rate limit exceeded: ${context.req.url}`);
+            Services_1.LogService.info(`Rate limit exceeded: ${context.req.url}`);
             context.res
                 .status(Enums_1.StatusCodes.TOO_MANY_REQUESTS)
                 .json({ error: "Rate limit exceeded." });
@@ -124,20 +124,20 @@ exports.rateLimit = rateLimit;
  * @param next NextFunction
  * @returns
  */
-const createRateLimitter = (middleware, options, req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
+const createRateLimitter = (identifier, req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
     // Checking the rate limits.
-    const isAllowed = yield checkRateLimit(middleware.clientKey, options);
+    const isAllowed = yield checkRateLimit(identifier.clientKey, identifier);
     // Setting the HTTP Response headers.
-    if (middleware.setResponseHeaders) {
-        res.setHeader(`X-${middleware.name}-Limit`, isAllowed.limit);
-        res.setHeader(`X-${middleware.name}-Remaining`, isAllowed.remaining);
+    if (identifier.setResponseHeaders) {
+        res.setHeader(`X-${identifier.name}-Limit`, isAllowed.limit);
+        res.setHeader(`X-${identifier.name}-Remaining`, isAllowed.remaining);
     }
     // If it is allowed, the next function would be called.
     if (isAllowed.success) {
         return next();
     }
     // Sending an error message.
-    Services_1.LogService.warn(`Rate limit exceeded: ${req.url}`);
+    Services_1.LogService.info(`Rate limit exceeded: ${req.url}`);
     res.writeHead(429, { "Content-Type": "application/json" });
     res.end(JSON.stringify({
         error: "Rate limit exceeded.",
@@ -161,7 +161,7 @@ exports.default = (req, res, next) => __awaiter(void 0, void 0, void 0, function
         return next();
     }
     // Sending an error message.
-    Services_1.LogService.warn(`Rate limit exceeded: ${req.url}`);
+    Services_1.LogService.info(`Rate limit exceeded: ${req.url}`);
     res.writeHead(429, { "Content-Type": "application/json" });
     res.end(JSON.stringify({
         error: "Rate limit exceeded.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "axe-api",
-  "version": "1.5.0-rc-2",
+  "version": "1.5.0-rc-4",
   "description": "AXE API is a simple tool to create Rest APIs quickly.",
   "main": "build/index.js",
   "types": "build/index.d.ts",