oauth-plugin 0.4.0.pre4 → 0.4.0.pre5

data/lib/generators/rspec/oauth_provider_generator.rb

@@ -9,10 +9,6 @@ module Rspec
       class_option :fixture, :type => :boolean
 
       def copy_controller_spec_files
-        template 'controller_spec_helper.rb',
-          File.join('spec/controllers', class_path, "#{file_name}_controller_spec_helper.rb")
-        template 'controller_spec.rb',
-          File.join('spec/controllers', class_path, "#{file_name}_controller_spec.rb")
         template 'clients_controller_spec.rb',
           File.join('spec/controllers', class_path, "#{file_name}_clients_controller_spec.rb")
       end

data/lib/generators/test_unit/oauth_provider_generator.rb

@@ -9,10 +9,6 @@ module TestUnit
       class_option :fixture, :type => :boolean
 
       def copy_controller_test_files
-        template 'controller_test_helper.rb',
-                 File.join('test', class_path, "#{file_name}_controller_test_helper.rb")
-        template 'controller_test.rb',
-                 File.join('test/functional', class_path, "#{file_name}_controller_test.rb")
         template 'clients_controller_test.rb',
                  File.join('test/functional', class_path, "#{file_name}_clients_controller_test.rb")
       end

data/lib/oauth-plugin/version.rb

@@ -1,5 +1,5 @@
 module Oauth
   module Plugin
-    VERSION = "0.4.0.pre4"
+    VERSION = "0.4.0.pre5"
   end
 end

data/lib/oauth/controllers/application_controller_methods.rb

@@ -1,4 +1,3 @@
-require 'oauth/signature'
 module OAuth
   module Controllers
    
@@ -41,27 +40,11 @@ module OAuth
           @strategies = strategies
         end
         
-        def params
-          controller.send :params
-        end
-        
-        def request
-          controller.send :request
-        end
-        
-        def env
-          request.env
-        end
-        
-        def using_rack_filter?
-          request.env["oauth_plugin"]
-        end
-        
         def allow?
-          if @strategies.any? do |strategy| 
-              @strategy  = strategy.to_sym
-              send @strategy
-            end
+          if @strategies.include?(:interactive) && interactive
+            true
+          elsif !(@strategies & env["oauth.strategies"].to_a).empty?
+            @controller.send :current_user=, token.user if token
             true
           else
             if @strategies.include?(:interactive) 
@@ -73,106 +56,43 @@ module OAuth
         end
 
         def oauth20_token
-          return false unless defined?(Oauth2Token)
-          token, options = token_and_options
-          token ||= params[:oauth_token] || params[:access_token]
-          if !token.blank?
-            @oauth2_token = Oauth2Token.find_by_token(token)
-            if @oauth2_token && @oauth2_token.authorized?
-              controller.send :current_token=, @oauth2_token
-            end
-          end
-          @oauth2_token!=nil
+           env["oauth.version"]==2 && env["oauth.token"]
         end
 
         def oauth10_token
-          if using_rack_filter?
-            if env["oauth.token"]
-              @oauth_token = env["oauth.token"]
-              controller.send :current_token=, @oauth_token
-              true
-            else
-              false
-            end
-          else  
-            begin
-              if ClientApplication.verify_request(request) do |request_proxy|
-                  @oauth_token = ClientApplication.find_token(request_proxy.token)
-                  if @oauth_token.respond_to?(:provided_oauth_verifier=)
-                    @oauth_token.provided_oauth_verifier=request_proxy.oauth_verifier 
-                  end
-                  # return the token secret and the consumer secret
-                  [(@oauth_token.nil? ? nil : @oauth_token.secret), (@oauth_token.client_application.nil? ? nil : @oauth_token.client_application.secret)]
-                end
-                controller.send :current_token=, @oauth_token
-                true
-              else
-                false
-              end
-            rescue
-              false
-            end
-          end
+          env["oauth.version"]==1 && env["oauth.token"]
         end
 
         def oauth10_request_token
-          oauth10_token && @oauth_token.is_a?(::RequestToken)
+          oauth10_token && oauth10_token.is_a?(::RequestToken) ? oauth10_token : nil
         end
 
         def oauth10_access_token
-          oauth10_token && @oauth_token.is_a?(::AccessToken)
+          oauth10_token && oauth10_token.is_a?(::AccessToken) ? oauth10_token : nil
         end
         
         def token
-          oauth20_token || oauth10_access_token
+          oauth20_token || oauth10_access_token || nil
         end
-        
-        def two_legged
-          if using_rack_filter?
-            if env["oauth.client_application"]
-              @client_application = env["oauth.client_application"]
-              controller.send :current_client_application=, @client_application
-            end
-          else
-            begin
-              if ClientApplication.verify_request(request) do |request_proxy|
-                  @client_application = ClientApplication.find_by_key(request_proxy.consumer_key)
 
-                  # Store this temporarily in client_application object for use in request token generation 
-                  @client_application.token_callback_url=request_proxy.oauth_callback if request_proxy.oauth_callback
+        def client_application
+          env["oauth.version"]==1 && env["oauth.client_application"] || oauth20_token.try(:client_application)
+        end
 
-                  # return the token secret and the consumer secret
-                  [nil, @client_application.secret]
-                end
-                controller.send :current_client_application=, @client_application
-                true
-              else
-                false
-              end
-            rescue
-              false
-            end
-          end
+        def two_legged
+           env["oauth.version"]==1 && client_application
         end
         
         def interactive
           @controller.send :logged_in?
         end
-        
-        # Blatantly stolen from http://github.com/technoweenie/http_token_authentication
-        # Parses the token and options out of the OAuth authorization header.  If
-        # the header looks like this:
-        #   Authorization: OAuth abc
-        # Then the returned token is "abc", and the options is {:nonce => "def"}
-        #
-        # request - ActionController::Request instance with the current headers.
-        #
-        # Returns an Array of [String, Hash] if a token is present.
-        # Returns nil if no token is found.
-        def token_and_options
-          if header = (request.respond_to?(:authorization) ? request.authorization : ActionController::HttpAuthentication::Basic.authorization(request)).to_s[/^OAuth (.*)/]
-            [$1.strip, {}]
-          end
+
+        def env
+          request.env
+        end
+
+        def request
+          controller.send :request
         end
 
       end
@@ -180,15 +100,15 @@ module OAuth
       protected
       
       def current_token
-        @current_token
+        request.env["oauth.token"]
       end
       
       def current_client_application
-        @current_client_application
+        request.env["oauth.version"]==1 && env["oauth.client_application"] || current_token.try(:client_application)
       end
       
       def oauth?
-        current_token!=nil
+        current_token
       end
       
       # use in a before_filter. Note this is for compatibility purposes. Better to use oauthenticate now
@@ -211,29 +131,6 @@ module OAuth
         head 401
       end
 
-      private
-      
-      def current_token=(token)
-        @current_token=token
-        if @current_token
-          @current_user=@current_token.user
-          @current_client_application=@current_token.client_application
-        else
-          @current_user = nil
-          @current_client_application = nil
-        end
-        @current_token
-      end
-      
-      def current_client_application=(app)
-        if app
-          @current_client_application = app
-          @current_user = app.user
-        else
-          @current_client_application = nil
-          @current_user = nil
-        end
-      end
     end
   end
 end

data/lib/oauth/controllers/consumer_controller.rb

@@ -18,14 +18,39 @@ module Oauth
       # If user is already connected it displays a page with an option to disconnect and redo
       def show
         unless @token
-          @request_token=@consumer.get_request_token(callback_oauth_consumer_url(params[:id]))
-          session[@request_token.token]=@request_token.secret
-          if @request_token.callback_confirmed?
-            redirect_to @request_token.authorize_url
+          if @consumer.ancestors.include?(Oauth2Token)
+            request_url = callback2_oauth_consumer_url(params[:id]) + '?' + request.query_string
+            redirect_to @consumer.authorize_url(request_url)
           else
-            redirect_to(@request_token.authorize_url + "&oauth_callback=#{callback_oauth_consumer_url(params[:id])}")
+            request_url = callback_oauth_consumer_url(params[:id]) + '?' + request.query_string
+            @request_token = @consumer.get_request_token(request_url)
+            session[@request_token.token]=@request_token.secret
+            if @request_token.callback_confirmed?
+              redirect_to @request_token.authorize_url
+            else
+              redirect_to(@request_token.authorize_url + "&oauth_callback=#{callback_oauth_consumer_url(params[:id])}")
+            end
+          end
+        end
+      end
+      
+      def callback2
+        @token = @consumer.access_token(current_user,params[:code], callback2_oauth_consumer_url(params[:id]))
+        logger.info @token.inspect
+        if @token
+          # Log user in
+          if logged_in?
+            flash[:notice] = "#{params[:id].humanize} was successfully connected to your account"
+          else
+            self.current_user = @token.user 
+            flash[:notice] = "You logged in with #{params[:id].humanize}"
           end
+          go_back
+        else
+          flash[:error] = "An error happened, please try connecting again"
+          redirect_to oauth_consumer_url(params[:id])
         end
+
       end
 
       def callback
@@ -51,6 +76,26 @@ module Oauth
 
       end
 
+      def client
+        method = request.method.downcase.to_sym
+        path = "/#{params[:endpoint]}?#{request.query_string}"
+        if consumer_credentials[:expose]
+          if @token
+            oauth_response = @token.client.send(method, path)
+            if oauth_response.is_a? Net::HTTPRedirection
+              # follow redirect
+              oauth_response = @token.client.send(method, oauth_response['Location'])
+            end
+
+            render :text => oauth_response.body
+          else
+            render :text => "Token needed.", :status => 403
+          end
+        else
+          render :text => "Not allowed", :status => 403
+        end
+      end
+
       def destroy
         throw RecordNotFound unless @token
         @token.destroy
@@ -70,10 +115,17 @@ module Oauth
         redirect_to root_url
       end
       
+      def consumer_credentials
+        OAUTH_CREDENTIALS[consumer_key]
+      end
+      
+      def consumer_key
+        @consumer_key ||= params[:id].to_sym
+      end
+      
       def load_consumer
-        consumer_key=params[:id].to_sym
         throw RecordNotFound unless OAUTH_CREDENTIALS.include?(consumer_key)
-        deny_access! unless logged_in? || OAUTH_CREDENTIALS[consumer_key][:allow_login]
+        deny_access! unless logged_in? || consumer_credentials[:allow_login]
         @consumer="#{consumer_key.to_s.camelcase}Token".constantize
         @token=@consumer.find(:first, :conditions=>{:user_id=>current_user.id.to_s}) if logged_in?
       end
@@ -85,4 +137,4 @@ module Oauth
       
     end
   end
-end
+end

data/lib/oauth/controllers/provider_controller.rb

@@ -121,7 +121,7 @@ module OAuth
       def oauth2_authorize_code
         @client_application = ClientApplication.find_by_key params[:client_id]
         if request.post?
-          @redirect_url = URI.parse(params[:redirect_url] || @client_application.callback_url)
+          @redirect_url = URI.parse(params[:redirect_uri] || @client_application.callback_url)
           if user_authorizes_token?
             @verification_code = Oauth2Verifier.create :client_application=>@client_application, :user=>current_user, :callback_url=>@redirect_url.to_s
 
@@ -151,14 +151,11 @@ module OAuth
       def oauth2_authorize_token
         @client_application = ClientApplication.find_by_key params[:client_id]
         if request.post?
-          @redirect_url = URI.parse(params[:redirect_url] || @client_application.callback_url)
+          @redirect_url = URI.parse(params[:redirect_uri] || @client_application.callback_url)
           if user_authorizes_token?
             @token  = Oauth2Token.create :client_application=>@client_application, :user=>current_user, :scope=>params[:scope]
             unless @redirect_url.to_s.blank?
-              @redirect_url.query = @redirect_url.query.blank? ?
-                                    "access_token=#{@token.token}" :
-                                    @redirect_url.query + "&access_token=#{@token.token}"
-              redirect_to @redirect_url.to_s
+              redirect_to "#{@redirect_url.to_s}#access_token=#{@token.token}"
             else
               render :action => "authorize_success"
             end
@@ -184,7 +181,7 @@ module OAuth
           oauth2_error
           return
         end
-        if @verification_code.redirect_url != params[:redirect_url]
+        if @verification_code.redirect_url != params[:redirect_uri]
           oauth2_error
           return
         end

data/lib/oauth/models/consumers/service_loader.rb

@@ -6,6 +6,8 @@ require 'oauth/controllers/consumer_controller'
 # So an entry called "my_service" will create a class MyServiceToken which you can 
 # connect with has_one to your user model.
 if defined? ConsumerToken && defined? OAUTH_CREDENTIALS
+  require File.join(File.dirname(__FILE__), 'services', 'oauth2_token')
+
   OAUTH_CREDENTIALS.each do |key, value|
     class_name=value[:class_name]||"#{key.to_s.classify}Token"
     unless Object.const_defined?(class_name.to_sym)
@@ -17,7 +19,7 @@ if defined? ConsumerToken && defined? OAUTH_CREDENTIALS
           # Let Rails auto-load from the models folder
           eval class_name
         rescue NameError
-          super_class = value[:super_class]||"ConsumerToken"
+          super_class = value[:super_class]||value[:oauth_version].to_i>=2 ? "Oauth2Token" : "ConsumerToken"
           eval "class #{class_name} < #{super_class} ;end"
         end
       end

data/lib/oauth/models/consumers/services/google_token.rb

@@ -1,27 +1,21 @@
-require 'portablecontacts'
-
 class GoogleToken < ConsumerToken
   GOOGLE_SETTINGS={
-    :site=>"https://www.google.com", 
+    :site=>"https://www.google.com",
     :request_token_path => "/accounts/OAuthGetRequestToken",
     :authorize_path => "/accounts/OAuthAuthorizeToken",
     :access_token_path => "/accounts/OAuthGetAccessToken",
   }
-  
+
   def self.consumer
     @consumer||=create_consumer
-  end 
-  
+  end
+
   def self.create_consumer(options={})
     OAuth::Consumer.new credentials[:key],credentials[:secret],GOOGLE_SETTINGS.merge(options)
   end
-    
+
   def self.get_request_token(callback_url, scope=nil)
     consumer.get_request_token({:oauth_callback=>callback_url}, :scope=>scope||credentials[:scope]||"http://www-opensocial.googleusercontent.com/api/people")
   end
-  
-  def portable_contacts
-    @portable_contacts||= PortableContacts::Client.new "http://www-opensocial.googleusercontent.com/api/people", client
-  end
-    
-end
+
+end

data/lib/oauth/models/consumers/services/oauth2_token.rb

@@ -0,0 +1,27 @@
+require 'oauth2'
+class Oauth2Token < ConsumerToken
+  
+  def self.consumer
+    @consumer||=create_consumer
+  end 
+  
+  def self.create_consumer(options={})
+    @consumer||=OAuth2::Client.new credentials[:key],credentials[:secret],credentials[:options]
+  end
+    
+  def self.authorize_url(callback_url)
+    options = {:redirect_uri=>callback_url}
+    options[:scope] = credentials[:scope] if credentials[:scope].present?
+    consumer.web_server.authorize_url(options)
+  end
+  
+  def self.access_token(user, code, redirect_uri)
+    access_token = consumer.web_server.get_access_token(code, :redirect_uri => redirect_uri)
+    find_or_create_from_access_token user, access_token
+  end
+  
+  def client
+    @client ||= OAuth2::AccessToken.new self.class.consumer, token
+  end
+    
+end