lib/omniauth/strategies/oauth.rb in oa-oauth-0.2.0.beta5 vs lib/omniauth/strategies/oauth.rb in oa-oauth-0.2.0

@@ -9,31 +9,39 @@
       def initialize(app, name, consumer_key = nil, consumer_secret = nil, consumer_options = {}, options = {}, &block)
         self.consumer_key = consumer_key
         self.consumer_secret = consumer_secret
         self.consumer_options = consumer_options
         super
+        self.options[:open_timeout] ||= 30
+        self.options[:read_timeout] ||= 30
       end
 
       def consumer
-        ::OAuth::Consumer.new(consumer_key, consumer_secret, consumer_options.merge(options[:client_options] || options[:consumer_options] || {}))
+        consumer = ::OAuth::Consumer.new(consumer_key, consumer_secret, consumer_options.merge(options[:client_options] || options[:consumer_options] || {}))
+        consumer.http.open_timeout = options[:open_timeout] if options[:open_timeout]
+        consumer.http.read_timeout = options[:read_timeout] if options[:read_timeout]
+        consumer
       end
 
       attr_reader :name
       attr_accessor :consumer_key, :consumer_secret, :consumer_options
 
       def request_phase
         request_token = consumer.get_request_token(:oauth_callback => callback_url)
-        (session['oauth']||={})[name.to_s] = {'callback_confirmed' => request_token.callback_confirmed?, 'request_token' => request_token.token, 'request_secret' => request_token.secret}
+        session['oauth'] ||= {}
+        session['oauth'][name.to_s] = {'callback_confirmed' => request_token.callback_confirmed?, 'request_token' => request_token.token, 'request_secret' => request_token.secret}
         r = Rack::Response.new
 
         if request_token.callback_confirmed?
           r.redirect(request_token.authorize_url)
         else
           r.redirect(request_token.authorize_url(:oauth_callback => callback_url))
         end
 
         r.finish
+      rescue ::Timeout::Error => e
+        fail!(:timeout, e)
       end
 
       def callback_phase
         request_token = ::OAuth::RequestToken.new(consumer, session['oauth'][name.to_s].delete('request_token'), session['oauth'][name.to_s].delete('request_secret'))
 
@@ -44,9 +52,11 @@
           opts[:oauth_callback] = callback_url
         end
 
         @access_token = request_token.get_access_token(opts)
         super
+      rescue ::Timeout::Error => e
+        fail!(:timeout, e)
       rescue ::Net::HTTPFatalError => e
         fail!(:service_unavailable, e)
       rescue ::OAuth::Unauthorized => e
         fail!(:invalid_credentials, e)
       rescue ::MultiJson::DecodeError => e