Merge pull request #315 from pplant/session.authentication.fix

Session authentication fix

Author: gcatanese

lib/adyen/client.rb

@@ -107,6 +107,10 @@ def service_url_base(service)
         when 'PosMobile'
           url = "https://checkout-#{@env}.adyen.com/checkout/possdk"
           supports_live_url_prefix = true
+        when 'SessionAuthentication'
+          subdomain = @env == :live ? "authe-#{@env}" : @env
+          url = "https://#{subdomain}.adyen.com/authe/api"
+          supports_live_url_prefix = false
         else
           raise ArgumentError, 'Invalid service specified'
         end
@@ -140,7 +144,7 @@ def service_url(service, action, version)
     def call_adyen_api(service, action, request_data, headers, version, _with_application_info: false)
       # get URL for requested endpoint
       url = service_url(service, action.is_a?(String) ? action : action.fetch(:url), version)
-
+      
       auth_type = auth_type(service, request_data)
 
       # initialize Faraday connection object
@@ -223,6 +227,9 @@ def call_adyen_api(service, action, request_data, headers, version, _with_applic
         when 403
           full_message = build_error_message(response.body, 'Authorisation error')
           raise Adyen::PermissionError.new(full_message, request_data, response.body)
+        when 404
+          full_message = build_error_message(response.body, 'Not found error')
+          raise Adyen::NotFoundError.new(full_message, request_data, response.body)
         when 422
           full_message = build_error_message(response.body, 'Validation error')
           raise Adyen::ValidationError.new(full_message, request_data, response.body)
@@ -368,8 +375,10 @@ def build_error_message(response_body, default_message)
       full_message = default_message
       begin
         error_details = response_body
+        error_details = JSON.parse(response_body, symbolize_names: true) if response_body.is_a?(String)
+
         # check different attributes to support both RFC 7807 and legacy models
-        message = error_details[:detail] || error_details[:message]
+        message = error_details[:detail] || error_details[:message]  || error_details
         error_code = error_details[:errorCode]
         if message && error_code
           full_message = "#{message} ErrorCode: #{error_code}"

lib/adyen/errors.rb

@@ -105,6 +105,12 @@ def initialize(msg, request)
     end
   end
 
+  class NotFoundError < AdyenError
+    def initialize(msg, request, response)
+      super(request, response, msg, 404)
+    end
+  end
+
   # catchall for errors which don't have more specific classes
   class APIError < AdyenError
     def initialize(msg, request, response, code)

spec/client_spec.rb

@@ -303,6 +303,18 @@
       .to eq('https://ca-test.adyen.com/ca/services/DisputesService')
   end  
 
+  it 'checks the creation of SessionAuthentication url for the test env' do
+    client = Adyen::Client.new(env: :test)
+    expect(client.service_url_base('SessionAuthentication'))
+      .to eq('https://test.adyen.com/authe/api')
+  end
+
+  it 'checks the creation of SessionAuthentication url for the live env' do
+    client = Adyen::Client.new(env: :live)
+    expect(client.service_url_base('SessionAuthentication'))
+      .to eq('https://authe-live.adyen.com/authe/api')
+  end
+
   it 'raises FormatError on 400 response and checks content' do
     client = Adyen::Client.new(api_key: 'api_key', env: :test)
     mock_faraday_connection = double(Faraday::Connection)
@@ -401,4 +413,22 @@
       expect(error.msg).to eq('Unexpected error. ErrorCode: 999')
     end
   end
+
+  it 'raises NotFoundError on 404 response and checks content' do
+    client = Adyen::Client.new(api_key: 'api_key', env: :test)
+    mock_faraday_connection = double(Faraday::Connection)
+    error_body = "701 Version 71 is not supported, latest version: 68"
+    mock_response = Faraday::Response.new(status: 404, body: error_body)
+
+    allow(Faraday).to receive(:new).and_return(mock_faraday_connection)
+    allow(mock_faraday_connection).to receive_message_chain(:headers, :[]=)
+    allow(mock_faraday_connection).to receive(:post).and_return(mock_response)
+
+    expect {
+      client.checkout.payments_api.payments({})
+    }.to raise_error(Adyen::NotFoundError) do |error|
+      expect(error.code).to eq(404)
+      expect(error.msg).to eq('Not found error')
+    end
+  end
 end