lib/xero_gateway/oauth.rb in xero_gateway-2.4.0 vs lib/xero_gateway/oauth.rb in xero_gateway-2.5.0

@@ -20,32 +20,38 @@
         :access_token_path  => "/oauth/AccessToken",
         :authorize_path     => "/oauth/Authorize"
       }.freeze
     end
 
-    extend Forwardable
-    def_delegators :access_token, :get, :post, :put, :delete
-
-    attr_reader   :ctoken, :csecret, :consumer_options, :authorization_expires_at
+    attr_reader   :ctoken, :csecret, :consumer_options, :authorization_expires_at, :expires_at
     attr_accessor :session_handle
 
     def initialize(ctoken, csecret, options = {})
       @ctoken, @csecret = ctoken, csecret
+      
+      # Allow user-agent base val for certification procedure (enforce for PartnerApp)
+      @base_headers = {}
+      @base_headers["User-Agent"] = options.delete(:user_agent) if options.has_key?(:user_agent)
+
       @consumer_options = XERO_CONSUMER_OPTIONS.merge(options)
     end
 
     def consumer
       @consumer ||= ::OAuth::Consumer.new(@ctoken, @csecret, consumer_options)
     end
 
     def request_token(params = {})
-      @request_token ||= consumer.get_request_token(params)
+      # Underlying oauth consumer accepts body params and headers for request via positional params - explicit nilling of 
+      #  body parameters allows for correct position for headers
+      @request_token ||= consumer.get_request_token(params, nil, @base_headers)
     end
 
     def authorize_from_request(rtoken, rsecret, params = {})
       request_token     = ::OAuth::RequestToken.new(consumer, rtoken, rsecret)
-      access_token      = request_token.get_access_token(params)
+      # Underlying oauth consumer accepts body params and headers for request via positional params - explicit nilling of 
+      #  body parameters allows for correct position for headers
+      access_token      = request_token.get_access_token(params, nil, @base_headers)
       @atoken, @asecret = access_token.token, access_token.secret
 
       update_attributes_from_token(access_token)
     end
 
@@ -63,20 +69,38 @@
       access_secret  ||= @asecret
       session_handle ||= @session_handle
 
       old_token = ::OAuth::RequestToken.new(consumer, access_token, access_secret)
 
+      # Underlying oauth consumer accepts body params and headers for request via positional params - explicit nilling of 
+      #  body parameters allows for correct position for headers
       access_token = old_token.get_access_token({
         :oauth_session_handle => session_handle,
         :token                => old_token
-      })
+      }, nil, @base_headers)
 
       update_attributes_from_token(access_token)
     rescue ::OAuth::Unauthorized => e
       # If the original access token is for some reason invalid an OAuth::Unauthorized could be raised.
       # In this case raise a XeroGateway::OAuth::TokenInvalid which can be captured by the caller.  In this
       # situation the end user will need to re-authorize the application via the request token authorization URL
       raise XeroGateway::OAuth::TokenInvalid.new(e.message)
+    end
+
+    def get(path, headers = {})
+      access_token.get(path, headers.merge(@base_headers))
+    end
+      
+    def post(path, body = '', headers = {})
+      access_token.post(path, body, headers.merge(@base_headers))
+    end
+      
+    def put(path, body = '', headers = {})
+      access_token.put(path, body, headers.merge(@base_headers))
+    end
+    
+    def delete(path, headers = {})
+      access_token.delete(path, headers.merge(@base_headers))
     end
 
     private
 
       # Update instance variables with those from the AccessToken.