From 812ea354d08d675b844d60096cdcd9269c3645b8 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 21 Feb 2018 16:26:58 +0100 Subject: [PATCH] User proper username + pass Signed-off-by: Roeland Jago Douma --- lib/private/Files/ObjectStore/SwiftFactory.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/private/Files/ObjectStore/SwiftFactory.php b/lib/private/Files/ObjectStore/SwiftFactory.php index 5a11d2c7592..9513cdc3ab8 100644 --- a/lib/private/Files/ObjectStore/SwiftFactory.php +++ b/lib/private/Files/ObjectStore/SwiftFactory.php @@ -79,7 +79,7 @@ class SwiftFactory { $this->params['autocreate'] = false; } if (isset($this->params['user']) && is_array($this->params['user'])) { - $userName = $this->params['user']['id']; + $userName = $this->params['user']['name']; } else { if (!isset($this->params['username']) && isset($this->params['user'])) { $this->params['username'] = $this->params['user']; @@ -102,7 +102,7 @@ class SwiftFactory { 'handler' => HandlerStack::create() ]); - if (isset($this->params['user']) && isset($this->params['user']['id'])) { + if (isset($this->params['user']) && isset($this->params['user']['name'])) { return $this->auth(IdentityV3Service::factory($httpClient), $cacheKey); } else { return $this->auth(IdentityV2Service::factory($httpClient), $cacheKey);