diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2020-03-18 06:04:12 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-18 06:04:12 +0300 |
commit | f0c246cb3a4db3021da7552f6779d56613799414 (patch) | |
tree | 42ddf7a9c2e086df78ffc40dfc23af74f8dd3a39 /tests/resources | |
parent | e493fee87c983e02001a7d9438cefe58141a38af (diff) |
App specific token_auths (#15410)
* some initial work
* add security page
* backing up some code
* more functionality
* adjust more UI parts
* adjust more code
* more tweaks
* add todo note
* few tweaks
* make sure date is in right format
* fix not existing column
* few fixes
* available hashes
* use different hash algo so tests run on php 5
* fix name of aglorithm
* trying to fix some tests
* another try to fix some tests
* more fixes
* more fixes
* few fixes
* update template
* fix some tests
* fix test
* fixing some tests
* various test fixes
* more fixes
* few more tests
* more tests
* various tweaks
* add translations
* add some ui tests
* fix selector
* tweaks
* trying to fix some ui tests
* fallback to regular authentication if needed
* fix call authenticate on null
* fix user settings
* fix some tests
* few fixes
* fix more ui tests
* update schema
* Update plugins/CoreHome/angularjs/widget-loader/widgetloader.directive.js
Co-Authored-By: Stefan Giehl <stefan@matomo.org>
* fix maps are not showing data
* trying to fix some tests
* set correct token
* trying to fix tracking failure
* minor tweaks and fixes
* fix more tests
* fix screenshot test
* trigger event so brute force logic is executed
* test no fallback to actual authentication
* allow fallback
* apply review feedback
* fix some tests
* fix tests
* make sure location values from query params are limited properly before attempting a db insert
* make sure plugin uninstall migration reloads plugins, make sure 4.0.0-b1 migration removes unique index that is no longer used, use defaults extra file in SqlDump to get test to run on travis
* Fix UI tests.
* update expected screenshot
Co-authored-by: Stefan Giehl <stefan@matomo.org>
Co-authored-by: diosmosis <diosmosis@users.noreply.github.com>
Diffstat (limited to 'tests/resources')
-rw-r--r-- | tests/resources/install-matomo.php | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/tests/resources/install-matomo.php b/tests/resources/install-matomo.php index d43cc699f6..741471c6bc 100644 --- a/tests/resources/install-matomo.php +++ b/tests/resources/install-matomo.php @@ -86,24 +86,20 @@ function createSuperUser() { $login = 'superUserLogin'; $password = $passwordHelper->hash(UsersManager::getPasswordHash('superUserPass')); - $token = UsersManagerAPI::getInstance()->createTokenAuth($login); $model = new \Piwik\Plugins\UsersManager\Model(); $user = $model->getUser($login); - if (!empty($user)) { - $token = $user['token_auth']; - } if (empty($user)) { - $model->addUser($login, $password, 'hello@example.org', $login, $token, Date::now()->getDatetime()); + $model->addUser($login, $password, 'hello@example.org', $login, Date::now()->getDatetime()); } else { - $model->updateUser($login, $password, 'hello@example.org', $login, $token); + $model->updateUser($login, $password, 'hello@example.org', $login); } $setSuperUser = empty($user) || !empty($user['superuser_access']); $model->setSuperUserAccess($login, $setSuperUser); - return $model->getUserByTokenAuth($token); + return $model->getUser($login); } function createWebsite($dateTime) |