@loopback/rest 6.1.0 → 8.0.0

package/dist/validation/openapi-formats.js

@@ -0,0 +1,85 @@
+"use strict";
+// Copyright IBM Corp. 2020. All Rights Reserved.
+// Node module: @loopback/rest
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.openapiFormats = exports.binaryFormat = exports.byteFormat = exports.doubleFormat = exports.floatFormat = exports.int64Format = exports.int32Format = void 0;
+/**
+ * int32: [-2147483648, 21474836 47]
+ */
+exports.int32Format = {
+    name: 'int32',
+    type: 'number',
+    validate: (value) => {
+        return (Number.isInteger(value) && value >= -2147483648 && value <= 2147483647);
+    },
+    async: false,
+};
+/**
+ * int64: [-9223372036854775808, 9223372036854775807]
+ */
+exports.int64Format = {
+    name: 'int64',
+    type: 'number',
+    validate: (value) => {
+        const max = Number.MAX_SAFE_INTEGER; // 9007199254740991
+        const min = Number.MIN_SAFE_INTEGER; // -9007199254740991
+        return Number.isInteger(value) && value >= min && value <= max;
+    },
+    async: false,
+};
+/**
+ * float: [-2^128, 2^128]
+ */
+exports.floatFormat = {
+    name: 'float',
+    type: 'number',
+    validate: (value) => {
+        return value >= -Math.pow(2, 128) && value <= Math.pow(2, 128);
+    },
+    async: false,
+};
+/**
+ * double: [-2^1024, 2^1024]
+ */
+exports.doubleFormat = {
+    name: 'double',
+    type: 'number',
+    validate: (value) => {
+        const max = Number.MAX_VALUE; // 1.7976931348623157e+308
+        const min = -Number.MAX_VALUE; // -1.7976931348623157e+308
+        return value >= min && value <= max;
+    },
+    async: false,
+};
+/**
+ * Base64 encoded string
+ */
+exports.byteFormat = {
+    name: 'byte',
+    type: 'string',
+    validate: (value) => {
+        const base64 = Buffer.from(value, 'base64').toString('base64');
+        return value === base64;
+    },
+    async: false,
+};
+/**
+ * Binary string
+ */
+exports.binaryFormat = {
+    name: 'binary',
+    type: 'string',
+    validate: (value) => true,
+    async: false,
+};
+exports.openapiFormats = [
+    exports.int32Format,
+    exports.int64Format,
+    exports.floatFormat,
+    exports.doubleFormat,
+    exports.byteFormat,
+    exports.binaryFormat,
+];
+//# sourceMappingURL=openapi-formats.js.map

package/dist/validation/openapi-formats.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"openapi-formats.js","sourceRoot":"","sources":["../../src/validation/openapi-formats.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;AAIhE;;GAEG;AACU,QAAA,WAAW,GAAc;IACpC,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;QAC1B,OAAO,CACL,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,UAAU,IAAI,KAAK,IAAI,UAAU,CACvE,CAAC;IACJ,CAAC;IACD,KAAK,EAAE,KAAK;CACb,CAAC;AAEF;;GAEG;AACU,QAAA,WAAW,GAAc;IACpC,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;QAC1B,MAAM,GAAG,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC,mBAAmB;QACxD,MAAM,GAAG,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC,oBAAoB;QACzD,OAAO,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,GAAG,IAAI,KAAK,IAAI,GAAG,CAAC;IACjE,CAAC;IACD,KAAK,EAAE,KAAK;CACb,CAAC;AAEF;;GAEG;AACU,QAAA,WAAW,GAAc;IACpC,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;QAC1B,OAAO,KAAK,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACjE,CAAC;IACD,KAAK,EAAE,KAAK;CACb,CAAC;AAEF;;GAEG;AACU,QAAA,YAAY,GAAc;IACrC,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;QAC1B,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,0BAA0B;QACxD,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,2BAA2B;QAC1D,OAAO,KAAK,IAAI,GAAG,IAAI,KAAK,IAAI,GAAG,CAAC;IACtC,CAAC;IACD,KAAK,EAAE,KAAK;CACb,CAAC;AAEF;;GAEG;AACU,QAAA,UAAU,GAAc;IACnC,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;QAC1B,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC/D,OAAO,KAAK,KAAK,MAAM,CAAC;IAC1B,CAAC;IACD,KAAK,EAAE,KAAK;CACb,CAAC;AAEF;;GAEG;AACU,QAAA,YAAY,GAAc;IACrC,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI;IACjC,KAAK,EAAE,KAAK;CACb,CAAC;AAEW,QAAA,cAAc,GAAgB;IACzC,mBAAW;IACX,mBAAW;IACX,mBAAW;IACX,oBAAY;IACZ,kBAAU;IACV,oBAAY;CACb,CAAC"}

package/dist/validation/request-body.validator.d.ts

@@ -13,10 +13,10 @@ import { ValidationOptions, ValueValidationOptions } from '../types';
  */
 export declare function validateRequestBody(body: RequestBody, requestBodySpec?: RequestBodyObject, globalSchemas?: SchemasObject, options?: ValidationOptions): Promise<void>;
 /**
- * Validate the request body data against JSON schema.
- * @param body - The request body data.
+ * Validate the value against JSON schema.
+ * @param value - The data value.
  * @param schema - The JSON schema used to perform the validation.
  * @param globalSchemas - Schema references.
- * @param options - Request body validation options.
+ * @param options - Value validation options.
  */
-export declare function validateValueAgainstSchema(value: any, schema: SchemaObject | ReferenceObject, globalSchemas?: SchemasObject, options?: ValueValidationOptions): Promise<void>;
+export declare function validateValueAgainstSchema(value: any, schema: SchemaObject | ReferenceObject, globalSchemas?: SchemasObject, options?: ValueValidationOptions): Promise<any>;

package/dist/validation/request-body.validator.js

@@ -85,11 +85,11 @@ function getKeyForOptions(options = ajv_factory_provider_1.DEFAULT_AJV_VALIDATIO
     return JSON.stringify(ajvOptions);
 }
 /**
- * Validate the request body data against JSON schema.
- * @param body - The request body data.
+ * Validate the value against JSON schema.
+ * @param value - The data value.
  * @param schema - The JSON schema used to perform the validation.
  * @param globalSchemas - Schema references.
- * @param options - Request body validation options.
+ * @param options - Value validation options.
  */
 async function validateValueAgainstSchema(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -114,11 +114,8 @@ value, schema, globalSchemas = {}, options = {}) {
     let validationErrors = [];
     try {
         const validationResult = await validate(value);
-        // When value is optional & values is empty / null, ajv returns null
-        if (validationResult || validationResult === null) {
-            debug(`Value from ${options.source} passed AJV validation.`);
-            return;
-        }
+        debug(`Value from ${options.source} passed AJV validation.`, validationResult);
+        return validationResult;
     }
     catch (error) {
         validationErrors = error.errors;

package/dist/validation/request-body.validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"request-body.validator.js","sourceRoot":"","sources":["../../src/validation/request-body.validator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"request-body.validator.js","sourceRoot":"","sources":["../../src/validation/request-body.validator.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@loopback/rest",
-  "version": "6.1.0",
+  "version": "8.0.0",
   "description": "Expose controllers as REST endpoints and route REST API requests to controller methods",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "engines": {
-    "node": ">=10.16"
+    "node": "^10.16 || 12 || 14"
   },
   "scripts": {
     "acceptance": "lb-mocha \"dist/__tests__/acceptance/**/*.js\"",
@@ -23,53 +23,56 @@
   "publishConfig": {
     "access": "public"
   },
+  "peerDependencies": {
+    "@loopback/core": "^2.11.0"
+  },
   "dependencies": {
-    "@loopback/core": "^2.9.4",
-    "@loopback/express": "^1.4.0",
-    "@loopback/http-server": "^2.1.12",
-    "@loopback/openapi-v3": "^3.4.8",
+    "@loopback/express": "^2.1.0",
+    "@loopback/http-server": "^2.3.0",
+    "@loopback/openapi-v3": "^5.0.0",
     "@openapi-contrib/openapi-schema-to-json-schema": "^3.0.4",
     "@types/body-parser": "^1.19.0",
     "@types/cors": "^2.8.7",
-    "@types/express": "^4.17.7",
-    "@types/express-serve-static-core": "^4.17.9",
+    "@types/express": "^4.17.8",
+    "@types/express-serve-static-core": "^4.17.13",
     "@types/http-errors": "^1.8.0",
     "@types/on-finished": "^2.3.1",
     "@types/serve-static": "1.13.5",
     "@types/type-is": "^1.6.3",
-    "ajv": "^6.12.4",
+    "ajv": "^6.12.5",
     "ajv-errors": "^1.0.1",
     "ajv-keywords": "^3.5.2",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
-    "debug": "^4.1.1",
+    "debug": "^4.2.0",
     "express": "^4.17.1",
     "http-errors": "^1.8.0",
     "js-yaml": "^3.14.0",
     "json-schema-compare": "^0.2.2",
     "lodash": "^4.17.20",
     "on-finished": "^2.3.0",
-    "path-to-regexp": "^6.1.0",
+    "path-to-regexp": "^6.2.0",
     "qs": "^6.9.4",
     "strong-error-handler": "^3.5.0",
-    "tslib": "^2.0.1",
+    "tslib": "^2.0.2",
     "type-is": "^1.6.18",
-    "validator": "^13.1.1"
+    "validator": "^13.1.17"
   },
   "devDependencies": {
-    "@loopback/build": "^6.2.1",
-    "@loopback/eslint-config": "^9.0.1",
-    "@loopback/openapi-spec-builder": "^2.1.12",
-    "@loopback/repository": "^2.11.1",
-    "@loopback/testlab": "^3.2.3",
+    "@loopback/build": "^6.2.5",
+    "@loopback/core": "^2.11.0",
+    "@loopback/eslint-config": "^10.0.1",
+    "@loopback/openapi-spec-builder": "^3.0.0",
+    "@loopback/repository": "^3.1.0",
+    "@loopback/testlab": "^3.2.7",
     "@types/debug": "^4.1.5",
     "@types/js-yaml": "^3.12.5",
     "@types/json-schema-compare": "^0.2.0",
-    "@types/lodash": "^4.14.159",
+    "@types/lodash": "^4.14.161",
     "@types/multer": "^1.4.4",
-    "@types/node": "^10.17.28",
+    "@types/node": "^10.17.35",
     "@types/on-finished": "^2.3.1",
-    "@types/qs": "^6.9.4",
+    "@types/qs": "^6.9.5",
     "multer": "^1.4.2"
   },
   "files": [
@@ -83,5 +86,5 @@
     "url": "https://github.com/strongloop/loopback-next.git",
     "directory": "packages/rest"
   },
-  "gitHead": "a056555744367da9caccb6be64095e27d2fe2e28"
+  "gitHead": "390f2794d10eea3d969ae417963af815ce1bc417"
 }

package/src/body-parsers/body-parser.ts

@@ -61,15 +61,18 @@ export class RequestBodyParser {
       if (customParser) {
         // Invoke the custom parser
         const body = await this._invokeCustomParser(customParser, request);
+        debug('Parsed request body', body);
         return Object.assign(requestBody, body);
       } else {
         const parser = this._findParser(matchedMediaType);
         if (parser) {
           const body = await parser.parse(request);
+          debug('Parsed request body', body);
           return Object.assign(requestBody, body);
         }
       }
     } catch (err) {
+      debug('Request body parsing error', err);
       throw normalizeParsingError(err);
     }
 

package/src/coercion/coerce-parameter.ts

@@ -13,10 +13,10 @@ import debugModule from 'debug';
 import {
   RestHttpErrors,
   validateValueAgainstSchema,
-  ValidationOptions,
   ValueValidationOptions,
 } from '../';
 import {parseJson} from '../parse-json';
+import {ValidationOptions} from '../types';
 import {DEFAULT_AJV_VALIDATION_OPTIONS} from '../validation/ajv-factory.provider';
 import {
   DateCoercionOptions,
@@ -61,31 +61,51 @@ export async function coerceParameter(
   validator.validateParamBeforeCoercion(data);
   if (data === undefined) return data;
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  let result: any = data;
+
   switch (OAIType) {
     case 'byte':
-      return coerceBuffer(data, spec);
+      result = coerceBuffer(data, spec);
+      break;
     case 'date':
-      return coerceDatetime(data, spec, {dateOnly: true});
+      result = coerceDatetime(data, spec, {dateOnly: true});
+      break;
     case 'date-time':
-      return coerceDatetime(data, spec);
+      result = coerceDatetime(data, spec);
+      break;
     case 'float':
     case 'double':
     case 'number':
-      return coerceNumber(data, spec);
+      result = coerceNumber(data, spec);
+      break;
     case 'long':
-      return coerceInteger(data, spec, {isLong: true});
+      result = coerceInteger(data, spec, {isLong: true});
+      break;
     case 'integer':
-      return coerceInteger(data, spec);
+      result = coerceInteger(data, spec);
+      break;
     case 'boolean':
-      return coerceBoolean(data, spec);
+      result = coerceBoolean(data, spec);
+      break;
     case 'object':
-      return coerceObject(data, spec, options);
+      result = await coerceObject(data, spec);
+      break;
     case 'string':
     case 'password':
-      return coerceString(data, spec);
-    default:
-      return data;
+      result = coerceString(data, spec);
+      break;
+  }
+
+  if (result != null) {
+    // For date/date-time/byte, we need to pass the raw string value to AJV
+    if (OAIType === 'date' || OAIType === 'date-time' || OAIType === 'byte') {
+      await validateParam(spec, data, options);
+      return result;
+    }
+    result = await validateParam(spec, result, options);
   }
+  return result;
 }
 
 function coerceString(data: string | object, spec: ParameterObject) {
@@ -165,11 +185,7 @@ function coerceBoolean(data: string | object, spec: ParameterObject) {
   throw RestHttpErrors.invalidData(data, spec.name);
 }
 
-async function coerceObject(
-  input: string | object,
-  spec: ParameterObject,
-  options: ValidationOptions = DEFAULT_AJV_VALIDATION_OPTIONS,
-) {
+async function coerceObject(input: string | object, spec: ParameterObject) {
   const data = parseJsonIfNeeded(input, spec);
 
   if (data == null) {
@@ -180,17 +196,25 @@ async function coerceObject(
   if (typeof data !== 'object' || Array.isArray(data))
     throw RestHttpErrors.invalidData(input, spec.name);
 
+  return data;
+}
+
+function validateParam(
+  spec: ParameterObject,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  data: any,
+  options: ValidationOptions = DEFAULT_AJV_VALIDATION_OPTIONS,
+) {
   const schema = extractSchemaFromSpec(spec);
   if (schema) {
     // Apply coercion based on properties defined by spec.schema
-    await validateValueAgainstSchema(
+    return validateValueAgainstSchema(
       data,
       schema,
       {},
       {...options, coerceTypes: true, source: 'parameter', name: spec.name},
     );
   }
-
   return data;
 }
 

package/src/http-handler.ts

@@ -4,6 +4,7 @@
 // License text available at https://opensource.org/licenses/MIT
 
 import {Context} from '@loopback/core';
+import {MIDDLEWARE_CONTEXT} from '@loopback/express';
 import {
   ComponentsObject,
   ControllerSpec,
@@ -109,6 +110,11 @@ export class HttpHandler {
       this._serverConfig,
     );
 
+    // Set the request context as a property of Express request object so that
+    // downstream Express native integration can access `RequestContext`
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (request as any)[MIDDLEWARE_CONTEXT] = requestContext;
+
     const sequence = await requestContext.get<SequenceHandler>(
       RestBindings.SEQUENCE,
     );

package/src/providers/find-route.provider.ts

@@ -3,14 +3,23 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
-import {bind, Context, inject, Provider} from '@loopback/core';
+import {
+  BindingScope,
+  Context,
+  inject,
+  injectable,
+  Provider,
+} from '@loopback/core';
 import {asMiddleware, Middleware} from '@loopback/express';
+import debugFactory from 'debug';
 import {HttpHandler} from '../http-handler';
 import {RestBindings, RestTags} from '../keys';
 import {ResolvedRoute} from '../router';
 import {RestMiddlewareGroups} from '../sequence';
 import {FindRoute, Request} from '../types';
 
+const debug = debugFactory('loopback:rest:find-route');
+
 export class FindRouteProvider implements Provider<FindRoute> {
   constructor(
     @inject(RestBindings.Http.CONTEXT) protected context: Context,
@@ -23,26 +32,33 @@ export class FindRouteProvider implements Provider<FindRoute> {
 
   action(request: Request): ResolvedRoute {
     const found = this.handler.findRoute(request);
+    debug('Route found for %s %s', request.method, request.originalUrl, found);
     found.updateBindings(this.context);
     return found;
   }
 }
 
-@bind(
+@injectable(
   asMiddleware({
     group: RestMiddlewareGroups.FIND_ROUTE,
     chain: RestTags.REST_MIDDLEWARE_CHAIN,
   }),
+  {scope: BindingScope.SINGLETON},
 )
 export class FindRouteMiddlewareProvider implements Provider<Middleware> {
-  constructor(
-    @inject(RestBindings.SequenceActions.FIND_ROUTE)
-    protected findRoute: FindRoute,
-  ) {}
-
   value(): Middleware {
     return async (ctx, next) => {
-      const route = this.findRoute(ctx.request);
+      const request = ctx.request;
+      debug('Finding route for %s %s', request.method, request.originalUrl);
+      const handler = await ctx.get(RestBindings.HANDLER);
+      const route = handler.findRoute(request);
+      debug(
+        'Route found for %s %s',
+        request.method,
+        request.originalUrl,
+        route,
+      );
+      route.updateBindings(ctx);
       ctx.bind(RestBindings.Operation.ROUTE).to(route);
       return next();
     };

package/src/providers/invoke-method.provider.ts

@@ -3,13 +3,22 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
-import {bind, Context, inject, Provider} from '@loopback/core';
+import {
+  BindingScope,
+  Context,
+  inject,
+  injectable,
+  Provider,
+} from '@loopback/core';
 import {asMiddleware, Middleware} from '@loopback/express';
+import debugFactory from 'debug';
 import {RestBindings, RestTags} from '../keys';
 import {RouteEntry} from '../router';
 import {RestMiddlewareGroups} from '../sequence';
 import {InvokeMethod, OperationArgs, OperationRetval} from '../types';
 
+const debug = debugFactory('loopback:rest:invoke-method');
+
 export class InvokeMethodProvider implements Provider<InvokeMethod> {
   constructor(@inject(RestBindings.Http.CONTEXT) protected context: Context) {}
 
@@ -22,28 +31,37 @@ export class InvokeMethodProvider implements Provider<InvokeMethod> {
   }
 }
 
-@bind(
+@injectable(
   asMiddleware({
     group: RestMiddlewareGroups.INVOKE_METHOD,
     upstreamGroups: RestMiddlewareGroups.PARSE_PARAMS,
     chain: RestTags.REST_MIDDLEWARE_CHAIN,
   }),
+  {scope: BindingScope.SINGLETON},
 )
 export class InvokeMethodMiddlewareProvider implements Provider<Middleware> {
-  constructor(
-    @inject(RestBindings.SequenceActions.INVOKE_METHOD)
-    protected invokeMethod: InvokeMethod,
-  ) {}
-
   value(): Middleware {
     return async (ctx, next) => {
       const route: RouteEntry = await ctx.get(RestBindings.Operation.ROUTE);
       const params: OperationArgs = await ctx.get(
         RestBindings.Operation.PARAMS,
       );
-      const retVal = await this.invokeMethod(route, params);
-      ctx.bind(RestBindings.Operation.RETURN_VALUE).to(retVal);
-      return retVal;
+      if (debug.enabled) {
+        debug('Invoking method %s with', route.describe(), params);
+      }
+      try {
+        const retVal = await route.invokeHandler(ctx, params);
+        ctx.bind(RestBindings.Operation.RETURN_VALUE).to(retVal);
+        if (debug.enabled) {
+          debug('Return value from %s', route.describe(), retVal);
+        }
+        return retVal;
+      } catch (err) {
+        if (debug.enabled) {
+          debug('Error thrown from %s', route.describe(), err);
+        }
+        throw err;
+      }
     };
   }
 }

package/src/providers/log-error.provider.ts

@@ -3,9 +3,10 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
-import {Provider} from '@loopback/core';
+import {BindingScope, injectable, Provider} from '@loopback/core';
 import {LogError, Request} from '../types';
 
+@injectable({scope: BindingScope.SINGLETON})
 export class LogErrorProvider implements Provider<LogError> {
   value(): LogError {
     return (err, statusCode, req) => this.action(err, statusCode, req);

package/src/providers/parse-params.provider.ts

@@ -3,8 +3,9 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
-import {bind, inject, Provider} from '@loopback/core';
+import {BindingScope, inject, injectable, Provider} from '@loopback/core';
 import {asMiddleware, Middleware} from '@loopback/express';
+import debugFactory from 'debug';
 import {RequestBodyParser} from '../body-parsers';
 import {RestBindings, RestTags} from '../keys';
 import {parseOperationArgs} from '../parser';
@@ -12,6 +13,9 @@ import {ResolvedRoute} from '../router';
 import {RestMiddlewareGroups} from '../sequence';
 import {AjvFactory, ParseParams, Request, ValidationOptions} from '../types';
 import {DEFAULT_AJV_VALIDATION_OPTIONS} from '../validation/ajv-factory.provider';
+
+const debug = debugFactory('loopback:rest:parse-param');
+
 /**
  * Provides the function for parsing args in requests at runtime.
  *
@@ -39,24 +43,40 @@ export class ParseParamsProvider implements Provider<ParseParams> {
   }
 }
 
-@bind(
+@injectable(
   asMiddleware({
     group: RestMiddlewareGroups.PARSE_PARAMS,
     upstreamGroups: RestMiddlewareGroups.FIND_ROUTE,
     chain: RestTags.REST_MIDDLEWARE_CHAIN,
   }),
+  {scope: BindingScope.SINGLETON},
 )
 export class ParseParamsMiddlewareProvider implements Provider<Middleware> {
-  constructor(
-    @inject(RestBindings.SequenceActions.PARSE_PARAMS)
-    protected parseParams: ParseParams,
-  ) {}
-
   value(): Middleware {
     return async (ctx, next) => {
+      const requestBodyParser = await ctx.get(RestBindings.REQUEST_BODY_PARSER);
+      const validationOptions: ValidationOptions =
+        (await ctx.get(
+          RestBindings.REQUEST_BODY_PARSER_OPTIONS.deepProperty('validation'),
+          {optional: true},
+        )) ?? DEFAULT_AJV_VALIDATION_OPTIONS;
+      const ajvFactory = await ctx.get(RestBindings.AJV_FACTORY, {
+        optional: true,
+      });
+
       const route: ResolvedRoute = await ctx.get(RestBindings.Operation.ROUTE);
-      const params = await this.parseParams(ctx.request, route);
+      debug('Parsing parameters for %s %s', route.verb, route.path);
+      const params = await parseOperationArgs(
+        ctx.request,
+        route,
+        requestBodyParser,
+        {
+          ajvFactory: ajvFactory,
+          ...validationOptions,
+        },
+      );
       ctx.bind(RestBindings.Operation.PARAMS).to(params);
+      debug('Parameters', params);
       return next();
     };
   }

package/src/providers/reject.provider.ts

@@ -3,11 +3,11 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
-import {LogError, Reject, HandlerContext} from '../types';
-import {inject, Provider} from '@loopback/core';
+import {BindingScope, inject, injectable, Provider} from '@loopback/core';
 import {HttpError} from 'http-errors';
+import {ErrorWriterOptions, writeErrorToResponse} from 'strong-error-handler';
 import {RestBindings} from '../keys';
-import {writeErrorToResponse, ErrorWriterOptions} from 'strong-error-handler';
+import {HandlerContext, LogError, Reject} from '../types';
 
 // TODO(bajtos) Make this mapping configurable at RestServer level,
 // allow apps and extensions to contribute additional mappings.
@@ -15,6 +15,7 @@ const codeToStatusCodeMap: {[key: string]: number} = {
   ENTITY_NOT_FOUND: 404,
 };
 
+@injectable({scope: BindingScope.SINGLETON})
 export class RejectProvider implements Provider<Reject> {
   constructor(
     @inject(RestBindings.SequenceActions.LOG_ERROR)