Merge branch 'master' of github.com:ProspectOne/UserModule into 233-we-need-to-have-ability-to-set-new-password-without-knowing-previous-one

HesyRa · HesyRa · commit 522f317c3c0c · 2017-09-15T12:29:37.000+03:00
diff --git a/src/Service/AuthAdapter.php b/src/Service/AuthAdapter.php
@@ -157,8 +157,7 @@ public function setPassword($password)
     public function authenticate()
     {
         /** @var User $user */
-        $user = $this->entityManager->getRepository(User::class)
-                ->findOneByEmail($this->email);
+        $user = $this->getUserByEmail($this->email);
         return $this->validateUser($user);
     }
 
@@ -176,14 +175,14 @@ public function headerAuth()
         }
 
         /** @var User $user */
-        $user = $this->entityManager->getRepository(User::class)
-            ->findOneByToken($this->getAuthHeader());
+        $user = $this->getUserByToken($this->getAuthHeader());
 
         if (empty($user)) {
-            throw new LogicException("Invalid user token");
+            throw new LogicException(LogicException::MESSAGE);
         }
 
         if(!empty($user) && $user->getStatus() !== User::STATUS_RETIRED) {
+            $this->setEmail($user->getEmail());
             return $user;
         }
 
@@ -230,6 +229,25 @@ protected function validateUser(?UserInterface $user): Result
             null,
             ['Invalid credentials.']);
     }
-}
-
+    /**
+     * Find user by password reset token
+     * @param string $token
+     * @return mixed
+     */
+    public function getUserByToken(string $token)
+    {
+        return $this->entityManager->getRepository(User::class)
+            ->findOneByToken($token);
+    }
 
+    /**
+     * Find user by Email
+     * @param string $email
+     * @return mixed
+     */
+    public function getUserByEmail(string $email)
+    {
+        return $this->entityManager->getRepository(User::class)
+            ->findOneByEmail($email);
+    }
+}
diff --git a/src/Service/Factory/AuthManagerFactory.php b/src/Service/Factory/AuthManagerFactory.php
@@ -25,8 +25,8 @@ class AuthManagerFactory implements FactoryInterface
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {        
         // Instantiate dependencies.
-        $authenticationService = $container->get(AuthenticationService::class);
         $sessionManager = $container->get(SessionManager::class);
+        $authenticationService = $container->get(AuthenticationService::class);
         
         // Get contents of 'access_filter' config key (the AuthManager service
         // will use this data to determine whether to allow currently logged in user
diff --git a/src/Service/UserManager.php b/src/Service/UserManager.php
@@ -34,18 +34,18 @@ class UserManager
     /**
 	  * @return EntityManager
 	  */
-	  public function getEntityManager(): EntityManager
-	  {
-		  return $this->entityManager;
-	  }
+    public function getEntityManager(): EntityManager
+	{
+	    return $this->entityManager;
+	}
 
-	  /**
-	  * @return Bcrypt
-	  */
-	  public function getBcrypt(): Bcrypt
-	  {
-  		return $this->bcrypt;
-	  }
+	/**
+	* @return Bcrypt
+	*/
+	public function getBcrypt(): Bcrypt
+	{
+ 	    return $this->bcrypt;
+	}
   
     /**
      * UserManager constructor.
@@ -164,22 +164,19 @@ public function createAdminUserIfNotExists()
     public function hasRole($email, $roles)
     {
         /** @var User $user */
-        $user = $this->entityManager->getRepository(User::class)->findOneByEmail($email);
-        if(in_array($user->getRoleName(),$roles, true)) {
-            return true;
-        }
-        return false;
+        $user = $this->getUserByEmail($email);
+
+        return in_array($user->getRoleName(),$roles, true);
     }
 
     /**
-     * Checks whether an active user with given email address already exists in the database.     
+     * Checks whether an active user with given email address already exists in the database.
+     * @param string $email
+     * @return bool
      */
-    public function checkUserExists($email) {
-        
-        $user = $this->entityManager->getRepository(User::class)
-                ->findOneByEmail($email);
-        
-        return $user !== null;
+    public function checkUserExists(string $email)
+    {
+        return !empty($this->getUserByEmail($email));
     }
 
     /**
@@ -264,10 +261,22 @@ public function validatePasswordResetToken($passwordResetToken)
      * @param string $passwordResetToken
      * @return mixed
      */
-    public function getUserByPasswordResetToken(string $passwordResetToken) {
+    public function getUserByPasswordResetToken(string $passwordResetToken)
+    {
         return $this->entityManager->getRepository(User::class)
             ->findOneByPasswordResetToken($passwordResetToken);
     }
+
+    /**
+     * Find user by Email
+     * @param string $email
+     * @return mixed
+     */
+    public function getUserByEmail(string $email)
+    {
+        return $this->entityManager->getRepository(User::class)
+            ->findOneByEmail($email);
+    }
     
     /**
      * This method sets new password by password reset token.

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ class AuthManagerFactory implements FactoryInterface`
`25`	`25`	`public function __invoke(ContainerInterface $container, $requestedName, array $options = null)`
`26`	`26`	`{`
`27`	`27`	`// Instantiate dependencies.`
`28`		`- $authenticationService = $container->get(AuthenticationService::class);`
`29`	`28`	`$sessionManager = $container->get(SessionManager::class);`
	`29`	`+ $authenticationService = $container->get(AuthenticationService::class);`
`30`	`30`
`31`	`31`	`// Get contents of 'access_filter' config key (the AuthManager service`
`32`	`32`	`// will use this data to determine whether to allow currently logged in user`