Skip to content

Commit eb40e22

Browse files
Changes per feedback
1 parent 9833091 commit eb40e22

File tree

2 files changed

+17
-18
lines changed

2 files changed

+17
-18
lines changed

src/ApiBundle/Controller/AuthController.php

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -252,14 +252,15 @@ public function postRegisterAction()
252252
foreach ($errors as $error) {
253253
$constraint = $error->getConstraint();
254254
$errorItem = array(
255-
"code" => 400,
256-
"error" => "Bad Request",
257255
"error_description" => $error->getMessage(),
258256
"show_message" => $this->get('translator')->trans($constraint->payload['api_error'], array(), 'messages', $request->getLocale())
259257
);
260258
array_push($errorArray, $errorItem);
261259
}
262-
return new JsonResponse($errorArray);
260+
return new JsonResponse(array(
261+
"code" => 400,
262+
"error" => "Bad Request",
263+
'errors' => $errorArray));
263264
}
264265

265266
// Everything ok, now write the user record
@@ -436,13 +437,16 @@ public function editProfileAction()
436437
$this->logAndThrowError(400, 'Invalid User', $this->get('translator')->trans('api.show_error_perm_edit', array(), 'messages', $request->getLocale()), $request->getLocale());
437438
}
438439

439-
$userManager = $this->get('fos_user.user_manager');
440-
441440
$data = $request->request->all();
442441

443-
$user->setFirstname(array_key_exists('firstname', $data) ? $data['firstname'] : $user->getFirstname() );
444-
$user->setLastname(array_key_exists('lastname', $data) ? $data['lastname'] : $user->getLastname() );
445-
$user->setDob( array_key_exists('dob', $data) ? $data['dob'] : $user->getDob() );
442+
$firstname = array_key_exists('firstname', $data) ? $data['firstname'] : $user->getFirstname();
443+
$user->setFirstname($firstname);
444+
445+
$lastname = array_key_exists('lastname', $data) ? $data['lastname'] : $user->getLastname();
446+
$user->setLastname($lastname);
447+
448+
$dob = array_key_exists('dob', $data) ? $data['dob'] : $user->getDob();
449+
$user->setDob($dob);
446450

447451
// Validate user data
448452
$validator = $this->get('validator');
@@ -453,17 +457,19 @@ public function editProfileAction()
453457
foreach ($errors as $error) {
454458
$constraint = $error->getConstraint();
455459
$errorItem = array(
456-
"code" => 400,
457-
"error" => "Bad Request",
458460
"error_description" => $error->getMessage(),
459461
"show_message" => $this->get('translator')->trans($constraint->payload['api_error'], array(), 'messages', $request->getLocale())
460462
);
461463
array_push($errorArray, $errorItem);
462464
}
463-
return new JsonResponse($errorArray);
465+
return new JsonResponse(array(
466+
"code" => 400,
467+
"error" => "Bad Request",
468+
'errors' => $errorArray));
464469
}
465470

466471
// Everything ok, now update the user record
472+
$userManager = $this->get('fos_user.user_manager');
467473
$userManager->updateUser($user);
468474

469475
$msg = 'Profile changed successfully';

src/ApiBundle/Resources/config/config.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@ parameters:
33
# app_locales: en|fr|de|es|cs|nl|ru|uk|ro|pt_BR|pl|it|ja|id|ca|sl
44
app_locales: en|fr|hi
55

6-
# Password matching expression. Match all alphanumeric character and predefined wild characters.
7-
# Password must consists of at least 8 characters and not more than 15 characters.
8-
password_regex: '/^([a-zA-Z0-9@*#]{8,15})$/'
9-
10-
# username at least 3 of those characters, but no more than 16, any lowercase letter (a-z), number (0-9), an underscore, or a hyphen
11-
username_regex: '/^[a-z0-9_-]{3,16}$/'
12-
136
# Assetic Configuration
147
assetic:
158
debug: '%kernel.debug%'

0 commit comments

Comments
 (0)