ipizza 1.0.0 → 2.0.0

data/spec/ipizza/config_spec.rb

@@ -3,7 +3,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Ipizza::Config do
   describe '.load_from_file' do
-
     before(:each) do
       Ipizza::Config.load_from_file(File.expand_path(File.dirname(__FILE__) + '/../config/plain_config.yml'))
     end
@@ -14,20 +13,20 @@ describe Ipizza::Config do
       Ipizza::Provider::Swedbank.cancel_url.should == 'http://test.local/cancel'
       Ipizza::Provider::Swedbank.key_secret.should == 'foobar'
       Ipizza::Provider::Swedbank.snd_id.should == 'dealer'
-      Ipizza::Provider::Swedbank.encoding.should == 'ISO-8859-4'
+      Ipizza::Provider::Swedbank.encoding.should == 'UTF-8'
       
       Ipizza::Provider::Seb.service_url.should == 'https://www.seb.ee/banklink'
     end
   
     it 'should load certificates from path relative to configuration file' do
-      Ipizza::Provider::Swedbank.file_key.should == File.expand_path(File.dirname(__FILE__) + '/../certificates/dealer.key')
-      Ipizza::Provider::Swedbank.file_cert.should == File.expand_path(File.dirname(__FILE__) + '/../certificates/bank.pub')
+      Ipizza::Provider::Swedbank.file_key.should == File.expand_path(File.dirname(__FILE__) + '/../certificates/pangalink_swedbank_user_key.pem')
+      Ipizza::Provider::Swedbank.file_cert.should == File.expand_path(File.dirname(__FILE__) + '/../certificates/pangalink_swedbank_bank_cert.pem')
     end
     
     it 'should load certificates from absolute file paths' do
       cfg = {'swedbank' => YAML::load_file(File.expand_path(File.dirname(__FILE__) + '/../config/config.yml'))['swedbank']}
-      cfg['swedbank']['file_key'] = File.expand_path(File.dirname(__FILE__) + '/../certificates/dealer.key')
-      cfg['swedbank']['file_cert'] = File.expand_path(File.dirname(__FILE__) + '/../certificates/bank.pub')
+      cfg['swedbank']['file_key'] = File.expand_path(File.dirname(__FILE__) + '/../certificates/pangalink_swedbank_user_key.pem')
+      cfg['swedbank']['file_cert'] = File.expand_path(File.dirname(__FILE__) + '/../certificates/pangalink_swedbank_bank_cert.pem')
       
       Tempfile::open('config.yml') do |tmp|
         tmp << cfg.to_yaml
@@ -35,8 +34,8 @@ describe Ipizza::Config do
         
         config = Ipizza::Config.load_from_file(File.expand_path(tmp.path))
         
-        Ipizza::Provider::Swedbank.file_key.should == File.expand_path(File.dirname(__FILE__) + '/../certificates/dealer.key')
-        Ipizza::Provider::Swedbank.file_cert.should == File.expand_path(File.dirname(__FILE__) + '/../certificates/bank.pub')
+        Ipizza::Provider::Swedbank.file_key.should == File.expand_path(File.dirname(__FILE__) + '/../certificates/pangalink_swedbank_user_key.pem')
+        Ipizza::Provider::Swedbank.file_cert.should == File.expand_path(File.dirname(__FILE__) + '/../certificates/pangalink_swedbank_bank_cert.pem')
       end
     end
   end
@@ -58,10 +57,10 @@ describe Ipizza::Config do
     it 'loads certificates from directory specified by certs_root' do
       Ipizza::Config.configure do |c|
         c.certs_root = File.expand_path(File.dirname(__FILE__) + '/../certificates')
-        c.swedbank_file_cert = 'seb_test_pub.pem'
+        c.swedbank_file_cert = 'pangalink_seb_bank_cert.pem'
       end
       
-      Ipizza::Provider::Swedbank.file_cert.should == File.expand_path(File.dirname(__FILE__) + '/../certificates/seb_test_pub.pem')
+      Ipizza::Provider::Swedbank.file_cert.should == File.expand_path(File.dirname(__FILE__) + '/../certificates/pangalink_seb_bank_cert.pem')
     end
   end
 end

data/spec/ipizza/provider/krediidipank_spec.rb

@@ -0,0 +1,89 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Ipizza::Provider::Krediidipank do
+  let(:response_time) { Ipizza::Util.time_to_iso8601(Time.now) }
+  let(:bank_key) { File.expand_path('../../../certificates/pangalink_krediidipank_bank_key.pem', __FILE__) }
+
+  describe '#payment_request' do
+    let(:payment) { Ipizza::Payment.new(stamp: 1, amount: '123.34', refnum: 1, message: 'Payment message', currency: 'EUR') }
+
+    before(:each) do
+      req_time = Time.now
+      Time.stub!(:now).and_return(req_time)
+    end
+
+    it 'should sign the request' do
+      req = Ipizza::Provider::Krediidipank.new.payment_request(payment)
+      params = {
+        'VK_SERVICE' => '1012',
+        'VK_VERSION' => '008',
+        'VK_SND_ID' => Ipizza::Provider::Krediidipank.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,
+        'VK_RETURN' => Ipizza::Provider::Krediidipank.return_url,
+        'VK_CANCEL' => Ipizza::Provider::Krediidipank.cancel_url,
+        'VK_DATETIME' => Ipizza::Util.time_to_iso8601(Time.now)
+      }
+      signature = Ipizza::Util.sign(Ipizza::Provider::Krediidipank.file_key, Ipizza::Provider::Krediidipank.key_secret, Ipizza::Util.mac_data_string(params, Ipizza::Request::PARAM_ORDER['1012']))
+      req.sign_params['VK_MAC'].should == signature
+    end
+  end
+
+  describe '#payment_response' do
+    let(:params) {
+      {
+        'VK_SERVICE' => '1111', 'VK_VERSION' => '008', 'VK_SND_ID' => 'KREP', 'VK_REC_ID' => 'sender',
+        'VK_STAMP' => '20150111000004', 'VK_T_NO' => '1143', 'VK_AMOUNT' => '.17', 'VK_CURR' => 'EUR',
+        'VK_REC_ACC' => 'EE411010002050618003', 'VK_REC_NAME' => 'ÕILIS OÜ',
+        'VK_SND_ACC' => 'EE541010010046155012', 'VK_SND_NAME' => 'TÕÄGER Leõpäöld¸´¨¦',
+        'VK_REF' => '201501110000048', 'VK_MSG' => 'Invoice #20150111000004', 'VK_T_DATETIME' => response_time,
+        'VK_ENCODING' => 'UTF-8', 'VK_LANG' => 'EST', 'VK_AUTO' => 'N'
+      }
+    }
+
+    it 'should parse and verify the payment response from bank' do
+      signature = Ipizza::Util.sign(bank_key, nil, Ipizza::Util.mac_data_string(params, Ipizza::Response::PARAM_ORDER['1111']))
+      Ipizza::Provider::Krediidipank.new.payment_response(params.merge('VK_MAC' => signature)).should be_valid
+    end
+  end
+
+  describe '#authentication_request' do
+    before(:each) do
+      req_time = Time.now
+      Time.stub!(:now).and_return(req_time)
+    end
+
+    it 'should sign the request' do
+      req = Ipizza::Provider::Krediidipank.new.authentication_request
+      params = {
+        'VK_SERVICE' => '4011',
+        'VK_VERSION' => '008',
+        'VK_SND_ID' => Ipizza::Provider::Krediidipank.snd_id,
+        'VK_RETURN' => Ipizza::Provider::Krediidipank.return_url,
+        'VK_DATETIME' => Ipizza::Util.time_to_iso8601(Time.now),
+        'VK_RID' => '',
+        'VK_REPLY' => '3012'
+      }
+      signature = Ipizza::Util.sign(Ipizza::Provider::Krediidipank.file_key, Ipizza::Provider::Krediidipank.key_secret, Ipizza::Util.mac_data_string(params, Ipizza::Request::PARAM_ORDER['4011']))
+      req.sign_params['VK_MAC'].should == signature
+    end
+  end
+
+  describe '#authentication_response' do
+    let(:params) {
+      {
+        'VK_SERVICE' => '3012', 'VK_VERSION' => '008', 'VK_USER' => 'dealer', 'VK_DATETIME' => response_time,
+        'VK_SND_ID' => 'KREP', 'VK_REC_ID' => 'sender', 'VK_USER_NAME' => 'TÕÄGER Leõpäöld¸´¨¦', 'VK_USER_ID' => '35511280268',
+        'VK_COUNTRY' => 'EE', 'VK_OTHER' => '', 'VK_TOKEN' => '7', 'VK_RID' => ''
+      }
+    }
+
+    it 'should parse and verify the authentication response from bank' do
+      signature = Ipizza::Util.sign(bank_key, nil, Ipizza::Util.mac_data_string(params, Ipizza::Response::PARAM_ORDER['3012']))
+      Ipizza::Provider::Krediidipank.new.authentication_response(params.merge('VK_MAC' => signature)).should be_valid
+    end
+  end
+end

data/spec/ipizza/provider/lhv_spec.rb

@@ -0,0 +1,89 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Ipizza::Provider::Lhv do
+  let(:response_time) { Ipizza::Util.time_to_iso8601(Time.now) }
+  let(:bank_key) { File.expand_path('../../../certificates/pangalink_lhv_bank_key.pem', __FILE__) }
+
+  describe '#payment_request' do
+    let(:payment) { Ipizza::Payment.new(stamp: 1, amount: '123.34', refnum: 1, message: 'Payment message', currency: 'EUR') }
+
+    before(:each) do
+      req_time = Time.now
+      Time.stub!(:now).and_return(req_time)
+    end
+
+    it 'should sign the request' do
+      req = Ipizza::Provider::Lhv.new.payment_request(payment)
+      params = {
+        'VK_SERVICE' => '1012',
+        'VK_VERSION' => '008',
+        'VK_SND_ID' => Ipizza::Provider::Lhv.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,
+        'VK_RETURN' => Ipizza::Provider::Lhv.return_url,
+        'VK_CANCEL' => Ipizza::Provider::Lhv.cancel_url,
+        'VK_DATETIME' => Ipizza::Util.time_to_iso8601(Time.now)
+      }
+      signature = Ipizza::Util.sign(Ipizza::Provider::Lhv.file_key, Ipizza::Provider::Lhv.key_secret, Ipizza::Util.mac_data_string(params, Ipizza::Request::PARAM_ORDER['1012']))
+      req.sign_params['VK_MAC'].should == signature
+    end
+  end
+
+  describe '#payment_response' do
+    let(:params) {
+      {
+        'VK_SERVICE' => '1111', 'VK_VERSION' => '008', 'VK_SND_ID' => 'LHV', 'VK_REC_ID' => 'sender',
+        'VK_STAMP' => '20150111000004', 'VK_T_NO' => '1143', 'VK_AMOUNT' => '.17', 'VK_CURR' => 'EUR',
+        'VK_REC_ACC' => 'EE411010002050618003', 'VK_REC_NAME' => 'ÕILIS OÜ',
+        'VK_SND_ACC' => 'EE541010010046155012', 'VK_SND_NAME' => 'TÕÄGER Leõpäöld¸´¨¦',
+        'VK_REF' => '201501110000048', 'VK_MSG' => 'Invoice #20150111000004', 'VK_T_DATETIME' => response_time,
+        'VK_ENCODING' => 'UTF-8', 'VK_LANG' => 'EST', 'VK_AUTO' => 'N'
+      }
+    }
+
+    it 'should parse and verify the payment response from bank' do
+      signature = Ipizza::Util.sign(bank_key, nil, Ipizza::Util.mac_data_string(params, Ipizza::Response::PARAM_ORDER['1111']))
+      Ipizza::Provider::Lhv.new.payment_response(params.merge('VK_MAC' => signature)).should be_valid
+    end
+  end
+
+  describe '#authentication_request' do
+    before(:each) do
+      req_time = Time.now
+      Time.stub!(:now).and_return(req_time)
+    end
+
+    it 'should sign the request' do
+      req = Ipizza::Provider::Lhv.new.authentication_request
+      params = {
+        'VK_SERVICE' => '4011',
+        'VK_VERSION' => '008',
+        'VK_SND_ID' => Ipizza::Provider::Lhv.snd_id,
+        'VK_RETURN' => Ipizza::Provider::Lhv.return_url,
+        'VK_DATETIME' => Ipizza::Util.time_to_iso8601(Time.now),
+        'VK_RID' => '',
+        'VK_REPLY' => '3012'
+      }
+      signature = Ipizza::Util.sign(Ipizza::Provider::Lhv.file_key, Ipizza::Provider::Lhv.key_secret, Ipizza::Util.mac_data_string(params, Ipizza::Request::PARAM_ORDER['4011']))
+      req.sign_params['VK_MAC'].should == signature
+    end
+  end
+
+  describe '#authentication_response' do
+    let(:params) {
+      {
+        'VK_SERVICE' => '3012', 'VK_VERSION' => '008', 'VK_USER' => 'dealer', 'VK_DATETIME' => response_time,
+        'VK_SND_ID' => 'LHV', 'VK_REC_ID' => 'sender', 'VK_USER_NAME' => 'TÕÄGER Leõpäöld¸´¨¦', 'VK_USER_ID' => '35511280268',
+        'VK_COUNTRY' => 'EE', 'VK_OTHER' => '', 'VK_TOKEN' => '7', 'VK_RID' => ''
+      }
+    }
+
+    it 'should parse and verify the authentication response from bank' do
+      signature = Ipizza::Util.sign(bank_key, nil, Ipizza::Util.mac_data_string(params, Ipizza::Response::PARAM_ORDER['3012']))
+      Ipizza::Provider::Lhv.new.authentication_response(params.merge('VK_MAC' => signature)).should be_valid
+    end
+  end
+end

data/spec/ipizza/provider/nordea/authentication_response_spec.rb

@@ -3,9 +3,9 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 describe Ipizza::Provider::Nordea::AuthenticationResponse do
   before(:each) do
     @valid_params = {
-      "B02K_CUSTNAME" => "Demo kasutaja", "B02K_IDNBR" => "87654321", "B02K_TIMESTMP" => "20020101204145428720",
-      "B02K_STAMP" => "20101204155339", "B02K_KEYVERS" => "0001", "B02K_MAC" => "A061E22312D7D63FDC2B0B52E16BC971",
-      "B02K_CUSTTYPE" => "01", "B02K_ALG" => "01", "B02K_CUSTID" => "37404280367", "B02K_VERS" => "0002"
+      'B02K_CUSTNAME' => 'Demo kasutaja', 'B02K_IDNBR' => '87654321', 'B02K_TIMESTMP' => '20020101204145428720',
+      'B02K_STAMP' => '20101204155339', 'B02K_KEYVERS' => '0001', 'B02K_MAC' => 'A061E22312D7D63FDC2B0B52E16BC971',
+      'B02K_CUSTTYPE' => '01', 'B02K_ALG' => '01', 'B02K_CUSTID' => '37404280367', 'B02K_VERS' => '0002'
     }
     @response = Ipizza::Provider::Nordea::AuthenticationResponse.new(@valid_params)
     @response.verify(Ipizza::Provider::Nordea.file_key)

data/spec/ipizza/provider/sampo_spec.rb

@@ -1,4 +1,89 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Ipizza::Provider::Sampo do
+  let(:response_time) { Ipizza::Util.time_to_iso8601(Time.now) }
+  let(:bank_key) { File.expand_path('../../../certificates/pangalink_danske_bank_key.pem', __FILE__) }
+
+  describe '#payment_request' do
+    let(:payment) { Ipizza::Payment.new(stamp: 1, amount: '123.34', refnum: 1, message: 'Payment message', currency: 'EUR') }
+
+    before(:each) do
+      req_time = Time.now
+      Time.stub!(:now).and_return(req_time)
+    end
+
+    it 'should sign the request' do
+      req = Ipizza::Provider::Sampo.new.payment_request(payment)
+      params = {
+        'VK_SERVICE' => '1012',
+        'VK_VERSION' => '008',
+        'VK_SND_ID' => Ipizza::Provider::Sampo.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,
+        'VK_RETURN' => Ipizza::Provider::Sampo.return_url,
+        'VK_CANCEL' => Ipizza::Provider::Sampo.cancel_url,
+        'VK_DATETIME' => Ipizza::Util.time_to_iso8601(Time.now)
+      }
+      signature = Ipizza::Util.sign(Ipizza::Provider::Sampo.file_key, Ipizza::Provider::Sampo.key_secret, Ipizza::Util.mac_data_string(params, Ipizza::Request::PARAM_ORDER['1012']))
+      req.sign_params['VK_MAC'].should == signature
+    end
+  end
+
+  describe '#payment_response' do
+    let(:params) {
+      {
+        'VK_SERVICE' => '1111', 'VK_VERSION' => '008', 'VK_SND_ID' => 'SAMPOPANK', 'VK_REC_ID' => 'sender',
+        'VK_STAMP' => '20150111000004', 'VK_T_NO' => '1143', 'VK_AMOUNT' => '.17', 'VK_CURR' => 'EUR',
+        'VK_REC_ACC' => 'EE411010002050618003', 'VK_REC_NAME' => 'ÕILIS OÜ',
+        'VK_SND_ACC' => 'EE541010010046155012', 'VK_SND_NAME' => 'TÕÄGER Leõpäöld¸´¨¦',
+        'VK_REF' => '201501110000048', 'VK_MSG' => 'Invoice #20150111000004', 'VK_T_DATETIME' => response_time,
+        'VK_ENCODING' => 'UTF-8', 'VK_LANG' => 'EST', 'VK_AUTO' => 'N'
+      }
+    }
+
+    it 'should parse and verify the payment response from bank' do
+      signature = Ipizza::Util.sign(bank_key, nil, Ipizza::Util.mac_data_string(params, Ipizza::Response::PARAM_ORDER['1111']))
+      Ipizza::Provider::Sampo.new.payment_response(params.merge('VK_MAC' => signature)).should be_valid
+    end
+  end
+
+  describe '#authentication_request' do
+    before(:each) do
+      req_time = Time.now
+      Time.stub!(:now).and_return(req_time)
+    end
+
+    it 'should sign the request' do
+      req = Ipizza::Provider::Sampo.new.authentication_request
+      params = {
+        'VK_SERVICE' => '4011',
+        'VK_VERSION' => '008',
+        'VK_SND_ID' => Ipizza::Provider::Sampo.snd_id,
+        'VK_RETURN' => Ipizza::Provider::Sampo.return_url,
+        'VK_DATETIME' => Ipizza::Util.time_to_iso8601(Time.now),
+        'VK_RID' => '',
+        'VK_REPLY' => '3012'
+      }
+      signature = Ipizza::Util.sign(Ipizza::Provider::Sampo.file_key, Ipizza::Provider::Sampo.key_secret, Ipizza::Util.mac_data_string(params, Ipizza::Request::PARAM_ORDER['4011']))
+      req.sign_params['VK_MAC'].should == signature
+    end
+  end
+
+  describe '#authentication_response' do
+    let(:params) {
+      {
+        'VK_SERVICE' => '3012', 'VK_VERSION' => '008', 'VK_USER' => 'dealer', 'VK_DATETIME' => response_time,
+        'VK_SND_ID' => 'SAMPOPANK', 'VK_REC_ID' => 'sender', 'VK_USER_NAME' => 'TÕÄGER Leõpäöld¸´¨¦', 'VK_USER_ID' => '35511280268',
+        'VK_COUNTRY' => 'EE', 'VK_OTHER' => '', 'VK_TOKEN' => '7', 'VK_RID' => ''
+      }
+    }
+
+    it 'should parse and verify the authentication response from bank' do
+      signature = Ipizza::Util.sign(bank_key, nil, Ipizza::Util.mac_data_string(params, Ipizza::Response::PARAM_ORDER['3012']))
+      Ipizza::Provider::Sampo.new.authentication_response(params.merge('VK_MAC' => signature)).should be_valid
+    end
+  end
 end

data/spec/ipizza/provider/seb_spec.rb

@@ -1,59 +1,89 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Ipizza::Provider::Seb do
+  let(:response_time) { Ipizza::Util.time_to_iso8601(Time.now) }
+  let(:bank_key) { File.expand_path('../../../certificates/pangalink_seb_bank_key.pem', __FILE__) }
+
   describe '#payment_request' do
-  
+    let(:payment) { Ipizza::Payment.new(stamp: 1, amount: '123.34', refnum: 1, message: 'Payment message', currency: 'EUR') }
+
     before(:each) do
-      @payment = Ipizza::Payment.new(:stamp => 1, :amount => '123.34', :refnum => 1, :message => 'Payment message', :currency => 'EUR')
+      req_time = Time.now
+      Time.stub!(:now).and_return(req_time)
     end
-    
+
     it 'should sign the request' do
-      req = Ipizza::Provider::Seb.new.payment_request(@payment)
-      req.sign_params['VK_MAC'].should == 'aVCFvsLJiczQw9VoYMdtoQKj5fXkP8OI+JfQN8bFGKZGxC/X5gVIIi/Bh9AyB6JXwbeMOfUlnvuJIukpmBpDg3dEWkv4xGwKdfacqwYkgSC17OBb7VmZ+B4d6HYaO088wxH1FBSVa87HKFJ7ScTEJfd3ZEZly9WzTPHiFWvpRGDxAYtuO5nfGMcscxOQ0B0cbrIcLKvqLho25hIgns3+lvRDWsOb9lFH//7U8OBOC9SuXCBwvC4Fng3wqmBSKRJgAqvQ40Y4XpBGt3U/ix26Vs1cP8lOGHUyqzrqKbcmvqqhgWzqpa0JoK6im/MhBePyNnHVoC8Pqw4ZwZb4YrrPXw=='
+      req = Ipizza::Provider::Seb.new.payment_request(payment)
+      params = {
+        'VK_SERVICE' => '1012',
+        'VK_VERSION' => '008',
+        'VK_SND_ID' => Ipizza::Provider::Seb.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,
+        'VK_RETURN' => Ipizza::Provider::Seb.return_url,
+        'VK_CANCEL' => Ipizza::Provider::Seb.cancel_url,
+        'VK_DATETIME' => Ipizza::Util.time_to_iso8601(Time.now)
+      }
+      signature = Ipizza::Util.sign(Ipizza::Provider::Seb.file_key, Ipizza::Provider::Seb.key_secret, Ipizza::Util.mac_data_string(params, Ipizza::Request::PARAM_ORDER['1012']))
+      req.sign_params['VK_MAC'].should == signature
     end
   end
 
   describe '#payment_response' do
-    before(:each) do
-      @params = {
-        'VK_T_NO' => '1143', 'VK_REF' => '201107010000048', 'VK_SND_NAME' => 'TÕÄGER Leõpäöld¸´¨¦', 'VK_REC_ID' => 'testvpos',
-        'appname' => 'UN3MIN', 'keel' => 'EST', 'VK_T_DATE' => '01.07.2011', 'VK_SND_ACC' => '10010046155012', 'VK_STAMP' => '20110701000004',
-        'VK_CHARSET' => 'UTF-8', 'VK_RETURN' => 'https://store.kraftal.com/return/seb', 'VK_LANG' => '', 'VK_REC_NAME' => 'ALLAS ALLAR',
-        'VK_AMOUNT' => '.17', 'VK_SERVICE' => '1101', 'VK_AUTO' => 'N', 'VK_MSG' => 'Edicy invoice #20110701000004', 'act' => 'UPOSTEST2',
-        'VK_SND_ID' => 'EYP', 'VK_VERSION' => '008', 'VK_REC_ACC' => '10002050618003', 'VK_CURR' => 'EUR',
-        'VK_MAC' => 'fj7moIwqMbvhmftFs5/5muOD1Dj5sRIlTUUcXGbzNKGFCrRz/N2ZpprFlO+8el7BNnGAoqCc2b4V2BrJ5XRsyYtLy1Gi4W8eSqwxbjBefDo21PFXpTmXYYJVy98fIWmWhOIBPMnEq6BlVf100GlV1C3OL+2mBU/ZjtPQG+B7OHo='
+    let(:params) {
+      {
+        'VK_SERVICE' => '1111', 'VK_VERSION' => '008', 'VK_SND_ID' => 'EYP', 'VK_REC_ID' => 'sender',
+        'VK_STAMP' => '20150111000004', 'VK_T_NO' => '1143', 'VK_AMOUNT' => '.17', 'VK_CURR' => 'EUR',
+        'VK_REC_ACC' => 'EE411010002050618003', 'VK_REC_NAME' => 'ÕILIS OÜ',
+        'VK_SND_ACC' => 'EE541010010046155012', 'VK_SND_NAME' => 'TÕÄGER Leõpäöld¸´¨¦',
+        'VK_REF' => '201501110000048', 'VK_MSG' => 'Invoice #20150111000004', 'VK_T_DATETIME' => response_time,
+        'VK_ENCODING' => 'UTF-8', 'VK_LANG' => 'EST', 'VK_AUTO' => 'N'
       }
-    end
-    
+    }
+
     it 'should parse and verify the payment response from bank' do
-      Ipizza::Provider::Seb.new.payment_response(@params).should be_valid
+      signature = Ipizza::Util.sign(bank_key, nil, Ipizza::Util.mac_data_string(params, Ipizza::Response::PARAM_ORDER['1111']))
+      Ipizza::Provider::Seb.new.payment_response(params.merge('VK_MAC' => signature)).should be_valid
     end
   end
 
   describe '#authentication_request' do
     before(:each) do
-      Time.stub!(:now).and_return(Time.parse('Mar 30 1981'))
-      Date.stub!(:today).and_return(Date.parse('Mar 30 1981'))
+      req_time = Time.now
+      Time.stub!(:now).and_return(req_time)
     end
-    
+
     it 'should sign the request' do
       req = Ipizza::Provider::Seb.new.authentication_request
-      req.sign_params['VK_MAC'].should == '0ZBLzC3XddTNZ4YBNJlPsJ/RDK4g7Utot9L3lvaxD9J0dfKfN4FUnife3oAQjhyc8lOi5MeBdjekN5mW7KXEMcOSTR9kCJTLZcJg1nMHTDjZcLu9FTAk2wcSrc8kUgigh22vBA38wQfbsZvong5ETYanH8RchZUp72tmO2rFmKzdD8bsnubg6l3m5NxoFv+2F6RsxzwtpkCNaKBpIH4iyWIYFWX7H3hTiUWlAXwKp8GP8OYPr1wUDbP2jVxOwpv7MW3g/heKfu3INBSazsvD22WhsNeKPKmqjJDIiJvo5QRhYq5Shze28oWQyCixMfw2UW7pk0gOtYJkrlwEEo22zQ=='
+      params = {
+        'VK_SERVICE' => '4011',
+        'VK_VERSION' => '008',
+        'VK_SND_ID' => Ipizza::Provider::Seb.snd_id,
+        'VK_RETURN' => Ipizza::Provider::Seb.return_url,
+        'VK_DATETIME' => Ipizza::Util.time_to_iso8601(Time.now),
+        'VK_RID' => '',
+        'VK_REPLY' => '3012'
+      }
+      signature = Ipizza::Util.sign(Ipizza::Provider::Seb.file_key, Ipizza::Provider::Seb.key_secret, Ipizza::Util.mac_data_string(params, Ipizza::Request::PARAM_ORDER['4011']))
+      req.sign_params['VK_MAC'].should == signature
     end
   end
 
   describe '#authentication_response' do
-    before(:each) do
-      @params = {
-        'VK_TIME' => '00:56:37', 'VK_USER' => '', 'VK_INFO' => 'NIMI:tõõger , LeõpäöldžŽšŠ;ISIK:35511280268',
-        'VK_DATE' => '24.10.2010', 'VK_CHARSET' => 'UTF-8', 'VK_RETURN' => 'http://rkas-aktide-is.local/ipizza/auth',
-        'VK_LANG' => 'EST', 'VK_SERVICE'=>'3002', 'VK_RID' => '', 'VK_SND_ID' => 'EYP', 'VK_VERSION' => '008',
-        'VK_MAC' => 'BeYfkTTj9HNCoMSVbBHSYujFpdcPfo3Ee56ZwaHzYwLj3/QMsb3b5cA7Z1GjeW2VLIoWVtOZmjWN9N74NtH7mu0Nv3RUYep6DJcsZvejs9uklpCLFS1bzInGlQKh3Q04Vttss6dLxgoRJu7lT3hvPKUPHtBZ2RZMHByLuwqNqC4='
+    let(:params) {
+      {
+        'VK_SERVICE' => '3012', 'VK_VERSION' => '008', 'VK_USER' => 'dealer', 'VK_DATETIME' => response_time,
+        'VK_SND_ID' => 'EYP', 'VK_REC_ID' => 'sender', 'VK_USER_NAME' => 'TÕÄGER Leõpäöld¸´¨¦', 'VK_USER_ID' => '35511280268',
+        'VK_COUNTRY' => 'EE', 'VK_OTHER' => '', 'VK_TOKEN' => '7', 'VK_RID' => ''
       }
-    end
-    
+    }
+
     it 'should parse and verify the authentication response from bank' do
-      Ipizza::Provider::Seb.new.authentication_response(@params).should be_valid
+      signature = Ipizza::Util.sign(bank_key, nil, Ipizza::Util.mac_data_string(params, Ipizza::Response::PARAM_ORDER['3012']))
+      Ipizza::Provider::Seb.new.authentication_response(params.merge('VK_MAC' => signature)).should be_valid
     end
   end
-end
+end