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

@@ -3,67 +3,69 @@
 
 module OmniAuth
   module Strategies
     class OAuth
       include OmniAuth::Strategy
-      
+
       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
       end
-      
+
       def consumer
         ::OAuth::Consumer.new(consumer_key, consumer_secret, consumer_options.merge(options[:client_options] || options[:consumer_options] || {}))
       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}
         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))        
+          r.redirect(request_token.authorize_url(:oauth_callback => callback_url))
         end
-        
+
         r.finish
       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'))
-        
+
         opts = {}
         if session['oauth'][name.to_s]['callback_confirmed']
-          opts[:oauth_verifier] = request['oauth_verifier']          
+          opts[:oauth_verifier] = request['oauth_verifier']
         else
-          opts[:oauth_callback] = callback_url  
+          opts[:oauth_callback] = callback_url
         end
 
         @access_token = request_token.get_access_token(opts)
         super
+      rescue ::Net::HTTPFatalError => e
+        fail!(:service_unavailable, e)
       rescue ::OAuth::Unauthorized => e
         fail!(:invalid_credentials, e)
       rescue ::MultiJson::DecodeError => e
         fail!(:invalid_response, e)
       end
-      
+
       def auth_hash
         OmniAuth::Utils.deep_merge(super, {
           'credentials' => {
-            'token' => @access_token.token, 
+            'token' => @access_token.token,
             'secret' => @access_token.secret
           }, 'extra' => {
             'access_token' => @access_token
           }
         })
       end
-      
+
       def unique_id
         nil
       end
     end
   end