Skip to content

Commit df12eaf

Browse files
Changes per feedback
1 parent 20cf74d commit df12eaf

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

src/ApiBundle/Controller/AuthController.php

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ private function validateAdminUser(Request $request) {
238238
* {"name"="lastname", "dataType"="string", "required"=false, "description"="lastname"},
239239
* {"name"="dob", "dataType"="datetime", "required"=true, "description"="date of birth mm/dd/yyyy"},
240240
* {"name"="email", "dataType"="email", "required"=true, "description"="Email"},
241-
* {"name"="image", "dataType"="image/jpeg, image/jpg, image/gif, image/png", "required"=false, "description"="jpeg/jpg/png/gif Pic Size: 1024k, Width: 50-300px, Height: 50-300px"},
241+
* {"name"="image", "dataType"="image/jpeg, image/jpg, image/gif, image/png", "required"=false, "description"="Profile Picture within 1024k size and dimensions within 50-300px x 50-300px"},
242242
* {"name"="_locale", "dataType"="string", "required"=false, "description"="User locale. Will default to en"}
243243
* },
244244
* )
@@ -272,7 +272,7 @@ public function postRegisterAction(Request $request)
272272
$user->setPassword($request->request->get('password'));
273273
$user->setEmail($request->request->get('email'));
274274
$user->setFirstname($request->request->get('firstname'));
275-
$user->setLastname($request->request->get('lastname') ? $request->request->get('lastname') : null);
275+
$user->setLastname($request->request->get('lastname') ? $request->request->get('lastname') : "");
276276
$user->setDob($request->request->get('dob'));
277277
$user->setRoles(array('ROLE_API'));
278278

@@ -291,9 +291,12 @@ public function postRegisterAction(Request $request)
291291
$oAuthRtn = 'Pending';
292292
$msg = 'N.A.';
293293
$grantType = 'password';
294+
295+
// If Login confirmation is set, then upon successful registration, user will be logged in automatically,
296+
// else user will be redirected to a login page to log in with the new credentials.
294297
$loginConfirmation = $this->container->getParameter('login_confirmation');
295298

296-
if (true == $this->container->getParameter('email_confirmation') ) {
299+
if (true == $this->container->getParameter('registration_requires_email_confirmation') ) {
297300
$msg = 'Please check your email to complete the registration.';
298301
} else {
299302
$msg = 'Registration complete. Welcome!';
@@ -467,7 +470,7 @@ public function getProfilePicAction()
467470
$this->logAndThrowError(400, 'Invalid User', $this->get('translator')->trans('api.show_error_perm_show', array(), 'messages', $request->getLocale()), $request->getLocale());
468471
}
469472

470-
// If no image file, then return empty response
473+
// If no image file, then return empty response with HTTP 200 OK
471474
if (!$user->getImage()) {
472475
return new Response();
473476
}
@@ -489,7 +492,7 @@ public function getProfilePicAction()
489492
* resource=true,
490493
* description="Fetch User profile detail. Access token to be provided in header (Authorization = Bearer <access token>)",
491494
* parameters={
492-
* {"name"="image", "dataType"="image/jpeg, image/jpg, image/gif, image/png", "required"=false, "description"="jpeg/jpg/png/gif Pic Size: 1024k, Width: 50-300px, Height: 50-300px"},
495+
* {"name"="image", "dataType"="image/jpeg, image/jpg, image/gif, image/png", "required"=false, "description"="Profile Picture within 1024k size and dimensions within 50-300px x 50-300px"},
493496
* {"name"="_locale", "dataType"="string", "required"=false, "description"="User locale. Will default to en"}
494497
* },
495498
* )

src/ApiBundle/Resources/config/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ 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
images_profile_directory: '%kernel.root_dir%/../web/images/profile'
6-
email_confirmation: false
6+
registration_requires_email_confirmation: false
77
login_confirmation: false
88

99
# Assetic Configuration

0 commit comments

Comments
 (0)