* Make authenticating_with_openid? method a little more stringent to …

…avoid trying to double authenticate. Ex: finding a session in the save block during a successful save.
binarylogic · Apr 3, 2009 · 8d9523a · 8d9523a
1 parent 343a53b
commit 8d9523a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -4,6 +4,7 @@
 * Set the openid_identifier by the one passed back by the provider in AuthlogicOpenid::ActsAsAuthentic.
 * Added required_fields and optional_fields config options for AuthlogicOpenid::ActsAsAuthentic.
 * Added map_openid_registration, attributes_to_save, and map_saved_attributes methods to customize how attributes are set for AuthlogicOpenid::ActsAsAuthentic.
+* Make authenticating_with_openid? method a little more stringent to avoid trying to double authenticate. Ex: finding a session in the save block during a successful save.
 
 == 1.0.2 released 2009-3-30
 

diff --git a/lib/authlogic_openid/session.rb b/lib/authlogic_openid/session.rb
@@ -64,7 +64,7 @@ def save(&block)
 
       private
         def authenticating_with_openid?
-          !openid_identifier.blank? || (controller.params[:open_id_complete] && controller.params[:for_session])
+          attempted_record.nil? && errors.empty? && (!openid_identifier.blank? || (controller.params[:open_id_complete] && controller.params[:for_session]))
         end
 
         def find_by_openid_identifier_method