Fixed Broken Sign in/Sign up. Enhanced Validations. Username/Email made readonly during edit on Web.

Author: aksinha-nerdapplabs

src/ApiBundle/Controller/Admin/UserController.php

@@ -48,17 +48,17 @@ public function indexAction()
      */
     public function newAction(Request $request)
     {
-        $user = new User();
+        $userManager = $this->container->get('fos_user.user_manager');
+        $user = $userManager->createUser();
         $user->setRoles(['ROLE_USER', 'ROLE_API']);
+
         $form = $this->createForm(UserType::class, $user);
+
         $locale = $request->getLocale();
 
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            $userManager = $this->container->get('fos_user.user_manager');
-            $user = $userManager->createUser();
-
             $this->setUserData($user, $form);
 
             $userManager->updateUser($user);
@@ -163,7 +163,7 @@ private function setUserData(User $user, \Symfony\Component\Form\Form $form)
       $user->setDob($form['dob']->getData());
       $user->setEmail($form['email']->getData());
       $user->setUsername($form['username']->getData());
-      $user->setPlainPassword($form['password']->getData());
+      $user->setPlainPassword($form['plainPassword']->getData());
       $user->setRoles($form['roles']->getData());
       $user->setConfirmationToken(null);
       $user->setEnabled(true);

src/ApiBundle/Controller/AuthController.php

@@ -251,7 +251,7 @@ public function postRegisterAction()
 
         // Validate user data
         $validator = $this->get('validator');
-        $errors = $validator->validate($user, null, array('Default', 'Registration', 'profile_edit'));
+        $errors = $validator->validate($user, null, array('Registration', 'profile_edit'));
 
         if (count($errors) > 0) {
            return $this->reportValidationErrors($errors, $request->getLocale());

src/ApiBundle/Form/UserType.php

@@ -28,7 +28,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('email', EmailType::class)
             ->add('dob', DateType::class, array('widget' => 'single_text', 'format' => 'M/d/y'))
             ->add('username', TextType::class)
-            ->add('password', PasswordType::class, array('data' => ''))
+            ->add('plainPassword', PasswordType::class, array('data' => ''))
             ->add('roles', CollectionType::class, array(
                   'entry_type'   => ChoiceType::class,
                   'entry_options'  => array(
@@ -48,7 +48,8 @@ public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
             'data_class' => 'ApiBundle\Entity\User',
-            'csrf_protection' => true
+            'csrf_protection' => true,
+            'validation_groups' => array('Registration', 'profile_edit')
         ));
     }
 

src/ApiBundle/Resources/config/validation.yml

@@ -14,56 +14,57 @@ ApiBundle\Entity\User:
     properties:
         firstname:
             - NotBlank:
-                  groups: [profile_edit, Default]
+                  groups: [profile_edit]
                   message: "user.show_error_firstname"
                   payload:
                       api_error: 'api.show_error_firstname'
         dob:
             - Date:
-                  groups: [profile_edit, Default]
+                  groups: [profile_edit]
                   message: "user.show_error_dob"
                   payload:
                       api_error: 'api.show_error_dob'
         username:
             - NotBlank:
-                  groups: [Registration, Profile, Default]
+                  groups: [Registration, Profile]
                   message: "user.show_error_username_policy"
                   payload:
                       api_error: 'api.show_error_username_policy'
             - Regex:
-                  groups: [Registration, Profile, Default]
+                  groups: [Registration, Profile]
                   pattern: '/^[a-z0-9_-]{3,16}$/'
                   match:   true
                   message: "user.show_error_username_policy"
                   payload:
                       api_error: 'api.show_error_username_policy'
         email:
             - NotBlank:
-                  groups: [Registration, Profile, Default]
+                  groups: [Registration, Profile]
                   message: "user.show_error_email"
                   payload:
                       api_error: 'api.show_error_email'
             - Email:
-                  groups: [Registration, Profile, Default]
+                  groups: [Registration, Profile]
                   checkMX: false
                   message: "user.show_error_email"
                   payload:
                       api_error: 'api.show_error_email'
         plainPassword:
             - NotBlank:
-                  groups: [profile_edit_password, Registration, Default]
+                  groups: [profile_edit_password, Registration]
                   message: "user.show_error_password_policy"
                   payload:
                       api_error: 'api.show_error_password_policy'
             - Regex:
-                  groups: [profile_edit_password, Registration, Profile, Default]
+                  groups: [profile_edit_password, Registration, Profile]
                   pattern: '/^([a-zA-Z0-9@*#]{8,15})$/'
                   match:   true
                   message: "user.show_error_password_policy"
                   payload:
                       api_error: 'api.show_error_password_policy'
         roles:
             - Choice:
+                  groups: [profile_roles]
                   choices:  ['ROLE_USER', 'ROLE_API']
                   multiple: true
                   message:  "user.show_error_role"

src/ApiBundle/Resources/views/admin/user/edit.html.twig

@@ -6,6 +6,7 @@
     <h1>{{ 'title.edit_user'|trans({'%id%': user.id}) }}</h1>
 
     {{ form_start(edit_form, { attr: attr|default({}) }) }}
+        {{ form_errors(edit_form) }}
         <table class="table">
             <tbody>
                 <tr>
@@ -33,21 +34,21 @@
                     <th scope="row">{{ 'label.user_email'|trans }}</th>
                     <td>
                       {{ form_errors(edit_form.email) }}
-                      {{ form_widget(edit_form.email) }}
+                      {{ form_widget(edit_form.email, { 'attr':{'readonly':'readonly'} }) }}
                     </td>
                 </tr>
                 <tr>
                     <th scope="row">{{ 'label.user_username'|trans }}</th>
                     <td>
                       {{ form_errors(edit_form.username) }}
-                      {{ form_widget(edit_form.username) }}
+                      {{ form_widget(edit_form.username, { 'attr':{'readonly':'readonly'} }) }}
                     </td>
                 </tr>
                 <tr>
                     <th scope="row">{{ 'label.user_password'|trans }}</th>
                     <td>
-                      {{ form_errors(edit_form.password) }}
-                      {{ form_widget(edit_form.password) }}
+                      {{ form_errors(edit_form.plainPassword) }}
+                      {{ form_widget(edit_form.plainPassword) }}
                     </td>
                 </tr>
                 <tr>

src/ApiBundle/Resources/views/admin/user/new.html.twig

@@ -6,6 +6,7 @@
     <h1>{{ 'title.user_new'|trans }}</h1>
 
     {{ form_start(form, { attr: attr|default({}) }) }}
+        {{ form_errors(form) }}
         <table class="table">
             <tbody>
                 <tr>
@@ -46,8 +47,8 @@
                 <tr>
                     <th scope="row">{{ 'label.user_password'|trans }}</th>
                     <td>
-                      {{ form_errors(form.password) }}
-                      {{ form_widget(form.password) }}
+                      {{ form_errors(form.plainPassword) }}
+                      {{ form_widget(form.plainPassword) }}
                     </td>
                 </tr>
                 <tr>