afip_wsfe 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d8c89ca3694469f3c4c373a59f0211581eb1ce4
-  data.tar.gz: 95516b46686e0106d211d6614527e05e3ac857b5
+  metadata.gz: dc15950903b8df7c10b8e916138819dcbc297011
+  data.tar.gz: a7ddc21e6172a123c72db29db85f60d11be174f8
 SHA512:
-  metadata.gz: bc8aefda1c084f7cf580b32feb10969c32637035af58ac33564623ecb70ea6aa533aaf7a894462c8088a8ed07fc5251e9c5fec5ee1eba5d4194adbb5e91b8137
-  data.tar.gz: 90ee766a5f0077d26b4af8917c22c37632abbfad88065cd8a5a55958ee5ae1f9a13559173fba638e027982fd0cbe7a36f881afa8d7acbc7ba8c126075e1129d7
+  metadata.gz: 28bac366586ce202a93d2bca0e06b46131305ac7256b2ba3749371c791e86dcd029014968ec2e4221a1c0bf0472fefa1da0b9fc59df65eaf36d295fbdc92216e
+  data.tar.gz: 24210c6f314c98e6faa46c7f921c92b5f6a49dc21f24bb7d4315df0c1e85a553189d9798e5315cec7a5d34dbbd5d723ad9435369f8defd2a1f66af3195a55703

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/afip_wsfe.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: afip_wsfe 0.1.3 ruby lib
+# stub: afip_wsfe 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "afip_wsfe".freeze
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Paco Moreno".freeze]
-  s.date = "2018-07-02"
+  s.date = "2018-07-04"
   s.description = "Wrapper para usar web service de factura electr\u{f3}nica de AFIP".freeze
   s.email = "pakerimus@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -31,8 +31,8 @@ Gem::Specification.new do |s|
     "afip_wsfe.gemspec",
     "lib/afip_wsfe.rb",
     "lib/afip_wsfe/auth_data.rb",
-    "lib/afip_wsfe/authorizer.rb",
     "lib/afip_wsfe/bill.rb",
+    "lib/afip_wsfe/client.rb",
     "lib/afip_wsfe/constants.rb",
     "lib/afip_wsfe/version.rb",
     "lib/afip_wsfe/wsaa.rb",

data/lib/afip_wsfe/auth_data.rb

@@ -6,26 +6,33 @@ module AfipWsfe
 
       attr_accessor :todays_data_file_name
 
+      def auth_hash
+        fetch unless AfipWsfe.constants.include?(:TOKEN) && AfipWsfe.constants.include?(:SIGN)
+        
+        {
+          auth: {
+            token: AfipWsfe::TOKEN,
+            sign: AfipWsfe::SIGN,
+            cuit: AfipWsfe.cuit,
+          }
+        }
+      end
+
+      def todays_data_file_name
+        @todays_data_file ||= "/tmp/afip_wsfe_#{ AfipWsfe.cuit }_#{ Time.zone.today.strftime('%Y_%m_%d') }.yml"
+      end
+
+      private
+      
       def fetch
-        todays_data_file_exists = if File.exists?(todays_data_file_name)
-          true
-        else
+        unless File.exists?(todays_data_file_name)
           wsaa = AfipWsfe::Wsaa.new
           wsaa.login
         end
 
         YAML.load_file(todays_data_file_name).each do |k, v|
-          AfipWsfe.const_set(k.to_s.upcase, v) unless AfipWsfe.const_defined?(k.to_s.upcase)
-        end if todays_data_file_exists
-      end
-
-      def auth_hash
-        fetch unless AfipWsfe.constants.include?(:TOKEN) && AfipWsfe.constants.include?(:SIGN)
-        { 'Token' => AfipWsfe::TOKEN, 'Sign' => AfipWsfe::SIGN, 'Cuit' => AfipWsfe.cuit }
-      end
-
-      def todays_data_file_name
-        @todays_data_file ||= "/tmp/bravo_#{ AfipWsfe.cuit }_#{ Time.zone.today.strftime('%Y_%m_%d') }.yml"
+          AfipWsfe.const_set(k.to_s.upcase, v)
+        end
       end
 
       def remove

data/lib/afip_wsfe/bill.rb

@@ -1,39 +1,22 @@
 module AfipWsfe
   class Bill
-    attr_reader :client, :base_imp, :total
-    attr_accessor :net, :doc_num, :iva_cond, :documento, :concepto, :moneda,
-                  :due_date, :fch_serv_desde, :fch_serv_hasta, :fch_emision,
-                  :body, :response, :ivas, :nro_comprobante
+    attr_reader :base_imp, :total
+    attr_accessor :fch_emision, :fch_vto_pago, :fch_serv_desde, :fch_serv_hasta,
+                  :nro_comprobante, :doc_num, :net, 
+                  :iva_cond, :documento, :concepto, :moneda, :ivas, 
+                  :body, :response
 
     def initialize(attrs = {})
-      AfipWsfe.environment ||= :test
-      AfipWsfe::AuthData.fetch
-
-      @client = Savon.client(
-        wsdl:  AfipWsfe::URLS[AfipWsfe.environment][:wsfe],
-        namespaces: {
-          "xmlns:soapenv" => "http://schemas.xmlsoap.org/soap/envelope/",
-          "xmlns:ar" => "http://ar.gov.afip.dif.FEV1/"
-        },
-        log:       AfipWsfe.log?,
-        log_level: AfipWsfe.log_level || :debug,
-        ssl_cert_key_file: AfipWsfe.pkey,
-        ssl_cert_file:     AfipWsfe.cert,
-        ssl_verify_mode: :none,
-        read_timeout: 90,
-        open_timeout: 90,
-        headers: {
-          "Accept-Encoding" => "gzip, deflate",
-          "Connection" => "Keep-Alive"
-        }
-      )
+      @client   = AfipWsfe::Client.new
+      @endpoint = :wsfe
+      @response = nil
+      @status   = false
 
-      @body           = {"Auth" => AfipWsfe.auth_hash}
-      @net            = attrs[:net] || 0
-      self.documento  = attrs[:documento] || AfipWsfe.default_documento
-      self.moneda     = attrs[:moneda]    || AfipWsfe.default_moneda
+      self.net        = attrs[:net] || 0
       self.iva_cond   = attrs[:iva_cond]  || :responsable_monotributo
+      self.documento  = attrs[:documento] || AfipWsfe.default_documento
       self.concepto   = attrs[:concepto]  || AfipWsfe.default_concepto
+      self.moneda     = attrs[:moneda]    || AfipWsfe.default_moneda
       self.ivas       = attrs[:ivas]      || Array.new # [ 1, 100.00, 10.50 ], [ 2, 100.00, 21.00 ] 
     end
 
@@ -56,10 +39,8 @@ module AfipWsfe
 
     def exchange_rate
       return 1 if moneda == :peso
-      savon_response = client.call :fe_param_get_cotizacion do
-        body.merge!({"MonId" => AfipWsfe::MONEDAS[moneda][:codigo]})
-      end
-      savon_response.to_hash[:fe_param_get_cotizacion_response][:fe_param_get_cotizacion_result][:result_get][:mon_cotiz].to_f
+      @status, @response = @client.call_endpoint @endpoint, :fe_param_get_cotizacion, {"MonId" => AfipWsfe::MONEDAS[moneda][:codigo]}
+      @response[:result_get][:mon_cotiz].to_f
     end
 
     def total
@@ -75,16 +56,34 @@ module AfipWsfe
     end
 
     def authorize
-      body = setup_bill
-      savon_response = client.call(:fecae_solicitar, message: body)
-      setup_response(savon_response.to_hash)
+      setup_bill
+      @status, @response = @client.call_endpoint(@endpoint, :fecae_solicitar, self.body)
+      setup_response
       self.authorized?
     end
 
+    def last_bill_number
+      params = {"PtoVta" => AfipWsfe.sale_point, "CbteTipo" => cbte_type}
+      @status, @response = @client.call_endpoint @endpoint, :fe_comp_ultimo_autorizado, params
+      @response[:cbte_nro].to_i
+    end
+
+    def next_bill_number
+      last_bill_number + 1
+    end
+
+    def authorized?       
+      @response && @response[:header_result] == "A"
+    end
+
+    private
+
     def setup_bill
-      fecha_emision = (fch_emision || Time.zone.today).strftime('%Y%m%d')
+      today = Time.zone.today.strftime('%Y%m%d')
+
+      fecha_emision = (fch_emision || today)
 
-      nro_comprobante ||= next_bill_number
+      self.nro_comprobante ||= next_bill_number
 
       array_ivas = Array.new
       self.ivas.each{ |i|
@@ -96,7 +95,11 @@ module AfipWsfe
 
       fecaereq = {
         "FeCAEReq" => {
-          "FeCabReq" => AfipWsfe::Bill.header(cbte_type),
+          "FeCabReq" => {
+            "CantReg" => "1",
+            "CbteTipo" => cbte_type,
+            "PtoVta" => AfipWsfe.sale_point
+          },
           "FeDetReq" => {
             "FECAEDetRequest" => {
               "CbteDesde"   => nro_comprobante,
@@ -119,7 +122,7 @@ module AfipWsfe
       detail = fecaereq["FeCAEReq"]["FeDetReq"]["FECAEDetRequest"]
 
       if AfipWsfe.own_iva_cond == :responsable_monotributo
-        detail["ImpTotal"]  = net.to_f
+        detail["ImpTotal"]  = net.to_f.round(2)
       else
         detail["ImpIVA"]    = iva_sum
         detail["ImpTotal"]  = total.to_f.round(2)
@@ -129,52 +132,30 @@ module AfipWsfe
       unless concepto == "Productos" # En "Productos" ("01"), si se mandan estos parámetros la afip rechaza.
         detail.merge!({"FchServDesde" => fch_serv_desde || today,
                       "FchServHasta"  => fch_serv_hasta || today,
-                      "FchVtoPago"    => due_date       || today})
-      end
-
-      body.merge!(fecaereq)
-    end
-
-    def next_bill_number
-      var = {"Auth" => AfipWsfe.auth_hash,"PtoVta" => AfipWsfe.sale_point, "CbteTipo" => cbte_type}
-      resp = client.call :fe_comp_ultimo_autorizado do
-        message(var)
+                      "FchVtoPago"    => fch_vto_pago   || today})
       end
 
-      resp.to_hash[:fe_comp_ultimo_autorizado_response][:fe_comp_ultimo_autorizado_result][:cbte_nro].to_i + 1
-    end
-
-    def authorized?       
-      !response.nil? && response[:header_result] == "A" && response[:detail_result] == "A"
-    end
-
-    private
-
-    class << self
-      def header(cbte_type)#todo sacado de la factura
-        {"CantReg" => "1", "CbteTipo" => cbte_type, "PtoVta" => AfipWsfe.sale_point}
-      end
+      self.body = fecaereq
     end
 
-    def setup_response(the_response)
-      result = the_response[:fecae_solicitar_response][:fecae_solicitar_result]
-          
-      if not result[:fe_det_resp] or not result[:fe_cab_resp] then 
-          self.response = {
-            errores:       result[:errors],
+    def setup_response
+      if not @response[:fe_det_resp] or not @response[:fe_cab_resp]
+          @response = {
+            errores:       @response[:errors],
             header_result: {resultado: "X"},
+            detail_result: {resultado: "X"},
             observaciones:  nil
           }
           return
       end       
 
-      response_header = result[:fe_cab_resp]
-      response_detail = result[:fe_det_resp][:fecae_det_response]
+      response_header = @response[:fe_cab_resp]
+      response_detail = @response[:fe_det_resp][:fecae_det_response]
 
-      request_header  = body["FeCAEReq"]["FeCabReq"].underscore_keys.symbolize_keys
-      request_detail  = body["FeCAEReq"]["FeDetReq"]["FECAEDetRequest"].underscore_keys.symbolize_keys
+      request_header  = body["FeCAEReq"]["FeCabReq"].transform_keys { |key| key.to_s.downcase.to_sym }
+      request_detail  = body["FeCAEReq"]["FeDetReq"]["FECAEDetRequest"].transform_keys { |key| key.to_s.downcase.to_sym }
 
-      response_detail.merge!( result[:errors] ) if result[:errors]
+      response_detail.merge!( @response[:errors] ) if @response[:errors]
 
       self.response = {
         header_result: response_header.delete(:resultado),

data/lib/afip_wsfe/client.rb

@@ -0,0 +1,24 @@
+module AfipWsfe
+  class Client
+    def initialize(authenticate=true)
+      AfipWsfe.environment ||= :test
+      @auth = authenticate ? AfipWsfe.auth_hash : {}
+    end
+
+    def call_endpoint(endpoint, savon_method, params={})
+      return_key = endpoint == :wsaa ? :"#{savon_method}_return" : :"#{savon_method}_result"
+      
+      result = Savon.client(
+        log: AfipWsfe.log?,
+        log_level: AfipWsfe.log_level || :debug,
+        wsdl: "#{AfipWsfe::URLS[AfipWsfe.environment][endpoint]}?wsdl",
+        convert_request_keys_to: :camelcase
+      ).call(savon_method, message: params.merge(@auth))
+
+      response = result.body[:"#{savon_method}_response"][return_key]
+      Hash.from_xml response if endpoint == :wsaa
+
+      [result.success?, response]
+    end
+  end
+end

data/lib/afip_wsfe/constants.rb

@@ -88,11 +88,11 @@ module AfipWsfe
   # This hash keeps the set of urls for wsaa and wsfe for production and testing envs
   URLS = {
     test: {
-      wsaa: 'https://wsaahomo.afip.gov.ar/ws/services/LoginCms?wsdl',
-      wsfe: 'https://wswhomo.afip.gov.ar/wsfev1/service.asmx?WSDL'
+      wsaa: 'https://wsaahomo.afip.gov.ar/ws/services/LoginCms',
+      wsfe: 'https://wswhomo.afip.gov.ar/wsfev1/service.asmx'
     },
     production: {
-      wsaa: 'https://wsaa.afip.gov.ar/ws/services/LoginCms?wsdl',
+      wsaa: 'https://wsaa.afip.gov.ar/ws/services/LoginCms',
       wsfe: 'https://servicios1.afip.gov.ar/wsfev1/service.asmx'
     }
   }

data/lib/afip_wsfe/version.rb

@@ -1,4 +1,4 @@
 module AfipWsfe
   # Gem version
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/afip_wsfe/wsaa.rb

@@ -5,45 +5,23 @@ module AfipWsfe
   class Wsaa
 
     def initialize(url=nil)
-      AfipWsfe.environment ||= :test
-      @client = Savon.client(
-        wsdl:  AfipWsfe::URLS[AfipWsfe.environment][:wsaa],
-        namespaces: {
-          "xmlns:soapenv" => "http://schemas.xmlsoap.org/soap/envelope/",
-          "xmlns:ar" => "http://ar.gov.afip.dif.FEV1/"
-        },
-        log:       AfipWsfe.log?,
-        log_level: AfipWsfe.log_level || :debug,
-        ssl_verify_mode: :none,
-        read_timeout: 90,
-        open_timeout: 90,
-        headers: {
-          "Accept-Encoding" => "gzip, deflate",
-          "Connection" => "Keep-Alive"
-        },
-        convert_request_keys_to: :none
-      )
-
-      @cms  = nil
-      @performed = false
+      @client = AfipWsfe::Client.new(false)
+      @endpoint = :wsaa
       @response = nil
+      @status = false
     end
 
     def login
+      raise "Ruta del archivo de llave privada no declarado" unless AfipWsfe.pkey.present?
+      raise "Ruta del archivo certificado no declarado" unless AfipWsfe.cert.present?
       raise "Archivo de llave privada no encontrado en #{ AfipWsfe.pkey }" unless File.exists?(AfipWsfe.pkey)
       raise "Archivo certificado no encontrado en #{ AfipWsfe.cert }" unless File.exists?(AfipWsfe.cert)
-      build_tra
-      call_web_service
+      @status, @response = @client.call_endpoint @endpoint, :login_cms, {in0: build_tra}
       parse_response
-      status
+      @status
     end
 
-    def status
-      return false unless @performed
-      @response.success?
-    end
-
-    protected
+    private
 
     def build_tra
       now  = Time.zone.now
@@ -60,34 +38,31 @@ module AfipWsfe
         "service" => "wsfe"
       }.to_xml(root: "loginTicketRequest")
 
-      @cms = `echo '#{ tra }' |
-        #{ AfipWsfe.openssl_bin } cms -sign -in /dev/stdin -signer #{ AfipWsfe.cert } -inkey #{ AfipWsfe.pkey } -nodetach -outform der |
-        #{ AfipWsfe.openssl_bin } base64 -e`
-    end
-
-    def call_web_service
-      @response = @client.call :login_cms, message: {in0: @cms}
-      @performed = true
+      pkcs7 = OpenSSL::PKCS7.sign(cert, key, tra)
+      OpenSSL::PKCS7.write_smime(pkcs7).lines[5..-2].join()
     end
 
     def parse_response
-      if status
-        response_hash = Hash.from_xml @response.body[:login_cms_response][:login_cms_return]
-        token = response_hash["loginTicketResponse"]["credentials"]["token"]
-        sign  = response_hash["loginTicketResponse"]["credentials"]["sign"]
-        write_yaml(token, sign)
-      end
+      write_yaml(@response["loginTicketResponse"]["credentials"])
     end
 
-    def write_yaml(token, sign)
-      filename = "/tmp/bravo_#{ AfipWsfe.cuit }_#{ Time.zone.today.strftime('%Y_%m_%d') }.yml"
+    def write_yaml(credentials)
+      filename = AuthData.todays_data_file_name
       content = {
-        token: token,
-        sign: sign
+        token: credentials["token"],
+        sign: credentials["sign"]
       }
       File.open(filename, 'w') { |f|
         f.write content.to_yaml
       }
     end
+
+    def cert
+      OpenSSL::X509::Certificate.new(File.read(AfipWsfe.cert))
+    end
+
+    def key
+      OpenSSL::PKey::RSA.new(File.read(AfipWsfe.pkey))
+    end
   end
 end

data/lib/afip_wsfe.rb

@@ -1,8 +1,9 @@
 # encoding: utf-8
 require 'bundler/setup'
+require 'savon'
 require 'afip_wsfe/version'
 require 'afip_wsfe/constants'
-require 'savon'
+require 'afip_wsfe/client'
 
 require 'net/http'
 require 'net/https'
@@ -12,21 +13,21 @@ module AfipWsfe
   # Exception Class for missing or invalid attributes
   class NullOrInvalidAttribute < StandardError; end
 
-  autoload :Constants,            'afip_wsfe/constants'
-  autoload :Authorizer,           'afip_wsfe/authorizer'
-  autoload :AuthData,             'afip_wsfe/auth_data'
-  autoload :Bill,                 'afip_wsfe/bill'
-  autoload :Wsaa,                 'afip_wsfe/wsaa'
+  autoload :Constants, 'afip_wsfe/constants'
+  autoload :AuthData,  'afip_wsfe/auth_data'
+  autoload :Client,    'afip_wsfe/client'
+  autoload :Wsaa,      'afip_wsfe/wsaa'
+  autoload :Bill,      'afip_wsfe/bill'
 
   extend self
 
   attr_accessor :environment, :verbose, :log_level,
-                :pkey, :cert, :openssl_bin,
+                :pkey, :cert,
                 :cuit, :own_iva_cond, :sale_point,
                 :default_documento, :default_concepto, :default_moneda
 
   def auth_hash
-    {"Token" => AfipWsfe::TOKEN, "Sign" => AfipWsfe::SIGN, "Cuit" => AfipWsfe.cuit}
+    AuthData.auth_hash
   end
 
   def log?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: afip_wsfe
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Paco Moreno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-02 00:00:00.000000000 Z
+date: 2018-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -114,8 +114,8 @@ files:
 - afip_wsfe.gemspec
 - lib/afip_wsfe.rb
 - lib/afip_wsfe/auth_data.rb
-- lib/afip_wsfe/authorizer.rb
 - lib/afip_wsfe/bill.rb
+- lib/afip_wsfe/client.rb
 - lib/afip_wsfe/constants.rb
 - lib/afip_wsfe/version.rb
 - lib/afip_wsfe/wsaa.rb

data/lib/afip_wsfe/authorizer.rb

@@ -1,10 +0,0 @@
-module AfipWsfe
-  class Authorizer
-    attr_reader :pkey, :cert
-
-    def initialize
-      @pkey = AfipWsfe.pkey
-      @cert = AfipWsfe.cert
-    end
-  end
-end