wepay-rails 2.1.0 → 2.2.0

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.2.0

data/app/controllers/wepay/checkout_controller.rb

@@ -0,0 +1,14 @@
+class Wepay::CheckoutController < Wepay::ApplicationController
+  def index
+    record = WepayCheckoutRecord.find_by_checkout_id_and_security_token(params[:checkout_id],params[:security_token])
+
+    if record.present?
+      wepay_gateway = WepayRails::Payments::Gateway.new
+      checkout = wepay_gateway.lookup_checkout(record.checkout_id)
+      record.update_attributes(checkout)
+      redirect_to "#{wepay_gateway.configuration[:after_checkout_redirect_uri]}?checkout_id=#{params[:checkout_id]}"
+    else
+      raise StandardError.new("Wepay IPN: No record found for checkout_id #{params[:checkout_id]} and security_token #{params[:security_token]}")
+    end
+  end
+end

data/app/controllers/wepay/ipn_controller.rb

@@ -1,7 +1,7 @@
 class Wepay::IpnController < Wepay::ApplicationController
   def create
 
-    record = WepayCheckoutRecord.find_by_checkout_id(params[:checkout_id])
+    record = WepayCheckoutRecord.find_by_checkout_id_and_security_token(params[:checkout_id],params[:security_token])
 
     if record.present?
       wepay_gateway = WepayRails::Payments::Gateway.new
@@ -9,7 +9,7 @@ class Wepay::IpnController < Wepay::ApplicationController
       record.update_attributes(checkout)
       render :text => "ok"
     else
-      raise StandardError.new("Wepay IPN: No record found for checkout_id #{params[:checkout_id]}")
+      raise StandardError.new("Wepay IPN: No record found for checkout_id #{params[:checkout_id]} and security_token #{params[:security_token]}")
     end
 
   end

data/lib/api/checkout_methods.rb

@@ -1,3 +1,4 @@
+require 'digest/sha2'
 module WepayRails
   module Api
     module CheckoutMethods
@@ -37,9 +38,10 @@ module WepayRails
       # :shipping_fee	No	The amount that you want to charge for shipping.
       # :charge_tax	No	A boolean value (0 or 1). If set to 1 and the account has a relevant tax entry (see /account/set_tax), then tax will be charged.
       def perform_checkout(parms)
+        security_token = Digest::SHA2.hexdigest("#{rand(4)}#{Time.now.to_i}")
         defaults = {
-            :callback_uri     => ipn_callback_uri,
-            :redirect_uri     => checkout_redirect_uri,
+            :callback_uri     => ipn_callback_uri(security_token),
+            :redirect_uri     => checkout_redirect_uri(security_token),
             :fee_payer        => @wepay_config[:fee_payer],
             :type             => @wepay_config[:checkout_type],
             :charge_tax       => @wepay_config[:charge_tax] ? 1 : 0,
@@ -50,21 +52,34 @@ module WepayRails
             :account_id       => @wepay_config[:account_id]
         }.merge(parms)
 
-        self.call_api("/checkout/create", defaults)
+        resp = self.call_api("/checkout/create", defaults).symbolize_keys!
+        resp.merge({:security_token => security_token})
       end
 
       def lookup_checkout(checkout_id)
         self.call_api("/checkout", {:checkout_id => checkout_id})
       end
 
-      def ipn_callback_uri
-        return @wepay_config[:ipn_callback_uri] if @wepay_config[:ipn_callback_uri].present?
-        "#{@wepay_config[:root_callback_uri]}/wepay/ipn"
+      def ipn_callback_uri(security_token)
+        uri = if @wepay_config[:ipn_callback_uri].present?
+                @wepay_config[:ipn_callback_uri]
+              else
+                "#{@wepay_config[:root_callback_uri]}/wepay/ipn"
+              end
+        apply_security_token(uri, security_token)
       end
 
-      def checkout_redirect_uri
-        return @wepay_config[:checkout_redirect_uri] if @wepay_config[:checkout_redirect_uri].present?
-        "#{@wepay_config[:root_callback_uri]}/wepay/checkout"
+      def checkout_redirect_uri(security_token)
+        uri = if @wepay_config[:ipn_callback_uri].present?
+                @wepay_config[:checkout_redirect_uri]
+              else
+                "#{@wepay_config[:root_callback_uri]}/wepay/checkout"
+              end
+        apply_security_token(uri, security_token)
+      end
+
+      def apply_security_token(uri, security_token)
+        uri += (uri =~ /\?/ ? '&' : '?') + "security_token=#{security_token}"
       end
     end
   end

data/lib/generators/wepay_rails/install/templates/create_wepay_checkout_records.rb

@@ -25,6 +25,7 @@ class CreateWepayCheckoutRecords < ActiveRecord::Migration
             t.boolean :require_shipping
             t.text :shipping_address
             t.decimal :tax
+            t.string :security_token
 
             t.timestamps
         end

data/lib/helpers/controller_helpers.rb

@@ -41,18 +41,19 @@ module WepayRails
         wepay_gateway = WepayRails::Payments::Gateway.new(access_token)
         response      = wepay_gateway.perform_checkout(params)
 
-        if response['checkout_uri'].blank?
+        if response[:checkout_uri].blank?
           raise WepayRails::Exceptions::WepayCheckoutError.new("An error occurred: #{response.inspect}")
         end
 
         params.merge!({
-            :access_token => wepay_gateway.access_token,
-            :checkout_id  => response['checkout_id']
+            :access_token   => wepay_gateway.access_token,
+            :checkout_id    => response[:checkout_id],
+            :security_token => response[:security_token]
         })
 
         WepayCheckoutRecord.create(params)
 
-        redirect_to response['checkout_uri'] and return
+        redirect_to response[:checkout_uri] and return
       end
     end
   end

data/wepay-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wepay-rails"
-  s.version = "2.1.0"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Medeiros"]
-  s.date = "2011-11-28"
+  s.date = "2011-11-29"
   s.description = "Rails gem that interfaces with the WePay API"
   s.email = "adammede@gmail.com"
   s.extra_rdoc_files = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "app/controllers/wepay/application_controller.rb",
     "app/controllers/wepay/authorize_controller.rb",
+    "app/controllers/wepay/checkout_controller.rb",
     "app/controllers/wepay/ipn_controller.rb",
     "config/routes.rb",
     "lib/api/account_methods.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wepay-rails
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-28 00:00:00.000000000Z
+date: 2011-11-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &24514020 !ruby/object:Gem::Requirement
+  requirement: &12133880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24514020
+  version_requirements: *12133880
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &24512520 !ruby/object:Gem::Requirement
+  requirement: &12132460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24512520
+  version_requirements: *12132460
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &24510740 !ruby/object:Gem::Requirement
+  requirement: &12130820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *24510740
+  version_requirements: *12130820
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &24486880 !ruby/object:Gem::Requirement
+  requirement: &12108320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *24486880
+  version_requirements: *12108320
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &24484080 !ruby/object:Gem::Requirement
+  requirement: &12106040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24484080
+  version_requirements: *12106040
 description: Rails gem that interfaces with the WePay API
 email: adammede@gmail.com
 executables: []
@@ -85,6 +85,7 @@ files:
 - VERSION
 - app/controllers/wepay/application_controller.rb
 - app/controllers/wepay/authorize_controller.rb
+- app/controllers/wepay/checkout_controller.rb
 - app/controllers/wepay/ipn_controller.rb
 - config/routes.rb
 - lib/api/account_methods.rb
@@ -113,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2056025376124091245
+      hash: -341794943592480612
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: