jro_apps/redmine Commit - r11716:4bd874ab46c3

Adds a way for a registered user to get a new action email (#14228)....

Jean-Philippe Lang -

r11716:4bd874ab46c3

parent child

Context file:

r11716:4bd874ab46c3

Collapse all files

app/controllers/account_controller.rb +48 -9

                 else
                   if request.post?
                     user = User.find_by_mail(params[:mail].to_s)
-                    # user not found or not active
+                    # user not found
-                    unless user && user.active?
+                    unless user
                       flash.now[:error] = l(:notice_account_unknown_email)
                       return
                     end
+                    unless user.active?
+                      handle_inactive_user(user, lost_password_path)
+                      return
+                    end
                     # user cannot change its password
                     unless user.change_password_allowed?
                       flash.now[:error] = l(:notice_can_t_change_password)
                 redirect_to signin_path
               end
+              # Sends a new account activation email
+              def activation_email
+                if session[:registered_user_id] && Setting.self_registration == '1'
+                  user_id = session.delete(:registered_user_id).to_i
+                  user = User.find_by_id(user_id)
+                  if user && user.registered?
+                    register_by_email_activation(user)
+                    return
+                  end
+                end
+                redirect_to(home_url)
+              end
               private
               def authenticate_user
               end
               def password_authentication
-                user = User.try_to_login(params[:username], params[:password])
+                user = User.try_to_login(params[:username], params[:password], false)
                 if user.nil?
                   invalid_credentials
                   onthefly_creation_failed(user, {:login => user.login, :auth_source_id => user.auth_source_id })
                 else
                   # Valid user
-                  successful_authentication(user)
+                  if user.active?
+                    successful_authentication(user)
+                  else
+                    handle_inactive_user(user)
+                  end
                 end
               end
                       if user.active?
                         successful_authentication(user)
                       else
-                        account_pending
+                        handle_inactive_user(user)
                       end
                     end
                   end
                 if user.save
                   # Sends an email to the administrators
                   Mailer.account_activation_request(user).deliver
-                  account_pending
+                  account_pending(user)
                 else
                   yield if block_given?
                 end
               end
-              def account_pending
+              def handle_inactive_user(user, redirect_path=signin_path)
-                flash[:notice] = l(:notice_account_pending)
+                if user.registered?
-                redirect_to signin_path
+                  account_pending(user, redirect_path)
+                else
+                  account_locked(user, redirect_path)
+                end
+              end
+              def account_pending(user, redirect_path=signin_path)
+                if Setting.self_registration == '1'
+                  flash[:error] = l(:notice_account_not_activated_yet, :url => activation_email_path)
+                  session[:registered_user_id] = user.id
+                else
+                  flash[:error] = l(:notice_account_pending)
+                end
+                redirect_to redirect_path
+              end
+              def account_locked(user, redirect_path=signin_path)
+                flash[:error] = l(:notice_account_locked)
+                redirect_to redirect_path
               end
             end

app/models/user.rb +3 -3

               end
               # Returns the user that matches provided login and password, or nil
-              def self.try_to_login(login, password)
+              def self.try_to_login(login, password, active_only=true)
                 login = login.to_s
                 password = password.to_s
                 user = find_by_login(login)
                 if user
                   # user is already in local database
-                  return nil unless user.active?
                   return nil unless user.check_password?(password)
+                  return nil if !user.active? && active_only
                 else
                   # user is not yet registered, try to authenticate with available sources
                   attrs = AuthSource.authenticate(login, password)
                     end
                   end
                 end
-                user.update_column(:last_login_on, Time.now) if user && !user.new_record?
+                user.update_column(:last_login_on, Time.now) if user && !user.new_record? && user.active?
                 user
               rescue => text
                 raise text

config/locales/en.yml +2 0

               notice_account_wrong_password: Wrong password
               notice_account_register_done: Account was successfully created. To activate your account, click on the link that was emailed to you.
               notice_account_unknown_email: Unknown user.
+              notice_account_not_activated_yet: You haven't activated your account yet. If you want to receive a new activation email, please <a href="%{url}">click this link</a>.
+              notice_account_locked: Your account is locked.
               notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password.
               notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you.
               notice_account_activated: Your account has been activated. You can now log in.

config/locales/fr.yml +2 0

               notice_account_wrong_password: Mot de passe incorrect
               notice_account_register_done: Un message contenant les instructions pour activer votre compte vous a été envoyé.
               notice_account_unknown_email: Aucun compte ne correspond à cette adresse.
+              notice_account_not_activated_yet: Vous n'avez pas encore activé votre compte. Si vous voulez recevoir un nouveau message d'activation, veuillez <a href="%{url}">cliquer sur ce lien</a>.
+              notice_account_locked: Votre compte est verrouillé.
               notice_can_t_change_password: Ce compte utilise une authentification externe. Impossible de changer le mot de passe.
               notice_account_lost_email_sent: Un message contenant les instructions pour choisir un nouveau mot de passe vous a été envoyé.
               notice_account_activated: Votre compte a été activé. Vous pouvez à présent vous connecter.

config/routes.rb +1 0

               match 'account/register', :to => 'account#register', :via => [:get, :post], :as => 'register'
               match 'account/lost_password', :to => 'account#lost_password', :via => [:get, :post], :as => 'lost_password'
               match 'account/activate', :to => 'account#activate', :via => :get
+              get 'account/activation_email', :to => 'account#activation_email', :as => 'activation_email'
               match '/news/preview', :controller => 'previews', :action => 'news', :as => 'preview_news', :via => [:get, :post, :put]
               match '/issues/preview/new/:project_id', :to => 'previews#issue', :as => 'preview_new_issue', :via => [:get, :post, :put]

test/functional/account_controller_test.rb +43 -1

@@ -63,6 +63,36 class AccountControllerTest < ActionController::TestCase
63	assert_select 'input[name=password][value]', 0	63	assert_select 'input[name=password][value]', 0
64	end	64	end
65		65
		66	def test_login_with_locked_account_should_fail
		67	User.find(2).update_attribute :status, User::STATUS_LOCKED
		68
		69	post :login, :username => 'jsmith', :password => 'jsmith'
		70	assert_redirected_to '/login'
		71	assert_include 'locked', flash[:error]
		72	assert_nil @request.session[:user_id]
		73	end
		74
		75	def test_login_as_registered_user_with_manual_activation_should_inform_user
		76	User.find(2).update_attribute :status, User::STATUS_REGISTERED
		77
		78	with_settings :self_registration => '2', :default_language => 'en' do
		79	post :login, :username => 'jsmith', :password => 'jsmith'
		80	assert_redirected_to '/login'
		81	assert_include 'pending administrator approval', flash[:error]
		82	end
		83	end
		84
		85	def test_login_as_registered_user_with_email_activation_should_propose_new_activation_email
		86	User.find(2).update_attribute :status, User::STATUS_REGISTERED
		87
		88	with_settings :self_registration => '1', :default_language => 'en' do
		89	post :login, :username => 'jsmith', :password => 'jsmith'
		90	assert_redirected_to '/login'
		91	assert_equal 2, @request.session[:registered_user_id]
		92	assert_include 'new activation email', flash[:error]
		93	end
		94	end
		95
66	def test_login_should_rescue_auth_source_exception	96	def test_login_should_rescue_auth_source_exception
67	source = AuthSource.create!(:name => 'Test')	97	source = AuthSource.create!(:name => 'Test')
68	User.find(2).update_attribute :auth_source_id, source.id	98	User.find(2).update_attribute :auth_source_id, source.id
@@ -217,7 +247,7 class AccountControllerTest < ActionController::TestCase
217		247
218	assert_no_difference 'Token.count' do	248	assert_no_difference 'Token.count' do
219	post :lost_password, :mail => 'JSmith@somenet.foo'	249	post :lost_password, :mail => 'JSmith@somenet.foo'
220	assert_response :success	250	assert_redirected_to '/account/lost_password'
221	end	251	end
222	end	252	end
223		253
@@ -274,4 +304,16 class AccountControllerTest < ActionController::TestCase
274	post :lost_password, :token => "abcdef", :new_password => 'newpass', :new_password_confirmation => 'newpass'	304	post :lost_password, :token => "abcdef", :new_password => 'newpass', :new_password_confirmation => 'newpass'
275	assert_redirected_to '/'	305	assert_redirected_to '/'
276	end	306	end
		307
		308	def test_activation_email_should_send_an_activation_email
		309	User.find(2).update_attribute :status, User::STATUS_REGISTERED
		310	@request.session[:registered_user_id] = 2
		311
		312	with_settings :self_registration => '1' do
		313	assert_difference 'ActionMailer::Base.deliveries.size' do
		314	get :activation_email
		315	assert_redirected_to '/login'
		316	end
		317	end
		318	end
277	end	319	end

test/integration/account_test.rb +45 0

@@ -221,4 +221,49 class AccountTest < ActionController::IntegrationTest
221	assert_equal 66, user.auth_source_id	221	assert_equal 66, user.auth_source_id
222	assert user.hashed_password.blank?	222	assert user.hashed_password.blank?
223	end	223	end
		224
		225	def test_registered_user_should_be_able_to_get_a_new_activation_email
		226	Token.delete_all
		227
		228	with_settings :self_registration => '1', :default_language => 'en' do
		229	# register a new account
		230	assert_difference 'User.count' do
		231	assert_difference 'Token.count' do
		232	post 'account/register',
		233	:user => {:login => "newuser", :language => "en",
		234	:firstname => "New", :lastname => "User", :mail => "newuser@foo.bar",
		235	:password => "newpass123", :password_confirmation => "newpass123"}
		236	end
		237	end
		238	user = User.order('id desc').first
		239	assert_equal User::STATUS_REGISTERED, user.status
		240	reset!
		241
		242	# try to use "lost password"
		243	assert_no_difference 'ActionMailer::Base.deliveries.size' do
		244	post '/account/lost_password', :mail => 'newuser@foo.bar'
		245	end
		246	assert_redirected_to '/account/lost_password'
		247	follow_redirect!
		248	assert_response :success
		249	assert_select 'div.flash', :text => /new activation email/
		250	assert_select 'div.flash a[href=/account/activation_email]'
		251
		252	# request a new action activation email
		253	assert_difference 'ActionMailer::Base.deliveries.size' do
		254	get '/account/activation_email'
		255	end
		256	assert_redirected_to '/login'
		257	token = Token.order('id desc').first
		258	activation_path = "/account/activate?token=#{token.value}"
		259	assert_include activation_path, mail_body(ActionMailer::Base.deliveries.last)
		260
		261	# activate the account
		262	get activation_path
		263	assert_redirected_to '/login'
		264
		265	post '/login', :username => 'newuser', :password => 'newpass123'
		266	assert_redirected_to '/my/page'
		267	end
		268	end
224	end	269	end

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