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 +10 -2

                       end
                     else
                       # Existing record
+                      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)
+                  account_pending
-                  redirect_to :action => 'login'
                 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

@@ -80,6 +80,21 class AccountControllerTest < Test::Unit::TestCase
80	assert_redirected_to 'my/page'	80	assert_redirected_to 'my/page'
81	end	81	end
82		82
		83	def test_login_with_openid_for_existing_non_active_user
		84	Setting.self_registration = '2'
		85	Setting.openid = '1'
		86	existing_user = User.new(:firstname => 'Cool',
		87	:lastname => 'User',
		88	:mail => 'user@somedomain.com',
		89	:identity_url => 'http://openid.example.com/good_user',
		90	:status => User::STATUS_REGISTERED)
		91	existing_user.login = 'cool_user'
		92	assert existing_user.save!
		93
		94	post :login, :openid_url => existing_user.identity_url
		95	assert_redirected_to 'login'
		96	end
		97
83	def test_login_with_openid_with_new_user_created	98	def test_login_with_openid_with_new_user_created
84	Setting.self_registration = '3'	99	Setting.self_registration = '3'
85	Setting.openid = '1'	100	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