From 3e849daf11ad3c30143f2903fb7b528ef1f7da14 Mon Sep 17 00:00:00 2001 From: Julien Lutran Date: Wed, 19 Feb 2020 11:23:51 +0100 Subject: Fix issues with Keystone auth v3 in files_external app Signed-off-by: Julien Lutran --- apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php | 1 + apps/files_external/lib/Lib/Backend/Swift.php | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'apps/files_external/lib') 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), -- cgit v1.2.3