Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/nestjs/nest
Browse files Browse the repository at this point in the history
  • Loading branch information
kamilmysliwiec committed Jul 30, 2020
2 parents 9bbe4f1 + 1ade11e commit eea77b7
Show file tree
Hide file tree
Showing 57 changed files with 46,769 additions and 17,105 deletions.
2 changes: 1 addition & 1 deletion packages/core/router/route-params-factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export class RouteParamsFactory implements IRouteParamsFactory {
case RouteParamtypes.QUERY:
return data ? req.query[data] : req.query;
case RouteParamtypes.HEADERS:
return data ? req.headers[data] : req.headers;
return data ? req.headers[data.toLowerCase()] : req.headers;
case RouteParamtypes.SESSION:
return req.session;
case RouteParamtypes.FILE:
Expand Down
10 changes: 5 additions & 5 deletions packages/microservices/client/client-kafka.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ export class ClientKafka extends ClientProxy {
protected client: Kafka = null;
protected consumer: Consumer = null;
protected producer: Producer = null;
protected readonly logger = new Logger(ClientKafka.name);
protected readonly responsePatterns: string[] = [];
protected logger = new Logger(ClientKafka.name);
protected responsePatterns: string[] = [];
protected consumerAssignments: { [key: string]: number[] } = {};

private readonly brokers: string[];
private readonly clientId: string;
private readonly groupId: string;
protected brokers: string[];
protected clientId: string;
protected groupId: string;

constructor(protected readonly options: KafkaOptions['options']) {
super();
Expand Down
9 changes: 5 additions & 4 deletions packages/microservices/server/server-kafka.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,14 @@ let kafkaPackage: any = {};
export class ServerKafka extends Server implements CustomTransportStrategy {
public readonly transportId = Transport.KAFKA;

protected readonly logger = new Logger(ServerKafka.name);
protected logger = new Logger(ServerKafka.name);
protected client: Kafka = null;
protected consumer: Consumer = null;
protected producer: Producer = null;
private readonly brokers: string[];
private readonly clientId: string;
private readonly groupId: string;

protected brokers: string[];
protected clientId: string;
protected groupId: string;

constructor(private readonly options: KafkaOptions['options']) {
super();
Expand Down
1,966 changes: 1,382 additions & 584 deletions sample/01-cats-app/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion sample/01-cats-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@types/jest": "26.0.7",
"@types/node": "10.17.3",
"@types/supertest": "2.0.10",
"jest": "26.1.0",
"jest": "26.2.1",
"prettier": "2.0.5",
"supertest": "4.0.2",
"ts-jest": "26.1.4",
Expand Down
2,375 changes: 1,797 additions & 578 deletions sample/02-gateways/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion sample/02-gateways/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@types/express": "4.17.7",
"@types/node": "7.10.9",
"@types/supertest": "2.0.10",
"jest": "26.1.0",
"jest": "26.2.1",
"prettier": "2.0.5",
"supertest": "4.0.2",
"ts-jest": "26.1.4",
Expand Down
2,529 changes: 1,874 additions & 655 deletions sample/03-microservices/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion sample/03-microservices/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@types/express": "4.17.7",
"@types/node": "12.12.31",
"@types/supertest": "2.0.10",
"jest": "26.1.0",
"jest": "26.2.1",
"prettier": "2.0.5",
"supertest": "4.0.2",
"ts-jest": "26.1.4",
Expand Down
2,389 changes: 1,804 additions & 585 deletions sample/04-grpc/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion sample/04-grpc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@types/node": "10.17.3",
"@types/supertest": "2.0.10",
"@types/ws": "7.2.6",
"jest": "26.1.0",
"jest": "26.2.1",
"prettier": "2.0.5",
"supertest": "4.0.2",
"ts-jest": "26.1.4",
Expand Down
Loading

0 comments on commit eea77b7

Please sign in to comment.