summaryrefslogtreecommitdiffstats
path: root/apps/files_external
diff options
context:
space:
mode:
authorJulien Lutran <julien.lutran@corp.ovh.com>2020-02-19 11:23:51 +0100
committerChristoph Wurst <christoph@winzerhof-wurst.at>2020-04-15 10:33:08 +0200
commit3e849daf11ad3c30143f2903fb7b528ef1f7da14 (patch)
tree00f5cb72a72ce559f335439a6a2c416afae7762b /apps/files_external
parentd63abebc937583f2f97e58dc2887d88b6c6d13ee (diff)
downloadnextcloud-server-3e849daf11ad3c30143f2903fb7b528ef1f7da14.tar.gz
nextcloud-server-3e849daf11ad3c30143f2903fb7b528ef1f7da14.zip
Fix issues with Keystone auth v3 in files_external app
Signed-off-by: Julien Lutran <julien.lutran@corp.ovh.com>
Diffstat (limited to 'apps/files_external')
-rw-r--r--apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php1
-rw-r--r--apps/files_external/lib/Lib/Backend/Swift.php3
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php b/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php
index c8a78f52c41..ee6db4818a6 100644
--- a/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php
+++ b/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php
@@ -46,6 +46,7 @@ class OpenStackV3 extends AuthMechanism {
new DefinitionParameter('domain', $l->t('Domain')),
(new DefinitionParameter('password', $l->t('Password')))
->setType(DefinitionParameter::VALUE_PASSWORD),
+ new DefinitionParameter('tenant', $l->t('Tenant name')),
new DefinitionParameter('url', $l->t('Identity endpoint URL'))
])
;
diff --git a/apps/files_external/lib/Lib/Backend/Swift.php b/apps/files_external/lib/Lib/Backend/Swift.php
index 25ed72337a1..5ac4346b422 100644
--- a/apps/files_external/lib/Lib/Backend/Swift.php
+++ b/apps/files_external/lib/Lib/Backend/Swift.php
@@ -44,8 +44,7 @@ class Swift extends Backend {
->addParameters([
(new DefinitionParameter('service_name', $l->t('Service name')))
->setFlag(DefinitionParameter::FLAG_OPTIONAL),
- (new DefinitionParameter('region', $l->t('Region')))
- ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+ new DefinitionParameter('region', $l->t('Region')),
new DefinitionParameter('bucket', $l->t('Bucket')),
(new DefinitionParameter('timeout', $l->t('Request timeout (seconds)')))
->setFlag(DefinitionParameter::FLAG_OPTIONAL),