Do not customize CSRF token ID.

DarvinStudio · Aug 5, 2020 · d0eb8db · d0eb8db
1 parent 47ed002
commit d0eb8db
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -54,3 +54,5 @@ darvin_user:
 - Use UserInterface instead of AdvancedUserInterface.
 
 6.2.0: Reorganize email sending functionality.
+
+6.2.11: Do not customize CSRF token ID.
diff --git a/Form/Type/PasswordResetToken/RequestType.php b/Form/Type/PasswordResetToken/RequestType.php
@@ -18,7 +18,6 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\Email;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
@@ -57,14 +56,6 @@ public function finishView(FormView $view, FormInterface $form, array $options):
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefault('csrf_token_id', md5(__FILE__.$this->getBlockPrefix()));
-    }
-
     /**
      * {@inheritDoc}
      */

diff --git a/Form/Type/Profile/PasswordChangeType.php b/Form/Type/Profile/PasswordChangeType.php
@@ -49,12 +49,9 @@ public function finishView(FormView $view, FormInterface $form, array $options):
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver
-            ->setDefaults([
-                'csrf_token_id'     => md5(__FILE__.$this->getBlockPrefix()),
-                'validation_groups' => [
-                    'Default',
-                    'PasswordChange',
-                ],
+            ->setDefault('validation_groups', [
+                'Default',
+                'PasswordChange',
             ])
             ->remove('data_class')
             ->setRequired('data_class')

diff --git a/Form/Type/Profile/ProfileType.php b/Form/Type/Profile/ProfileType.php
@@ -48,12 +48,9 @@ public function finishView(FormView $view, FormInterface $form, array $options):
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver
-            ->setDefaults([
-                'csrf_token_id'     => md5(__FILE__.$this->getBlockPrefix()),
-                'validation_groups' => [
-                    'Default',
-                    'Profile',
-                ],
+            ->setDefault('validation_groups', [
+                'Default',
+                'Profile',
             ])
             ->remove('data_class')
             ->setRequired('data_class')

diff --git a/Form/Type/Security/PasswordResetType.php b/Form/Type/Security/PasswordResetType.php
@@ -52,11 +52,8 @@ public function finishView(FormView $view, FormInterface $form, array $options):
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver
-            ->setDefaults([
-                'csrf_token_id'     => md5(__FILE__.$this->getBlockPrefix()),
-                'validation_groups' => [
-                    'PasswordReset',
-                ],
+            ->setDefault('validation_groups', [
+                'PasswordReset',
             ])
             ->remove('data_class')
             ->setRequired('data_class')

diff --git a/Form/Type/Security/RegistrationType.php b/Form/Type/Security/RegistrationType.php
@@ -53,12 +53,9 @@ public function finishView(FormView $view, FormInterface $form, array $options):
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver
-            ->setDefaults([
-                'csrf_token_id'     => md5(__FILE__.$this->getBlockPrefix()),
-                'validation_groups' => [
-                    'Default',
-                    'Register',
-                ],
+            ->setDefault('validation_groups', [
+                'Default',
+                'Register',
             ])
             ->remove('data_class')
             ->setRequired('data_class')