Skip to content

Commit 26a3d93

Browse files
aksinha-nerdapplabsaksinha-nerdapplabs
committed
Ashish's ticket resolved. Minor refactoring
1 parent 9c4f1cc commit 26a3d93

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

‎src/ApiBundle/Controller/AuthController.php‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public function cgetAction()
8787

8888
$users = $query->getResult();
8989

90-
$this->logMessage(200, 'Users fetched ' . serialize($users));
90+
$this->logMessage(200, 'Users fetched '.serialize($users));
9191

9292
$view = $this->view($users, 200)
9393
->setTemplate("default/users.html.twig")
@@ -137,7 +137,7 @@ public function newClientAction()
137137

138138
$clientManager->updateClient($client);
139139

140-
$this->logMessage(200, 'Client successfully created: ' . $client->getPublicId());
140+
$this->logMessage(200, 'Client successfully created: '.$client->getPublicId());
141141

142142
return new JsonResponse(array(
143143
'code' => 200,
@@ -192,15 +192,15 @@ private function validateAdminUser(Request $request) {
192192
if ($encoder->isPasswordValid($user->getPassword(), $password, $user->getSalt())) {
193193
// Not an Admin
194194
if (!in_array('ROLE_ADMIN', $user->getRoles())) {
195-
$this->logAndThrowError(400, 'User ' . $username . ' is not an Admin. Role(s) assigned: ' . implode($user->getRoles(), ', '), $this->get('translator')->trans('api.show_error_non_admin', array(), 'messages', $request->getLocale()), $request->getLocale());
195+
$this->logAndThrowError(400, 'User '.$username.' is not an Admin. Role(s) assigned: '.implode($user->getRoles(), ', '), $this->get('translator')->trans('api.show_error_non_admin', array(), 'messages', $request->getLocale()), $request->getLocale());
196196
}
197197
} else {
198198
// Password bad
199199
$this->logAndThrowError(400, 'Password does not match: '. $password, $this->get('translator')->trans('api.show_error_password', array(), 'messages', $request->getLocale()), $request->getLocale());
200200
}
201201
} else {
202202
// Username bad
203-
$this->logAndThrowError(400, 'Invalid username: ' . $username, $this->get('translator')->trans('api.show_error_username_missing', array(), 'messages', $request->getLocale()), $request->getLocale());
203+
$this->logAndThrowError(400, 'Invalid username: '.$username, $this->get('translator')->trans('api.show_error_username_missing', array(), 'messages', $request->getLocale()), $request->getLocale());
204204
}
205205
}
206206

@@ -265,7 +265,7 @@ public function postRegisterAction()
265265
$oAuthRtn = $this->fetchAccessToken($request, $grantType);
266266
}
267267

268-
$this->logMessage(201, 'User successfully created ' . $request->request->get('username') );
268+
$this->logMessage(201, 'User successfully created '.$request->request->get('username') );
269269

270270
return new JsonResponse(array(
271271
'code' => 201,
@@ -295,7 +295,7 @@ private function validateClient(Request $request) {
295295
));
296296

297297
if (null == $client) {
298-
$this->logAndThrowError(400, 'Invalid Client Credentials: ' . $clientId);
298+
$this->logAndThrowError(400, 'Invalid Client Credentials: '.$clientId);
299299
}
300300
}
301301

@@ -314,7 +314,7 @@ private function validateUsername(Request $request) {
314314
/** @var $user UserInterface */
315315
$user = $this->container->get('fos_user.user_manager')->findUserByUsernameOrEmail($username);
316316
if (null != $user) {
317-
$this->logAndThrowError(400, 'User already exists. Username: ' . $user->getUsername(), $this->get('translator')->trans('api.show_error_username_taken', array(), 'messages', $request->getLocale()), $request->getLocale());
317+
$this->logAndThrowError(400, 'User already exists. Username: '.$user->getUsername(), $this->get('translator')->trans('api.show_error_username_taken', array(), 'messages', $request->getLocale()), $request->getLocale());
318318
}
319319
}
320320

@@ -338,12 +338,12 @@ private function validateEmail(Request $request) {
338338

339339
// Check if email is valid
340340
if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
341-
$this->logAndThrowError(400, 'Invalid email: ' . $email, $this->get('translator')->trans('api.show_error_email', array(), 'messages', $request->getLocale()), $request->getLocale());
341+
$this->logAndThrowError(400, 'Invalid email: '.$email, $this->get('translator')->trans('api.show_error_email', array(), 'messages', $request->getLocale()), $request->getLocale());
342342
}
343343

344344
$user = $this->container->get('fos_user.user_manager')->findUserByUsernameOrEmail($email);
345345
if (null != $user) {
346-
$this->logAndThrowError(400, 'Email ' . $user->getEmail() . ' already taken by Username: ' . $user->getUsername(), $this->get('translator')->trans('api.show_error_email_taken', array(), 'messages', $request->getLocale()), $request->getLocale());
346+
$this->logAndThrowError(400, 'Email '.$user->getEmail().' already taken by Username: '.$user->getUsername(), $this->get('translator')->trans('api.show_error_email_taken', array(), 'messages', $request->getLocale()), $request->getLocale());
347347
}
348348
}
349349

@@ -369,7 +369,7 @@ private function validateDob(Request $request) {
369369
// Check if dob is valid
370370
list($mm,$dd,$yyyy) = explode('/',$dob);
371371
if (!checkdate($mm,$dd,$yyyy)) {
372-
$this->logAndThrowError(400, 'Invalid mm/dd/yyyy DOB: ' . $dob, $this->get('translator')->trans('api.show_error_dob', array(), 'messages', $request->getLocale()), $request->getLocale());
372+
$this->logAndThrowError(400, 'Invalid mm/dd/yyyy DOB: '.$dob, $this->get('translator')->trans('api.show_error_dob', array(), 'messages', $request->getLocale()), $request->getLocale());
373373
}
374374
}
375375

@@ -381,7 +381,7 @@ private function validateScope(Request $request) {
381381

382382
// Check if scope is set to API
383383
if ('API' != $scope) {
384-
$this->logAndThrowError(400, 'Invalid scope: ' . $scope, $this->get('translator')->trans('api.show_error_scope', array(), 'messages', $request->getLocale()), $request->getLocale());
384+
$this->logAndThrowError(400, 'Invalid scope: '.$scope, $this->get('translator')->trans('api.show_error_scope', array(), 'messages', $request->getLocale()), $request->getLocale());
385385
}
386386
}
387387

@@ -431,7 +431,7 @@ public function editPasswordAction()
431431

432432
$userManager->updateUser($user);
433433

434-
$this->logMessage(200, $msg . ' for ' . $user->getUsername());
434+
$this->logMessage(200, $msg.' for '.$user->getUsername());
435435

436436
return new JsonResponse(array(
437437
'code' => 201,
@@ -467,12 +467,12 @@ public function getProfileAction()
467467
// Check if dob is valid
468468
if ($user->dobString() == "Null Date of Birth" || $user->dobString() == "Malformed date of birth") {
469469
$dobString = '';
470-
$this->logMessage(400, 'Invalid or null DOB: ' . $user->dobString() . ' for ' . $user->getUsername());
470+
$this->logMessage(400, 'Invalid or null DOB: '.$user->dobString().' for '.$user->getUsername());
471471
} else {
472472
$dobString = $user->dobString();
473473
}
474474

475-
$this->logMessage(200, 'Profile fetched successfully for ' . $user->getUsername());
475+
$this->logMessage(200, 'Profile fetched successfully for '.$user->getUsername());
476476

477477
return new JsonResponse(array(
478478
'code' => 201,
@@ -529,11 +529,11 @@ public function editProfileAction()
529529

530530
$username = $user->getUsername();
531531

532-
$this->logMessage(201, $msg . ' for ' . $username);
532+
$this->logMessage(201, $msg.' for '.$username);
533533

534534
return new JsonResponse(array(
535535
'code' => 201,
536-
'show_message' => $msg . ' for ' . $username
536+
'show_message' => $msg.' for '.$username
537537
));
538538
}
539539

@@ -549,7 +549,7 @@ private function handleKeyUsername(UserInterface $user, Request $request) {
549549
// Check if username is already taken
550550
$user1 = $this->container->get('fos_user.user_manager')->findUserByUsernameOrEmail($data['username']);
551551
if (null != $user1) {
552-
$this->logAndThrowError(400, 'Already taken by Username: ' . $user1->getUsername(), $this->get('translator')->trans('api.show_error_username_taken', array(), 'messages', $request->getLocale()), $request->getLocale());
552+
$this->logAndThrowError(400, 'Already taken by Username: '.$user1->getUsername(), $this->get('translator')->trans('api.show_error_username_taken', array(), 'messages', $request->getLocale()), $request->getLocale());
553553
}
554554
$user->setUsername($data['username']);
555555
}
@@ -565,14 +565,14 @@ private function handleKeyEmail(UserInterface $user, Request $request) {
565565
if (array_key_exists('email', $data)) {
566566
// Check if email is valid
567567
if (!filter_var($data['email'], FILTER_VALIDATE_EMAIL)) {
568-
$this->logAndThrowError(400, 'Invalid email: ' . $data['email'], 'Invalid email: ' . $data['email']);
568+
$this->logAndThrowError(400, 'Invalid email: '.$data['email'], 'Invalid email: '.$data['email']);
569569
}
570570
// Update email only if email is changed
571571
if ($data['email'] != $user->getEmail()) {
572572
// Check if email is already taken
573573
$user1 = $this->container->get('fos_user.user_manager')->findUserByUsernameOrEmail($data['email']);
574574
if (null != $user1) {
575-
$this->logAndThrowError(400, 'Email ' . $user1->getEmail() . ' already taken by Username: ' . $user1->getUsername(), $this->get('translator')->trans('api.show_error_email_taken', array(), 'messages', $request->getLocale()), $request->getLocale());
575+
$this->logAndThrowError(400, 'Email ' .$user1->getEmail().' already taken by Username: '.$user1->getUsername(), $this->get('translator')->trans('api.show_error_email_taken', array(), 'messages', $request->getLocale()), $request->getLocale());
576576
}
577577
$user->setEmail($data['email']);
578578
}
@@ -616,7 +616,7 @@ private function handleKeyDob(UserInterface $user, Request $request) {
616616
// Check if dob is valid
617617
list($mm,$dd,$yyyy) = array_merge( explode('/',$data['dob']), array(0,0,0) );
618618
if (!checkdate($mm,$dd,$yyyy)) {
619-
$this->logAndThrowError(400, 'Invalid mm/dd/yyyy DOB: ' . $data['dob'], $this->get('translator')->trans('api.show_error_dob', array(), 'messages', $request->getLocale()), $request->getLocale());
619+
$this->logAndThrowError(400, 'Invalid mm/dd/yyyy DOB: '.$data['dob'], $this->get('translator')->trans('api.show_error_dob', array(), 'messages', $request->getLocale()), $request->getLocale());
620620
}
621621
$user->setDob($data['dob']);
622622
}
@@ -688,7 +688,7 @@ protected function getObfuscatedEmail(UserInterface $user)
688688
{
689689
$email = $user->getEmail();
690690
if (false !== $pos = strpos($email, '@')) {
691-
$email = '...' . substr($email, $pos);
691+
$email = '...'.substr($email, $pos);
692692
}
693693

694694
$this->logMessage(200, $email);
@@ -734,7 +734,7 @@ public function postAccessTokenAction()
734734

735735
$oAuthRtn = $this->fetchAccessToken($request, $grantType);
736736

737-
$msg = 'Access Token successfully fetched for ' . $username;
737+
$msg = 'Access Token successfully fetched for '.$username;
738738
$this->logMessage(201, $msg);
739739

740740
$oAuthRtn['code'] = 201;
@@ -834,11 +834,11 @@ private function fetchAccessToken(Request $request, $grantType)
834834

835835
private function logAndThrowError($errCode = 400, $errMsg = 'Bad Request', $showMsg = '', $locale = 'en') {
836836
$this->logMessage($errCode, $errMsg);
837-
throw new HttpException($errCode, $errMsg . ($showMsg ? '#showme#' . '['. $locale . '] ' . $showMsg : '') );
837+
throw new HttpException($errCode, $errMsg.($showMsg ? '#showme#'.$showMsg : '') );
838838
}
839839

840840
private function logMessage($errCode = 200, $logMsg = 'Nil Log Message') {
841841
$logger = $this->get('logger');
842-
$logger->info($errCode . ' ' . $logMsg);
842+
$logger->info($errCode.' '.$logMsg);
843843
}
844844
}

0 commit comments

Comments
 (0)