Skip to content

Username and Password regex added #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Feb 17, 2017
Merged

Username and Password regex added #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
787b56e
Username and Password regex added
aksinha-nerdapplabs Feb 15, 2017
89ba0d0
Symfony validation added and custom validations removed from UserCont…
aksinha-nerdapplabs Feb 16, 2017
9833091
Symfony validation added to AuthController
aksinha-nerdapplabs Feb 17, 2017
eb40e22
Changes per feedback
aksinha-nerdapplabs Feb 17, 2017
d38264d
Changes per feedback
aksinha-nerdapplabs Feb 17, 2017
c1ff549
Changes per feedback
aksinha-nerdapplabs Feb 17, 2017
7474f36
Changes per feedback
aksinha-nerdapplabs Feb 17, 2017
38d8986
Changes per feedback
aksinha-nerdapplabs Feb 17, 2017
15f1fce
Changes per feedback
aksinha-nerdapplabs Feb 17, 2017
5f95d5e
Readme corrected
aksinha-nerdapplabs Feb 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ This is an example project, ready to use. This project is using below Symfony Bu

cd /path/to/auth
php app/console doctrine:database:create
php app/console doctrine:scheme:create
php app/console doctrine:schema:create

**Step 3 - Create assets**

Expand All @@ -62,7 +62,7 @@ This is an example project, ready to use. This project is using below Symfony Bu

Make this user admin

php app/console fos:user:create admin ROLE_ADMIN
php app/console fos:user:promote admin ROLE_ADMIN

Now you are ready to use the Package!

Expand Down
204 changes: 30 additions & 174 deletions src/ApiBundle/Controller/Admin/UserController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,48 +56,17 @@ public function newAction(Request $request)
$form->handleRequest($request);

if ($form->isSubmitted() && $form->isValid()) {
try {
$this->validateUsername($form, $locale, new User());
$this->validatePassword($form, $locale);
$this->validateEmail($form, $locale, new User());
$this->validateFirstname($form, $locale);
$this->validateDob($form, $locale);
$this->validateRoles($form, $locale);

// Everything ok, now proceed to create the user
$userManager = $this->container->get('fos_user.user_manager');
$user = $userManager->createUser();

$user->setFirstname($form['firstname']->getData());
$user->setLastname($form['lastname']->getData());
$user->setDob($form['dob']->getData());
$user->setEmail($form['email']->getData());
$user->setUsername($form['username']->getData());
$user->setPlainPassword($form['password']->getData());
$user->setRoles($form['roles']->getData());
$user->setConfirmationToken(null);
$user->setEnabled(true);
$user->setLastLogin(new \DateTime());

$userManager->updateUser($user);
$flashMsg = $this->get('translator')->trans('flash.user_created_successfully');
$this->addFlash('success', $flashMsg);

} catch(HttpException $e) {
// Error messages for this section will come from above validate methods
return $this->redirectToRoute('admin_user_new');

// Always catch exact exception for which flash message or logger is needed,
// otherwise catch block will not get executed on higher or lower ranked exceptions.
} catch(\Doctrine\DBAL\Exception\UniqueConstraintViolationException $e) {
$flashMsg = $this->get('translator')->trans('flash.user_already_exists');
$this->logMessage(400, 'danger', $e->getMessage());
$this->addFlash('danger', $flashMsg);
return $this->redirectToRoute('admin_user_new');
}
$userManager = $this->container->get('fos_user.user_manager');
$user = $userManager->createUser();

$this->setUserData($user, $form);

$userManager->updateUser($user);

$this->logMessageAndFlash(200, 'success', 'User successfully created: ', $this->get('translator')->trans('flash.user_creatd_successfully'), $request->getLocale() );

return $this->redirectToRoute('admin_user_index');
} // if form is valid
}

return $this->render('@ApiBundle/Resources/views/admin/user/new.html.twig', [
'form' => $form->createView(),
Expand Down Expand Up @@ -128,49 +97,19 @@ public function showAction(User $user)
*/
public function editAction(User $user, Request $request)
{
$entityManager = $this->getDoctrine()->getManager();

$editForm = $this->createForm(UserType::class, $user);
$deleteForm = $this->createDeleteForm($user);
$locale = $request->getLocale();

$editForm->handleRequest($request);

if ($editForm->isSubmitted() && $editForm->isValid()) {
try {
$this->validateUsername($editForm, $locale, $user);
$this->validatePassword($editForm, $locale);
$this->validateEmail($editForm, $locale, $user);
$this->validateFirstname($editForm, $locale);
$this->validateDob($editForm, $locale);
$this->validateRoles($editForm, $locale);

$user->setFirstname($editForm['firstname']->getData());
$user->setLastname($editForm['lastname']->getData());
$user->setDob($editForm['dob']->getData());
$user->setEmail($editForm['email']->getData());
$user->setUsername($editForm['username']->getData());
$user->setPlainPassword($editForm['password']->getData());
$user->setRoles($editForm['roles']->getData());
$user->setConfirmationToken(null);
$user->setEnabled(true);
$user->setLastLogin(new \DateTime());

$entityManager->flush();
$flashMsg = $this->get('translator')->trans('flash.user_updated_successfully');
$this->addFlash('success', $flashMsg);

// Always catch exact exception for which flash message or logger is needed,
// otherwise catch block will not get executed on higher or lower ranked exceptions.
} catch(HttpException $e) {
// Error messages for this section will come from above validate methods
return $this->redirectToRoute('admin_user_edit', ['id' => $user->getId()]);
} catch(\Doctrine\DBAL\Exception\UniqueConstraintViolationException $e) {
$flashMsg = $this->get('translator')->trans('flash.user_already_exists');
$this->logMessage(400, 'danger', $e->getMessage());
$this->addFlash('danger', $flashMsg);
return $this->redirectToRoute('admin_user_edit', ['id' => $user->getId()]);
}
$this->setUserData($user, $editForm);

$entityManager = $this->getDoctrine()->getManager();
$entityManager->flush();

$this->logMessageAndFlash(200, 'success', 'User successfully updated: ', $this->get('translator')->trans('flash.user_updated_successfully'), $request->getLocale() );

return $this->redirectToRoute('admin_user_index');
}
Expand All @@ -182,100 +121,6 @@ public function editAction(User $user, Request $request)
]);
}

/**
* Validate username
*/
private function validateUsername(\Symfony\Component\Form\Form $form, $locale, User $user) {
$username = $form['username']->getData();

// Check if username is empty
if (null == $username) {
$this->logMessageAndFlash(400, 'danger', 'Empty username', $this->get('translator')->trans('api.show_error_username_missing', array(), 'messages', $locale), $locale);
}

// If the username belongs to same user, no need to further check
if (!($user->getUsername() == $username)) {
// Do a check for existing user with userManager->findByUsername
/** @var $user UserInterface */
$user = $this->container->get('fos_user.user_manager')->findUserByUsernameOrEmail($username);
if (null != $user) {
$this->logMessageAndFlash(400, 'danger', 'User already exists. Username: '.$user->getUsername(), $this->get('translator')->trans('api.show_error_username_taken', array(), 'messages', $locale), $locale);
}
}
}

/**
* Validate password
*/
private function validatePassword(\Symfony\Component\Form\Form $form, $locale) {
$password = $form['password']->getData();

// Check if password is empty
if (null == $password) {
$this->logMessageAndFlash(400, 'danger', 'Invalid empty password', $this->get('translator')->trans('api.show_error_password', array(), 'messages', $locale), $locale);
}
}

/**
* Validate email
*/
private function validateEmail(\Symfony\Component\Form\Form $form, $locale, User $user) {
$email = $form['email']->getData();

// Check if email is valid
if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
$this->logMessageAndFlash(400, 'danger', 'Invalid email: '.$email, $this->get('translator')->trans('api.show_error_email', array(), 'messages', $locale), $locale);
}

// If the email belongs to same user, no need to further check
if (!($user->getEmail() == $email )) {
$user = $this->container->get('fos_user.user_manager')->findUserByUsernameOrEmail($email);
if (null != $user) {
$this->logMessageAndFlash(400, 'danger', 'Email '.$user->getEmail().' already taken by Username: '.$user->getUsername(), $this->get('translator')->trans('api.show_error_email_taken', array(), 'messages', $locale), $locale);
}
}
}

/**
* Validate firstname
*/
private function validateFirstname(\Symfony\Component\Form\Form $form, $locale) {
$firstname = $form['firstname']->getData();

// Check if firstname is empty. At least firstname is required.
if (null == $firstname) {
$this->logMessageAndFlash(400, 'danger', 'Invalid empty firstname', $this->get('translator')->trans('api.show_error_firstname', array(), 'messages', $locale), $locale);
}

}

/**
* Validate dob
*/
private function validateDob(\Symfony\Component\Form\Form $form, $locale) {
$dob = $form['dob']->getData();

// Check if dob is valid
list($mm,$dd,$yyyy) = explode('/', $dob->format('m/d/Y') );
if (!checkdate($mm,$dd,$yyyy)) {
$this->logMessageAndFlash(400, 'danger', 'Invalid mm/dd/yyyy DOB: '.$dob, $this->get('translator')->trans('api.show_error_dob', array(), 'messages', $locale), $locale);
}
}

/**
* Validate roles
*/
private function validateRoles(\Symfony\Component\Form\Form $form, $locale) {
$roles = $form['roles']->getData();
$permittedRoles = ['ROLE_API', "ROLE_USER"];

foreach ($roles as $role) {
// Check if role is valid
if (!in_array($role, $permittedRoles) )
$this->logMessageAndFlash(400, 'warning', 'Invalid role: '.$role, $this->get('translator')->trans('api.show_error_role'.' '.$role, array(), 'messages', $locale), $locale);
}
}

/**
* Deletes a User entity.
*
Expand All @@ -290,9 +135,7 @@ public function deleteAction(Request $request, User $user)

$entityManager->flush();

$flashMsg = $this->get('translator')->trans('flash.user_deleted_successfully');
$this->logMessage(200, 'success', 'User successfully deleted: ');
$this->addFlash('success', $flashMsg);
$this->logMessageAndFlash(200, 'success', 'User successfully deleted: ', $this->get('translator')->trans('flash.user_deleted_successfully'), $request->getLocale() );

return $this->redirectToRoute('admin_user_index');
}
Expand All @@ -313,11 +156,24 @@ private function createDeleteForm(User $user)
;
}

private function setUserData(User $user, \Symfony\Component\Form\Form $form)
{
$user->setFirstname($form['firstname']->getData());
$user->setLastname($form['lastname']->getData());
$user->setDob($form['dob']->getData());
$user->setEmail($form['email']->getData());
$user->setUsername($form['username']->getData());
$user->setPlainPassword($form['password']->getData());
$user->setRoles($form['roles']->getData());
$user->setConfirmationToken(null);
$user->setEnabled(true);
$user->setLastLogin(new \DateTime());
}

private function logMessageAndFlash($code = 200, $type = 'success', $logMsg = '', $flashMsg = '', $locale = 'en')
{
$this->logMessage($code, $type, $logMsg);
$this->addFlash($type, $flashMsg);
throw new HttpException($code, $logMsg);
}

private function logMessage($code = 200, $type='success', $logMsg = '') {
Expand Down
Loading