Implement authenticate_url

Author: Agora@Ubuntu-dev

lib/oauth/consumer.rb

@@ -23,6 +23,7 @@ class Consumer
 
       # default paths on site. These are the same as the defaults set up by the generators
       :request_token_path => '/oauth/request_token',
+      :authenticate_path  => '/oauth/authenticate',
       :authorize_path     => '/oauth/authorize',
       :access_token_path  => '/oauth/access_token',
 
@@ -266,6 +267,10 @@ def request_token_path
       @options[:request_token_path]
     end
 
+    def authenticate_path
+      @options[:authenticate_path]
+    end
+
     def authorize_path
       @options[:authorize_path]
     end
@@ -283,6 +288,14 @@ def request_token_url?
       @options.has_key?(:request_token_url)
     end
 
+    def authenticate_url
+      @options[:authenticate_url] || site + authenticate_path
+    end
+
+    def authenticate_url?
+      @options.has_key?(:authenticate_url)
+    end
+
     def authorize_url
       @options[:authorize_url] || site + authorize_path
     end

lib/oauth/tokens/request_token.rb

@@ -11,6 +11,13 @@ def authorize_url(params = nil)
       build_authorize_url(consumer.authorize_url, params)
     end
 
+    def authenticate_url(params = nil)
+      return nil if self.token.nil?
+
+      params = (params || {}).merge(:oauth_token => self.token)
+      build_authenticate_url(consumer.authenticate_url, params)
+    end
+
     def callback_confirmed?
       params[:oauth_callback_confirmed] == "true"
     end
@@ -33,5 +40,16 @@ def build_authorize_url(base_url, params)
       uri.query = URI.encode_www_form(queries) if !queries.empty?
       uri.to_s
     end
+
+    # construct an authenticate url
+    def build_authenticate_url(base_url, params)
+      uri = URI.parse(base_url.to_s)
+      queries = {}
+      queries = Hash[URI.decode_www_form(uri.query)] if uri.query
+      # TODO doesn't handle array values correctly
+      queries.merge!(params) if params
+      uri.query = URI.encode_www_form(queries) if !queries.empty?
+      uri.to_s
+    end
   end
 end

lib/oauth/version.rb

@@ -1,3 +1,3 @@
 module OAuth
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end