jro_apps/redmine Commit - r2385:8194cfaf8690

Added user setup needed based on the system's registration settings...

Eric Davis -

r2385:8194cfaf8690

parent child

Context file:

r2385:8194cfaf8690

Collapse all files

app/controllers/account_controller.rb +41 -7

@@ -122,6 +122,7 class AccountController < ApplicationController
122	else	122	else
123	@user.login = params[:user][:login]	123	@user.login = params[:user][:login]
124	@user.password, @user.password_confirmation = params[:password], params[:password_confirmation]	124	@user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
		125	# TODO: Duplicated in open_id_authenticate action. A good sized refactoring would be good here
125	case Setting.self_registration	126	case Setting.self_registration
126	when '1'	127	when '1'
127	# Email activation	128	# Email activation
@@ -205,14 +206,40 private
205	user.mail = registration['email'] unless registration['email'].nil?	206	user.mail = registration['email'] unless registration['email'].nil?
206	user.firstname, user.lastname = registration['fullname'].split(' ') unless registration['fullname'].nil?	207	user.firstname, user.lastname = registration['fullname'].split(' ') unless registration['fullname'].nil?
207	user.random_password	208	user.random_password
208	if user.save	209	user.status = User::STATUS_REGISTERED
209	successful_authentication(user)	210
		211	# TODO: Duplicated in register action. A good sized refactoring would be good here
		212	case Setting.self_registration
		213	when '1'
		214	# Email activation
		215	token = Token.new(:user => user, :action => "register")
		216	if user.save and token.save
		217	Mailer.deliver_register(token)
		218	flash[:notice] = l(:notice_account_register_done)
		219	redirect_to :action => 'login'
		220	else
		221	onthefly_creation_failed(user, {:login => user.login, :identity_url => identity_url })
		222	end
		223	when '3'
		224	# Automatic activation
		225	user.status = User::STATUS_ACTIVE
		226	if user.save
		227	flash[:notice] = l(:notice_account_activated)
		228	successful_authentication(user)
		229	else
		230	onthefly_creation_failed(user, {:login => user.login, :identity_url => identity_url })
		231	end
210	else	232	else
211	# Onthefly creation failed, display the registration form to fill/fix attributes	233	# Manual activation by the administrator
212	~~@user~~ = user	234	if user.save
213	session[:auth_source_registration] = {:login => user.login, :identity_url => identity_url }	235	# Sends an email to the administrators
214	render :action => 'register'	236	Mailer.deliver_account_activation_request(user)
215	end	237	flash[:notice] = l(:notice_account_pending)
		238	redirect_to :action => 'login'
		239	else
		240	onthefly_creation_failed(user, {:login => user.login, :identity_url => identity_url })
		241	end
		242	end
216	else	243	else
217	# Existing record	244	# Existing record
218	successful_authentication(user)	245	successful_authentication(user)
@@ -232,4 +259,11 private
232	redirect_back_or_default :controller => 'my', :action => 'page'	259	redirect_back_or_default :controller => 'my', :action => 'page'
233	end	260	end
234		261
		262	# Onthefly creation failed, display the registration form to fill/fix attributes
		263	def onthefly_creation_failed(user, auth_source_options = { })
		264	@user = user
		265	session[:auth_source_registration] = auth_source_options unless auth_source_options.empty?
		266	render :action => 'register'
		267	end
		268
235	end	269	end

test/functional/account_controller_test.rb +23 0

               end
               def test_login_with_openid
+                Setting.self_registration = '3'
                 post :login, :openid_url => 'http://openid.example.com/good_user'
                 assert_redirected_to 'my/page'
               end
               def test_login_with_openid_with_new_user_created
+                Setting.self_registration = '3'
                 post :login, :openid_url => 'http://openid.example.com/good_user'
                 assert_redirected_to 'my/page'
                 user = User.find_by_login('cool_user')
                 assert_equal 'User', user.lastname
               end
+              def test_login_with_openid_with_new_user_created_with_email_activation_should_have_a_token
+                Setting.self_registration = '1'
+                post :login, :openid_url => 'http://openid.example.com/good_user'
+                assert_redirected_to 'login'
+                user = User.find_by_login('cool_user')
+                assert user
+                token = Token.find_by_user_id_and_action(user.id, 'register')
+                assert token
+              end
+              def test_login_with_openid_with_new_user_created_with_manual_activation
+                Setting.self_registration = '2'
+                post :login, :openid_url => 'http://openid.example.com/good_user'
+                assert_redirected_to 'login'
+                user = User.find_by_login('cool_user')
+                assert user
+                assert_equal User::STATUS_REGISTERED, user.status
+              end
               def test_login_with_openid_with_new_user_with_conflict_should_register
+                Setting.self_registration = '3'
                 existing_user = User.new(:firstname => 'Cool', :lastname => 'User', :mail => 'user@somedomain.com')
                 existing_user.login = 'cool_user'
                 assert existing_user.save!

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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