Basic authentication not working for Extract using HTTP Client #605 (#608)

src/Core/Client/Adapter/Http.php

@@ -73,6 +73,18 @@ class Http extends Configurable implements AdapterInterface
             ]
         );
 
+        // 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'])
+            );
+        }
+
         if (Request::METHOD_POST == $method) {
             if ($request->getFileUpload()) {
                 $boundary = '----------'.md5(time());
@@ -114,18 +126,6 @@ class Http extends Configurable implements AdapterInterface
             }
         }
 
-        // 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'])
-            );
-        }
-
         $headers = $request->getHeaders();
         if (count($headers) > 0) {
             stream_context_set_option(