authlogic_rpx 1.0.4 → 1.1.0

data/Rakefile

@@ -10,11 +10,39 @@ Echoe.new("authlogic_rpx") do |p|
   p.summary = "Authlogic plug-in for RPX support"
   p.description = "Authlogic extension/plugin that provides RPX (rpxnow.com) authentication support"
 
-  p.runtime_dependencies = ["authlogic >=2.1.1", "rpx_now >=0.6.6" ]
+  p.runtime_dependencies = ["authlogic >=2.1.3", "rpx_now >=0.6.11" ]
   p.development_dependencies = []
 
   p.author = "Paul Gallagher / tardate"
   p.email  = "gallagher.paul@gmail.com"
 
   p.install_message = ""
-end
+end
+
+
+Rake::Task[:test].clear
+
+Rake::TestTask.new(:unit) do |t|
+  t.libs << "test/libs"
+  t.pattern = 'test/unit/*test.rb'
+  t.verbose = true
+end
+
+Rake::TestTask.new(:no_mapping) do |t|
+  t.libs << "test/libs"
+  t.test_files = FileList.new('test/unit/*test.rb', 'test/integration/no_mapping/*test.rb')
+  t.verbose = true
+end
+
+Rake::TestTask.new(:internal_mapping) do |t|
+  t.libs << "test/libs"
+  t.test_files = FileList.new('test/integration/internal_mapping/*test.rb')
+  t.verbose = true
+end
+
+task :test do
+  Rake::Task[:no_mapping].invoke
+  Rake::Task[:internal_mapping].invoke
+end
+
+task :default => :test

data/authlogic_rpx.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{authlogic_rpx}
-  s.version = "1.0.4"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Gallagher / tardate"]
-  s.date = %q{2009-10-15}
+  s.date = %q{2010-01-05}
   s.description = %q{Authlogic extension/plugin that provides RPX (rpxnow.com) authentication support}
   s.email = %q{gallagher.paul@gmail.com}
-  s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.rdoc", "lib/authlogic_rpx.rb", "lib/authlogic_rpx/acts_as_authentic.rb", "lib/authlogic_rpx/helper.rb", "lib/authlogic_rpx/session.rb", "lib/authlogic_rpx/version.rb"]
-  s.files = ["CHANGELOG.rdoc", "MIT-LICENSE", "Manifest", "README.rdoc", "Rakefile", "authlogic_rpx.gemspec", "init.rb", "lib/authlogic_rpx.rb", "lib/authlogic_rpx/acts_as_authentic.rb", "lib/authlogic_rpx/helper.rb", "lib/authlogic_rpx/session.rb", "lib/authlogic_rpx/version.rb", "rails/init.rb", "test/acts_as_authentic_test.rb", "test/fixtures/users.yml", "test/libs/rails_trickery.rb", "test/libs/user.rb", "test/libs/user_session.rb", "test/session_test.rb", "test/test_helper.rb"]
+  s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.rdoc", "lib/authlogic_rpx.rb", "lib/authlogic_rpx/acts_as_authentic.rb", "lib/authlogic_rpx/helper.rb", "lib/authlogic_rpx/rpx_identifier.rb", "lib/authlogic_rpx/session.rb", "lib/authlogic_rpx/version.rb"]
+  s.files = ["CHANGELOG.rdoc", "MIT-LICENSE", "Manifest", "README.rdoc", "Rakefile", "authlogic_rpx.gemspec", "generators/add_authlogic_rpx_migration/USAGE", "generators/add_authlogic_rpx_migration/add_authlogic_rpx_migration_generator.rb", "generators/add_authlogic_rpx_migration/templates/migration_internal_mapping.rb", "generators/add_authlogic_rpx_migration/templates/migration_no_mapping.rb", "init.rb", "lib/authlogic_rpx.rb", "lib/authlogic_rpx/acts_as_authentic.rb", "lib/authlogic_rpx/helper.rb", "lib/authlogic_rpx/rpx_identifier.rb", "lib/authlogic_rpx/session.rb", "lib/authlogic_rpx/version.rb", "rails/init.rb", "test/fixtures/rpxresponses.yml", "test/fixtures/users.yml", "test/integration/basic_authentication_and_registration_test.rb", "test/integration/internal_mapping/basic_authentication_and_registration_test.rb", "test/integration/internal_mapping/settings_test.rb", "test/integration/no_mapping/basic_authentication_and_registration_test.rb", "test/integration/no_mapping/settings_test.rb", "test/libs/ext_test_unit.rb", "test/libs/mock_rpx_now.rb", "test/libs/rails_trickery.rb", "test/libs/rpxresponse.rb", "test/libs/user.rb", "test/libs/user_session.rb", "test/test_helper.rb", "test/test_internal_mapping_helper.rb", "test/unit/acts_as_authentic_settings_test.rb", "test/unit/session_settings_test.rb", "test/unit/session_validation_test.rb", "test/unit/verify_rpx_mock_test.rb"]
   s.homepage = %q{http://github.com/tardate/authlogic_rpx}
   s.post_install_message = %q{}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Authlogic_rpx", "--main", "README.rdoc"]
@@ -18,21 +18,21 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{authlogic_rpx}
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Authlogic plug-in for RPX support}
-  s.test_files = ["test/acts_as_authentic_test.rb", "test/session_test.rb", "test/test_helper.rb"]
+  s.test_files = ["test/integration/basic_authentication_and_registration_test.rb", "test/integration/internal_mapping/basic_authentication_and_registration_test.rb", "test/integration/internal_mapping/settings_test.rb", "test/integration/no_mapping/basic_authentication_and_registration_test.rb", "test/integration/no_mapping/settings_test.rb", "test/test_helper.rb", "test/test_internal_mapping_helper.rb", "test/unit/acts_as_authentic_settings_test.rb", "test/unit/session_settings_test.rb", "test/unit/session_validation_test.rb", "test/unit/verify_rpx_mock_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<authlogic>, [">= 2.1.1"])
-      s.add_runtime_dependency(%q<rpx_now>, [">= 0.6.6"])
+      s.add_runtime_dependency(%q<authlogic>, [">= 2.1.3"])
+      s.add_runtime_dependency(%q<rpx_now>, [">= 0.6.11"])
     else
-      s.add_dependency(%q<authlogic>, [">= 2.1.1"])
-      s.add_dependency(%q<rpx_now>, [">= 0.6.6"])
+      s.add_dependency(%q<authlogic>, [">= 2.1.3"])
+      s.add_dependency(%q<rpx_now>, [">= 0.6.11"])
     end
   else
-    s.add_dependency(%q<authlogic>, [">= 2.1.1"])
-    s.add_dependency(%q<rpx_now>, [">= 0.6.6"])
+    s.add_dependency(%q<authlogic>, [">= 2.1.3"])
+    s.add_dependency(%q<rpx_now>, [">= 0.6.11"])
   end
 end

data/generators/add_authlogic_rpx_migration/USAGE

@@ -0,0 +1,18 @@
+Description:
+    ruby script/generate add_authlogic_rpx_migration [mapping:mapping_mode] [user_model:model_name] 
+    
+    Creates an add_authlogic_rpx_migration file in db/migrate.
+    
+    The mapping_mode parameter indicates which style of Authlogic_RPX-supported identity 
+    mapping should be used. Allowed values for mapping_mode are:
+       none
+       internal 
+    Default mapping_mode is 'internal'
+    
+    The user_model parameter specifies the name of the user/member model in your application.
+    Default model_name is 'User'
+
+    e.g. to generate the RPX migration where the user model is called 'Member' and you do not
+    want to support identity mapping:
+    
+    ruby script/generate add_authlogic_rpx_migration mapping:none user_model:member

data/generators/add_authlogic_rpx_migration/add_authlogic_rpx_migration_generator.rb

@@ -0,0 +1,44 @@
+class AddAuthlogicRpxMigrationGenerator < Rails::Generator::Base
+  def manifest
+
+    record do |m| 
+      
+      m.migration_template template_name, 'db/migrate', :assigns => {
+        :user_model_base => user_model_base,
+        :user_model => user_model,
+        :user_model_collection => user_model_collection
+      }
+    end
+  end
+  
+  def file_name
+    "add_authlogic_rpx_migration"
+  end
+  
+  protected
+    # Override with your own usage banner.
+    def banner
+      "Usage: #{$0} #{spec.name} [options] [mapping:mapping_mode] [user_model:model_name]"
+    end
+
+    attr_writer :params
+    def params
+      @params ||= {"mapping" => "internal", "user_model" => "User"}.merge( Hash[*(@args.collect { |arg| arg.split(":") }.flatten)] )
+    end
+    
+    def user_model_base
+      params['user_model'].singularize.downcase
+    end
+    def user_model
+      params['user_model'].singularize.capitalize
+    end
+    def user_model_collection
+      params['user_model'].pluralize.downcase
+    end
+    def mapping
+      params['mapping']
+    end
+    def template_name
+      mapping == 'none' ? 'migration_no_mapping.rb' : 'migration_internal_mapping.rb'
+    end
+end

data/generators/add_authlogic_rpx_migration/templates/migration_internal_mapping.rb

@@ -0,0 +1,34 @@
+class AddAuthlogicRpxMigration < ActiveRecord::Migration
+  def self.up
+    create_table :rpx_identifiers do |t|
+      t.string  :identifier, :null => false
+      t.string  :provider_name
+      t.integer :<%= user_model_base %>_id, :null => false
+      t.timestamps
+    end
+    add_index :rpx_identifiers, :identifier, :unique => true, :null => false
+    add_index :rpx_identifiers, :<%= user_model_base %>_id, :unique => false, :null => false
+    
+    # == Customisation may be required here ==
+    # You may need to remove database constraints on other fields if they will be unused in the RPX case
+    # (e.g. crypted_password and password_salt to make password authentication optional). 
+    # If you are using auto-registration, you must also remove any database constraints for fields that will be automatically mapped
+    # e.g.:
+    #change_column :<%= user_model_collection %>, :crypted_password, :string, :default => nil, :null => true
+    #change_column :<%= user_model_collection %>, :password_salt, :string, :default => nil, :null => true
+    
+  end
+  
+  def self.down
+    drop_table :rpx_identifiers
+    
+    # == Customisation may be required here ==
+    # Restore user model database constraints as appropriate
+    # e.g.:
+    #[:crypted_password, :password_salt].each do |field|
+    #  <%= user_model %>.all(:conditions => "#{field} is NULL").each { |user| user.update_attribute(field, "") if user.send(field).nil? }
+    #  change_column :<%= user_model_collection %>, field, :string, :default => "", :null => false
+    #end
+
+  end
+end

data/generators/add_authlogic_rpx_migration/templates/migration_no_mapping.rb

@@ -0,0 +1,29 @@
+class AddAuthlogicRpxMigration < ActiveRecord::Migration
+
+  def self.up
+    add_column :<%= user_model_collection %>, :rpx_identifier, :string
+    add_index :<%= user_model_collection %>, :rpx_identifier
+      
+    # == Customisation may be required here ==
+    # You may need to remove database constraints on other fields if they will be unused in the RPX case
+    # (e.g. crypted_password and password_salt to make password authentication optional). 
+    # If you are using auto-registration, you must also remove any database constraints for fields that will be automatically mapped
+    # e.g.:
+    #change_column :<%= user_model_collection %>, :crypted_password, :string, :default => nil, :null => true
+    #change_column :<%= user_model_collection %>, :password_salt, :string, :default => nil, :null => true
+    
+  end
+
+  def self.down
+    remove_column :<%= user_model_collection %>, :rpx_identifier
+    
+    # == Customisation may be required here ==
+    # Restore user model database constraints as appropriate
+    # e.g.:
+    #[:crypted_password, :password_salt].each do |field|
+    #  <%= user_model %>.all(:conditions => "#{field} is NULL").each { |user| user.update_attribute(field, "") if user.send(field).nil? }
+    #  change_column :<%= user_model_collection %>, field, :string, :default => "", :null => false
+    #end
+
+  end
+end

data/lib/authlogic_rpx.rb

@@ -2,6 +2,7 @@ require "authlogic_rpx/version"
 require "authlogic_rpx/acts_as_authentic"
 require "authlogic_rpx/session"
 require "authlogic_rpx/helper"
+require "authlogic_rpx/rpx_identifier"
 
 ActiveRecord::Base.send(:include, AuthlogicRpx::ActsAsAuthentic)
 Authlogic::Session::Base.send(:include, AuthlogicRpx::Session)

data/lib/authlogic_rpx/acts_as_authentic.rb

@@ -7,24 +7,73 @@ module AuthlogicRpx
 		# Adds in the neccesary modules for acts_as_authentic to include and also disabled password validation if
 		# RPX is being used.
 		def self.included(klass)
-		  klass.class_eval do
-			extend Config
-			add_acts_as_authentic_module(Methods, :prepend)
-		  end
+			klass.class_eval do
+				extend Config
+				add_acts_as_authentic_module(Methods, :prepend)
+			end
 		end
 
+  	class GeneralError < StandardError
+  	end
+  	class ConfigurationError < StandardError
+  	end
+  		
 		module Config
-		
-			# map_id is used to enable RPX identity mapping
-			# experimental - a feature of RPX paid accounts and not properly developed/tested yet
+		  
+			# account_merge_enabled is used to enable merging of accounts.
 			#
 			# * <tt>Default:</tt> false
 			# * <tt>Accepts:</tt> boolean
-			def map_id(value = false)
-				rw_config(:map_id, value, false)
+			def account_merge_enabled(value=false)
+				account_merge_enabled_value(value)
+			end
+			def account_merge_enabled_value(value=nil)
+				rw_config(:account_merge_enabled,value,false)
+			end      
+			alias_method :account_merge_enabled=,:account_merge_enabled
+			
+
+			# account_mapping_mode is used to explicitly set/override the mapping behaviour.
+			#
+			# * <tt>Default:</tt> :auto
+			# * <tt>Accepts:</tt> :auto, :none, :internal, :rpxnow
+			def account_mapping_mode(value=:auto)
+				account_mapping_mode_value(value)
 			end
-			alias_method :map_id=, :map_id
+			def account_mapping_mode_value(value=nil)
+			  raise AuthlogicRpx::ActsAsAuthentic::ConfigurationError.new unless value.nil? || [:auto,:none,:internal].include?( value ) 
+				rw_config(:account_mapping_mode,value,:auto)
+			end      
+			alias_method :account_mapping_mode=,:account_mapping_mode
+			
+			# returns the actual account mapping mode in use - resolves :auto to actual mechanism
+			#
+			attr_writer :account_mapping_mode_used
+			def account_mapping_mode_used
+			  @account_mapping_mode_used ||= (
+			    account_mapping_mode_value == :auto ?
+			    ( RPXIdentifier.table_exists? ? 
+			      :internal : 
+			      ( self.column_names.include?("rpx_identifier") ? :none : AuthlogicRpx::ActsAsAuthentic::ConfigurationError.new ) 
+			    ) :
+			    account_mapping_mode_value
+			  )
+			end
+
 
+			# determines if no account mapping is supported (the only behaviour in authlogic_rpx v1.0.4)
+			def using_no_mapping?
+				account_mapping_mode_used == :none
+			end
+			# determines if internal account mapping is enabled (behaviour added in authlogic_rpx v1.1.0)
+			def using_internal_mapping?
+				account_mapping_mode_used == :internal
+			end		
+			# determines if rpxnow account mapping is enabled (currently not implemented)
+			def using_rpx_mapping?
+				account_mapping_mode_used == :rpxnow
+			end
+			
 		end
 		
 		module Methods
@@ -32,12 +81,60 @@ module AuthlogicRpx
 			# Set up some simple validations
 			def self.included(klass)
 				klass.class_eval do
-					validates_uniqueness_of :rpx_identifier, :scope => validations_scope, :if => :using_rpx?
+				  
+				  case
+				  when using_no_mapping?
+				    alias_method :using_rpx?, :using_rpx__nomap?
+				    alias_method :add_rpx_identifier, :add_rpx_identifier__nomap
+				    alias_method :identified_by?, :identified_by__nomap?
+				    alias_method :merge_user_id, :merge_user_id__nomap
+				    
+				    # Uses default find_by_rpx_identifier class method
+				    
+				    # Add an rpx_identifier collection method
+				    def rpx_identifiers
+				      [{ :identifier => rpx_identifier, :provider_name => "Unknown" }]
+				    end
+				    
+          when using_internal_mapping? 
+				    alias_method :using_rpx?, :using_rpx__internal?
+				    alias_method :add_rpx_identifier, :add_rpx_identifier__internal
+				    alias_method :identified_by?, :identified_by__internal?
+				    alias_method :merge_user_id, :merge_user_id__internal
+            has_many :rpx_identifiers, :class_name => 'RPXIdentifier', :dependent => :destroy
+            
+      			# Add custom find_by_rpx_identifier class method
+      			def self.find_by_rpx_identifier(id)
+      				identifier = RPXIdentifier.find_by_identifier(id)
+      				if identifier.nil?
+      				  if self.column_names.include? 'rpx_identifier'
+      				    # check for authentication using <=1.0.4, migrate identifier to rpx_identifiers table
+      				    user = self.find( :first, :conditions => [ "rpx_identifier = ?", id ] )
+      				    unless user.nil?
+      				      user.add_rpx_identifier( id, 'Unknown' )
+      				    end
+      				    return user
+      				  else
+      				    return nil
+      				  end
+      				else
+      				  identifier.user
+      				end
+      			end
+			            
+          else
+            raise AuthlogicRpx::ActsAsAuthentic::ConfigurationError.new( "invalid or unsupported account_mapping_mode" )
+          end
+
 					validates_length_of_password_field_options validates_length_of_password_field_options.merge(:if => :validate_password_with_rpx?)
 					validates_confirmation_of_password_field_options validates_confirmation_of_password_field_options.merge(:if => :validate_password_with_rpx?)
 					validates_length_of_password_confirmation_field_options validates_length_of_password_confirmation_field_options.merge(:if => :validate_password_with_rpx?)
+					
 					before_validation :adding_rpx_identifier
-					after_create :map_rpx_identifier
+				end
+
+				RPXIdentifier.class_eval do
+					belongs_to klass.name.downcase.to_sym
 				end
 			end
 
@@ -49,65 +146,135 @@ module AuthlogicRpx
 			end
 
 			# test if account it using RPX authentication
-			def using_rpx?
-				!rpx_identifier.blank?
+			# aliased to using_rpx based on authlogic_rpx configuration mode
+			def using_rpx__nomap?
+			  !rpx_identifier.blank?
 			end
-
+			def using_rpx__internal?
+			  !rpx_identifiers.empty?
+			end
+			
 			# test if account it using normal password authentication
 			def using_password?
 				!send(crypted_password_field).blank?
 			end
 
+      # adds RPX identification to the instance.
+      # Abstracts how the RPX identifier is added to allow for multiplicity of underlying implementations
+			# aliased to add_rpx_identifier based on authlogic_rpx configuration mode
+      def add_rpx_identifier__nomap( rpx_id, rpx_provider_name )
+			  self.rpx_identifier = rpx_id
+			  #TODO: make rpx_provider_name a std param?
+      end
+      def add_rpx_identifier__internal( rpx_id, rpx_provider_name )
+			  self.rpx_identifiers.build(:identifier => rpx_id, :provider_name => rpx_provider_name )
+      end
+      
+      # Checks if given identifier is an identity for this account
+      # aliased to identified_by based on authlogic_rpx configuration mode
+			def identified_by__nomap?( id )
+				self.rpx_identifier == id
+			end
+			def identified_by__internal?( id )
+				self.rpx_identifiers.find_by_identifier( id )
+			end
+			
 		private
 			
+			# tests if password authentication should be checked: if rpx is enabled (but not used by this user) 
 			def validate_password_with_rpx?
 				!using_rpx? && require_password?
 			end
+
+			# determines if account merging is enabled; delegates to class method
+			def account_merge_enabled?
+				self.class.account_merge_enabled_value
+			end
 			
 			# hook for adding RPX identifier to an existing account. This is invoked prior to model validation.
 			# RPX information is plucked from the controller session object (where it was placed by the session model as a result
 			# of the RPX callback)
-			# The minimal action taken is to populate the rpx_identifier field in the user model.
+			# The minimal action taken is to add an RPXIdentifier object to the user.
 			#
 			# This procedure chains to the map_added_rpx_data, which may be over-ridden in your project to perform
 			# additional mapping of RPX information to the user model as may be desired.
 			#
 			def adding_rpx_identifier
 				return true unless session_class && session_class.controller
-				added_rpx_data = session_class.controller.session['added_rpx_data']	
+				
+				added_rpx_data = session_class.controller.session['added_rpx_data']
 				unless added_rpx_data.blank?
 					session_class.controller.session['added_rpx_data'] = nil
+  				rpx_id = added_rpx_data['profile']['identifier']
+  				rpx_provider_name	= added_rpx_data['profile']['providerName']
+  				
+					unless self.identified_by?( rpx_id )
+					  # identifier not already set for this user..
+					  
+					  another_user = self.class.find_by_rpx_identifier( rpx_id )
+					  if another_user
+					    return false unless account_merge_enabled?
+					    # another user already has this id registered..
+					    
+					    # merge all IDs from another_user to self, with application callbacks before/after
+					    before_merge_rpx_data( another_user, self )
+				      merge_user_id another_user
+				      after_merge_rpx_data( another_user, self )
+				      
+					  else
+					    self.add_rpx_identifier( rpx_id, rpx_provider_name )
+					  end
+				  end
+				  
 					map_added_rpx_data( added_rpx_data ) 
 				end
+				
 				return true
+			end	
+			
+			# merge_user_id is an internal method used to merge the actual RPX identifiers
+			# aliased to merge_user_id based on authlogic_rpx configuration mode
+			def merge_user_id__nomap( from_user )
+			  self.rpx_identifier = from_user.rpx_identifier
+			  from_user.rpx_identifier = nil
+			  from_user.save
+			  from_user.reload		
+			end		
+			def merge_user_id__internal( from_user )
+				self.rpx_identifiers << from_user.rpx_identifiers	
+				from_user.reload
 			end
 			
+									
 			# map_added_rpx_data maps additional fields from the RPX response into the user object during the "add RPX to existing account" process.
 			# Override this in your user model to perform field mapping as may be desired
 			# See https://rpxnow.com/docs#profile_data for the definition of available attributes
 			#
-			# By default, it only maps the rpx_identifier field.
+			# "self" at this point is the user model. Map details as appropriate from the rpx_data structure provided.
 			#
 			def map_added_rpx_data( rpx_data )
-			  self.rpx_identifier = rpx_data['profile']['identifier']
+
 			end
+						
+			# before_merge_rpx_data provides a hook for application developers to perform data migration prior to the merging of user accounts.
+			# This method is called just before authlogic_rpx merges the user registration for 'from_user' into 'to_user'
+			# Authlogic_RPX is responsible for merging registration data.
+			#
+			# By default, it does not merge any other details (e.g. application data ownership)
+			#
+			def before_merge_rpx_data( from_user, to_user )
 			
-			
-			
-			# experimental - a feature of RPX paid accounts and not properly developed/tested yet
-			def map_id?
-				self.class.map_id
-			end
-				
-			# experimental - a feature of RPX paid accounts and not properly developed/tested yet
-			def map_rpx_identifier
-				RPXNow.map(rpx_identifier, id) if using_rpx? && map_id?
 			end
 			
-			# experimental - a feature of RPX paid accounts and not properly developed/tested yet
-			def unmap_rpx_identifer
-				RPXNow.unmap(rpx_identifier, id) if using_rpx? && map_id?
+			# after_merge_rpx_data provides a hook for application developers to perform account clean-up after authlogic_rpx has
+			# migrated registration details.
+			#
+			# By default, does nothing. It could, for example, be used to delete or disable the 'from_user' account
+			#
+			def after_merge_rpx_data( from_user, to_user )
+			
 			end
+											    
 			
 		end
 	end