Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/authentication/test/acceptance/basic-auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import {
Application,
api,
ServerResponse,
parseOperationArgs,
ParsedRequest,
ParseParams,
FindRoute,
InvokeMethod,
GetFromContext,
Expand Down Expand Up @@ -110,6 +110,8 @@ describe('Basic Authentication', () => {
class MySequence implements SequenceHandler {
constructor(
@inject('sequence.actions.findRoute') protected findRoute: FindRoute,
@inject('sequence.actions.parseParams')
protected parseParams: ParseParams,
@inject('sequence.actions.invokeMethod') protected invoke: InvokeMethod,
@inject('sequence.actions.send') protected send: Send,
@inject('sequence.actions.reject') protected reject: Reject,
Expand All @@ -130,7 +132,7 @@ describe('Basic Authentication', () => {
else throw new HttpErrors.InternalServerError('auth error');

// Authentication successful, proceed to invoke controller
const args = await parseOperationArgs(req, route);
const args = await this.parseParams(req, route);
const result = await this.invoke(route, args);
this.send(res, result);
} catch (err) {
Expand Down
14 changes: 12 additions & 2 deletions packages/core/src/application.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
ControllerRoute,
RouteEntry,
createEmptyApiSpec,
parseOperationArgs,
} from '.';
import {ServerRequest, ServerResponse, createServer} from 'http';
import {Component, mountComponent} from './component';
Expand All @@ -27,7 +28,13 @@ import {HttpHandler} from './http-handler';
import {writeResultToResponse} from './writer';
import {DefaultSequence, SequenceHandler, SequenceFunction} from './sequence';
import {RejectProvider} from './router/reject';
import {FindRoute, InvokeMethod, Send, Reject} from './internal-types';
import {
FindRoute,
InvokeMethod,
Send,
Reject,
ParseParams,
} from './internal-types';
import {ControllerClass} from './router/routing-table';

// NOTE(bajtos) we cannot use `import * as cloneDeep from 'lodash/cloneDeep'
Expand Down Expand Up @@ -85,6 +92,7 @@ export class Application extends Context {
}
};

this.bind('sequence.actions.parseParams').to(parseOperationArgs);
this.bind('sequence.actions.logError').to(this._logError.bind(this));
this.bind('sequence.actions.send').to(writeResultToResponse);
this.bind('sequence.actions.reject').toProvider(RejectProvider);
Expand Down Expand Up @@ -403,11 +411,13 @@ export class Application extends Context {
// in order for our DI/IoC framework to inject constructor arguments
constructor(
@inject('sequence.actions.findRoute') protected findRoute: FindRoute,
@inject('sequence.actions.parseParams')
protected parseParams: ParseParams,
@inject('sequence.actions.invokeMethod') protected invoke: InvokeMethod,
@inject('sequence.actions.send') public send: Send,
@inject('sequence.actions.reject') public reject: Reject,
) {
super(findRoute, invoke, send, reject);
super(findRoute, parseParams, invoke, send, reject);
}

async handle(
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export {
GetFromContext,
BindElement,
PathParameterValues,
ParseParams,
Reject,
Send,
} from './internal-types';
Expand Down
8 changes: 8 additions & 0 deletions packages/core/src/internal-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@ export interface ParsedRequest extends ServerRequest {
*/
export type FindRoute = (request: ParsedRequest) => ResolvedRoute;

/**
*
*/
export type ParseParams = (
request: ParsedRequest,
route: ResolvedRoute,
) => Promise<OperationArgs>;

/**
* Invokes a method defined in the Application Controller
*
Expand Down
5 changes: 3 additions & 2 deletions packages/core/src/sequence.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import {
ParsedRequest,
Send,
Reject,
ParseParams,
} from './internal-types';
import {parseOperationArgs} from './parser';
import {writeResultToResponse} from './writer';
import {HttpError} from 'http-errors';

Expand Down Expand Up @@ -71,6 +71,7 @@ export class DefaultSequence implements SequenceHandler {
*/
constructor(
@inject('sequence.actions.findRoute') protected findRoute: FindRoute,
@inject('sequence.actions.parseParams') protected parseParams: ParseParams,
@inject('sequence.actions.invokeMethod') protected invoke: InvokeMethod,
@inject('sequence.actions.send') public send: Send,
@inject('sequence.actions.reject') public reject: Reject,
Expand All @@ -96,7 +97,7 @@ export class DefaultSequence implements SequenceHandler {
async handle(req: ParsedRequest, res: ServerResponse) {
try {
const route = this.findRoute(req);
const args = await parseOperationArgs(req, route);
const args = await this.parseParams(req, route);
const result = await this.invoke(route, args);

debug('%s result -', route.describe(), result);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import {
ParameterObject,
ServerRequest,
ServerResponse,
parseOperationArgs,
ParsedRequest,
OperationArgs,
FindRoute,
InvokeMethod,
Send,
Reject,
SequenceHandler,
ParseParams,
} from '../../..';
import {expect, Client, createClientForApp} from '@loopback/testlab';
import {anOpenApiSpec} from '@loopback/openapi-spec-builder';
Expand Down Expand Up @@ -61,13 +61,15 @@ describe('Sequence', () => {
class MySequence {
constructor(
@inject('sequence.actions.findRoute') protected findRoute: FindRoute,
@inject('sequence.actions.parseParams')
protected parseParams: ParseParams,
@inject('sequence.actions.invokeMethod') protected invoke: InvokeMethod,
@inject('sequence.actions.send') protected send: Send,
) {}

async handle(req: ParsedRequest, res: ServerResponse) {
const route = this.findRoute(req);
const args = await parseOperationArgs(req, route);
const args = await this.parseParams(req, route);
const result = await this.invoke(route, args);
this.send(res, `MySequence ${result}`);
}
Expand Down
2 changes: 2 additions & 0 deletions packages/core/test/integration/http-handler.integration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
writeResultToResponse,
RejectProvider,
ControllerSpec,
parseOperationArgs,
} from '../..';
import {Context} from '@loopback/context';
import {expect, Client, createClientForHandler} from '@loopback/testlab';
Expand Down Expand Up @@ -383,6 +384,7 @@ describe('HttpHandler', () => {
let handler: HttpHandler;
function givenHandler() {
rootContext = new Context();
rootContext.bind('sequence.actions.parseParams').to(parseOperationArgs);
rootContext.bind('sequence.actions.logError').to(logger);
rootContext.bind('sequence.actions.send').to(writeResultToResponse);
rootContext.bind('sequence.actions.reject').toProvider(RejectProvider);
Expand Down