User proper username + pass

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
nextcloud · Feb 21, 2018 · 97919c8 · 97919c8
1 parent 39b2e15
commit 97919c8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/private/Files/ObjectStore/SwiftFactory.php b/lib/private/Files/ObjectStore/SwiftFactory.php
@@ -79,7 +79,7 @@ private function getClient() {
 			$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 @@ private function getClient() {
 			'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);