mrpastewart/platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2.0.0

Browse source
This commit is contained in:
Tobe O 2018-11-06 14:18:48 -05:00
parent 8bf246e564
commit cead271c45
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -1,3 +1,6 @@
# 2.0.0
* Finish update for Angel 2.
# 2.0.0-alpha.1 # 2.0.0-alpha.1
* Update for Angel 2. * Update for Angel 2.

21
lib/server.dart
View file

@ -12,7 +12,8 @@ export 'angel_validate.dart';
/// Auto-parses numbers in `req.body`. /// Auto-parses numbers in `req.body`.
RequestHandler autoParseBody(List<String> fields) { RequestHandler autoParseBody(List<String> fields) {
return (RequestContext req, res) async { return (RequestContext req, res) async {
(await req.parseBody()).addAll(autoParse(await req.parseBody(), fields)); var body = await req.parseBody();
body.addAll(autoParse(body, fields));
return true; return true;
}; };
} }
@ -20,7 +21,8 @@ RequestHandler autoParseBody(List<String> fields) {
/// Auto-parses numbers in `req.query`. /// Auto-parses numbers in `req.query`.
RequestHandler autoParseQuery(List<String> fields) { RequestHandler autoParseQuery(List<String> fields) {
return (RequestContext req, res) async { return (RequestContext req, res) async {
(await req.parseQuery()).addAll(autoParse(await req.parseQuery(), fields)); var query = new Map<String, dynamic>.from(await req.parseQuery());
(await req.parseQuery()).addAll(autoParse(query, fields));
return true; return true;
}; };
} }
@ -28,8 +30,9 @@ RequestHandler autoParseQuery(List<String> fields) {
/// Filters unwanted data out of `req.body`. /// Filters unwanted data out of `req.body`.
RequestHandler filterBody(Iterable<String> only) { RequestHandler filterBody(Iterable<String> only) {
return (RequestContext req, res) async { return (RequestContext req, res) async {
var filtered = filter(await req.parseBody(), only); var body = await req.parseBody();
(await req.parseBody()) var filtered = filter(body, only);
body
..clear() ..clear()
..addAll(filtered); ..addAll(filtered);
return true; return true;
@ -41,7 +44,7 @@ RequestHandler filterQuery(Iterable<String> only) {
return (RequestContext req, res) async { return (RequestContext req, res) async {
var query = await req.parseQuery(); var query = await req.parseQuery();
var filtered = filter(query, only); var filtered = filter(query, only);
query (await req.parseQuery())
..clear() ..clear()
..addAll(filtered); ..addAll(filtered);
return true; return true;
@ -53,15 +56,16 @@ RequestHandler filterQuery(Iterable<String> only) {
RequestHandler validate(Validator validator, RequestHandler validate(Validator validator,
{String errorMessage: 'Invalid data.'}) { {String errorMessage: 'Invalid data.'}) {
return (RequestContext req, res) async { return (RequestContext req, res) async {
var body = await req.parseBody();
var result = var result =
await asyncApplyValidator(validator, await req.parseBody(), req.app); await asyncApplyValidator(validator, body, req.app);
if (result.errors.isNotEmpty) { if (result.errors.isNotEmpty) {
throw new AngelHttpException.badRequest( throw new AngelHttpException.badRequest(
message: errorMessage, errors: result.errors); message: errorMessage, errors: result.errors);
} }
(await req.parseBody()) body
..clear() ..clear()
..addAll(result.data); ..addAll(result.data);
@ -74,8 +78,9 @@ RequestHandler validate(Validator validator,
RequestHandler validateQuery(Validator validator, RequestHandler validateQuery(Validator validator,
{String errorMessage: 'Invalid data.'}) { {String errorMessage: 'Invalid data.'}) {
return (RequestContext req, res) async { return (RequestContext req, res) async {
var query = await req.parseQuery();
var result = var result =
await asyncApplyValidator(validator, await req.parseQuery(), req.app); await asyncApplyValidator(validator, query, req.app);
if (result.errors.isNotEmpty) { if (result.errors.isNotEmpty) {
throw new AngelHttpException.badRequest( throw new AngelHttpException.badRequest(