Revert "Always set header in batch mode" (lynndylanhurley#1161)

This reverts commit 1c4e1d0.

app/controllers/devise_token_auth/concerns/set_user_by_token.rb

@@ -135,22 +135,13 @@ def update_auth_header
           if @is_batch_request
             auth_header = @resource.extend_batch_buffer(@token, @client_id)
 
-            # Do not return token for batch requests to avoid invalidated
-            # tokens returned to the client in case of race conditions.
-            # Use a blank string for the header to still be present and
-            # being passed in a XHR response in case of
-            # 304 Not Modified responses.
-            auth_header[DeviseTokenAuth.headers_names[:"access-token"]] = ' '
-            auth_header[DeviseTokenAuth.headers_names[:"expiry"]] = ' '
-
           # update Authorization response header with new token
           else
             auth_header = @resource.create_new_auth_token(@client_id)
-          end
-
-          # update the response header
-          response.headers.merge!(auth_header)
 
+            # update the response header
+            response.headers.merge!(auth_header)
+          end
         end # end lock
       end # end ensure_pristine_resource
     end

test/controllers/demo_mang_controller_test.rb

@@ -216,7 +216,7 @@ class DemoMangControllerTest < ActionDispatch::IntegrationTest
           end
 
           it 'should not return auth headers for second (batched) requests' do
-            assert_equal ' ', @second_access_token
+            refute @second_access_token
           end
         end
 
@@ -284,3 +284,4 @@ class DemoMangControllerTest < ActionDispatch::IntegrationTest
     end
   end
 end
+

test/controllers/demo_user_controller_test.rb

@@ -217,7 +217,7 @@ class DemoUserControllerTest < ActionDispatch::IntegrationTest
           end
 
           it 'should not return auth headers for second (batched) requests' do
-            assert_equal ' ', @second_access_token
+            refute @second_access_token
           end
         end