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
18 changes: 10 additions & 8 deletions app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -102,27 +102,29 @@ public function boot()
});

Validator::extend("password_policy", function($attribute, $value, $parameters, $validator){
$min_length = Config::get("auth.password_min_length");
$max_length = Config::get("auth.password_max_length");
$warning = Config::get("auth.password_shape_warning");
$pattern = Config::get("auth.password_shape_pattern");

$validator->addReplacer('password_policy', function($message, $attribute, $rule, $parameters) use ($validator, $min_length, $max_length, $warning) {
return sprintf("The %s must be %s–%s characters, and %s", $attribute, $min_length, $max_length, $warning);
});

$password = TextUtils::trim($value);

$min_length = Config::get("auth.password_min_length");
if (strlen($password) < $min_length) {
return false;
}

$max_length = Config::get("auth.password_max_length");
if (strlen($password) > $max_length) {
return false;
}
$warning = Config::get("auth.password_shape_warning");
$pattern = Config::get("auth.password_shape_pattern");

if (!preg_match("/$pattern/", $password)) {
return false;
}

$validator->addReplacer('password_policy', function($message, $attribute, $rule, $parameters) use ($validator, $min_length, $max_length, $warning) {
return sprintf("The %s must be %s–%s characters, and %s", $attribute, $min_length, $max_length, $warning);
});

return true;
});
}
Expand Down
6 changes: 4 additions & 2 deletions public/assets/js/ajax.utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ function ajaxError(jqXHR, textStatus, errorThrown){
if(HTTP_status == 412 ){
var msg = '';

for(const error of response.errors) {
msg +='* '+ error+'\n';
for (const [key, value] of Object.entries(response.errors)) {
msg += isNaN(key) ? `* ${key}: ` : "";
msg += `${value}\n`;
}

displayErrorMessage('Validation error', msg);
return;
}
Expand Down
Loading