fixed broken signin/signup

Author: aksinha-nerdapplabs

src/ApiBundle/Controller/AuthController.php

@@ -232,6 +232,12 @@ public function postRegisterAction()
         $request = $this->container->get('request');
         $userManager = $this->get('fos_user.user_manager');
 
+        // TODO: Why this validation is not working in Validation.yml for dob
+        $timestamp = strtotime($request->request->get('dob'));
+        if (!$timestamp) {
+          $this->logAndThrowError(400, 'Date of Birth should be in MM/DD/YYYY format.', $this->get('translator')->trans('api.show_error_dob', array(), 'messages', $request->getLocale()), $request->getLocale());
+        }
+
         $user = $userManager->createUser();
 
         $user->setUsername($request->request->get('username'));
@@ -245,7 +251,7 @@ public function postRegisterAction()
 
         // Validate user data
         $validator = $this->get('validator');
-        $errors = $validator->validate($user);
+        $errors = $validator->validate($user, null, array('Default', 'Registration', 'profile_edit'));
 
         if (count($errors) > 0) {
            return $this->reportValidationErrors($errors, $request->getLocale());
@@ -341,9 +347,17 @@ public function editPasswordAction()
         }
 
         $user->setPlainPassword($password);
-        $msg = 'Password changed successfully';
+
+        // Validate user data
+        $validator = $this->get('validator');
+        $errors = $validator->validate($user, null, array('profile_edit_password'));
+
+        if (count($errors) > 0) {
+           return $this->reportValidationErrors($errors, $request->getLocale());
+        }
 
         $userManager->updateUser($user);
+        $msg = 'Password changed successfully';
 
         $this->logMessage(200, $msg.' for '.$user->getUsername());
 
@@ -436,6 +450,12 @@ public function editProfileAction()
         $dob = array_key_exists('dob', $data) ? $data['dob'] : $user->getDob();
         $user->setDob($dob);
 
+        // TODO: Why this validation is not working in Validation.yml for dob
+        $timestamp = strtotime($dob);
+        if ($dob && !$timestamp) {
+          $this->logAndThrowError(400, 'Date of Birth should be in MM/DD/YYYY format.', $this->get('translator')->trans('api.show_error_dob', array(), 'messages', $request->getLocale()), $request->getLocale());
+        }
+
         // Validate user data
         $validator = $this->get('validator');
         $errors = $validator->validate($user, null, array('profile_edit'));

src/ApiBundle/Resources/config/config.yml

@@ -41,9 +41,7 @@ fos_rest:
 
 fos_user:
     db_driver: orm
-    firewall_name: main                                 # Seems to be used when registering user/reseting password,
-                                                        # but since there is no "login", as so it seems to be useless in
-                                                        # our particular context, but still required by "FOSUserBundle"
+    firewall_name: main
     user_class: ApiBundle\Entity\User
 
 fos_oauth_server:

src/ApiBundle/Resources/config/validation.yml

@@ -14,40 +14,72 @@ ApiBundle\Entity\User:
     properties:
         firstname:
             - NotBlank:
-                  groups: [profile_edit]
+                  groups: [profile_edit, Default]
                   message: "user.show_error_firstname"
                   payload:
                       api_error: 'api.show_error_firstname'
+        dob:
+            - Date:
+                  groups: [profile_edit, Default]
+                  message: "user.show_error_dob"
+                  payload:
+                      api_error: 'api.show_error_dob'
         username:
-            - Regex:
-                  pattern: '/^[a-z0-9_-]{3,16}$/'
-                  match:   true
+            - NotBlank:
+                  groups: [Registration, Profile, Default]
                   message: "user.show_error_username_policy"
                   payload:
                       api_error: 'api.show_error_username_policy'
-        password:
             - Regex:
-                  pattern: '/^([a-zA-Z0-9@*#]{8,15})$/'
+                  groups: [Registration, Profile, Default]
+                  pattern: '/^[a-z0-9_-]{3,16}$/'
                   match:   true
-                  message: "user.show_error_password_policy"
+                  message: "user.show_error_username_policy"
                   payload:
-                      api_error: 'api.show_error_password_policy'
+                      api_error: 'api.show_error_username_policy'
         email:
-            - Email:
+            - NotBlank:
+                  groups: [Registration, Profile, Default]
                   message: "user.show_error_email"
+                  payload:
+                      api_error: 'api.show_error_email'
+            - Email:
+                  groups: [Registration, Profile, Default]
                   checkMX: false
+                  message: "user.show_error_email"
                   payload:
                       api_error: 'api.show_error_email'
-        dob:
-            - Date:
-                  groups: [profile_edit]
-                  message: "user.show_error_dob"
+        plainPassword:
+            - NotBlank:
+                  groups: [profile_edit_password, Registration, Default]
+                  message: "user.show_error_password_policy"
                   payload:
-                      api_error: 'api.show_error_dob'
+                      api_error: 'api.show_error_password_policy'
+            - Regex:
+                  groups: [profile_edit_password, Registration, Profile, Default]
+                  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:
                   choices:  ['ROLE_USER', 'ROLE_API']
                   multiple: true
                   message:  "user.show_error_role"
                   payload:
                       api_error: 'api.show_error_role'
+
+FOS\UserBundle\Form\Model\ChangePassword:
+    properties:
+        new:
+            - NotBlank:
+                  message: "user.show_error_password_policy"
+                  payload:
+                      api_error: 'api.show_error_password_policy'
+            - Regex:
+                  pattern: '/^([a-zA-Z0-9@*#]{8,15})$/'
+                  match:   true
+                  message: "user.show_error_password_policy"
+                  payload:
+                      api_error: 'api.show_error_password_policy'