diff --git a/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php b/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php index adf6b8012a03b0da3a74e1de91e70f3a3b1feb0c..ead790e0ab5565ef152a5b954dd8f3a7b0fe0226 100644 --- a/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php +++ b/apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php @@ -37,7 +37,8 @@ class OpenStackV3 extends AuthMechanism { ->setScheme(self::SCHEME_OPENSTACK) ->setText($l->t('OpenStack v3')) ->addParameters([ - new DefinitionParameter('userid', $l->t('User Id')), + new DefinitionParameter('user', $l->t('Username')), + new DefinitionParameter('domain', $l->t('Domain')), (new DefinitionParameter('password', $l->t('Password'))) ->setType(DefinitionParameter::VALUE_PASSWORD), new DefinitionParameter('url', $l->t('Identity endpoint URL')) diff --git a/apps/files_external/lib/Lib/Storage/Swift.php b/apps/files_external/lib/Lib/Storage/Swift.php index 2f8207cac4f8775428c4831a77f427152396fbe6..a638169dcb2fa6e67275fc934139e3e35c4783f1 100644 --- a/apps/files_external/lib/Lib/Storage/Swift.php +++ b/apps/files_external/lib/Lib/Storage/Swift.php @@ -162,7 +162,7 @@ class Swift extends \OC\Files\Storage\Common { throw new StorageBadConfigException("API Key or password, Username, Bucket and Region have to be configured."); } - $user = isset($params['user']) ? $params['user'] : $params['userid']; + $user = $params['user']; $this->id = 'swift::' . $user . md5($params['bucket']); $bucketUrl = new Uri($params['bucket']); @@ -181,10 +181,13 @@ class Swift extends \OC\Files\Storage\Common { $params['autocreate'] = true; - if (isset($params['userid'])) { + if (isset($params['domain'])) { $params['user'] = [ - 'id' => $params['userid'], - 'password' => $params['password'] + 'name' => $params['user'], + 'password' => $params['password'], + 'domain' => [ + 'name' => $params['domain'], + ] ]; }