@@ -252,14 +252,15 @@ public function postRegisterAction()
252
252
foreach ($ errors as $ error ) {
253
253
$ constraint = $ error ->getConstraint ();
254
254
$ errorItem = array (
255
- "code " => 400 ,
256
- "error " => "Bad Request " ,
257
255
"error_description " => $ error ->getMessage (),
258
256
"show_message " => $ this ->get ('translator ' )->trans ($ constraint ->payload ['api_error ' ], array (), 'messages ' , $ request ->getLocale ())
259
257
);
260
258
array_push ($ errorArray , $ errorItem );
261
259
}
262
- return new JsonResponse ($ errorArray );
260
+ return new JsonResponse (array (
261
+ "code " => 400 ,
262
+ "error " => "Bad Request " ,
263
+ 'errors ' => $ errorArray ));
263
264
}
264
265
265
266
// Everything ok, now write the user record
@@ -436,13 +437,16 @@ public function editProfileAction()
436
437
$ this ->logAndThrowError (400 , 'Invalid User ' , $ this ->get ('translator ' )->trans ('api.show_error_perm_edit ' , array (), 'messages ' , $ request ->getLocale ()), $ request ->getLocale ());
437
438
}
438
439
439
- $ userManager = $ this ->get ('fos_user.user_manager ' );
440
-
441
440
$ data = $ request ->request ->all ();
442
441
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 );
446
450
447
451
// Validate user data
448
452
$ validator = $ this ->get ('validator ' );
@@ -453,17 +457,19 @@ public function editProfileAction()
453
457
foreach ($ errors as $ error ) {
454
458
$ constraint = $ error ->getConstraint ();
455
459
$ errorItem = array (
456
- "code " => 400 ,
457
- "error " => "Bad Request " ,
458
460
"error_description " => $ error ->getMessage (),
459
461
"show_message " => $ this ->get ('translator ' )->trans ($ constraint ->payload ['api_error ' ], array (), 'messages ' , $ request ->getLocale ())
460
462
);
461
463
array_push ($ errorArray , $ errorItem );
462
464
}
463
- return new JsonResponse ($ errorArray );
465
+ return new JsonResponse (array (
466
+ "code " => 400 ,
467
+ "error " => "Bad Request " ,
468
+ 'errors ' => $ errorArray ));
464
469
}
465
470
466
471
// Everything ok, now update the user record
472
+ $ userManager = $ this ->get ('fos_user.user_manager ' );
467
473
$ userManager ->updateUser ($ user );
468
474
469
475
$ msg = 'Profile changed successfully ' ;
0 commit comments