ipizza 0.7.1 → 2.1.0

data/lib/ipizza/provider/krediidipank.rb

@@ -1,50 +1,4 @@
 module Ipizza::Provider
-  class Krediidipank
-
-    class << self
-      attr_accessor :service_url, :return_url, :file_key, :key_secret, :file_cert, :snd_id, :encoding, :lang, :rec_acc, :rec_name
-    end
-
-    def payment_request(payment, service = 1002)
-      req = Ipizza::PaymentRequest.new
-      req.service_url = self.class.service_url
-      req.sign_params = {
-        'VK_SERVICE' => service.to_s,
-        'VK_VERSION' => '008',
-        'VK_SND_ID' => self.class.snd_id,
-        'VK_STAMP' => payment.stamp,
-        'VK_AMOUNT' => sprintf('%.2f', payment.amount),
-        'VK_CURR' => payment.currency,
-        'VK_REF' => Ipizza::Util.sign_731(payment.refnum),
-        'VK_MSG' => payment.message
-      }
-
-      if service == 1001
-        req.sign_params['VK_ACC'] = self.class.rec_acc
-        req.sign_params['VK_NAME'] = self.class.rec_name
-      end
-
-      req.extra_params = {
-        'VK_CHARSET' => self.class.encoding,
-        'VK_RETURN' => self.class.return_url,
-        'VK_LANG' => self.class.lang
-      }
-
-      if service == 1001
-        param_order = ['VK_SERVICE', 'VK_VERSION', 'VK_SND_ID', 'VK_STAMP', 'VK_AMOUNT', 'VK_CURR', 'VK_ACC', 'VK_NAME', 'VK_REF', 'VK_MSG']
-      else
-        param_order = ['VK_SERVICE', 'VK_VERSION', 'VK_SND_ID', 'VK_STAMP', 'VK_AMOUNT', 'VK_CURR', 'VK_REF', 'VK_MSG']
-      end
-
-      req.sign(self.class.file_key, self.class.key_secret, param_order)
-      req
-    end
-
-    def payment_response(params)
-      response = Ipizza::PaymentResponse.new(params)
-      response.verify(self.class.file_cert)
-
-      return response
-    end
+  class Krediidipank < Ipizza::Provider::Base
   end
 end

data/lib/ipizza/provider/lhv.rb

@@ -0,0 +1,4 @@
+module Ipizza::Provider
+  class Lhv < Ipizza::Provider::Base
+  end
+end

data/lib/ipizza/provider/luminor.rb

@@ -0,0 +1,4 @@
+module Ipizza::Provider
+  class Luminor < Ipizza::Provider::Base
+  end
+end

data/lib/ipizza/provider/nordea/authentication_request.rb

@@ -18,7 +18,7 @@ module Ipizza::Provider
     private
     
     def mac_data_string(key)
-      order = ['ACTION_ID', 'VERS', 'RCVID', 'LANGCODE', 'STAMP', 'IDTYPE', 'RETLINK', 'CANLINK', 'REJLINK', 'KEYVERS', 'ALG']
+      order = %w(ACTION_ID VERS RCVID LANGCODE STAMP IDTYPE RETLINK CANLINK REJLINK KEYVERS ALG)
       
       datastr = order.inject('') do |memo, param|
         memo << params[param].to_s << '&'
@@ -26,4 +26,4 @@ module Ipizza::Provider
       datastr << key << '&'
     end
   end
-end
+end

data/lib/ipizza/provider/nordea/authentication_response.rb

@@ -27,11 +27,15 @@ module Ipizza::Provider
     def info_social_security_id
       valid? ? @params['B02K_CUSTID'] : ''
     end
-    
+
+    def authentication_info
+      @authentication_info ||= Ipizza::Authentication.new(user_name: info_name, user_id: info_social_security_id)
+    end
+
     private
     
     def mac_data_string(key)
-      order = ['VERS', 'TIMESTMP', 'IDNBR', 'STAMP', 'CUSTNAME', 'KEYVERS', 'ALG', 'CUSTID', 'CUSTTYPE']
+      order = %w(VERS TIMESTMP IDNBR STAMP CUSTNAME KEYVERS ALG CUSTID CUSTTYPE)
       
       datastr = order.inject('') do |memo, param|
         memo << @params["B02K_#{param}"].to_s << '&'
@@ -39,4 +43,4 @@ module Ipizza::Provider
       datastr << key << '&'
     end
   end
-end
+end

data/lib/ipizza/provider/nordea/payment_request.rb

@@ -18,7 +18,7 @@ module Ipizza::Provider
     private
     
     def mac_data_string(key)
-      order = ['VERSION', 'STAMP', 'RCV_ID', 'AMOUNT', 'REF', 'DATE', 'CUR']
+      order = %w(VERSION STAMP RCV_ID AMOUNT REF DATE CUR)
       
       datastr = order.inject('') do |memo, param|
         memo << params[param].to_s
@@ -30,4 +30,4 @@ module Ipizza::Provider
       datastr
     end
   end
-end
+end

data/lib/ipizza/provider/nordea/payment_response.rb

@@ -13,7 +13,7 @@ module Ipizza::Provider
     end
     
     def success?
-      if @valid && !@params['RETURN_PAID'].blank? then true else false end
+      @valid && !@params['RETURN_PAID'].blank?
     end
     
     def valid?
@@ -21,13 +21,13 @@ module Ipizza::Provider
     end
     
     def payment_info
-      @payment_info ||= Ipizza::Payment.new(:stamp => @params['RETURN_STAMP'], :refnum => @params['RETURN_REF'])
+      @payment_info ||= Ipizza::Payment.new(stamp: @params['RETURN_STAMP'], refnum: @params['RETURN_REF'])
     end
     
     private
     
     def mac_data_string(key)
-      order = ['RETURN_VERSION', 'RETURN_STAMP', 'RETURN_REF', 'RETURN_PAID']
+      order = %w(RETURN_VERSION RETURN_STAMP RETURN_REF RETURN_PAID)
       
       datastr = order.inject('') do |memo, param|
         memo << @params[param].to_s
@@ -40,4 +40,4 @@ module Ipizza::Provider
       datastr
     end
   end
-end
+end

data/lib/ipizza/provider/nordea.rb

@@ -1,77 +1,4 @@
 module Ipizza::Provider
-
-  # TODO: configure whether use sha-1 or md5 for signing and verification
-  class Nordea
-
-    require 'ipizza/provider/nordea/payment_request'
-    require 'ipizza/provider/nordea/payment_response'
-    require 'ipizza/provider/nordea/authentication_request'
-    require 'ipizza/provider/nordea/authentication_response'
-
-    class << self
-      attr_accessor :payments_service_url, :payments_return_url, :payments_reject_url, :payments_cancel_url
-      attr_accessor :payments_rcv_id, :payments_language
-      attr_accessor :auth_service_url, :auth_return_url, :auth_reject_url, :auth_cancel_url, :auth_language
-      attr_accessor :auth_rcv_id
-      attr_accessor :file_key, :rcv_account, :rcv_name, :confirm, :keyvers
-    end
-
-    def payment_request(payment, service = 1002)
-      req = Ipizza::Provider::Nordea::PaymentRequest.new
-      req.service_url = self.class.payments_service_url
-      req.params = {
-        'VERSION' => '0003',
-        'STAMP' => payment.stamp,
-        'RCV_ID' => self.class.payments_rcv_id,
-        # 'RCV_ACCOUNT' => self.rcv_account,
-        # 'RCV_NAME' => self.rcv_name,
-        'LANGUAGE' => self.class.payments_language,
-        'AMOUNT' => sprintf('%.2f', payment.amount),
-        'REF' => Ipizza::Util.sign_731(payment.refnum),
-        'DATE' => 'EXPRESS',
-        'MSG' => payment.message,
-        'CONFIRM' => self.class.confirm,
-        'CUR' => payment.currency,
-        'KEYVERS' => self.class.keyvers,
-        'REJECT' => self.class.payments_reject_url,
-        'RETURN' => self.class.payments_return_url,
-        'CANCEL' => self.class.payments_cancel_url
-      }
-
-      req.sign(self.class.file_key)
-      req
-    end
-
-    def payment_response(params)
-      response = Ipizza::Provider::Nordea::PaymentResponse.new(params)
-      response.verify(self.class.file_key)
-      return response
-    end
-
-    def authentication_request
-      req = Ipizza::Provider::Nordea::AuthenticationRequest.new
-      req.service_url = self.class.auth_service_url
-      req.params = {
-        'ACTION_ID' => '701',
-        'VERS' => '0002',
-        'RCVID' => self.class.auth_rcv_id,
-        'LANGCODE' => self.class.auth_language,
-        'STAMP' => Time.now.strftime('%Y%m%d%H%M%S'),
-        'IDTYPE' => '02',
-        'KEYVERS' => self.class.keyvers,
-        'RETLINK' => self.class.auth_return_url,
-        'CANLINK' => self.class.auth_cancel_url,
-        'REJLINK' => self.class.auth_reject_url,
-        'ALG' => '01'
-      }
-      req.sign(self.class.file_key)
-      req
-    end
-
-    def authentication_response(params)
-      response = Ipizza::Provider::Nordea::AuthenticationResponse.new(params)
-      response.verify(self.class.file_key)
-      return response
-    end
+  class Nordea < Ipizza::Provider::Base
   end
 end

data/lib/ipizza/provider/sampo.rb

@@ -1,49 +1,4 @@
 module Ipizza::Provider
-  class Sampo
-
-    class << self
-      attr_accessor :service_url, :return_url, :file_key, :key_secret, :file_cert, :snd_id, :lang, :rec_acc, :rec_name
-    end
-
-    def payment_request(payment, service = 1002)
-      req = Ipizza::PaymentRequest.new
-      req.service_url = self.class.service_url
-      req.sign_params = {
-        'VK_SERVICE' => service.to_s,
-        'VK_VERSION' => '008',
-        'VK_SND_ID' => self.class.snd_id,
-        'VK_STAMP' => payment.stamp,
-        'VK_AMOUNT' => sprintf('%.2f', payment.amount),
-        'VK_CURR' => payment.currency,
-        'VK_REF' => Ipizza::Util.sign_731(payment.refnum),
-        'VK_MSG' => payment.message
-      }
-
-      if service == 1001
-        req.sign_params['VK_ACC'] = self.class.rec_acc
-        req.sign_params['VK_NAME'] = self.class.rec_name
-      end
-
-      req.extra_params = {
-        'VK_RETURN' => self.class.return_url,
-        'VK_LANG' => self.class.lang
-      }
-
-      if service == 1001
-        param_order = ['VK_SERVICE', 'VK_VERSION', 'VK_SND_ID', 'VK_STAMP', 'VK_AMOUNT', 'VK_CURR', 'VK_ACC', 'VK_NAME', 'VK_REF', 'VK_MSG']
-      else
-        param_order = ['VK_SERVICE', 'VK_VERSION', 'VK_SND_ID', 'VK_STAMP', 'VK_AMOUNT', 'VK_CURR', 'VK_REF', 'VK_MSG']
-      end
-
-      req.sign(self.class.file_key, self.class.key_secret, param_order)
-      req
-    end
-
-    def payment_response(params)
-      response = Ipizza::PaymentResponse.new(params)
-      response.verify(self.class.file_cert)
-
-      return response
-    end
+  class Sampo < Ipizza::Provider::Base
   end
 end

data/lib/ipizza/provider/seb.rb

@@ -1,81 +1,4 @@
 module Ipizza::Provider
-  class Seb
-    
-    class << self
-      attr_accessor :service_url, :return_url, :cancel_url, :file_key, :key_secret, :file_cert, :snd_id, :encoding, :rec_acc, :rec_name
-    end
-    
-    def payment_request(payment, service = 1002)
-      req = Ipizza::PaymentRequest.new
-      req.service_url = self.class.service_url
-      req.sign_params = {
-        'VK_SERVICE' => service.to_s,
-        'VK_VERSION' => '008',
-        'VK_SND_ID' => self.class.snd_id,
-        'VK_STAMP' => payment.stamp,
-        'VK_AMOUNT' => sprintf('%.2f', payment.amount),
-        'VK_CURR' => payment.currency,
-        'VK_REF' => Ipizza::Util.sign_731(payment.refnum),
-        'VK_MSG' => payment.message
-      }
-
-      # TODO: add 1001 support
-      # if service == 1001
-      #   req.sign_params['VK_ACC'] = self.rec_acc
-      #   req.sign_params['VK_NAME'] = self.rec_name
-      # end
-      
-      req.extra_params = {
-        'VK_CHARSET' => self.class.encoding,
-        'VK_RETURN' => self.class.return_url,
-        'VK_CANCEL' => self.class.cancel_url
-      }
-      
-      if service == 1001
-        param_order = ['VK_SERVICE', 'VK_VERSION', 'VK_SND_ID', 'VK_STAMP', 'VK_AMOUNT', 'VK_CURR', 'VK_ACC', 'VK_NAME', 'VK_REF', 'VK_MSG']
-      else
-        param_order = ['VK_SERVICE', 'VK_VERSION', 'VK_SND_ID', 'VK_STAMP', 'VK_AMOUNT', 'VK_CURR', 'VK_REF', 'VK_MSG']
-      end
-
-      req.sign(self.class.file_key, self.class.key_secret, param_order)
-      req
-    end
-    
-    def payment_response(params)
-      response = Ipizza::PaymentResponse.new(params)
-      response.verify(self.class.file_cert)
-      
-      return response
-    end
-
-    def authentication_request(service_no = 4001)
-      req = Ipizza::AuthenticationRequest.new
-      req.service_url = self.class.service_url
-      req.sign_params = {
-        'VK_SERVICE' => service_no,
-        'VK_VERSION' => '008',
-        'VK_SND_ID' => self.class.snd_id,
-        'VK_REPLY' => '3002',
-        'VK_RETURN' => self.class.return_url,
-        'VK_DATE' => Date.today.strftime('%d.%m.%Y'),
-        'VK_TIME' => Time.now.strftime('%H:%M:%S')
-      }
-    
-      req.extra_params = {
-        'VK_CHARSET' => self.class.encoding
-      }
-    
-      param_order = ['VK_SERVICE', 'VK_VERSION', 'VK_SND_ID', 'VK_REPLY', 'VK_RETURN', 'VK_DATE', 'VK_TIME']
-    
-      req.sign(self.class.file_key, self.class.key_secret, param_order)
-      req
-    end
-    
-    def authentication_response(params)
-      response = Ipizza::AuthenticationResponse.new(params)
-      response.verify(self.class.file_cert)
-      return response
-    end
-
+  class Seb < Ipizza::Provider::Base
   end
 end

data/lib/ipizza/provider/swedbank.rb

@@ -1,69 +1,4 @@
 module Ipizza::Provider
-  class Swedbank
-
-    class << self
-      attr_accessor :service_url, :return_url, :cancel_url, :file_key, :key_secret, :file_cert, :snd_id, :encoding
-    end
-
-    def payment_request(payment, service = 1002)
-      req = Ipizza::PaymentRequest.new
-      req.service_url = self.class.service_url
-      req.sign_params = {
-        'VK_SERVICE' => '1002',
-        'VK_VERSION' => '008',
-        'VK_SND_ID' => self.class.snd_id,
-        'VK_STAMP' => payment.stamp,
-        'VK_AMOUNT' => sprintf('%.2f', payment.amount),
-        'VK_CURR' => payment.currency,
-        'VK_REF' => Ipizza::Util.sign_731(payment.refnum),
-        'VK_MSG' => payment.message
-      }
-
-      req.extra_params = {
-        'VK_CHARSET' => self.class.encoding,
-        'VK_RETURN' => self.class.return_url,
-        'VK_CANCEL' => self.class.cancel_url
-      }
-
-      param_order = ['VK_SERVICE', 'VK_VERSION', 'VK_SND_ID', 'VK_STAMP', 'VK_AMOUNT', 'VK_CURR', 'VK_REF', 'VK_MSG']
-
-      req.sign(self.class.file_key, self.class.key_secret, param_order)
-      req
-    end
-
-    def payment_response(params)
-      response = Ipizza::PaymentResponse.new(params)
-      response.verify(self.class.file_cert)
-      return response
-    end
-
-    def authentication_request(service_no = 4001)
-      req = Ipizza::AuthenticationRequest.new
-      req.service_url = self.class.service_url
-      req.sign_params = {
-        'VK_SERVICE' => service_no,
-        'VK_VERSION' => '008',
-        'VK_SND_ID' => self.class.snd_id,
-        'VK_REPLY' => '3002',
-        'VK_RETURN' => self.class.return_url,
-        'VK_DATE' => Date.today.strftime('%d.%m.%Y'),
-        'VK_TIME' => Time.now.strftime('%H:%M:%S')
-      }
-
-      req.extra_params = {
-        'VK_ENCODING' => self.class.encoding
-      }
-
-      param_order = ['VK_SERVICE', 'VK_VERSION', 'VK_SND_ID', 'VK_REPLY', 'VK_RETURN', 'VK_DATE', 'VK_TIME']
-
-      req.sign(self.class.file_key, self.class.key_secret, param_order)
-      req
-    end
-
-    def authentication_response(params)
-      response = Ipizza::AuthenticationResponse.new(params)
-      response.verify(self.class.file_cert, self.class.encoding)
-      return response
-    end
+  class Swedbank < Ipizza::Provider::Base
   end
 end

data/lib/ipizza/provider.rb

@@ -3,25 +3,19 @@ module Ipizza
 
     class << self
       def get(provider_name)
-        case provider_name.downcase
-        when 'swedbank'
+        case provider_name.to_s.downcase
+        when 'lhv'
+          Ipizza::Provider::Lhv.new
+        when 'swedbank', 'hp'
           Ipizza::Provider::Swedbank.new
-        when 'hp'
-          Ipizza::Provider::Swedbank.new
-        when 'eyp'
-          Ipizza::Provider::Seb.new
-        when 'seb'
+        when 'eyp', 'seb'
           Ipizza::Provider::Seb.new
-        when 'sampo'
+        when 'sampo', 'sampopank', 'danske'
           Ipizza::Provider::Sampo.new
-        when 'sampopank'
-          Ipizza::Provider::Sampo.new
-        when 'krep'
-          Ipizza::Provider::Krediidipank.new
-        when 'krediidipank'
+        when 'krep', 'krediidipank'
           Ipizza::Provider::Krediidipank.new
-        when 'nordea'
-          Ipizza::Provider::Nordea.new
+        when 'luminor', 'testluminor'
+          Ipizza::Provider::Luminor.new
         end
       end
     end