From 0b07998c4266b56d2e33bc9543f70cf368806647 Mon Sep 17 00:00:00 2001
From: Pelle Braendgaard <pelleb@gmail.com>
Date: Thu, 1 Oct 2009 16:04:36 -0400
Subject: [PATCH] Handles the issues caused by autoregistration with OpenID 2.0
 directed identity.

---
 lib/authlogic_openid/session.rb | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/lib/authlogic_openid/session.rb b/lib/authlogic_openid/session.rb
index 3ad9cc5..0ce5811 100644
--- a/lib/authlogic_openid/session.rb
+++ b/lib/authlogic_openid/session.rb
@@ -70,10 +70,21 @@ def openid_identifier=(value)
       # error.
       def save(&block)
         begin
-          block = nil if !openid_identifier.blank?
-          super(&block)
+          if beginning_authenticating_with_openid?
+            block = nil
+            super &block
+          else
+            super do |result|
+              if block
+                # don't call the block if we have already rendered or redirected elsewhere
+                block.call(result) unless controller.send(:performed?)
+              end
+            end
+          end
         rescue AuthlogicOpenid::Session::OpenIDNotFoundException
+          # The openid library sets a bunch of sessions fields we need to clear up
           controller.send( :open_id_consumer).send( :cleanup_session)
+          # The user object won't start the discovery correctly if open_id_complete is set
           controller.params[:open_id_complete]=nil #we need to start a fresh for autocomplete
           self.attempted_record = klass.new :openid_identifier=>openid_identifier
           attempted_record.save do |result|
@@ -87,6 +98,11 @@ def authenticating_with_openid?
           attempted_record.nil? && errors.empty? && (!openid_identifier.blank? || (controller.params[:open_id_complete] && controller.params[:for_session]))
         end
         
+        # We are starting the openid process
+        def beginning_authenticating_with_openid?
+          attempted_record.nil? && errors.empty? && (!openid_identifier.blank? )
+        end
+        
         def find_by_openid_identifier_method
           self.class.find_by_openid_identifier_method
         end
@@ -98,10 +114,11 @@ def auto_register?
         def validate_by_openid
           self.remember_me = controller.params[:remember_me] == "true" if controller.params.key?(:remember_me)
           if openid_complete?
-            self.openid_identifier ||= controller.params["openid.identity"]
+            self.openid_identifier ||= controller.params["openid.claimed_id"]||controller.params["openid.identity"]
             self.attempted_record = klass.send(find_by_openid_identifier_method, openid_identifier)
             if !attempted_record
               if auto_register?
+                # We raise an exception here so we don't have to deal with all the other issues here
                 raise OpenIDNotFoundException
               else
                 errors.add(:openid_identifier, "did not match any users in our database, have you set up your account to use OpenID?")