tests

src/Auth/Business/LuUsersBusiness.php

@@ -8,7 +8,7 @@
 
 namespace Luticate\Auth\Business;
 
-use Luticate\Auth\DataAccess\LuUserDataAccess;
+use Luticate\Auth\DataAccess\LuUsersDataAccess;
 use Luticate\Auth\Dbo\LuBuiltInPermissions;
 use Luticate\Auth\Dbo\Users\LuUsersAddDbo;
 use Luticate\Auth\Dbo\Users\LuUsersDbo;
@@ -27,36 +27,36 @@ class LuUsersBusiness extends LuBusiness
     const KEY_DATA =  "data";
 
     /**
-     * @return LuUserDataAccess
+     * @return LuUsersDataAccess
      */
     protected static function getDataAccess()
     {
-        return new LuUserDataAccess();
+        return new LuUsersDataAccess();
     }
 
-    protected function badPassword()
+    protected static function badPassword()
     {
         static::unauthorized("Bad username/password");
     }
 
-    public function hashPassword(string $password)
+    public static function hashPassword(string $password)
     {
         return password_hash($password, PASSWORD_BCRYPT);
     }
 
-    public function verifyPassword(string $password, string $hash)
+    public static function verifyPassword(string $password, string $hash)
     {
         return password_verify($password, $hash);
     }
 
-    public function checkPasswordRequirements(string $password)
+    public static function checkPasswordRequirements(string $password)
     {
         if (strlen($password) < 5) { //TODO: add a setting
             self::badInput("Password must have at least 5 characters");
         }
     }
 
-    public function getSalt($length = 16)
+    public static function getSalt($length = 16)
     {
         $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
         $charactersLength = strlen($characters);
@@ -67,7 +67,7 @@ class LuUsersBusiness extends LuBusiness
         return $randomString;
     }
 
-    public function getToken(LuUsersDbo $user, $data = null)
+    public static function getToken(LuUsersDbo $user, $data = null)
     {
         $session_time = 30;//TODO add a setting
         return JwtHelper::encode(array(
@@ -121,13 +121,24 @@ class LuUsersBusiness extends LuBusiness
         }
     }
 
-    public function login(LuUsersLoginDbo $login)
+    public static function getByUsernameOrEmail(string $name)
+    {
+        $user = static::getDataAccess()->getByUsernameOrEmail($name);
+        if (is_null($user)) {
+            static::notFound(static::getResourceName() . " not found");
+        }
+        return $user;
+    }
+
+    public static function login(LuUsersLoginDbo $login)
     {
         $user = static::getDataAccess()->getByUsernameOrEmail($login->getUsername());
-        if (is_null($user))
+        if (is_null($user)) {
             self::badPassword();
-        if (!self::verifyPassword($login->getPassword(), $user->getPassword()))
+        }
+        if (!self::verifyPassword($login->getPassword(), $user->getPassword())) {
             self::badPassword();
+        }
 
         /**
          * @var $result LuUsersLoginResultDbo
@@ -137,7 +148,7 @@ class LuUsersBusiness extends LuBusiness
         return $result;
     }
 
-    public function logout(LuUsersDbo $user)
+    public static function logout(LuUsersDbo $user)
     {
         if ($user->getId() != 0) {
             $user->setSalt(self::getSalt());
@@ -146,7 +157,7 @@ class LuUsersBusiness extends LuBusiness
         return true;
     }
 
-    public function getSingleLiteById($userId)
+    public static function getSingleLiteById($userId)
     {
         /**
          * @var $user LuUsersDbo
@@ -159,7 +170,7 @@ class LuUsersBusiness extends LuBusiness
      * @param LuQueryDbo $query
      * @return LuPaginatedDbo
      */
-    public function getAllLite(LuQueryDbo $query)
+    public static function getAllLite(LuQueryDbo $query)
     {
         return static::getDataAccess()->getAll($query)->map(function($user)
         {
@@ -170,7 +181,7 @@ class LuUsersBusiness extends LuBusiness
         });
     }
 
-    public function add(LuUsersAddDbo $user)
+    public static function add(LuUsersAddDbo $user)
     {
         static::checkPasswordRequirements($user->getPassword());
 
@@ -205,7 +216,7 @@ class LuUsersBusiness extends LuBusiness
         return self::getById($id);
     }
 
-    public function del(int $userId)
+    public static function del(int $userId)
     {
         $user = static::getSingleLiteById($userId);
         if ($userId != 0) {
@@ -214,7 +225,7 @@ class LuUsersBusiness extends LuBusiness
         return $user;
     }
 
-    public function edit(int $userId, LuUsersEditDbo $user)
+    public static function edit(int $userId, LuUsersEditDbo $user)
     {
         $existingUser = static::getSingleLiteById($userId);
         if (!filter_var($user->getEmail(), FILTER_VALIDATE_EMAIL)) {
@@ -234,9 +245,9 @@ class LuUsersBusiness extends LuBusiness
         return static::getSingleLiteById($existingUser->getId());
     }
 
-    public function setPassword(int $userId, string $password)
+    public static function setPassword(int $userId, string $password)
     {
-        $this->checkPasswordRequirements($password);
+        static::checkPasswordRequirements($password);
 
         /**
          * @var $existingUser LuUsersDbo
@@ -250,7 +261,7 @@ class LuUsersBusiness extends LuBusiness
         return true;
     }
 
-    public function setPasswordMe(LuUsersDbo $_user, string $password, string $oldPassword)
+    public static function setPasswordMe(LuUsersDbo $_user, string $password, string $oldPassword)
     {
         $loginDbo = new LuUsersLoginDbo();
         $loginDbo->setUsername($_user->getUsername());

src/Auth/DataAccess/LuUserDataAccess.php → src/Auth/DataAccess/LuUsersDataAccess.php

@@ -14,7 +14,7 @@ use Luticate\Auth\Dbo\Users\LuUsersDbo;
 use Luticate\Utils\DataAccess\LuDataAccess;
 use Luticate\Utils\Dbo\LuQueryDbo;
 
-class LuUserDataAccess extends LuDataAccess
+class LuUsersDataAccess extends LuDataAccess
 {
     protected static $_connection = "luticatedb";
     protected static $_table = "lu_users";

src/Auth/Middleware/LuAuthMiddleware.php

@@ -8,13 +8,8 @@
 
 namespace Luticate\Auth\Middleware;
 
-use Luticate\Auth\Business\JwtHelper;
-use Luticate\Auth\Business\LuPermissionsBusiness;
 use Luticate\Auth\Business\LuUsersBusiness;
-use Luticate\Auth\Dbo\LuBuiltInPermissions;
-use Luticate\Auth\Dbo\LuUsersDbo;
 use Luticate\Utils\Business\LuBusiness;
-use Luticate\Utils\Business\LuLog;
 use Luticate\Utils\Middleware\LuAbstractMiddleware;
 
 class LuAuthMiddleware implements LuAbstractMiddleware

tests/LuUsersTest.php

@@ -2,6 +2,8 @@
 use Luticate\Auth\Business\LuUsersBusiness;
 use Luticate\Auth\Controller\LuUsersController;
 use Luticate\Auth\Dbo\Users\LuUsersAddDbo;
+use Luticate\Auth\Dbo\Users\LuUsersDbo;
+use Luticate\Auth\Dbo\Users\LuUsersEditDbo;
 use Luticate\Auth\Dbo\Users\LuUsersLoginDbo;
 use Luticate\Utils\Business\LuBusinessException;
 use Luticate\Utils\Controller\LuticateApplication;
@@ -75,6 +77,7 @@ class LuUsersTest extends \PHPUnit_Framework_TestCase
         $newUser->setProfileId(null);
 
         $this->expectException(LuBusinessException::class);
+        $this->expectExceptionCode(400);
         $ctrl->add($newUser);
     }
 
@@ -92,6 +95,7 @@ class LuUsersTest extends \PHPUnit_Framework_TestCase
         $newUser->setProfileId(null);
 
         $this->expectException(LuBusinessException::class);
+        $this->expectExceptionCode(400);
         $ctrl->add($newUser);
     }
 
@@ -153,4 +157,125 @@ class LuUsersTest extends \PHPUnit_Framework_TestCase
 
         $this->assertSame("test.user2@example.com", $loggedUser->getEmail());
     }
+
+    public function testUserLogin3()
+    {
+        $ctrl = static::getCtrl();
+
+        $loginDbo = new LuUsersLoginDbo();
+        $loginDbo->setUsername("azertyuiop");
+        $loginDbo->setPassword("azertyuiop");
+
+        $this->expectException(LuBusinessException::class);
+        $this->expectExceptionCode(401);
+        $ctrl->login($loginDbo);
+    }
+
+    public function testUserGetMe1()
+    {
+        $ctrl = static::getCtrl();
+
+        $loginDbo = new LuUsersLoginDbo();
+        $loginDbo->setUsername("_test_user1");
+        $loginDbo->setPassword("test42");
+        $loginResult = $ctrl->login($loginDbo);
+
+        $this->assertNotNull($loginResult);
+        $this->assertSame("test.user1@example.com", $loginResult->getEmail());
+
+        /**
+         * @var $user LuUsersDbo
+         */
+        $user = LuUsersBusiness::getById($loginResult->getId());
+
+        $me = $ctrl->getMe($user);
+
+        $this->assertSame("test.user1@example.com", $me->getEmail());
+        $this->assertSame("_test_user1", $user->getUsername());
+    }
+
+    public function testUserGetById1()
+    {
+        $ctrl = static::getCtrl();
+
+        $user = LuUsersBusiness::getByUsernameOrEmail("test.user1@example.com");
+
+        $user = $ctrl->getById($user->getId());
+
+        $this->assertSame("test.user1@example.com", $user->getEmail());
+        $this->assertSame("_test_user1", $user->getUsername());
+    }
+
+    public function testUserGetById2()
+    {
+        $ctrl = static::getCtrl();
+
+        $user = LuUsersBusiness::getByUsernameOrEmail("_test_user2");
+
+        $user = $ctrl->getById($user->getId());
+
+        $this->assertSame("test.user2@example.com", $user->getEmail());
+        $this->assertSame("_test_user2", $user->getUsername());
+    }
+
+    public function testUserEditMe1()
+    {
+        $ctrl = static::getCtrl();
+
+        $user = LuUsersBusiness::getByUsernameOrEmail("_test_user2");
+
+        $edited = new LuUsersEditDbo();
+        $edited->setEmail("test.user2+edited@example.com");
+        $edited->setFirstname("test-edited");
+        $edited->setLastname("user2-edited");
+
+        $ctrl->editMe($user, $edited);
+
+        $editedUser = $ctrl->getById($user->getId());
+
+        $this->assertSame("test.user2+edited@example.com", $editedUser->getEmail());
+        $this->assertSame("test-edited", $editedUser->getFirstname());
+        $this->assertSame("user2-edited", $editedUser->getLastname());
+    }
+
+    public function testUserEdit1()
+    {
+        $ctrl = static::getCtrl();
+
+        $user = LuUsersBusiness::getByUsernameOrEmail("_test_user2");
+
+        $edited = new LuUsersEditDbo();
+        $edited->setEmail("test.user2@example.com");
+        $edited->setFirstname("test");
+        $edited->setLastname("user2");
+
+        $ctrl->edit($user->getId(), $edited);
+
+        $editedUser = $ctrl->getById($user->getId());
+
+        $this->assertSame("test.user2@example.com", $editedUser->getEmail());
+        $this->assertSame("test", $editedUser->getFirstname());
+        $this->assertSame("user2", $editedUser->getLastname());
+    }
+
+    public function testUserDelete1()
+    {
+        //TODO
+//        $ctrl = static::getCtrl();
+//
+//        $loginDbo = new LuUsersLoginDbo();
+//        $loginDbo->setUsername("_test_user1");
+//        $loginDbo->setPassword("test42");
+//        $loginResult = $ctrl->login($loginDbo);
+//
+//        $this->assertNotNull($loginResult);
+//        $this->assertSame("test.user1@example.com", $loginResult->getEmail());
+//
+//        $user = LuUsersBusiness::getByUsernameOrEmail("test.user2@example.com");
+//
+//        $user = $ctrl->getById($user->getId());
+//
+//        $this->assertSame("test.user2@example.com", $user->getEmail());
+//        $this->assertSame("_test_user2", $user->getUsername());
+    }
 }