effective_orders 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b5a91a9aee45dd22835d990a8a86debf6f6bb93
-  data.tar.gz: 9f246825aef174e7796f65a3d7f8a7d156cd8bbb
+  metadata.gz: 0d4870a5fe33fa214673827989e18d0fffb52025
+  data.tar.gz: e2eee7d058341602182405e8e527dff323a4eed9
 SHA512:
-  metadata.gz: 290d57dfbef5bd79dcedc48d55a64d16583e9dafdc912e09656baa9c7a4fda2e49bef8fc11e8526fe9532f22b6dde363516f01e70e6aefa0f446dc2c13844dbb
-  data.tar.gz: 4f4fa278897534b968aa8abcec312f67f4fbfc74b06b2c75cc9c536e0eeff59158e1fb792d72a575895ac14e84c75951b0945d1a1906f1947895d422101b2af7
+  metadata.gz: e5028380b88bd4f21802ecb2bf34ea25edd1de4a798110605a67d1bee00f27970c568152add9165d4469ea41b5ee03c818adc834c731d3b56b007d64bc0f529e
+  data.tar.gz: a6b792c03e03954cf3d30eb99368ccdc9afa05adec843b0b5b001a84e400592f17e2327523b193fac1014a6b3ae12c424ac175b4d6d6312f69315e4d7fa629e8

data/app/controllers/effective/webhooks_controller.rb

@@ -17,13 +17,14 @@ module Effective
 
     def stripe
       @event = (Stripe::Webhook.construct_event(request.body.read, request.env['HTTP_STRIPE_SIGNATURE'], EffectiveOrders.subscriptions[:webhook_secret]) rescue nil)
+      (head(:ok) and return) if request.get? && @event.blank?
       (head(:bad_request) and return) unless @event
 
       unless EffectiveOrders.subscriptions[:ignore_livemode]
         (head(:bad_request) and return) if (params[:livemode] == false && Rails.env.production?)
       end
 
-      Rails.logger.info "[STRIPE] webhook received: #{@event.type} for #{customer || 'unknown customer'}" # Customer must be called here
+      Rails.logger.info "[STRIPE] webhook received: #{@event.type} for #{customer || 'no customer'}"
 
       Effective::Customer.transaction do
         case @event.type
@@ -58,7 +59,7 @@ module Effective
         when 'customer.subscription.updated'
           send_email(:subscription_updated, customer)
         else
-          Rails.logger.info "[STRIPE] webhook unhandled event type: #{@event.type}"
+          Rails.logger.info "[STRIPE] successful event: #{@event.type}. Nothing to do."
         end
       end
 
@@ -74,7 +75,7 @@ module Effective
         stripe_customer_id = @event.data.object.customer if @event.data.object.respond_to?(:customer)
         stripe_customer_id = @event.data.object.id if @event.data.object.object == 'customer'
 
-        Effective::Customer.where(stripe_customer_id: stripe_customer_id || 'unknown').first!
+        Effective::Customer.where(stripe_customer_id: stripe_customer_id || 'none').first
       )
     end
 
@@ -84,7 +85,7 @@ module Effective
     end
 
     def run_subscribable_buyer_callbacks!
-      return if @event.blank? || @customer.blank?
+      return true if (@event.blank? || @customer.blank?)
 
       name = ('after_' + @event.type.to_s.gsub('.', '_')).to_sym
       buyer = @customer.user

data/config/routes.rb

@@ -29,7 +29,7 @@ EffectiveOrders::Engine.routes.draw do
 
       match 'customer/settings', to: 'customers#edit', as: :customer_settings, via: [:get]
       match 'customer/settings', to: 'customers#update', via: [:patch, :put, :post]
-      match 'webhooks/stripe', to: 'webhooks#stripe', via: [:post, :put]
+      match 'webhooks/stripe', to: 'webhooks#stripe', via: [:get, :post, :put]
     end
 
     match 'cart', to: 'carts#show', as: 'cart', via: :get

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.0.2'.freeze
+  VERSION = '4.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-25 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails