Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJulien Lutran <julien.lutran@corp.ovh.com>2020-02-19 13:23:51 +0300
committerChristoph Wurst <christoph@winzerhof-wurst.at>2020-04-15 11:33:08 +0300
commit3e849daf11ad3c30143f2903fb7b528ef1f7da14 (patch)
tree00f5cb72a72ce559f335439a6a2c416afae7762b /lib
parentd63abebc937583f2f97e58dc2887d88b6c6d13ee (diff)
Fix issues with Keystone auth v3 in files_external app
Signed-off-by: Julien Lutran <julien.lutran@corp.ovh.com>
Diffstat (limited to 'lib')
-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 59446576400..7c8a1b995b4 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'];