Fixed validator analysis warnings
This commit is contained in:
parent
33ba0c69ca
commit
0043114180
3 changed files with 20 additions and 22 deletions
|
@ -101,18 +101,16 @@ HookedServiceEventListener validateEvent(Validator validator,
|
||||||
{String errorMessage = 'Invalid data.'}) {
|
{String errorMessage = 'Invalid data.'}) {
|
||||||
return (HookedServiceEvent e) async {
|
return (HookedServiceEvent e) async {
|
||||||
var app = e.request?.app ?? e.service.app;
|
var app = e.request?.app ?? e.service.app;
|
||||||
if (app != null) {
|
var result = await asyncApplyValidator(validator, e.data as Map, app);
|
||||||
var result = await asyncApplyValidator(validator, e.data as Map, app);
|
|
||||||
|
|
||||||
if (result.errors.isNotEmpty) {
|
if (result.errors.isNotEmpty) {
|
||||||
throw AngelHttpException.badRequest(
|
throw AngelHttpException.badRequest(
|
||||||
message: errorMessage, errors: result.errors);
|
message: errorMessage, errors: result.errors);
|
||||||
}
|
|
||||||
|
|
||||||
e.data
|
|
||||||
..clear()
|
|
||||||
..addAll(result.data);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
e.data
|
||||||
|
..clear()
|
||||||
|
..addAll(result.data);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -79,7 +79,7 @@ class Validator extends Matcher {
|
||||||
requiredFields.add(fieldName);
|
requiredFields.add(fieldName);
|
||||||
}
|
}
|
||||||
|
|
||||||
var _iterable =
|
var tmpIterable =
|
||||||
schema[keys] is Iterable ? schema[keys] : [schema[keys]];
|
schema[keys] is Iterable ? schema[keys] : [schema[keys]];
|
||||||
var iterable = [];
|
var iterable = [];
|
||||||
|
|
||||||
|
@ -91,7 +91,7 @@ class Validator extends Matcher {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_iterable.forEach(_addTo);
|
tmpIterable.forEach(_addTo);
|
||||||
|
|
||||||
for (var rule in iterable) {
|
for (var rule in iterable) {
|
||||||
if (rule is Matcher) {
|
if (rule is Matcher) {
|
||||||
|
@ -271,7 +271,7 @@ class Validator extends Matcher {
|
||||||
{Map<String, dynamic> defaultValues = const {},
|
{Map<String, dynamic> defaultValues = const {},
|
||||||
Map<String, dynamic> customErrorMessages = const {},
|
Map<String, dynamic> customErrorMessages = const {},
|
||||||
bool overwrite = false}) {
|
bool overwrite = false}) {
|
||||||
var _schema = <String, dynamic>{};
|
var tmpSchema = <String, dynamic>{};
|
||||||
var child = Validator.empty()
|
var child = Validator.empty()
|
||||||
..defaultValues.addAll(this.defaultValues)
|
..defaultValues.addAll(this.defaultValues)
|
||||||
..defaultValues.addAll(defaultValues)
|
..defaultValues.addAll(defaultValues)
|
||||||
|
@ -307,10 +307,10 @@ class Validator extends Matcher {
|
||||||
if (child.rules.containsKey(fieldName)) child.rules.remove(fieldName);
|
if (child.rules.containsKey(fieldName)) child.rules.remove(fieldName);
|
||||||
}
|
}
|
||||||
|
|
||||||
_schema[fieldName] = schema[key];
|
tmpSchema[fieldName] = schema[key];
|
||||||
}
|
}
|
||||||
|
|
||||||
return child.._importSchema(_schema);
|
return child.._importSchema(tmpSchema);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Adds a [rule].
|
/// Adds a [rule].
|
||||||
|
@ -383,14 +383,14 @@ class ValidationResult {
|
||||||
/// Occurs when user-provided data is invalid.
|
/// Occurs when user-provided data is invalid.
|
||||||
class ValidationException extends AngelHttpException {
|
class ValidationException extends AngelHttpException {
|
||||||
/// A list of errors that resulted in the given data being marked invalid.
|
/// A list of errors that resulted in the given data being marked invalid.
|
||||||
@override
|
//@override
|
||||||
final List<String> errors = [];
|
//final List<String> errors = [];
|
||||||
|
|
||||||
/// A descriptive message describing the error.
|
/// A descriptive message describing the error.
|
||||||
@override
|
//@override
|
||||||
final String message;
|
//final String message;
|
||||||
|
|
||||||
ValidationException(this.message, {Iterable<String> errors = const []})
|
ValidationException(String message, {Iterable<String> errors = const []})
|
||||||
: super(
|
: super(
|
||||||
message: message,
|
message: message,
|
||||||
statusCode: 400,
|
statusCode: 400,
|
||||||
|
|
|
@ -35,9 +35,9 @@ void main() {
|
||||||
|
|
||||||
var formData = {};
|
var formData = {};
|
||||||
|
|
||||||
['firstName', 'lastName', 'age', 'familySize'].forEach((key) {
|
for (var key in ['firstName', 'lastName', 'age', 'familySize']) {
|
||||||
formData[key] = (querySelector('[name="$key"]') as InputElement).value;
|
formData[key] = (querySelector('[name="$key"]') as InputElement).value;
|
||||||
});
|
}
|
||||||
|
|
||||||
if ($blank!.value!.isNotEmpty) formData['blank'] = $blank!.value;
|
if ($blank!.value!.isNotEmpty) formData['blank'] = $blank!.value;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue