braintree 2.80.0 → 2.80.1

data/lib/braintree/oauth_gateway.rb

@@ -42,8 +42,8 @@ module Braintree
       end
     end
 
-    def connect_url(params)
-      params[:client_id] = @config.client_id
+    def connect_url(raw_params)
+      params = raw_params.merge({:client_id => @config.client_id})
       user_params = _sub_query(params, :user)
       business_params = _sub_query(params, :business)
       payment_methods = _sub_array_query(params, :payment_methods)
@@ -53,8 +53,7 @@ module Braintree
         concat(payment_methods)
 
       query_string = query.map { |k, v| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}" }.join("&")
-      url = "#{@config.base_url}/oauth/connect?#{query_string}"
-      "#{url}&signature=#{_compute_signature(url)}&algorithm=SHA256"
+      "#{@config.base_url}/oauth/connect?#{query_string}"
     end
 
     def _sub_query(params, root)
@@ -70,10 +69,5 @@ module Braintree
         ["#{root}[]", value]
       end
     end
-
-    def _compute_signature(url)
-      key_digest = OpenSSL::Digest::SHA256.digest(@config.client_secret)
-      OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, key_digest, url)
-    end
   end
 end

data/lib/braintree/version.rb

@@ -2,7 +2,7 @@ module Braintree
   module Version
     Major = 2
     Minor = 80
-    Tiny = 0
+    Tiny = 1
 
     String = "#{Major}.#{Minor}.#{Tiny}"
   end

data/spec/integration/braintree/oauth_spec.rb

@@ -193,9 +193,6 @@ describe "OAuth" do
       query["business[fulfillment_completed_in]"].should == ["7"]
       query["business[currency]"].should == ["USD"]
       query["business[website]"].should == ["http://example.com"]
-
-      query["signature"][0].length.should == 64
-      query["algorithm"].should == ["SHA256"]
     end
 
     it "builds the query string with multiple payment_methods" do
@@ -216,19 +213,13 @@ describe "OAuth" do
       query["payment_methods[]"].should include("paypal")
       query["payment_methods[]"].should include("credit_card")
     end
-  end
 
-  describe "_compute_signature" do
-    it "computes the correct signature" do
-      @gateway = Braintree::Gateway.new(
-        :client_id => "client_id$development$integration_client_id",
-        :client_secret => "client_secret$development$integration_client_secret",
-        :logger => Logger.new("/dev/null")
-      )
-      url = "http://localhost:3000/oauth/connect?business%5Bname%5D=We+Like+Spaces&client_id=client_id%24development%24integration_client_id"
-      signature = @gateway.oauth._compute_signature(url)
+    it "doesn't mutate the options" do
+      params = {:payment_methods => ["credit_card"]}
+
+      @gateway.oauth.connect_url(params)
 
-      signature.should == "a36bcf10dd982e2e47e0d6a2cb930aea47ade73f954b7d59c58dae6167894d41"
+      params.should == {:payment_methods => ["credit_card"]}
     end
   end
 end

data/spec/integration/braintree/transaction_spec.rb

@@ -1944,7 +1944,7 @@ describe Braintree::Transaction do
             }
           )
           result.success?.should == true
-          result.transaction.status.should == Braintree::Transaction::Status::Settled
+          result.transaction.status.should == Braintree::Transaction::Status::Settling
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braintree
 version: !ruby/object:Gem::Version
-  version: 2.80.0
+  version: 2.80.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder