banklink_lv 1.0.2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8ffa82dc6e5fb3d28a30670349fb52b6877c56a
-  data.tar.gz: ff9dc27db51a21c0f8682e978feec47c2116dcb1
+  metadata.gz: 79927e13a0531a2f8a925c02f2293aaff508f521
+  data.tar.gz: 854372fbf7785d800510ece6905cd7db228fff0a
 SHA512:
-  metadata.gz: fe37fe090c02338e868fc8b354414e67b322930f284495dd58527996584bafd8b6afc9c47c7d56a29c34d2bcb557159ebaefd555c75a10a5978d1860f4f792ba
-  data.tar.gz: 7f4715437ccb1435c9de41e4d890079bbe4eaee68885c0b6f4c6b42b51141ab7cc000668d595eb7bb7ed9002e6a58e08a3101454f3e4cb15934db77388cb410b
+  metadata.gz: ba74084eae12f265fe8d78f1df15ccfdbcfb2d646f9572f3093d49404737464e9e804e3472fd87fab1f4dd94e74a01aef98583be440078ab5d25e57283596c04
+  data.tar.gz: 6405873656f0fe8261996335441a806c7685062b118cb137551e29adc06825e528db7613bf94eacb03f1157804c578f483a46c5f0475458031b3ff706d968384

data/.bundle/install.log

@@ -0,0 +1,19 @@
+# Logfile created on 2014-12-10 20:23:24 +0200 by logger.rb/44203
+I, [2014-12-10T20:23:24.263820 #22785]  INFO -- : 0:  rake (10.1.1) from /Users/arturs/.rvm/gems/ruby-2.1.0/specifications/rake-10.1.1.gemspec
+I, [2014-12-10T20:23:24.264734 #22785]  INFO -- : 0:  i18n (0.6.11) from /Users/arturs/.rvm/gems/ruby-2.1.0/specifications/i18n-0.6.11.gemspec
+I, [2014-12-10T20:23:24.265245 #22785]  INFO -- : 0:  minitest (4.7.5) from /Users/arturs/.rvm/rubies/ruby-2.1.0/lib/ruby/gems/2.1.0/specifications/default/minitest-4.7.5.gemspec
+I, [2014-12-10T20:23:26.173103 #22785]  INFO -- : 0:  multi_json (1.10.1) from /Users/arturs/.rvm/gems/ruby-2.1.0/specifications/multi_json-1.10.1.gemspec
+I, [2014-12-10T20:23:26.173767 #22785]  INFO -- : 0:  thread_safe (0.3.4) from /Users/arturs/.rvm/gems/ruby-2.1.0/specifications/thread_safe-0.3.4.gemspec
+I, [2014-12-10T20:23:28.192576 #22785]  INFO -- : 0:  tzinfo (0.3.42) from /Users/arturs/.rvm/gems/ruby-2.1.0/specifications/tzinfo-0.3.42.gemspec
+I, [2014-12-10T20:23:30.218916 #22785]  INFO -- : 0:  activesupport (4.0.12) from /Users/arturs/.rvm/gems/ruby-2.1.0/specifications/activesupport-4.0.12.gemspec
+I, [2014-12-10T20:23:30.308160 #22785]  INFO -- : 0:  banklink_lv (1.1.1) from /Users/arturs/Workspace/banklink/banklink_lv.gemspec
+I, [2014-12-10T20:23:30.308943 #22785]  INFO -- : 0:  bundler (1.5.1) from /Users/arturs/.rvm/gems/ruby-2.1.0@global/specifications/bundler-1.5.1.gemspec
+I, [2014-12-10T20:28:40.066649 #22992]  INFO -- : 0:  rake (10.1.1) from /Users/arturs/.rvm/gems/ruby-2.1.0/specifications/rake-10.1.1.gemspec
+I, [2014-12-10T20:28:40.067241 #22992]  INFO -- : 0:  i18n (0.6.11) from /Users/arturs/.rvm/gems/ruby-2.1.0/specifications/i18n-0.6.11.gemspec
+I, [2014-12-10T20:28:40.067763 #22992]  INFO -- : 0:  minitest (4.7.5) from /Users/arturs/.rvm/rubies/ruby-2.1.0/lib/ruby/gems/2.1.0/specifications/default/minitest-4.7.5.gemspec
+I, [2014-12-10T20:28:40.068278 #22992]  INFO -- : 0:  multi_json (1.10.1) from /Users/arturs/.rvm/gems/ruby-2.1.0/specifications/multi_json-1.10.1.gemspec
+I, [2014-12-10T20:28:40.068824 #22992]  INFO -- : 0:  thread_safe (0.3.4) from /Users/arturs/.rvm/gems/ruby-2.1.0/specifications/thread_safe-0.3.4.gemspec
+I, [2014-12-10T20:28:40.069371 #22992]  INFO -- : 0:  tzinfo (0.3.42) from /Users/arturs/.rvm/gems/ruby-2.1.0/specifications/tzinfo-0.3.42.gemspec
+I, [2014-12-10T20:28:40.069871 #22992]  INFO -- : 0:  activesupport (4.0.12) from /Users/arturs/.rvm/gems/ruby-2.1.0/specifications/activesupport-4.0.12.gemspec
+I, [2014-12-10T20:28:40.143917 #22992]  INFO -- : 0:  banklink_lv (1.1.1) from /Users/arturs/Workspace/banklink/banklink_lv.gemspec
+I, [2014-12-10T20:28:40.144331 #22992]  INFO -- : 0:  bundler (1.5.1) from /Users/arturs/.rvm/gems/ruby-2.1.0@global/specifications/bundler-1.5.1.gemspec

data/CHANGLOG.md

@@ -0,0 +1,12 @@
+## 1.1.1
+
+### Bug Fixes
+
+* Rename <tt>reciever_name</tt> to <tt>receiver_name</tt>
+* Rename <tt>reciever_bank_account</tt> to <tt>receiver_name</tt>
+
+Also left old methods as alias. Will be removed in 1.2.0
+
+### Contributors
+
+* Arturs Braucs

data/Gemfile

@@ -1,2 +1,4 @@
+source 'https://rubygems.org'
+
 # Specify your gem's dependencies in banklink.gemspec
 gemspec

data/Gemfile.lock

@@ -1,29 +1,29 @@
 PATH
   remote: .
   specs:
-    banklink_lv (1.0.2)
+    banklink_lv (1.1.1)
       activesupport
 
 GEM
+  remote: https://rubygems.org/
   specs:
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
+    activesupport (4.0.12)
+      i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    atomic (1.1.14)
-    i18n (0.6.9)
+    i18n (0.6.11)
     minitest (4.7.5)
-    multi_json (1.8.4)
+    multi_json (1.10.1)
     rake (10.1.1)
-    thread_safe (0.1.3)
-      atomic
-    tzinfo (0.3.38)
+    thread_safe (0.3.4)
+    tzinfo (0.3.42)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   banklink_lv!
+  minitest
   rake

data/README.rdoc

@@ -2,6 +2,11 @@
 
 Payment system integration for Latvian banks what uses banklink API.
 
+== Changes in 1.1.0
+
+* Move Swedbank under Banklink::Swedbank (Please run tests and refacture)
+* Add SEB banklink support
+
 == Changes in 1.0.0
 
 * No test keys and certificates options.
@@ -30,9 +35,17 @@ Insert this into your Gemfile
 
 Insert this in your config file:
 
-  Swedbank.private_key = File.read("#{Rails.root}/path/to/your_private_key")
-  Swedbank.bank_certificate = File.read("#{Rails.root}/path/to/bank_public_key")
-  Swedbank.production_url = "https://ib.swedbank.lv/banklink"
+==== Swedbank
+
+  Banklink::Swedbank.private_key = File.read("#{Rails.root}/path/to/your_private_key")
+  Banklink::Swedbank.bank_certificate = File.read("#{Rails.root}/path/to/bank_public_key")
+  Banklink::Swedbank.production_url = "https://ib.swedbank.lv/banklink"
+
+==== SEB
+
+  Banklink::Seb.private_key = File.read("#{Rails.root}/path/to/your_private_key")
+  Banklink::Seb.bank_certificate = File.read("#{Rails.root}/path/to/bank_public_key")
+  Banklink::Seb.production_url = "https://ib.swedbank.lv/banklink"
 
 Helper for view:
 
@@ -42,11 +55,11 @@ Helper for view:
     options[:return] = 'http://yourapp.com/'
     options[:reference] = '454'
     options[:message] = 'Testing banklink'
-    @helper = Banklink::Helper.new(TRANS_ID, YOUR_SENDER_ID, options)
+    @helper = Banklink::Swedbank.helper(TRANS_ID, YOUR_SENDER_ID, options) # OR Banklink::Seb.helper(TRANS_ID, YOUR_SENDER_ID, options)
 
 Then create Notification controller for notify. Then you can notify:
 
-    notify = Banklink::Notification.new(request.raw_post)
+    notify = Banklink::Swedbank.notification(request.raw_post) # OR Banklink::Seb.notification(request.raw_post)
     @text
     if notify.acknowledge
       if notify.complete?

data/banklink_lv.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "banklink_lv"
 
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'minitest'
 
-  s.add_dependency "activesupport"
+  s.add_dependency 'activesupport'
 end

data/lib/banklink.rb

@@ -2,6 +2,7 @@ require 'banklink/version'
 
 require "base64"
 require "active_support/dependencies"
+require "active_support/concern"
 
 require 'net/http'
 require 'net/https'
@@ -15,6 +16,5 @@ require 'cgi'
 
 require 'banklink/banklink'
 require 'banklink/base'
-require 'banklink/helper'
 require 'banklink/swedbank'
-require 'banklink/notification'
+require 'banklink/seb'

data/lib/banklink/banklink.rb

@@ -1,92 +1,5 @@
 module Banklink
 
-  # Detect bank module from params
-  #def self.get_class(params)
-  #  case params['VK_SND_ID']
-  #    when 'EYP' then SebEst
-  #    when 'SAMPOPANK' then SampoEst
-  #    when 'HP' then SwedbankEst
-
-    # Swedbank uses same sender id for different countries, currently can't detect Lithuanian
-    # use:
-    #   notify = Swedbank::Notification.new(params)
-    #when 'HP' then Swedbank
-
-    #when '70440' then SebLtu
-    #when 'SMPOLT22' then DanskeLtu
-    #when 'SNORLT22' then SnorasLtu
-    #when '112029720' then DnbnordLtu
-    #when '70100' then UbLtu
-
-  #    else raise(ArgumentError, "unknown sender id: #{params['VK_SND_ID']}")
-  #  end
-  #end
-
-  # Define required fields for each service message.
-  # We need to know this in order to calculate VK_MAC
-  # from a given hash of parameters.
-  # Order of the parameters is important.
-  mattr_accessor :required_service_params
-  self.required_service_params = {
-  1001 => [
-    'VK_SERVICE',
-    'VK_VERSION',
-    'VK_SND_ID',
-    'VK_STAMP',
-    'VK_AMOUNT',
-    'VK_CURR',
-    'VK_ACC',
-    'VK_NAME',
-    'VK_REF',
-    'VK_MSG'],
-  1002 => [
-    'VK_SERVICE',
-    'VK_VERSION',
-    'VK_SND_ID',
-    'VK_STAMP',
-    'VK_AMOUNT',
-    'VK_CURR',
-    'VK_REF',
-    'VK_MSG' ],
-  1101 => [
-    'VK_SERVICE',
-    'VK_VERSION',
-    'VK_SND_ID',
-    'VK_REC_ID',
-    'VK_STAMP',
-    'VK_T_NO',
-    'VK_AMOUNT',
-    'VK_CURR',
-    'VK_REC_ACC',
-    'VK_REC_NAME',
-    'VK_SND_ACC',
-    'VK_SND_NAME',
-    'VK_REF',
-    'VK_MSG',
-    'VK_T_DATE'],
-  1201 => [
-    'VK_SERVICE',
-    'VK_VERSION',
-    'VK_SND_ID',
-    'VK_REC_ID',
-    'VK_STAMP',
-    'VK_AMOUNT',
-    'VK_CURR',
-    'VK_REC_ACC',
-    'VK_REC_NAME',
-    'VK_SND_ACC',
-    'VK_SND_NAME',
-    'VK_REF',
-    'VK_MSG'],
-  1901 => [
-    'VK_SERVICE',
-    'VK_VERSION',
-    'VK_SND_ID',
-    'VK_REC_ID',
-    'VK_STAMP',
-    'VK_REF',
-    'VK_MSG']
-  }
 
   # Calculation using method VK_VERSION=008:
   # VK_MAC is RSA signature of the request fields coded into BASE64.
@@ -102,6 +15,7 @@ module Banklink
   # d is RSA secret exponent
   # n is RSA modulus
   module Common
+    extend ActiveSupport::Concern
     # p(x) is length of the field x represented by three digits
     def func_p(val)
       sprintf("%03i", val.length)
@@ -113,23 +27,37 @@ module Banklink
     # p(x) is length of the field x represented by three digits
     # Parameters val1, val2, value3 would be turned into:
     # '003val1003val2006value3'
-    def generate_data_string(service_msg_number, sigparams)
+    def generate_data_string(service_msg_number, sigparams, required_service_params)
       str = ''
-      Banklink.required_service_params[Integer(service_msg_number)].each do |param|
+      required_params = required_service_params[Integer(service_msg_number)] || required_service_params[service_msg_number]
+      required_params.each do |param|
         val = sigparams[param].to_s # nil goes to ''
         str << func_p(val) << val
       end
       str
     end
 
-    def generate_signature(service_msg_number, sigparams)
-      # privkey = self.class.parent.get_private_key
-      privkey = Swedbank.get_private_key
-      privkey.sign(OpenSSL::Digest::SHA1.new, generate_data_string(service_msg_number, sigparams))
+    def generate_signature(service_msg_number, sigparams, required_service_params)
+      privkey = self.class.parent.get_private_key
+      privkey.sign(OpenSSL::Digest::SHA1.new, generate_data_string(service_msg_number, sigparams, required_service_params))
+    end
+
+    def generate_mac(service_msg_number, sigparams, required_service_params)
+      Base64.encode64(generate_signature(service_msg_number, sigparams, required_service_params)).gsub(/\n/,'')
     end
 
-    def generate_mac(service_msg_number, sigparams)
-      Base64.encode64(generate_signature(service_msg_number, sigparams)).gsub(/\n/,'')
+    def encode_to_utf8 string
+      string.encode('UTF-8', :invalid => :replace, :replace => '').encode('UTF-8')
     end
+
+    # Take the posted data and move the relevant data into a hash
+    def parse(post)
+      @raw = post.to_s
+      for line in @raw.split('&')
+        key, value = *line.scan( %r{^([A-Za-z0-9_.]+)\=(.*)$} ).flatten
+        params[key] = CGI.unescape(value)
+      end
+    end
+
   end
 end

data/lib/banklink/base.rb

@@ -5,5 +5,4 @@ class Hash
 end
 
 module Banklink
-
 end

data/lib/banklink/seb.rb

@@ -0,0 +1,78 @@
+require 'banklink/seb/helper'
+require 'banklink/seb/notification'
+
+module Banklink
+  module Seb
+
+    # Raw X509 certificate of the bank, string format.
+    mattr_accessor :bank_certificate
+    # RSA public key of the bank, taken from the X509 certificate of the bank. OpenSSL container.
+    def self.get_bank_public_key
+      cert = self.bank_certificate
+      # OpenSSL::X509::Certificate.new(cert.gsub(/  /, '')).public_key
+      OpenSSL::X509::Certificate.new(cert).public_key
+    end
+
+    mattr_accessor :private_key
+    # Our RSA private key. OpenSSL container.
+    def self.get_private_key
+      private_key = self.private_key
+      OpenSSL::PKey::RSA.new(private_key.gsub(/  /, ''))
+    end
+
+    mattr_accessor :service_url
+
+    def self.notification(post)
+      Notification.new(post)
+    end
+
+    def self.helper(order, account, options = {})
+      Helper.new(order, account, options)
+    end
+
+    # Define required fields for each service message.
+    # We need to know this in order to calculate VK_MAC
+    # from a given hash of parameters.
+    # Order of the parameters is important.
+    mattr_accessor :required_service_params
+    self.required_service_params = {
+    '0002' => [
+      'IB_SND_ID',
+      'IB_SERVICE',
+      'IB_VERSION',
+      'IB_AMOUNT',
+      'IB_CURR',
+      'IB_NAME',
+      'IB_PAYMENT_ID',
+      'IB_PAYMENT_DESC'
+      ],
+    '0003' => [
+      'IB_SND_ID',
+      'IB_SERVICE',
+      'IB_VERSION',
+      'IB_PAYMENT_ID',
+      'IB_AMOUNT',
+      'IB_CURR',
+      'IB_REC_ID',
+      'IB_REC_ACC',
+      'IB_REC_NAME',
+      'IB_PAYER_ACC',
+      'IB_PAYER_NAME',
+      'IB_PAYMENT_DESC',
+      'IB_PAYMENT_DATE',
+      'IB_PAYMENT_TIME'
+      ],
+    '0004' => [
+      'IB_SND_ID',
+      'IB_SERVICE',
+      'IB_VERSION',
+      'IB_REC_ID',
+      'IB_PAYMENT_ID',
+      'IB_PAYMENT_DESC',
+      'IB_FROM_SERVER',
+      'IB_STATUS'
+      ]
+    }
+
+  end
+end

data/lib/banklink/seb/helper.rb

@@ -0,0 +1,102 @@
+module Banklink #:nodoc:
+  module Seb
+    class Helper
+      attr_reader :fields
+      include Banklink::Common
+
+      def initialize(transaction, account, options = {})
+
+        @options = options
+        @fields = {}
+
+        @options['IB_SND_ID'] = account
+        @options['IB_PAYMENT_ID'] = transaction
+        @options['IB_AMOUNT'] = options[:amount]
+        @options['IB_CURR'] = options[:currency] || "EUR"
+        @options['IB_FEEDBACK'] = options[:return]
+        @options['IB_NAME'] = options[:name] || "Company"
+        @options['IB_PAYMENT_DESC'] = options[:message]
+        @options['IB_LANG'] = options[:lang] if options[:lang]
+
+        if options[:service_msg_number]
+          @service_msg_number = options.delete(:service_msg_number)
+        else
+          @service_msg_number = default_service_msg_number
+        end
+
+        add_required_params
+        add_ib_crc
+
+        add_lang_field
+        add_return_url_field
+      end
+
+
+      def form_fields
+        @fields
+      end
+
+      def self.mapping(attribute, options = {})
+        self.mappings ||= {}
+        self.mappings[attribute] = options
+      end
+
+      def add_field(name, value)
+        return if name.blank? || value.blank?
+        @fields[name.to_s] = value.to_s
+      end
+
+      def add_ib_crc
+        # Signature used to validate previous parameters
+        add_field('IB_CRC', generate_mac(@service_msg_number, form_fields, Seb.required_service_params))
+      end
+
+      def add_return_url_field
+        add_field('IB_FEEDBACK', @options['IB_FEEDBACK'])
+      end
+
+      def add_lang_field
+        if @options['IB_LANG']
+          add_field(ib_lang_param, @options['IB_LANG'])
+        else
+          add_field ib_lang_param, ib_lang
+        end
+      end
+
+      def add_required_params
+        required_params = Seb.required_service_params[@service_msg_number]
+        required_params.each do |param|
+          param_value = (@options.delete(param) || send(param.to_s.downcase)).to_s
+          add_field param, encode_to_utf8(param_value)
+        end
+      end
+
+      def ib_lang
+        'LAT'
+      end
+
+      def ib_lang_param
+        'IB_LANG'
+      end
+
+      def ib_service
+        @service_msg_number
+      end
+
+      def ib_version
+        '001'
+      end
+
+      def redirect_url
+        Seb.service_url
+      end
+
+      # Default service message number.
+      # Use '0002' because it requires the least amount of parameters.
+      def default_service_msg_number
+        "0002"
+      end
+
+    end
+  end
+end