Profile pic further updations

aksinha-nerdapplabs · aksinha-nerdapplabs · commit 954ada4da12d · 2017-02-21T14:17:55.000+05:30
diff --git a/src/ApiBundle/Controller/Admin/UserController.php b/src/ApiBundle/Controller/Admin/UserController.php
@@ -4,6 +4,7 @@
 
 use ApiBundle\Entity\User;
 use ApiBundle\Form\UserType;
+use ApiBundle\Form\UserProfileType;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
@@ -15,6 +16,8 @@
 use Symfony\Component\HttpFoundation\File\Exception\UploadException;
 use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 
 /**
  * Controller used to manage user contents in the backend.
@@ -53,10 +56,22 @@ public function newAction(Request $request)
     {
         $userManager = $this->container->get('fos_user.user_manager');
         $user = $userManager->createUser();
-        $user->setRoles(['ROLE_USER']);
 
         $form = $this->createForm(UserType::class, $user);
 
+        // Role added in admin area
+        $form->add('roles', CollectionType::class, array(
+                          'entry_type'   => ChoiceType::class,
+                          'entry_options'  => array(
+                              'label' => false,
+                              'choices'  => array(
+                                  'ROLE_ADMIN' => 'ROLE_ADMIN',
+                                  'ROLE_USER' => 'ROLE_USER',
+                                  'ROLE_API'  => 'ROLE_API',
+                                  ),
+                          ),
+        ));
+
         $locale = $request->getLocale();
 
         $form->handleRequest($request);
@@ -127,10 +142,23 @@ public function editAction(User $user, Request $request)
           );
         }
 
-        $editForm = $this->createForm(UserType::class, $user);
+        $editForm = $this->createForm(UserProfileType::class, $user);
         $deleteForm = $this->createDeleteForm($user);
         $locale = $request->getLocale();
 
+        // Role added in admin area
+        $editForm->add('roles', CollectionType::class, array(
+                          'entry_type'   => ChoiceType::class,
+                          'entry_options'  => array(
+                              'label' => false,
+                              'choices'  => array(
+                                  'ROLE_ADMIN' => 'ROLE_ADMIN',
+                                  'ROLE_USER' => 'ROLE_USER',
+                                  'ROLE_API'  => 'ROLE_API',
+                                  ),
+                          ),
+        ));
+
         $editForm->handleRequest($request);
 
         if ($editForm->isSubmitted() && $editForm->isValid()) {
@@ -153,7 +181,7 @@ public function editAction(User $user, Request $request)
                 $user->setImage($currentFilename);
             }
 
-            $this->setUserData($user, $editForm);
+            $this->setUserProfileData($user, $editForm);
 
             $entityManager = $this->getDoctrine()->getManager();
             $entityManager->flush();
@@ -221,6 +249,17 @@ private function setUserData(User $user, \Symfony\Component\Form\Form $form)
       $user->setLastLogin(new \DateTime());
     }
 
+    private function setUserProfileData(User $user, \Symfony\Component\Form\Form $form)
+    {
+      $user->setFirstname($form['firstname']->getData());
+      $user->setLastname($form['lastname']->getData());
+      $user->setDob($form['dob']->getData());
+      $user->setEmail($form['email']->getData());
+      $user->setUsername($form['username']->getData());
+      $user->setRoles($form['roles']->getData());
+    }
+
+
     private function logMessageAndFlash($code = 200, $type = 'success', $logMsg = '', $flashMsg = '', $locale = 'en')
     {
         $this->logMessage($code, $type, $logMsg);
diff --git a/src/ApiBundle/Controller/AuthController.php b/src/ApiBundle/Controller/AuthController.php
@@ -172,14 +172,14 @@ public function newClientAction()
       *      {"name"="lastname", "dataType"="string", "required"=true, "description"="lastname"},
       *      {"name"="dob", "dataType"="datetime", "required"=true, "description"="date of birth mm/dd/yyyy"},
       *      {"name"="email", "dataType"="email", "required"=true, "description"="Email"},
-      *      {"name"="email_confirmation", "dataType"="integer", "required"=true, "description"="0-email confirmation not required, 1-required"},
       *      {"name"="image", "dataType"="image/jpeg, image/jpg, image/gif, image/png", "required"=false, "description"="Profile Picture within 1024k size"},
       *      {"name"="_locale", "dataType"="string", "required"=false, "description"="User locale. Will default to en"}
       *  },
       * )
       */
     public function postRegisterAction(Request $request)
     {
+        $confirmationEnabled = $this->container->getParameter('registration_requires_email_confirmation');
         $request = $this->container->get('request');
 
         $userManager = $this->get('fos_user.user_manager');
@@ -208,7 +208,7 @@ public function postRegisterAction(Request $request)
         $msg = 'N.A.';
         $grantType = 'password';
 
-        if ('1' == $request->request->get('email_confirmation')) {
+        if (true == $confirmationEnabled ) {
             $msg = 'Please check your email to complete the registration.';
         } else {
             $msg = 'Registration complete. Welcome!';
@@ -451,7 +451,7 @@ public function editProfilePicAction()
         $userManager = $this->get('fos_user.user_manager');
         $userManager->updateUser($user);
 
-        $msg = 'Profile Pic updated successfully'.$user->getUsername();
+        $msg = 'Profile Pic updated successfully. '.$user->getUsername();
         $this->logMessage(201, $msg);
 
         return new JsonResponse(array(
@@ -544,7 +544,7 @@ public function postAccessTokenAction()
 
         $oAuthRtn = $this->fetchAccessToken($request, $grantType);
 
-        $msg = 'Access Token successfully fetched for '.$username;
+        $msg = 'Access Token successfully fetched for '.$data['username'];
         $this->logMessage(201, $msg);
 
         $oAuthRtn['code'] = 201;
@@ -747,7 +747,7 @@ private function setUserData(Request $request, User $user)
 
             // Update the 'image' property to store the Image file name
             // instead of its contents
-            $user->setImage('/images/profile/'.$fileName);
+            $user->setImage($this->getParameter('images_profile_directory').$fileName);
         }
 
         $user->setUsername($request->request->get('username'));
@@ -783,7 +783,7 @@ private function setUserPicData(Request $request, User $user)
 
             // Update the 'image' property to store the Image file name
             // instead of its contents
-            $user->setImage($fileName);
+            $user->setImage($this->getParameter('images_profile_directory').$fileName);
         }
     }
 
diff --git a/src/ApiBundle/Controller/UserController.php b/src/ApiBundle/Controller/UserController.php
@@ -53,7 +53,8 @@ public function indexAction()
      */
     public function newAction(Request $request)
     {
-        $confirmationEnabled = $this->container->getParameter('registration_requires_email_confirmation');        $userManager = $this->container->get('fos_user.user_manager');
+        $confirmationEnabled = $this->container->getParameter('registration_requires_email_confirmation');
+        $userManager = $this->container->get('fos_user.user_manager');
 
         $user = $userManager->createUser();
         $user->setRoles(['ROLE_USER']);
@@ -128,6 +129,7 @@ protected function authenticateUser(UserInterface $user, Response $response)
         } catch (AccountStatusException $ex) {
             // We simply do not authenticate users which do not pass the user
             // checker (not enabled, expired, etc.).
+            $this->logMessageAndFlash(200, 'warning', 'User Authentication failed: '.$user->getUsername(), $this->get('translator')->trans('flash.user_authentication_failed'), $request->getLocale() );
         }
     }
 
@@ -217,7 +219,12 @@ private function setUserData(User $user, \Symfony\Component\Form\Form $form)
       $user->setEmail($form['email']->getData());
       $user->setUsername($form['username']->getData());
       $user->setPlainPassword($form['plainPassword']->getData());
-      $user->setRoles($form['roles']->getData());
+
+      // If Roles exist in form as the form is common for both admin and user areas
+      // Only admin area is allowed to have roles
+      $roles = array_key_exists('roles', $form) ? $form['roles']->getData() : $user->getRoles();
+      $user->setRoles($roles);
+
       $user->setConfirmationToken(null);
       $user->setEnabled(true);
       $user->setLastLogin(new \DateTime());
diff --git a/src/ApiBundle/Form/UserType.php b/src/ApiBundle/Form/UserType.php
@@ -39,17 +39,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'second_options' => array('label' => 'form.password_confirmation'),
                 'invalid_message' => 'fos_user.password.mismatch',
             ))
-            ->add('roles', CollectionType::class, array(
-                  'entry_type'   => ChoiceType::class,
-                  'entry_options'  => array(
-                      'label' => false,
-                      'choices'  => array(
-                          'ROLE_ADMIN' => 'ROLE_ADMIN',
-                          'ROLE_USER' => 'ROLE_USER',
-                          'ROLE_API'  => 'ROLE_API',
-                          ),
-                  ),
-            ));
+            ;
     }
 
     /**
diff --git a/src/ApiBundle/Resources/config/config.yml b/src/ApiBundle/Resources/config/config.yml
@@ -2,9 +2,8 @@ parameters:
     # This parameter defines the codes of the locales (languages) enabled in the application
     # app_locales: en|fr|de|es|cs|nl|ru|uk|ro|pt_BR|pl|it|ja|id|ca|sl
     app_locales: en|fr|hi
-    images_profile_directory: '%kernel.root_dir%/../web/images/profile'
     registration_requires_email_confirmation: false
-    login_confirmation: false
+    images_profile_directory: '%kernel.root_dir%/../web/images/profile/'
 
 # Assetic Configuration
 assetic:
@@ -19,9 +18,9 @@ fos_rest:
     routing_loader:
         default_format: json                            # All responses should be JSON formated
         include_format: false                           # We do not include format in request, so that all responses
-    exception:
-        enabled: true
-        exception_controller: 'ApiBundle\Controller\ApiExceptionController::showAction'                                                        # will eventually be JSON formated
+    # exception:
+    #     enabled: true
+    #     exception_controller: 'ApiBundle\Controller\ApiExceptionController::showAction'                                                        # will eventually be JSON formated
     versioning:
         enabled: true
         resolvers:
diff --git a/src/ApiBundle/Resources/translations/messages.en.yml b/src/ApiBundle/Resources/translations/messages.en.yml
@@ -126,6 +126,7 @@ flash:
   user_created_successfully: User created successfully!
   user_updated_successfully: User updated successfully!
   user_deleted_successfully: User deleted successfully!
+  user_authentication_failed: User Authentication failed!
 api:
   show_error_client_name:  Sorry, Client Name cannot be empty!
   show_error_client_name_taken:  Sorry, Client Name already taken!
diff --git a/src/ApiBundle/Resources/translations/messages.fr.yml b/src/ApiBundle/Resources/translations/messages.fr.yml
@@ -114,6 +114,7 @@ flash:
   user_created_successfully: Utilisateur créé avec succès!
   user_updated_successfully: Utilisateur mis à jour avec succès!
   user_deleted_successfully: L'utilisateur a été supprimé avec succès!
+  user_authentication_failed: L'identification de l'utilisateur a échoué!
 api:
   show_error_client_name:  Désolé, le nom du client ne peut pas être vide!
   show_error_client_name_taken:  Désolé, Nom du client déjà pris!
diff --git a/src/ApiBundle/Resources/translations/messages.hi.yml b/src/ApiBundle/Resources/translations/messages.hi.yml
@@ -114,6 +114,7 @@ flash:
   user_created_successfully: प्रयोक्ता सफलतापूर्वक बनाया!
   user_updated_successfully: प्रयोक्ता को सफलतापूर्वक अद्यतन!
   user_deleted_successfully: प्रयोक्ता को सफलतापूर्वक नष्ट कर दिया!
+  user_authentication_failed: उपयोगकर्ता प्रमाणीकरण विफल रहा!
 api:
   show_error_client_name:  क्षमा करें, क्लाइंट का नाम रिक्त नहीं हो सकता!
   show_error_client_name_taken:  क्षमा करें, क्लाइंट का नाम पहले ही ले लिया!
diff --git a/src/ApiBundle/Resources/views/admin/user/edit.html.twig b/src/ApiBundle/Resources/views/admin/user/edit.html.twig
@@ -46,21 +46,14 @@
                     <th scope="row">{{ 'label.user_email'|trans }}</th>
                     <td>
                       {{ form_errors(edit_form.email) }}
-                      {{ form_widget(edit_form.email, { 'attr':{'readonly':'readonly'} }) }}
+                      {{ form_widget(edit_form.email) }}
                     </td>
                 </tr>
                 <tr>
                     <th scope="row">{{ 'label.user_username'|trans }}</th>
                     <td>
                       {{ form_errors(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.plainPassword) }}
-                      {{ form_widget(edit_form.plainPassword) }}
+                      {{ form_widget(edit_form.username) }}
                     </td>
                 </tr>
                 <tr>
diff --git a/src/ApiBundle/Resources/views/user/new.html.twig b/src/ApiBundle/Resources/views/user/new.html.twig
@@ -58,13 +58,6 @@
                       {{ form_widget(form.plainPassword) }}
                     </td>
                 </tr>
-                <tr>
-                    <th scope="row">{{ 'label.user_roles'|trans }}</th>
-                    <td>
-                      {{ form_errors(form.roles) }}
-                      {{ form_widget(form.roles) }}
-                    </td>
-                </tr>
             </tbody>
         </table>
         <input type="submit" value="{{ button_label|default('action.create_user'|trans) }}"
