aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/Files
diff options
context:
space:
mode:
authorJulien Lutran <julien.lutran@corp.ovh.com>2020-02-19 11:23:51 +0100
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2020-05-15 15:19:36 +0000
commit1a990b9487041d251264b51902a2bc07a5d4707b (patch)
tree0481bcafef35c73d268a94f3bd15a739f3693c93 /lib/private/Files
parent62950e9f9b7dab0b2d8fb886bd878cf2513d135c (diff)
downloadnextcloud-server-1a990b9487041d251264b51902a2bc07a5d4707b.tar.gz
nextcloud-server-1a990b9487041d251264b51902a2bc07a5d4707b.zip
Fix issues with Keystone auth v3 in files_external app
Signed-off-by: Julien Lutran <julien.lutran@corp.ovh.com>
Diffstat (limited to 'lib/private/Files')
-rw-r--r--lib/private/Files/ObjectStore/SwiftFactory.php4
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'];