Backport: If a http with a payload returns a 401, then return a respo…

…nse instead of an error cherry-picked from: 9eeaf22 - This is to allow handling of 401 responses due to lack of user permissions [#132849945] Signed-off-by: Dennis Leon <[email protected]>
istvanballok · Nov 1, 2016 · 8b27e12 · 8b27e12
1 parent 6d4aba5
commit 8b27e12
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/bosh_cli/lib/cli/client/director.rb b/bosh_cli/lib/cli/client/director.rb
@@ -875,7 +875,11 @@ def perform_http_request(method, uri, payload = nil, headers = {}, &block)
           }, &block)
 
           if !response.nil? && response.code == 401
-            if @credentials.nil? || !payload.nil? || !@credentials.refresh
+            if !payload.nil?
+              return response
+            end
+
+            if @credentials.nil? || !@credentials.refresh
               raise AuthError
             end
 

diff --git a/bosh_cli/spec/unit/client/director_spec.rb b/bosh_cli/spec/unit/client/director_spec.rb
@@ -197,7 +197,7 @@
             with(headers: { 'Content-Type' => 'application/json' }).
             to_return(body: '{"version":258}', status: 401)
 
-          expect { @director.post('/path', 'application/json', 'binary data') }.to raise_error(Bosh::Cli::AuthError)
+          expect { @director.post('/path', 'application/json', 'binary data') }.to raise_error(Bosh::Cli::DirectorError, /HTTP 401/)
         end
       end
 
@@ -226,7 +226,7 @@
 
           expect(credentials).to receive(:refresh).once
 
-          expect {@director.post('/path', 'application/json', 'binary data')}.to raise_error(Bosh::Cli::AuthError)
+          expect {@director.post('/path', 'application/json', 'binary data')}.to raise_error(Bosh::Cli::DirectorError, /HTTP 401/)
         end
 
         it 'should not refresh the token before making a request without a body' do