Password hashing (#10926)

1 files changed, 18 insertions, 13 deletions

diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php
index c0ea0ce4cd..131af64a0f 100644
--- a/tests/PHPUnit/Framework/Fixture.php
+++ b/tests/PHPUnit/Framework/Fixture.php
@@ -12,6 +12,7 @@ use Piwik\Application\Environment;
 use Piwik\Archive;
 use Piwik\ArchiveProcessor\PluginsArchiver;
 use Piwik\Auth;
+use Piwik\Auth\Password;
 use Piwik\Cache\Backend\File;
 use Piwik\Cache as PiwikCache;
 use Piwik\Common;
@@ -663,34 +664,38 @@ class Fixture extends \PHPUnit_Framework_Assert
      */
     public static function getTokenAuth()
     {
-        return APIUsersManager::getInstance()->getTokenAuth(
-            self::ADMIN_USER_LOGIN,
-            UsersManager::getPasswordHash(self::ADMIN_USER_PASSWORD)
-        );
+        $model = new \Piwik\Plugins\UsersManager\Model();
+        $user  = $model->getUser(self::ADMIN_USER_LOGIN);
+
+        return $user['token_auth'];
     }
 
     public static function createSuperUser($removeExisting = true)
     {
-        $login = self::ADMIN_USER_LOGIN;
-        $password = UsersManager::getPasswordHash(self::ADMIN_USER_PASSWORD);
-        $token = self::getTokenAuth();
+        $passwordHelper = new Password();
+
+        $login    = self::ADMIN_USER_LOGIN;
+        $password = $passwordHelper->hash(UsersManager::getPasswordHash(self::ADMIN_USER_PASSWORD));
+        $token    = APIUsersManager::getInstance()->createTokenAuth($login);
 
         $model = new \Piwik\Plugins\UsersManager\Model();
+        $user  = $model->getUser($login);
+
         if ($removeExisting) {
             $model->deleteUserOnly($login);
         }
 
-        $user = $model->getUser($login);
-
-        if (empty($user)) {
+        if (!empty($user) && !$removeExisting) {
+            $token = $user['token_auth'];
+        }
+        if (empty($user) || $removeExisting) {
             $model->addUser($login, $password, 'hello@example.org', $login, $token, Date::now()->getDatetime());
         } else {
             $model->updateUser($login, $password, 'hello@example.org', $login, $token);
         }
 
-        if (empty($user['superuser_access'])) {
-            $model->setSuperUserAccess($login, true);
-        }
+        $setSuperUser = empty($user) || !empty($user['superuser_access']);
+        $model->setSuperUserAccess($login, $setSuperUser);
 
         return $model->getUserByTokenAuth($token);
     }