diff options
| -rw-r--r-- | plugins/Login/Auth.php | 2 | ||||
| -rwxr-xr-x | tests/PHPUnit/IntegrationTestCase.php | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/plugins/Login/Auth.php b/plugins/Login/Auth.php index e83188a83f..1741841038 100644 --- a/plugins/Login/Auth.php +++ b/plugins/Login/Auth.php @@ -86,7 +86,7 @@ class Piwik_Login_Auth implements Piwik_Auth if ($this->token_auth !== null) { - echo "\nROOT LOGIN: '$rootLogin'\nROOT TOKEN: '$rootToken'\nAUTH SUPPLIED: '{$this->token_auth}\n'"; + echo "\nCHECKING AUTH - ROOT LOGIN: '$rootLogin'\nROOT TOKEN: '$rootPassword'\n"; } return new Piwik_Auth_Result( Piwik_Auth_Result::FAILURE, $this->login, $this->token_auth ); diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php index 360e453c28..31ee955d3c 100755 --- a/tests/PHPUnit/IntegrationTestCase.php +++ b/tests/PHPUnit/IntegrationTestCase.php @@ -572,7 +572,12 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase */ public static function getTokenAuth() { - return md5(Zend_Registry::get('config')->superuser->login . Zend_Registry::get('config')->superuser->password); + echo "GETTING TOKEN AUTH - LOGIN: '".Zend_Registry::get('config')->superuser->login."'\n". + "PASSWORD: '".Zend_Registry::get('config')->superuser->password."'\n"; + return Piwik_UsersManager_API::getInstance()->getTokenAuth( + Zend_Registry::get('config')->superuser->login, + Zend_Registry::get('config')->superuser->password + ); } /** |