- Incorporate Business::OnlinePayment::AuthorizeNet::AIM::ErrorCodes by

[Business-OnlinePayment-AuthorizeNet.git] / AuthorizeNet / AIM.pm

diff --git a/AuthorizeNet/AIM.pm b/AuthorizeNet/AIM.pm
index 5324e51..0039502 100644 (file)
--- a/AuthorizeNet/AIM.pm
+++ b/AuthorizeNet/AIM.pm
@@ -2,17 +2,14 @@ package Business::OnlinePayment::AuthorizeNet::AIM;
 
 use strict;
 use Carp;
+use Business::OnlinePayment::HTTPS;
 use Business::OnlinePayment::AuthorizeNet;
-use Net::SSLeay qw/make_form post_https make_headers/;
+use Business::OnlinePayment::AuthorizeNet::AIM::ErrorCodes '%ERRORS';
 use Text::CSV_XS;
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
 
-require Exporter;
-
-@ISA = qw(Exporter Business::OnlinePayment::AuthorizeNet);
-@EXPORT = qw();
-@EXPORT_OK = qw();
-$VERSION = '3.21';
+@ISA = qw(Business::OnlinePayment::AuthorizeNet Business::OnlinePayment::HTTPS);
+$VERSION = '3.22';
 
 sub set_defaults {
     my $self = shift;
@@ -59,10 +56,6 @@ sub map_fields {
     $content{'account_type'} = $account_types{lc($content{'account_type'})}
                                || $content{'account_type'};
 
-    $content{'referer'} = defined( $content{'referer'} )
-                            ? make_headers( 'Referer' => $content{'referer'} )
-                            : "";
-
     if (length $content{'password'} == 15) {
         $content{'transaction_key'} = delete $content{'password'};
     }
@@ -229,25 +222,50 @@ sub submit {
       $post_data{'x_Email_Customer'} = 'FALSE';
     }
 
+    my $data_string = join("", values %post_data);
+
+    my $encap_character;
+    # The first set of characters here are recommended by authorize.net in their
+    #   encapsulating character example.
+    # The second set we made up hoping they will work if the first fail.
+    # The third chr(31) is the binary 'unit separator' and is our final last
+    #   ditch effort to find something not in the input.
+    foreach my $char( qw( | " ' : ; / \ - * ), '#', qw( ^ + < > [ ] ~), chr(31) ){
+      if( index($data_string, $char) == -1 ){ # found one.
+        $encap_character = $char;
+        last;
+      }
+    }
+
+    if(!$encap_character){
+      $self->is_success(0);
+      $self->error_message(
+                          "DEBUG: Input contains all encapsulating characters."
+                          . " Please remove | or ^ from your input if possible."
+                         );
+      return;
+    }
+
     $post_data{'x_ADC_Delim_Data'} = 'TRUE';
     $post_data{'x_delim_char'} = ',';
-    $post_data{'x_encap_char'} = '"';
+    $post_data{'x_encap_char'} = $encap_character;
     $post_data{'x_ADC_URL'} = 'FALSE';
     $post_data{'x_Version'} = '3.1';
 
-    my $pd = make_form(%post_data);
-    my $s = $self->server();
-    my $p = $self->port();
-    my $t = $self->path();
-    my $r = $self->{_content}->{referer};
-    my($page,$server_response,%headers) = post_https($s,$p,$t,$r,$pd);
+    my $opt = defined( $self->{_content}->{referer} )
+                ? { 'headers' => { 'Referer' => $self->{_content}->{referer} } }
+                : {};
+
+    my($page, $server_response, %headers) =
+      $self->https_post( $opt, \%post_data );
+
     #escape NULL (binary 0x00) values
     $page =~ s/\x00/\^0/g;
 
     #trim 'ip_addr="1.2.3.4"' added by eProcessingNetwork Authorize.Net compat
     $page =~ s/,ip_addr="[\d\.]+"$//;
 
-    my $csv = new Text::CSV_XS({ binary=>1, escape_char=>'' });
+    my $csv = new Text::CSV_XS({ binary=>1, escape_char=>'', quote_char => $encap_character });
     $csv->parse($page);
     my @col = $csv->fields();
 
@@ -270,7 +288,11 @@ sub submit {
         $self->is_success(0);
         $self->result_code($col[2]);
         $self->error_message($col[3]);
-        unless ( $self->result_code() ) { #additional logging information
+        if ( $self->result_code ) {
+          my $addl = $ERRORS{ $self->result_code };
+          $self->error_message( $self->error_message. ' - '. $addl->{notes})
+            if $addl && ref($addl) eq 'HASH' && $addl->{notes};
+        } else { #additional logging information
           #$page =~ s/\x00/\^0/g;
           $self->error_message($col[3].
             " DEBUG: No x_response_code from server, ".