Remove mutual exclusivity between PAT and API+App key auth

Author: tausman

.generator/src/generator/templates/api_client.j2

@@ -366,15 +366,7 @@ module {{ module_name }}
     # @param [Hash] query_params Query parameters
     # @param [String] auth_names Authentication scheme name
     def update_params_for_auth!(header_params, query_params, auth_names)
-      auth_names = Array(auth_names)
-
-      # When a bearer token (PAT) is configured, use Bearer auth exclusively
-      # instead of API key + App key.
-      if @config.access_token
-        auth_names = [:bearerAuth]
-      end
-
-      auth_names.each do |auth_name|
+      Array(auth_names).each do |auth_name|
         auth_setting = @config.auth_settings[auth_name]
         next unless auth_setting
         next if auth_setting[:value].nil? || auth_setting[:value].to_s.empty?

lib/datadog_api_client/api_client.rb

@@ -377,15 +377,7 @@ def build_request_url(path, opts = {})
     # @param [Hash] query_params Query parameters
     # @param [String] auth_names Authentication scheme name
     def update_params_for_auth!(header_params, query_params, auth_names)
-      auth_names = Array(auth_names)
-
-      # When a bearer token (PAT) is configured, use Bearer auth exclusively
-      # instead of API key + App key.
-      if @config.access_token
-        auth_names = [:bearerAuth]
-      end
-
-      auth_names.each do |auth_name|
+      Array(auth_names).each do |auth_name|
         auth_setting = @config.auth_settings[auth_name]
         next unless auth_setting
         next if auth_setting[:value].nil? || auth_setting[:value].to_s.empty?

spec/api_client_spec.rb

@@ -211,23 +211,29 @@
     let(:config) { DatadogAPIClient::Configuration.new }
     let(:api_client) { DatadogAPIClient::APIClient.new(config) }
 
-    context 'when bearer token (PAT) is configured' do
+    context 'when all auth credentials are configured' do
       before do
         config.api_key = 'test_api_key'
         config.application_key = 'test_app_key'
         config.access_token = 'ddpat_test_pat'
       end
 
-      it 'sends only Bearer Authorization header, no API key or app key' do
+      it 'sends all configured auth headers simultaneously' do
         header_params = {}
         query_params = {}
-        api_client.update_params_for_auth!(header_params, query_params, [:apiKeyAuth, :appKeyAuth])
+        api_client.update_params_for_auth!(header_params, query_params, [:apiKeyAuth, :appKeyAuth, :bearerAuth])
         expect(header_params['Authorization']).to eq('Bearer ddpat_test_pat')
-        expect(header_params).not_to have_key('DD-API-KEY')
-        expect(header_params).not_to have_key('DD-APPLICATION-KEY')
+        expect(header_params['DD-API-KEY']).to eq('test_api_key')
+        expect(header_params['DD-APPLICATION-KEY']).to eq('test_app_key')
       end
+    end
 
-      it 'sends only Bearer even when bearerAuth is already in auth_names' do
+    context 'when only bearer token is configured' do
+      before do
+        config.access_token = 'ddpat_test_pat'
+      end
+
+      it 'sends only Bearer header, skips empty API key and app key' do
         header_params = {}
         query_params = {}
         api_client.update_params_for_auth!(header_params, query_params, [:apiKeyAuth, :appKeyAuth, :bearerAuth])
@@ -237,16 +243,16 @@
       end
     end
 
-    context 'when bearer token is not configured' do
+    context 'when only API key and app key are configured' do
       before do
         config.api_key = 'test_api_key'
         config.application_key = 'test_app_key'
       end
 
-      it 'uses API key and app key, no Bearer header' do
+      it 'sends API key and app key, no Bearer header' do
         header_params = {}
         query_params = {}
-        api_client.update_params_for_auth!(header_params, query_params, [:apiKeyAuth, :appKeyAuth])
+        api_client.update_params_for_auth!(header_params, query_params, [:apiKeyAuth, :appKeyAuth, :bearerAuth])
         expect(header_params['DD-API-KEY']).to eq('test_api_key')
         expect(header_params['DD-APPLICATION-KEY']).to eq('test_app_key')
         expect(header_params).not_to have_key('Authorization')