Added endpoint authentication support to adapters

julienlegros · Jan 22, 2013 · 3784276 · 3784276
1 parent c4a8b6a
commit 3784276
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/library/Solarium/Core/Client/Adapter/Http.php b/library/Solarium/Core/Client/Adapter/Http.php
@@ -127,7 +127,10 @@ public function createContext($request, $endpoint)
             }
         }
 
-        $authData = $request->getAuthentication();
+        // Try endpoint authentication first, fallback to request for backwards compatibility
+        $authData = $endpoint->getAuthentication();
+        if(empty($authData['username'])) $authData = $request->getAuthentication();
+
         if ( !empty($authData['username']) && !empty($authData['password'])) {
             $request->addHeader('Authorization: Basic ' . base64_encode($authData['username']. ':' . $authData['password'] ));
         }

diff --git a/library/Solarium/Core/Client/Adapter/PeclHttp.php b/library/Solarium/Core/Client/Adapter/PeclHttp.php
@@ -150,7 +150,10 @@ public function toHttpRequest($request, $endpoint)
             }
         }
 
-        $authData = $request->getAuthentication();
+        // Try endpoint authentication first, fallback to request for backwards compatibility
+        $authData = $endpoint->getAuthentication();
+        if(empty($authData['username'])) $authData = $request->getAuthentication();
+
         if ( !empty($authData['username']) && !empty($authData['password'])) {
             $headers['Authorization'] = 'Basic ' . base64_encode($authData['username']. ':' . $authData['password'] );
         }