diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2018-02-21 16:26:58 +0100 |
|---|---|---|
| committer | Robin Appelman <robin@icewind.nl> | 2018-02-26 14:54:18 +0100 |
| commit | 812ea354d08d675b844d60096cdcd9269c3645b8 (patch) | |
| tree | f2db576f8a2b441c785aface55582e1a4900f05e /lib | |
| parent | fe05ecfd16c6f8d0317b0fcbeeea2235cb0c187a (diff) | |
| download | nextcloud-server-812ea354d08d675b844d60096cdcd9269c3645b8.tar.gz nextcloud-server-812ea354d08d675b844d60096cdcd9269c3645b8.zip | |
User proper username + pass
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Files/ObjectStore/SwiftFactory.php | 4 |
1 files 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); |