diff --git a/lib/ably/auth.rb b/lib/ably/auth.rb index 0befcb27..06b4598d 100644 --- a/lib/ably/auth.rb +++ b/lib/ably/auth.rb @@ -425,7 +425,7 @@ def extra_auth_headers # spec - RSA7e # @return string def client_id_for_request - options[:client_id] if options[:client_id] && using_basic_auth? + options[:client_id] end # Auth params used in URI endpoint for Realtime connections diff --git a/spec/acceptance/realtime/client_spec.rb b/spec/acceptance/realtime/client_spec.rb index a4f50ae9..b392d118 100644 --- a/spec/acceptance/realtime/client_spec.rb +++ b/spec/acceptance/realtime/client_spec.rb @@ -142,8 +142,7 @@ context 'and an explicit client_id in ClientOptions' do let(:client_id) { random_str } - # Skipped because more clarification needed on RSA7e, see https://github.com/ably/ably-ruby/issues/425 - xit 'allows uses the explicit client_id in the connection' do + it 'allows uses the explicit client_id in the connection' do connection.__incoming_protocol_msgbus__.subscribe(:protocol_message) do |protocol_message| if protocol_message.action == :connected expect(protocol_message.connection_details.client_id).to eql(client_id) diff --git a/spec/acceptance/realtime/connection_spec.rb b/spec/acceptance/realtime/connection_spec.rb index 8827257a..36ca720f 100644 --- a/spec/acceptance/realtime/connection_spec.rb +++ b/spec/acceptance/realtime/connection_spec.rb @@ -383,12 +383,11 @@ def publish_and_check_disconnect(options = {}) let(:client_id) { random_str } let(:client_options) { default_options.merge(client_id: 'incompatible', token: token_string, key: nil, log_level: :none) } - # Skipped because more clarification needed on RSA7e, see https://github.com/ably/ably-ruby/issues/425 - xit 'fails the connection' do + it 'fails the connection' do expect(client.client_id).to eql('incompatible') client.connection.once(:failed) do expect(client.client_id).to eql('incompatible') - expect(client.connection.error_reason.code).to eql(40101) # Invalid clientId for credentials + expect(client.connection.error_reason.code).to eql(40102) # Incompatible clientId for credentials stop_reactor end end