cic_payment 0.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7a9ab1ef67d2fa58b5d65ea218357c23309af5f
-  data.tar.gz: d6fa62f8539328b668989efa02990321301e1f99
+  metadata.gz: 8871afe40aa1ae38a2866977e68de252f4f82a45
+  data.tar.gz: 53ffbc797742f39cf8967de16437a93df3fd8878
 SHA512:
-  metadata.gz: 90b86638090ab0a557fd21027e963ca72658475e01e42c34a659fd0a03399cd8059396cbc681b34e880e290d03b01fc03eaeb12b3146f67e5b4a439d33677688
-  data.tar.gz: 93bda4215ce221d1f59a429e37a1e48a252d9a791b01394fd6b8f96d3dc60b80558da008425d9a79aae37a55eaf5264e2742016e18a992670f29242c09e0e2c0
+  metadata.gz: 2c253796bf67f908754ec5c71e9b2232362ff6719f8b1318dbdccf3ec520edcd3d9136d94dbd868ce9edb9e561dd7687dcdb32d84086bee33c1bb4eb7304a883
+  data.tar.gz: ed603293928cbba1a1350898e6750472de42a6db0c58404348cce327774c079e0642204206c9b43eaf601164bbaf8c575aa5c63b5d25f27219627d7776f8d105

data/cic_payment.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "cic_payment"
-  s.version     = "0.4"
+  s.version     = "0.4.1"
   s.date        = "2014-03-18"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Novelys Team", 'Guillaume Barillot', 'Regis Millet (aka Kulgar)']

data/lib/cic_payment.rb

@@ -51,44 +51,44 @@ class CicPayment < PaymentSettings
   end
 
   def response(params)
-
     if verify_hmac(params)
-
-      if params['code-retour'] == "Annulation"
+      case params['code-retour']
+      when "Annulation"
         params.update(:success => false)
-
-      elsif params['code-retour'] == "payetest"
-        params.update(:success => true)
-
-      elsif params['code-retour'] == "paiement"
+      when "payetest", "paiement"
         params.update(:success => true)
+      else
+        params.update(:success => false)
       end
-
     else
       params.update(:success => false)
     end
-
   end
 
-  def self.mac_string params
-    hmac_key = CicPayment.new
-    mac_string = [hmac_key.tpe, params['date'], params['montant'], params['reference'], params['texte-libre'], hmac_key.version, params['code-retour'], params['cvx'], params['vld'], params['brand'], params['status3ds'], params['numauto'], params['motifrefus'], params['originecb'], params['bincb'], params['hpancb'], params['ipclient'], params['originetr'], params['veres'], params['pares']].join('*') + "*"
+  # Use this function for your tests to create the mac properly
+  def response_mac params
+    # The HMAC returned by the bank uses this chain: 
+    # <TPE>*<date>*<montant>*<reference>*<texte-libre>*3.0*<code-retour>*
+    # <cvx>*<vld>*<brand>*<status3ds>*<numauto>*<motifrefus>*<originecb>*
+    # <bincb>*<hpancb>*<ipclient>*<originetr>*<veres>*<pares>*
+    chain = [
+      self.tpe, params['date'], params['montant'], params['reference'], params['texte-libre'], self.version, params['code-retour'], 
+      params['cvx'], params['vld'], params['brand'], params['status3ds'], params["numauto"], params['motifrefus'], params['originecb'], 
+      params['bincb'], params['hpancb'], params['ipclient'], params['originetr'], params['veres'], params['pares'], ""
+    ].join('*')
+    
+    hmac_token(false, chain)
   end
 
   def verify_hmac params
-    mac_string = [self.tpe, params['date'], params['montant'], params['reference'], params['texte-libre'], self.version, params['code-retour'], params['cvx'], params['vld'], params['brand'], params['status3ds'], params['numauto'], params['motifrefus'], params['originecb'], params['bincb'], params['hpancb'], params['ipclient'], params['originetr'], params['veres'], params['pares']].join('*') + "*"
-
     params['MAC'] ? hmac = params['MAC'] : hmac = ""
-    self.valid_hmac?(hmac)
-  end
 
-  # Check if the HMAC matches the HMAC of the data string
-	def valid_hmac?(sent_mac)
-		hmac_token == sent_mac.downcase
-	end
+    # Check if the HMAC matches the HMAC of the data string
+    response_mac(params) == hmac
+  end
 
   # Return the HMAC for a data string
-	def hmac_token
+	def hmac_token(form_hmac = true, chain = nil)
     # This chain must contains:
     # <TPE>*<date>*<montant>*<reference>*<texte-libre>*<version>*<lgue>*<societe>*<mail>*
     # <nbrech>*<dateech1>*<montantech1>*<dateech2>*<montantech2>*<dateech3>*<montantech3>*
@@ -103,17 +103,19 @@ class CicPayment < PaymentSettings
     # For a fragmented payment: 
     # 1234567*05/12/2006:11:55:23*62.73EUR*ABERTYP00145*ExempleTexteLibre*3.0*FR*monSite1*internaute@sonemail.fr*
     # 4*05/12/2006*16.23EUR*05/01/2007*15.5EUR*05/02/2007*15.5EUR*05/03/2007*15.5EUR*
-    chain = [self.tpe,
-        self.date,
-        self.montant,
-        self.reference,
-        self.texte_libre,
-        self.version,
-        self.lgue,
-        self.societe,
-        self.mail,
-        "", "", "", "", "", "", "", "", "", "" # 10 stars: 9 for fragmented unfilled params + 1 final star 
-    ].join("*")
+    if form_hmac && chain.blank?
+      chain = [self.tpe,
+          self.date,
+          self.montant,
+          self.reference,
+          self.texte_libre,
+          self.version,
+          self.lgue,
+          self.societe,
+          self.mail,
+          "", "", "", "", "", "", "", "", "", "" # 10 stars: 9 for fragmented unfilled params + 1 final star 
+      ].join("*")
+    end
 
 		hmac_sha1(usable_key(self.hmac_key), chain).downcase
 	end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module CicPayment
-  VERSION = "0.4.0".freeze
+  VERSION = "0.4.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cic_payment
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.4.1
 platform: ruby
 authors:
 - Novelys Team