authlogic-connect 0.0.3.4 → 0.0.3.6

data/lib/authlogic_connect/openid/variables.rb

@@ -1,5 +1,19 @@
-module AuthlogicConnect::Openid
-  module Variables
-
+module AuthlogicConnect::Openid::Variables
+  include AuthlogicConnect::Openid::State
+  
+  # openid_provider = "blogger", "myopenid", etc.
+  # openid_identifier = "viatropos.myopenid.com", etc.
+  # openid_key = "viatropos"
+#  def openid_attributes
+#    [:openid_provider, :openid_identifier, :openid_key]
+#  end
+  
+  def openid_identifier
+    auth_params[:openid_identifier]
   end
+  
+  def openid_provider
+    from_session_or_params(:openid_provider)
+  end
+  
 end

data/lib/authlogic_connect/token.rb

@@ -1,6 +1,5 @@
 class Token < ActiveRecord::Base
   belongs_to :user
-  validates_presence_of :key, :secret
   
   def client
     self.class.client

data/lib/open_id_authentication.rb

@@ -86,7 +86,6 @@ module OpenIdAuthentication
 
     def authenticate_with_open_id(identifier = nil, options = {}, &block) #:doc:
       identifier ||= open_id_identifier
-
       if request.env[Rack::OpenID::RESPONSE]
         complete_open_id_authentication(&block)
       else

data/rails/init.rb

@@ -10,8 +10,8 @@ end
 
 require 'open_id_authentication'
 
-config.middleware.use AuthlogicConnect::CallbackFilter
 config.middleware.use OpenIdAuthentication
+config.middleware.use AuthlogicConnect::CallbackFilter
 
 config.after_initialize do
   OpenID::Util.logger = Rails.logger

data/test/controllers/test_users_controller.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/../test_helper.rb'
+
+class UsersControllerTest < ActionController::TestCase
+
+  tests UsersController
+
+  context "when signed out" do
+    # setup { sign_out }
+
+    context "on GET to #new" do
+      
+      setup { get :new }
+
+      should "do something???" do
+        puts "REQUEST: #{@user.inspect}"
+      end
+      
+    end
+    
+  end
+end

data/test/libs/database.rb

@@ -0,0 +1,48 @@
+
+begin
+  ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+rescue ArgumentError
+  ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
+end
+
+ActiveRecord::Base.configurations = true
+
+# this schema was directly copied from 
+# http://github.com/viatropos/authlogic-connect-example/blob/master/db/schema.rb
+ActiveRecord::Schema.define(:version => 1) do
+  
+  create_table :sessions, :force => true do |t|
+    t.string   :session_id, :null => false
+    t.text     :data
+    t.datetime :created_at
+    t.datetime :updated_at
+  end
+
+  create_table :tokens, :force => true do |t|
+    t.integer  :user_id
+    t.string   :type,       :limit => 30
+    t.string   :key,        :limit => 1024
+    t.string   :secret
+    t.boolean  :active
+    t.datetime :created_at
+    t.datetime :updated_at
+  end
+
+  create_table :users, :force => true do |t|
+    t.datetime :created_at
+    t.datetime :updated_at
+    t.string   :login
+    t.string   :crypted_password
+    t.string   :password_salt
+    t.string   :persistence_token,                :null => false
+    t.integer  :login_count,       :default => 0, :null => false
+    t.datetime :last_request_at
+    t.datetime :last_login_at
+    t.datetime :current_login_at
+    t.string   :last_login_ip
+    t.string   :current_login_ip
+    t.string   :openid_identifier
+    t.integer  :active_token_id
+  end
+
+end

data/test/libs/user.rb

@@ -0,0 +1,3 @@
+class User < ActiveRecord::Base
+  acts_as_authentic
+end

data/test/libs/user_session.rb

@@ -0,0 +1,2 @@
+class UserSession < Authlogic::Session::Base
+end

data/test/old.rb

@@ -0,0 +1,53 @@
+require 'rubygems'
+require 'tempfile'
+require 'test/unit'
+
+require 'shoulda'
+gem 'activerecord',  '~>3.0.0'
+gem 'activesupport', '~>3.0.0'
+gem 'actionpack',    '~>3.0.0'
+require 'active_record'
+require 'active_record/version'
+require 'active_support'
+require 'action_pack'
+gem "ruby-openid"
+gem 'rack-openid', '>=0.2.1'
+gem "authlogic", :git => "git://github.com/odorcicd/authlogic.git", :branch => "rails3"
+require 'authlogic'
+gem "oauth"
+gem "oauth2"
+
+puts "Testing against version #{ActiveRecord::VERSION::STRING}"
+
+begin
+  require 'ruby-debug'
+rescue LoadError => e
+  puts "debugger disabled"
+end
+
+ROOT = File.join(File.dirname(__FILE__), '..')
+
+def silence_warnings
+  old_verbose, $VERBOSE = $VERBOSE, nil
+  yield
+ensure
+  $VERBOSE = old_verbose
+end
+
+class Test::Unit::TestCase
+  def setup
+    silence_warnings do
+      Object.const_set(:Rails, stub('Rails', :root => ROOT, :env => 'test'))
+    end
+  end
+end
+
+$LOAD_PATH << File.join(ROOT, 'lib')
+$LOAD_PATH << File.join(ROOT, 'lib', 'authlogic-connect')
+
+require File.join(ROOT, 'lib', 'authlogic-connect.rb')
+
+FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures") 
+config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
+ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
+ActiveRecord::Base.establish_connection(config['test'])

data/test/test_authlogic_connect.rb

@@ -1,4 +1,4 @@
-require 'test/helper'
+require File.dirname(__FILE__) + '/test_helper.rb'
 
 class AuthlogicConnectTest < Test::Unit::TestCase
   context "AuthlogicConnect.config" do

data/test/test_helper.rb

@@ -1,53 +1,153 @@
-require 'rubygems'
-require 'tempfile'
-require 'test/unit'
-
-require 'shoulda'
-gem 'activerecord',  '~>3.0.0'
-gem 'activesupport', '~>3.0.0'
-gem 'actionpack',    '~>3.0.0'
-require 'active_record'
-require 'active_record/version'
+require "test/unit"
+require "rubygems"
+require "ruby-debug"
+gem "activerecord", "= 2.3.5"
+require "active_record"
+require "active_record/fixtures"
+gem "activesupport", "= 2.3.5"
 require 'active_support'
-require 'action_pack'
-gem "ruby-openid"
-gem 'rack-openid', '>=0.2.1'
-gem "authlogic", :git => "git://github.com/odorcicd/authlogic.git", :branch => "rails3"
-require 'authlogic'
-gem "oauth"
-gem "oauth2"
-
-puts "Testing against version #{ActiveRecord::VERSION::STRING}"
-
-begin
-  require 'ruby-debug'
-rescue LoadError => e
-  puts "debugger disabled"
+gem 'actionpack', "= 2.3.5"
+require 'action_controller'
+require 'shoulda'
+
+require File.dirname(__FILE__) + '/libs/database'
+require File.dirname(__FILE__) + '/../lib/authlogic-connect' unless defined?(AuthlogicConnect)
+require File.dirname(__FILE__) + '/libs/user'
+require File.dirname(__FILE__) + '/libs/user_session'
+require 'authlogic/test_case'
+
+# A temporary fix to bring active record errors up to speed with rails edge.
+# I need to remove this once the new gem is released. This is only here so my tests pass.
+unless defined?(::ActiveModel)
+  class ActiveRecord::Errors
+    def [](key)
+      value = on(key)
+      value.is_a?(Array) ? value : [value].compact
+    end
+  end
 end
 
-ROOT = File.join(File.dirname(__FILE__), '..')
 
-def silence_warnings
-  old_verbose, $VERBOSE = $VERBOSE, nil
-  yield
-ensure
-  $VERBOSE = old_verbose
+AuthlogicConnect.config = {
+  :default => "twitter",
+  :connect => {
+    :twitter => {
+      :key => "my_key",
+      :secret => "my_secret",
+      :label => "Twitter"
+    },
+    :facebook => {
+      :key => "my_key",
+      :secret => "my_secret",
+      :label => "Facebook"
+    },
+    :google => {
+      :key => "my_key",
+      :secret => "my_secret",
+      :label => "Google"
+    },
+    :yahoo => {
+      :key => "my_key",
+      :secret => "my_secret",
+      :label => "Yahoo"
+    },
+    :vimeo => {
+  
+    }
+  }
+}
+
+# want to add a "method" property!
+Authlogic::TestCase::MockRequest.class_eval do
+  def method
+    "POST"
+  end
 end
 
-class Test::Unit::TestCase
-  def setup
-    silence_warnings do
-      Object.const_set(:Rails, stub('Rails', :root => ROOT, :env => 'test'))
+module ControllerHelpers
+  def controller_name
+    "users"
+  end
+  
+  def action_name
+    "create"
+  end
+  
+  def url_for(options = {})
+    p = []
+    option.each do |k,v|
+      p << "#{k}=#{v}"
     end
+    p = "?#{p.join("&")}"
+    url = "http://localhost:3000/users#{p}"
+  end
+  
+  def session=(value)
+    @session = value
   end
 end
+Authlogic::ControllerAdapters::AbstractAdapter.send(:include, ControllerHelpers)
 
-$LOAD_PATH << File.join(ROOT, 'lib')
-$LOAD_PATH << File.join(ROOT, 'lib', 'authlogic-connect')
+Authlogic::CryptoProviders::AES256.key = "myafdsfddddddddddddddddddddddddddddddddddddddddddddddd"
 
-require File.join(ROOT, 'lib', 'authlogic-connect.rb')
-
-FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures") 
-config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
-ActiveRecord::Base.establish_connection(config['test'])
+class ActiveSupport::TestCase
+  include ActiveRecord::TestFixtures
+  self.fixture_path = File.dirname(__FILE__) + "/fixtures"
+  self.use_transactional_fixtures = false
+  self.use_instantiated_fixtures  = false
+  self.pre_loaded_fixtures = false
+  fixtures :all
+  setup :activate_authlogic
+  
+  private
+    def password_for(user)
+      case user
+      when users(:ben)
+        "benrocks"
+      when users(:zack)
+        "zackrocks"
+      end
+    end
+    
+    def http_basic_auth_for(user = nil, &block)
+      unless user.blank?
+        controller.http_user = user.login
+        controller.http_password = password_for(user)
+      end
+      yield
+      controller.http_user = controller.http_password = nil
+    end
+    
+    def set_cookie_for(user, id = nil)
+      controller.cookies["user_credentials"] = {:value => user.persistence_token, :expires => nil}
+    end
+    
+    def unset_cookie
+      controller.cookies["user_credentials"] = nil
+    end
+    
+    def set_params_for(user, id = nil)
+      controller.params["user_credentials"] = user.single_access_token
+    end
+    
+    def unset_params
+      controller.params["user_credentials"] = nil
+    end
+    
+    def set_request_content_type(type)
+      controller.request_content_type = type
+    end
+    
+    def unset_request_content_type
+      controller.request_content_type = nil
+    end
+    
+    def set_session_for(user, id = nil)
+      controller.session["user_credentials"] = user.persistence_token
+      controller.session["user_credentials_id"] = user.id
+    end
+    
+    def unset_session
+      controller.session["user_credentials"] = controller.session["user_credentials_id"] = nil
+    end
+end

data/test/test_user.rb

@@ -0,0 +1,255 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+module AuthlogicConnect
+  class UserTest < Test::Unit::TestCase
+    context "User creation" do
+      setup do
+        @user = User.new(:login => "viatropos")
+      end
+
+      should "make sure we are loading the models" do
+        assert_equal "viatropos", @user.login
+      end
+      
+      context "responds to added oauth methods (our oauth api on the user)" do
+        
+        should "have 'tokens' method" do
+          assert @user.respond_to?(:tokens)
+          assert_equal [], @user.tokens
+        end
+        
+        should "have 'active_token' method" do
+          assert @user.respond_to?(:active_token)
+          assert_equal nil, @user.active_token
+        end
+        
+      end
+      
+      context "with controller and session..." do
+        
+        setup do
+          controller.params.merge!(:authentication_type => "user")
+          Authlogic::Session::Base.controller = controller
+        end
+        
+        should "have a valid controller" do
+          assert @user.auth_controller
+        end
+        
+        should "have auth_params" do
+          assert @user.auth_params?
+        end
+        
+        should "have an empty 'auth_session'" do
+          assert @user.auth_session.empty?
+          assert_equal false, @user.auth_session?
+        end
+        
+        context "save the user without any parameters" do
+          
+          setup do
+            @save_success = @user.save
+          end
+          
+          should "not be a valid save" do
+            assert_equal false, @save_success
+          end
+          
+          should "not be using oauth" do
+            assert_equal false, @user.using_oauth?
+          end
+          
+          should "not be using openid" do
+            assert_equal false, @user.using_openid?
+          end
+          
+        end
+        
+        context "with oauth parameters" do
+          
+          setup do
+            @user.auth_controller.params.merge!(:oauth_provider => "twitter")
+            # mock token
+            @token = OAuth::RequestToken.new("twitter", "key", "secret")
+            @token.params = {
+              :oauth_callback_confirmed => "true", 
+              :oauth_token_secret=>"secret",
+              :oauth_token=>"key"
+            }
+            @token.consumer = OAuth::Consumer.new("key", "secret",
+              :site=>"http://twitter.com",
+              :proxy=>nil,
+              :oauth_version=>"1.0",
+              :request_token_path=>"/oauth/request_token",
+              :authorize_path=>"/oauth/authorize",
+              :scheme=>:header,
+              :signature_method=>"HMAC-SHA1",
+              :authorize_url=>"http://twitter.com/oauth/authenticate",
+              :access_token_path=>"/oauth/access_token"
+            )
+            @session_vars = [
+              :authentication_type,
+              :auth_request_class,
+              :oauth_provider,
+              :auth_callback_method
+            ]
+          end
+          
+          should "have an 'oauth_provider'" do
+            assert @user.oauth_provider?
+          end
+          
+          should "be an 'oauth_request'" do
+            assert @user.oauth_request?
+          end
+          
+          should "not be an 'oauth_response'" do
+            assert_equal false, @user.oauth_response?
+          end
+          
+          should "be using oauth" do
+            assert @user.using_oauth?
+          end
+          
+          should "not be using openid" do
+            assert_equal false, @user.using_openid?
+          end
+          
+          should "have the correct class (authentication_type == user)" do
+            assert @user.correct_request_class?
+          end
+          
+          should "realize we are authenticating_with_oauth?" do
+            assert @user.authenticating_with_oauth?
+          end
+          
+          context "and 'save_with_oauth', manually checking each step" do
+            
+            setup do
+              # mock save
+              # this, and the whole redirect process happens
+              # but we'll just assume we saved the session data and got the redirect back
+              @user.save_oauth_session
+              @user.save(:skip_redirect => true, :keep_session => true) do
+                "I'm the block you want"
+              end
+              # copy to test controller
+              @user.auth_session.each do |key, value|
+                @user.auth_controller.session[key] = value
+              end
+            end
+            
+            should "should have a full session" do
+              @session_vars.each {|key| assert @user.auth_session.has_key?(key)}
+            end
+            
+            should "'cleanup_auth_session'" do
+              @user.cleanup_auth_session
+              @session_vars.each {|key| assert_equal false, @user.auth_session.has_key?(key)}
+            end
+            
+            teardown do
+              @user.destroy
+            end
+            
+          end
+          
+          context "and 'save_with_oauth' completely" do
+            setup do
+              # mock save
+              # this, and the whole redirect process happens
+              # but we'll just assume we saved the session data and got the redirect back
+              @user.save_oauth_session
+              @user.save(:skip_redirect => true, :keep_session => false) do
+                "I'm the block you want"
+              end
+              # copy to test controller
+              @user.auth_controller.session = @user.auth_session
+            end
+            
+            should "have a clear session" do
+              @session_vars.each do |key|
+                assert_equal false, @user.auth_session.has_key?(key)
+              end
+            end
+            
+            should "be a valid save" do
+              assert @user.valid?
+            end
+            
+            # so login isn't saved
+            teardown do
+              User.all.collect(&:destroy)
+            end
+          end
+          
+        
+        end
+        
+        context "with openid parameters" do
+          setup do
+            @user.auth_controller.params.merge!(:openid_identifier => "viatropos.myopenid.com")
+            @session_vars = [
+              :authentication_type,
+              :auth_request_class,
+              :openid_identifier,
+              :auth_callback_method
+            ]
+          end
+          
+          should "have an 'openid_identifier'" do
+            assert_equal true, @user.openid_identifier?
+          end
+          
+          should "be an 'openid_request'" do
+            assert @user.openid_request?
+          end
+          
+          should "not be an 'openid_response'" do
+            assert_equal false, @user.openid_response?
+          end
+          
+          should "be using openid" do
+            assert @user.using_openid?
+          end
+          
+          should "not be using oauth" do
+            assert_equal false, @user.using_oauth?
+          end
+          
+          should "have the correct class (authentication_type == user)" do
+            assert @user.correct_request_class?
+          end
+          
+          should "realize we are authenticating_with_openid?" do
+            assert @user.authenticating_with_openid?
+          end
+          
+          context "and 'save_with_openid', manually checking each step" do
+            
+            setup do
+              # mock save
+              # this, and the whole redirect process happens
+              # but we'll just assume we saved the session data and got the redirect back
+              @user.save_openid_session
+              @user.save(:skip_redirect => true, :keep_session => true) do
+                "I'm the block you want"
+              end
+              # copy to test controller
+              @user.auth_session.each do |key, value|
+                @user.auth_controller.session[key] = value
+              end
+            end
+            
+            teardown do
+              @user.destroy
+            end
+            
+          end
+        end
+
+      end
+    end
+    
+  end
+end