Merge pull request #19540 from jlutran/fixKeystoneV3Auth

Fix issues with Keystone auth v3 in files_external app

Author: MorrisJobke

apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php

@@ -46,6 +46,7 @@ public function __construct(IL10N $l) {
 				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'))
 			])
 		;

apps/files_external/lib/Lib/Backend/Swift.php

@@ -44,8 +44,7 @@ public function __construct(IL10N $l, OpenStackV2 $openstackAuth, Rackspace $rac
 			->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),

lib/private/Files/ObjectStore/SwiftFactory.php

@@ -119,6 +119,10 @@ private function getClient() {
 		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'];