oauth2.rb in oa-oauth-0.2.5

- old
+ new

@@ -10,30 +10,30 @@
     # You must generally register your application with the provider and
     # utilize an application id and secret in order to authenticate using
     # OAuth 2.0.
     class OAuth2
       include OmniAuth::Strategy
-      
+
       # The options passed in to the strategy.
       attr_accessor :options
       # The `OAuth2::Client` for this strategy.
       attr_accessor :client_id, :client_secret, :client_options
-      
+
       # An error that is indicated in the OAuth 2.0 callback.
-      # This could be a `redirect_uri_mismatch` or other 
+      # This could be a `redirect_uri_mismatch` or other
       class CallbackError < StandardError
         attr_accessor :error, :error_reason, :error_uri
-        
+
         def initialize(error, error_reason=nil, error_uri=nil)
           self.error = error
           self.error_reason = error_reason
           self.error_uri = error_uri
         end
       end
-      
+
       # Initialize a new OAuth 2.0 authentication provider.
-      
+
       # @param [Rack Application] app standard middleware application argument
       # @param [String] name the name for this provider to be used in its URL, e.g. `/auth/name`
       # @param [String] client_id the client/application ID of this provider
       # @param [String] client_secret the client/application secret of this provider
       # @param [Hash] options that will be passed through to the OAuth2::Client (see [oauth2 docs](http://rubydoc.info/gems/oauth2))
@@ -41,59 +41,58 @@
         self.client_id = client_id
         self.client_secret = client_secret
         self.client_options = client_options
         super
       end
-      
+
       def client
         ::OAuth2::Client.new(client_id, client_secret, client_options.merge(options[:client_options] || {}))
       end
-      
+
       def callback_url
         full_host + callback_path
       end
 
       protected
-        
+
       def request_phase
         redirect client.web_server.authorize_url({:redirect_uri => callback_url}.merge(options))
       end
 
       def callback_phase
         if request.params['error'] || request.params['error_reason']
           raise CallbackError.new(request.params['error'], request.params['error_description'] || request.params['error_reason'], request.params['error_uri'])
         end
-        
+
         @access_token = build_access_token
-        
+
         if @access_token.expires? && @access_token.expires_in <= 0
-          client.request(:post, client.access_token_url, { 
+          client.request(:post, client.access_token_url, {
               'client_id' => client_id,
-              'grant_type' => 'refresh_token', 
+              'grant_type' => 'refresh_token',
               'client_secret' => client_secret,
-              'refresh_token' => @access_token.refresh_token 
+              'refresh_token' => @access_token.refresh_token
             }.merge(options))
           @access_token = client.web_server.get_access_token(verifier, {:redirect_uri => callback_url}.merge(options))
         end
-        
+
         super
       rescue ::OAuth2::HTTPError, ::OAuth2::AccessDenied, CallbackError => e
         fail!(:invalid_credentials, e)
       rescue ::MultiJson::DecodeError => e
         fail!(:invalid_response, e)
       end
 
       def build_access_token
-        verifier = request.params['code']        
+        verifier = request.params['code']
         client.web_server.get_access_token(verifier, {:redirect_uri => callback_url}.merge(options))
       end
-      
+
       def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-          'credentials' => {
-            'token' => @access_token.token
-          }
-        })
+        credentials = {'token' => @access_token.token}
+        credentials.merge('refresh_token' => @access_token.refresh_token) if @access_token.expires?
+
+        OmniAuth::Utils.deep_merge(super, {'credentials' => credentials})
       end
     end
   end
 end