stripe 3.0.1 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79dc89b3485d9c9077874530b9483ba3a048b1d8
-  data.tar.gz: a73e14de59f52f2282196f1a30537a7d6c353497
+  metadata.gz: 71ad66341e1b3896e85749e3f18870b734386a86
+  data.tar.gz: 67175bb4549ab20ca69f38016e9f7d96aedaa817
 SHA512:
-  metadata.gz: 59133df8f5c29d44597f9a8145c77f0becf8705fe1b507b4612fb57930eb0b09afa2ef05e1ebe10c52e0749484bbcc957dbf998a2eb50df3d3d9879a9bcb2004
-  data.tar.gz: e5b4737ca902571ed0866df6b1401c5c3a2823d70e8a8da224dc5f2266b50cb454cffade965b5746098ce07e8ce0dd6eeedfe6c0b8c444a275d935eb9e008a42
+  metadata.gz: f740ee89ea7c34c45944dc299ba346ad715c96b736a05dc6ad2f13337125656d049ff16a33671de454d5e2511e98e7431ae58caf275c934d957e3f608cb7df91
+  data.tar.gz: 04d28b541238aba0ce44820f5b1daf38a4a798892764d1d18e565d5d688b0d627895b037152ad976cbec982f1277dc6b7475bd5589ef152d6e7cbbebbb77b428

data/History.txt

@@ -1,7 +1,21 @@
+=== 3.0.3 2017-07-28
+
+* Revert `nil` to empty string coercion from 3.0.2
+* Handle `invalid_client` OAuth error code
+* Improve safety of error handling logic safer for unrecognized OAuth error
+  codes
+
+=== 3.0.2 2017-07-12 (yanked)
+
+* Convert `nil` to empty string when serializing parameters (instead of
+  opaquely dropping it) -- NOTE: this change has since been reverted
+
 === 3.0.1 2017-07-11
 
-* Properties set with an API resource will now serialize that resource's ID if possible
-* API resources will throw an ArgumentError on save if a property has been with an API resource that cannot be serialized
+* Properties set with an API resource will now serialize that resource's ID if
+  possible
+* API resources will throw an ArgumentError on save if a property has been with
+  an API resource that cannot be serialized
 
 === 3.0.0 2017-06-27
 
@@ -652,3 +666,5 @@ Identical to 1.56.0 above. I incorrectly cut a patch-level release.
 
 * 1 major enhancement:
   * Initial release
+
+# vim: set tw=79:

data/VERSION

@@ -1 +1 @@
-3.0.1
+3.0.3

data/lib/stripe/errors.rb

@@ -114,6 +114,12 @@ module Stripe
       end
     end
 
+    # InvalidClientError is raised when the client doesn't belong to you, or
+    # the API key mode (live or test) doesn't match the client mode. Or the
+    # stripe_user_id doesn't exist or isn't connected to your application.
+    class InvalidClientError < OAuthError
+    end
+
     # InvalidGrantError is raised when a specified code doesn't exist, is
     # expired, has been used, or doesn't belong to you; a refresh token doesn't
     # exist, or doesn't belong to you; or if an API key's mode (live or test)

data/lib/stripe/stripe_client.rb

@@ -244,8 +244,7 @@ module Stripe
 
       if error_data.is_a?(String)
         error = specific_oauth_error(resp, error_data)
-      end
-      if error.nil?
+      else
         error = specific_api_error(resp, error_data)
       end
 
@@ -307,13 +306,16 @@ module Stripe
       }]
 
       case error_code
+      when 'invalid_client'            then OAuth::InvalidClientError.new(*args)
       when 'invalid_grant'             then OAuth::InvalidGrantError.new(*args)
       when 'invalid_request'           then OAuth::InvalidRequestError.new(*args)
       when 'invalid_scope'             then OAuth::InvalidScopeError.new(*args)
       when 'unsupported_grant_type'    then OAuth::UnsupportedGrantTypeError.new(*args)
       when 'unsupported_response_type' then OAuth::UnsupportedResponseTypeError.new(*args)
       else
-        nil
+        # We'd prefer that all errors are typed, but we create a generic
+        # OAuthError in case we run into a code that we don't recognize.
+        OAuth::OAuthError.new(*args)
       end
     end
 

data/lib/stripe/version.rb

@@ -1,3 +1,3 @@
 module Stripe
-  VERSION = '3.0.1'
+  VERSION = '3.0.3'
 end

data/test/stripe/invoice_test.rb

@@ -74,6 +74,19 @@ module Stripe
           }
         assert invoice.kind_of?(Stripe::Invoice)
       end
+
+      should "be callable with an empty string" do
+        invoice = Stripe::Invoice.upcoming(
+          coupon: '',
+          customer: API_FIXTURES[:customer][:id]
+        )
+        assert_requested :get, "#{Stripe.api_base}/v1/invoices/upcoming",
+          query: {
+            coupon: '',
+            customer: API_FIXTURES[:customer][:id]
+          }
+        assert invoice.kind_of?(Stripe::Invoice)
+      end
     end
   end
 end

data/test/stripe/stripe_client_test.rb

@@ -368,6 +368,42 @@ module Stripe
           assert_equal('invalid_grant', e.code)
           assert_equal('This authorization code has already been used. All tokens issued with this code have been revoked.', e.message)
         end
+
+        should "raise OAuth::InvalidClientError when error is a string with value 'invalid_client'" do
+          stub_request(:post, "#{Stripe.connect_base}/oauth/deauthorize").
+            to_return(body: JSON.generate({
+              error: "invalid_client",
+              error_description: "This application is not connected to stripe account acct_19tLK7DSlTMT26Mk, or that account does not exist.",
+            }), status: 401)
+
+          client = StripeClient.new
+          opts = {api_base: Stripe.connect_base}
+          e = assert_raises Stripe::OAuth::InvalidClientError do
+            client.execute_request(:post, '/oauth/deauthorize', opts)
+          end
+
+          assert_equal(401, e.http_status)
+          assert_equal('invalid_client', e.code)
+          assert_equal('This application is not connected to stripe account acct_19tLK7DSlTMT26Mk, or that account does not exist.', e.message)
+        end
+
+        should "raise Stripe::OAuthError on indeterminate OAuth error" do
+          stub_request(:post, "#{Stripe.connect_base}/oauth/deauthorize").
+            to_return(body: JSON.generate({
+              error: "new_code_not_recognized",
+              error_description: "Something.",
+            }), status: 401)
+
+          client = StripeClient.new
+          opts = {api_base: Stripe.connect_base}
+          e = assert_raises Stripe::OAuth::OAuthError do
+            client.execute_request(:post, '/oauth/deauthorize', opts)
+          end
+
+          assert_equal(401, e.http_status)
+          assert_equal("new_code_not_recognized", e.code)
+          assert_equal("Something.", e.message)
+        end
       end
 
       context "idempotency keys" do
@@ -455,6 +491,27 @@ module Stripe
           client.execute_request(:post, '/v1/charges')
         end
       end
+
+      context "params serialization" do
+        should 'allows empty strings in params' do
+          client = StripeClient.new
+          client.execute_request(:get, '/v1/invoices/upcoming',
+                                 params: { customer: API_FIXTURES[:customer][:id],
+                                           coupon: '' })
+          assert_requested(:get, "#{Stripe.api_base}/v1/invoices/upcoming?",
+                           query: { customer: API_FIXTURES[:customer][:id],
+                                    coupon: '' })
+        end
+
+        should 'filter nils in params' do
+          client = StripeClient.new
+          client.execute_request(:get, '/v1/invoices/upcoming',
+                                 params: { customer: API_FIXTURES[:customer][:id],
+                                           coupon: nil })
+          assert_requested(:get, "#{Stripe.api_base}/v1/invoices/upcoming?",
+                           query: { customer: API_FIXTURES[:customer][:id] })
+        end
+      end
     end
 
     context "#request" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stripe
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.3
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -233,4 +233,3 @@ test_files:
 - test/stripe_test.rb
 - test/test_data.rb
 - test/test_helper.rb
-has_rdoc: