diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2018-07-18 07:47:13 +0300 |
|---|---|---|
| committer | diosmosis <diosmosis@users.noreply.github.com> | 2018-07-18 07:47:13 +0300 |
| commit | 105e007721b5c0ea12ff2596d8d82c721021fb4e (patch) | |
| tree | 558162844ba663781fdf0ec691642f0dc453e94e /config | |
| parent | 74334d8d0908910ed3cc4a9a918436d9f9ccc3f6 (diff) | |
Introducing a new role "write" and possibility to define capabilities (#13163)
* started working on some ACL concept
* acl implementation
* add category
* small tweaks
* more tweaks
* more api methods and fixes
* cache capabilities
* various enhancements, fixes, tweaks
* more tweaks
* added more tests and fixed some bugs
* fix parameter
* make sure to be BC
* make sure to be BC
* fix some tests
* more apis, translations, changelog entry, ...
* update db
* correct error message
* fix capabilities were not detected in tests
* directly access provider
* fix and add test
* JS api to check capabilities, better structure for capabilities in tests
* add ability to inject permissions
* apply review changes
* fix test
Diffstat (limited to 'config')
| -rw-r--r-- | config/environment/test.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/config/environment/test.php b/config/environment/test.php index 8e75e1d970..2ac39275b8 100644 --- a/config/environment/test.php +++ b/config/environment/test.php @@ -45,13 +45,21 @@ return array( if ($testUseMockAuth) { $idSitesAdmin = $c->get('test.vars.idSitesAdminAccess'); $idSitesView = $c->get('test.vars.idSitesViewAccess'); + $idSitesWrite = $c->get('test.vars.idSitesWriteAccess'); + $idSitesCapabilities = $c->get('test.vars.idSitesCapabilities'); $access = new FakeAccess(); if (!empty($idSitesView)) { FakeAccess::$superUser = false; FakeAccess::$idSitesView = $idSitesView; + FakeAccess::$idSitesWrite = !empty($idSitesWrite) ? $idSitesWrite : array(); FakeAccess::$idSitesAdmin = !empty($idSitesAdmin) ? $idSitesAdmin : array(); FakeAccess::$identity = 'viewUserLogin'; + } elseif (!empty($idSitesWrite)) { + FakeAccess::$superUser = false; + FakeAccess::$idSitesWrite = !empty($idSitesWrite) ? $idSitesWrite : array(); + FakeAccess::$idSitesAdmin = !empty($idSitesAdmin) ? $idSitesAdmin : array(); + FakeAccess::$identity = 'writeUserLogin'; } elseif (!empty($idSitesAdmin)) { FakeAccess::$superUser = false; FakeAccess::$idSitesAdmin = $idSitesAdmin; @@ -60,6 +68,9 @@ return array( FakeAccess::$superUser = true; FakeAccess::$superUserLogin = 'superUserLogin'; } + if (!empty($idSitesCapabilities)) { + FakeAccess::$idSitesCapabilities = (array) $idSitesCapabilities; + } return $access; } else { return $previous; |