jro_apps/redmine Commit - r2420:aed1787d510f

Fixed a bug in the OpenID login when a user signed up with OpenID but hasn't...

Eric Davis -

r2420:aed1787d510f

parent child

Context file:

r2420:aed1787d510f

app/controllers/account_controller.rb +11 -3

                        end
                      else
                        # Existing record
-                       successful_authentication(user)
+                       if user.active?
+                         successful_authentication(user)
+                       else
+                         account_pending
+                       end
                      end
                    end
                  end
                  if user.save
                    # Sends an email to the administrators
                    Mailer.deliver_account_activation_request(user)
-                   flash[:notice] = l(:notice_account_pending)
-                   redirect_to :action => 'login'
+                   account_pending
                  else
                    yield if block_given?
                  end
                end
+               def account_pending
+                 flash[:notice] = l(:notice_account_pending)
+                 redirect_to :action => 'login'
+               end
              end

test/functional/account_controller_test.rb +15 0

                  assert_redirected_to 'my/page'
                end
+               def test_login_with_openid_for_existing_non_active_user
+                 Setting.self_registration = '2'
+                 Setting.openid = '1'
+                 existing_user = User.new(:firstname => 'Cool',
+                                          :lastname => 'User',
+                                          :mail => 'user@somedomain.com',
+                                          :identity_url => 'http://openid.example.com/good_user',
+                                          :status => User::STATUS_REGISTERED)
+                 existing_user.login = 'cool_user'
+                 assert existing_user.save!
+                 post :login, :openid_url => existing_user.identity_url
+                 assert_redirected_to 'login'
+               end
                def test_login_with_openid_with_new_user_created
                  Setting.self_registration = '3'
                  Setting.openid = '1'

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages