gocardless 1.2.0 → 1.2.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.2.1 - July 11, 2012
+
+- Fix bug which caused Client#merchant to fail after #fetch_access_token was
+  called during the merchant authorization flow (this only concerns partners).
+
 ## 1.2.0 - June 19, 2012
 
 - Add some extra attributes to resources (e.g. status, merchant's balance, etc)

data/lib/gocardless/client.rb

@@ -45,6 +45,7 @@ module GoCardless
     end
 
     # Generate the OAuth authorize url
+    #
     # @param [Hash] options parameters to be included in the url.
     #   +:redirect_uri+ is required.
     # @return [String] the authorize url
@@ -61,12 +62,19 @@ module GoCardless
     end
     alias :new_merchant_url :authorize_url
 
-    # @method fetch_access_token(auth_code, options)
+    # Exchange the authorization code for an access token
+    #
     # @param [String] auth_code to exchange for the access_token
     # @return [String] the access_token required to make API calls to resources
     def fetch_access_token(auth_code, options)
       raise ArgumentError, ':redirect_uri required' unless options[:redirect_uri]
+      # Exchange the auth code for an access token
       @access_token = @oauth_client.auth_code.get_token(auth_code, options)
+
+      # Use the scope to figure out which merchant we're managing
+      scope = @access_token.params[:scope] || @access_token.params['scope']
+      set_merchant_id_from_scope(scope)
+
       self.access_token
     end
 
@@ -89,10 +97,7 @@ module GoCardless
       @access_token = OAuth2::AccessToken.new(@oauth_client, token)
       @access_token.params['scope'] = scope
 
-      unless @merchant_id
-        perm = scope.split.select {|p| p.start_with?('manage_merchant:') }.first
-        @merchant_id = perm.split(':')[1] if perm
-      end
+      set_merchant_id_from_scope(scope) unless @merchant_id
     end
 
     # Issue an GET request to the API server
@@ -272,6 +277,12 @@ module GoCardless
       @merchant_id
     end
 
+    # Pull the merchant id out of the access scope
+    def set_merchant_id_from_scope(scope)
+      perm = scope.split.select {|p| p.start_with?('manage_merchant:') }.first
+      @merchant_id = perm.split(':')[1] if perm
+    end
+
     # Send a request to the GoCardless API servers
     #
     # @param [Symbol] method the HTTP method to use (e.g. +:get+, +:post+)

data/lib/gocardless/version.rb

@@ -1,3 +1,3 @@
 module GoCardless
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.2.1'.freeze
 end

data/spec/client_spec.rb

@@ -92,31 +92,33 @@ describe GoCardless::Client do
     end
 
     describe "with valid params" do
+      let(:oauth_client) { @client.instance_variable_get(:@oauth_client) }
+      let(:fake_token) do
+        stub(:params => {'scope' => 'manage_merchant:x'}, :token  => 'abc')
+      end
+
+      before { oauth_client.auth_code.stubs(:get_token).returns(fake_token) }
+
       it "calls correct method with correct args" do
         auth_code = 'fakecode'
-        access_token = mock
-
-        @client.instance_variable_get(:@access_token).should be_nil
 
-        oauth_client = @client.instance_variable_get(:@oauth_client)
         oauth_client.auth_code.expects(:get_token).with(
           auth_code, has_entry(:redirect_uri => @redirect_uri)
-        )
+        ).returns(fake_token)
 
         @client.fetch_access_token(auth_code, {:redirect_uri => @redirect_uri})
       end
 
       it "sets @access_token" do
-        access_token = mock
-        access_token.stubs(:params).returns('scope' => '')
-        access_token.stubs(:token).returns('')
-
-        oauth_client = @client.instance_variable_get(:@oauth_client)
-        oauth_client.auth_code.expects(:get_token).returns(access_token)
-
         @client.instance_variable_get(:@access_token).should be_nil
         @client.fetch_access_token('code', {:redirect_uri => @redirect_uri})
-        @client.instance_variable_get(:@access_token).should == access_token
+        @client.instance_variable_get(:@access_token).should == fake_token
+      end
+
+      it "sets @merchant_id" do
+        @client.instance_variable_get(:@merchant_id).should be_nil
+        @client.fetch_access_token('code', {:redirect_uri => @redirect_uri})
+        @client.instance_variable_get(:@merchant_id).should == 'x'
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gocardless
 version: !ruby/object:Gem::Version 
-  hash: 242951009964279202
+  hash: 849635752354842289
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Harry Marr
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-19 00:00:00 Z
+date: 2012-07-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: oauth2