From 1b895feba881315bf132c75b3f135b7f747ff573 Mon Sep 17 00:00:00 2001 From: Richard Wossal Date: Tue, 1 Oct 2019 15:01:19 +0200 Subject: [PATCH 1/3] Fix direct password edit by making the name of the password field flexible: * 'password' on the user creation form * 'value' on the edit password form --- .../admin/templates/forms/partials/user-set-password.html.twig | 2 +- app/sprinkles/admin/templates/forms/user-set-password.html.twig | 2 +- .../admin/templates/modals/user-set-password.html.twig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/sprinkles/admin/templates/forms/partials/user-set-password.html.twig b/app/sprinkles/admin/templates/forms/partials/user-set-password.html.twig index cb6c1502b..cef46e827 100644 --- a/app/sprinkles/admin/templates/forms/partials/user-set-password.html.twig +++ b/app/sprinkles/admin/templates/forms/partials/user-set-password.html.twig @@ -22,7 +22,7 @@
- +
diff --git a/app/sprinkles/admin/templates/forms/user-set-password.html.twig b/app/sprinkles/admin/templates/forms/user-set-password.html.twig index 0299f32d7..c8b4dccbe 100644 --- a/app/sprinkles/admin/templates/forms/user-set-password.html.twig +++ b/app/sprinkles/admin/templates/forms/user-set-password.html.twig @@ -3,7 +3,7 @@
- {% include "forms/partials/user-set-password.html.twig" %} + {% include "forms/partials/user-set-password.html.twig" with {'passwordFieldName':passwordFieldName} %}

diff --git a/app/sprinkles/admin/templates/modals/user-set-password.html.twig b/app/sprinkles/admin/templates/modals/user-set-password.html.twig index fcd7b137b..ad2c97922 100644 --- a/app/sprinkles/admin/templates/modals/user-set-password.html.twig +++ b/app/sprinkles/admin/templates/modals/user-set-password.html.twig @@ -3,5 +3,5 @@ {% block modal_title %}{{translate("USER.ADMIN.CHANGE_PASSWORD")}}{% endblock %} {% block modal_body %} - {% include "forms/user-set-password.html.twig" %} + {% include "forms/user-set-password.html.twig" with {'passwordFieldName': 'value'} %} {% endblock %} From e9eb77a40e33fbce31ca4c46baaa1a206456a2a7 Mon Sep 17 00:00:00 2001 From: Richard Wossal Date: Mon, 7 Oct 2019 15:51:53 +0200 Subject: [PATCH 2/3] Fix: use site.password.length for set-password placeholder --- .../admin/templates/forms/partials/user-set-password.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/sprinkles/admin/templates/forms/partials/user-set-password.html.twig b/app/sprinkles/admin/templates/forms/partials/user-set-password.html.twig index cef46e827..c52283606 100644 --- a/app/sprinkles/admin/templates/forms/partials/user-set-password.html.twig +++ b/app/sprinkles/admin/templates/forms/partials/user-set-password.html.twig @@ -22,7 +22,7 @@
- +
From 5bc185b5527eea1e7925f6bb03528590f20fc522 Mon Sep 17 00:00:00 2001 From: Richard Wossal Date: Mon, 7 Oct 2019 15:59:14 +0200 Subject: [PATCH 3/3] Also use site.password.length on admin's user creation form plus fix password field schema path for edit form --- .../admin/src/Controller/UserController.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/sprinkles/admin/src/Controller/UserController.php b/app/sprinkles/admin/src/Controller/UserController.php index 5d9417b3d..bec8e25a8 100644 --- a/app/sprinkles/admin/src/Controller/UserController.php +++ b/app/sprinkles/admin/src/Controller/UserController.php @@ -77,6 +77,10 @@ public function create(Request $request, Response $response, $args) // Load the request schema $schema = new RequestSchema('schema://requests/user/create.yaml'); + $schema->set('password.validators.length.min', $config['site.password.length.min']); + $schema->set('password.validators.length.max', $config['site.password.length.max']); + $schema->set('passwordc.validators.length.min', $config['site.password.length.min']); + $schema->set('passwordc.validators.length.max', $config['site.password.length.max']); // Whitelist and set parameter defaults $transformer = new RequestDataTransformer($schema); @@ -621,6 +625,10 @@ public function getModalCreate(Request $request, Response $response, $args) // Load validation rules $schema = new RequestSchema('schema://requests/user/create.yaml'); + $schema->set('password.validators.length.min', $config['site.password.length.min']); + $schema->set('password.validators.length.max', $config['site.password.length.max']); + $schema->set('passwordc.validators.length.min', $config['site.password.length.min']); + $schema->set('passwordc.validators.length.max', $config['site.password.length.max']); $validator = new JqueryValidationAdapter($schema, $this->ci->translator); return $this->ci->view->render($response, 'modals/user.html.twig', [ @@ -786,8 +794,8 @@ public function getModalEditPassword(Request $request, Response $response, $args // Load validation rules $schema = new RequestSchema('schema://requests/user/edit-password.yaml'); - $schema->set('password.validators.length.min', $config['site.password.length.min']); - $schema->set('password.validators.length.max', $config['site.password.length.max']); + $schema->set('value.validators.length.min', $config['site.password.length.min']); + $schema->set('value.validators.length.max', $config['site.password.length.max']); $schema->set('passwordc.validators.length.min', $config['site.password.length.min']); $schema->set('passwordc.validators.length.max', $config['site.password.length.max']); $validator = new JqueryValidationAdapter($schema, $this->ci->translator);