Empact-authlogic_rpx 1.1.4 → 1.1.5

data/Empact-authlogic_rpx.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{Empact-authlogic_rpx}
-  s.version = "1.1.4"
+  s.version = "1.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Gallagher / tardate"]
-  s.date = %q{2010-04-15}
+  s.date = %q{2010-05-22}
   s.description = %q{Authlogic extension/plugin that provides RPX (rpxnow.com) authentication support}
   s.email = %q{gallagher.paul@gmail.com}
   s.extra_rdoc_files = [

data/README.rdoc

@@ -10,10 +10,11 @@ This fork enables full-featured auto-registration without sacrificing database c
 Authlogic_RPX is an Authlogic extension library that provides support for authentication using the RPX multi-authentication service offered by JanRain. To use RPX, you must first register your application at {RPX}[http://rpxnow.com/]. A free "Basic" account is available, in addition to paid enhanced versions. All work with Authlogic_RPX.  
 
 Key features and capabilities:
+* You can offer your users all the authentication methods supported by RPX (OpenID, Facebook, twitter, Google, Yahoo!, LinkedIn etc)
 * Auto-registration by default following RPX authentication (can be disabled if required)
-* Can allow users to enable RPX authentication for their existing password-enabled accounts
 * View helpers to assist with inserting login fragments in pages
 * Can co-exist with standard password authentication
+* Allow users to enable RPX authentication for any existing password-enabled accounts
 * Supports identity mapping and merging (allowing users to have multiple logins associated with one member record on your site)
 
 
@@ -582,6 +583,13 @@ For example, to insert a login link in a navigation bar is as simple as this:
     <% end %>
   </div>
 
+<b>NOTE:</b> One of the most common problems people encounter in testing out authlogic_rpx is to <b>no set the correct :app_name</b>.
+The example above shows how this parameter is set for the rails-authlogic-rpx-sample, but you need to replace this value with the
+name you registered at rpxnow.com .
+
+<b>NOTE2:</b> Make sure the application name is entered here all in lowercase. If you do not, it can cause SSL certificate errors to
+be displayed when logging in with certain browsers (notably Android 2.1 webkit).
+
 === 8. Allow users to "Add RPX" to existing accounts (optional)
 
 If you got this far and have a working application, you are ready to go, especially if you only plan to support RPX authentication.
@@ -732,4 +740,4 @@ The idea of adding RPX support to authlogic is not new. Some early ideas were fo
 *	<b>http://github.com/gampleman/authlogic_rpx/</b> similar, but including an implementation of the RPX api
 
 authlogic_rpx was created by Paul Gallagher (tardate.com) and released under the MIT license.
-Big thanks for contributions from {John}[http://gitub.com/jjb] and {Damir}[http://gitub.com/sidonath]
+Big thanks for contributions from {Joris}[http://github.com/trooster], {John}[http://gitub.com/jjb], {Damir}[http://gitub.com/sidonath], {Ben}[http://github.com/Empact]

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.5

data/lib/authlogic_rpx/acts_as_authentic.rb

@@ -32,7 +32,6 @@ module AuthlogicRpx
 			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
@@ -78,73 +77,64 @@ module AuthlogicRpx
 		
 		module Methods
 		
-			# Set up some simple validations
+			# Mix-in the required methods based on mapping mode
+			#
 			def self.included(klass)
 				klass.class_eval do
 				  
 				  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
+				    include AuthlogicRpx::MethodSet_NoMapping
 				    
           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', :validate => false, :dependent => :destroy
+            include AuthlogicRpx::MethodSet_InternalMapping
+            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
+        		# 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.send( self.class_name.downcase )
+        			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?)
+          # Set up some fundamental conditional validations
+					validates_length_of_password_field_options validates_length_of_password_field_options.merge(:if => :validate_password_not_rpx?)
+					validates_confirmation_of_password_field_options validates_confirmation_of_password_field_options.merge(:if => :validate_password_not_rpx?)
+					validates_length_of_password_confirmation_field_options validates_length_of_password_confirmation_field_options.merge(:if => :validate_password_not_rpx?)
 					
 					before_validation :adding_rpx_identifier
 				end
 
+        # add relations and validation to RPXIdentifier based on the actual user model class name used
+        #
 				RPXIdentifier.class_eval do
 					belongs_to klass.name.downcase.to_sym
+        	validates_presence_of "#{klass.name.downcase}_id".to_sym
 				end
 			end
 
-			# test if account it using RPX authentication
-			# 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?
+			# support a block given to the save
+			def save(perform_validation = true, &block)
+				result = super perform_validation
+				yield(result) if block_given?
+				result
 			end
 			
 			# test if account it using normal password authentication
@@ -152,30 +142,11 @@ module AuthlogicRpx
 				!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?
+			# tests if password authentication should be checked instead of rpx (i.e. if rpx is enabled but not used by this user) 
+			def validate_password_not_rpx?
 				!using_rpx? && require_password?
 			end
 
@@ -221,23 +192,8 @@ module AuthlogicRpx
 				  
 					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
@@ -271,4 +227,78 @@ module AuthlogicRpx
 			
 		end
 	end
+	
+	# Mix-in collection of methods that are specific to no-mapping mode of operation
+	#
+	module MethodSet_NoMapping
+		# test if account it using RPX authentication
+		# 
+		def using_rpx?
+		  !rpx_identifier.blank?
+		end
+		
+    # adds RPX identification to the instance.
+    # Abstracts how the RPX identifier is added to allow for multiplicity of underlying implementations
+		# 
+    def add_rpx_identifier( rpx_id, rpx_provider_name )
+		  self.rpx_identifier = rpx_id
+		  #TODO: make rpx_provider_name a std param?
+    end
+    
+    # Checks if given identifier is an identity for this account
+    # 
+		def identified_by?( id )
+			self.rpx_identifier == id
+		end
+
+		# merge_user_id is an internal method used to merge the actual RPX identifiers
+		# 
+		def merge_user_id( from_user )
+		  self.rpx_identifier = from_user.rpx_identifier
+		  from_user.rpx_identifier = nil
+		  from_user.save
+		  from_user.reload		
+		end
+
+    # Uses default find_by_rpx_identifier class method
+    
+    # Add an rpx_identifier collection method
+    def rpx_identifiers
+      [{ :identifier => rpx_identifier, :provider_name => "Unknown" }]
+    end
+	end
+	
+	
+	# Mix-in collection of methods that are specific to internal mapping mode of operation
+	#
+	module MethodSet_InternalMapping
+		# test if account it using RPX authentication
+		# 
+		def using_rpx?
+		  !rpx_identifiers.empty?
+		end	
+
+    # adds RPX identification to the instance.
+    # Abstracts how the RPX identifier is added to allow for multiplicity of underlying implementations
+		# 
+    def add_rpx_identifier( 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
+    # 
+		def identified_by?( id )
+			self.rpx_identifiers.find_by_identifier( id )
+		end
+		
+		# merge_user_id is an internal method used to merge the actual RPX identifiers
+		# 
+		def merge_user_id( from_user )
+			self.rpx_identifiers << from_user.rpx_identifiers	
+			from_user.reload
+		end
+		
+
+	end
+	
 end

data/lib/authlogic_rpx/helper.rb

@@ -36,7 +36,7 @@ module AuthlogicRpx
     private
     
     def build_token_url!( options )
-      options.delete( :return_url ) + '?' + (
+      options.delete( :return_url ) + (options[:return_url].include?('?') ? '&' : '?') + (
         { :authenticity_token => form_authenticity_token, :add_rpx => options.delete( :add_rpx ) }.collect { |n| "#{n[0]}=#{ u(n[1]) }" if n[1] }
 			).compact.join('&')
     end

data/lib/authlogic_rpx/rpx_identifier.rb

@@ -1,5 +1,4 @@
 class RPXIdentifier < ActiveRecord::Base
 	validates_presence_of :identifier
 	validates_uniqueness_of :identifier
-	validates_presence_of :user_id
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 4
-  version: 1.1.4
+  - 5
+  version: 1.1.5
 platform: ruby
 authors: 
 - Paul Gallagher / tardate
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-15 00:00:00 -04:00
+date: 2010-05-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency