diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-05-18 11:52:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-18 11:52:12 +0200 |
| commit | 883e5196085137270f4e4ccfb98f807fb34ae4f9 (patch) | |
| tree | b902b1642abb5317de4551563924d3c60c1f2c1b /lib | |
| parent | 9033d57e39eb340636c1afa6d847eba3a12f15f7 (diff) | |
| parent | 1a990b9487041d251264b51902a2bc07a5d4707b (diff) | |
| download | nextcloud-server-883e5196085137270f4e4ccfb98f807fb34ae4f9.tar.gz nextcloud-server-883e5196085137270f4e4ccfb98f807fb34ae4f9.zip | |
Merge pull request #20994 from nextcloud/backport/19540/stable18
[stable18] Fix issues with Keystone auth v3 in files_external app
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Files/ObjectStore/SwiftFactory.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/Files/ObjectStore/SwiftFactory.php b/lib/private/Files/ObjectStore/SwiftFactory.php index 93ff02f1f8b..9aa8c13b038 100644 --- a/lib/private/Files/ObjectStore/SwiftFactory.php +++ b/lib/private/Files/ObjectStore/SwiftFactory.php @@ -119,6 +119,10 @@ class SwiftFactory { if (!isset($this->params['tenantName']) && isset($this->params['tenant'])) { $this->params['tenantName'] = $this->params['tenant']; } + if (isset($this->params['domain'])) { + $this->params['scope']['project']['name'] = $this->params['tenant']; + $this->params['scope']['project']['domain']['name'] = $this->params['domain']; + } $this->params = array_merge(self::DEFAULT_OPTIONS, $this->params); $cacheKey = $userName . '@' . $this->params['url'] . '/' . $this->params['container']; |