From 720f928cd2cafd0edb4357bce9d63e3b4dd10c3b Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Wed, 11 Feb 2009 19:07:34 +0000 Subject: [PATCH] Refactored common methods out of register and open_id_authenticate * Extracted register_by_email_activation * Extracted register_automatically * Extracted register_manually_by_administrator #699 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2447 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/account_controller.rb | 92 ++++++++++++---------- test/functional/account_controller_test.rb | 13 ++- 2 files changed, 59 insertions(+), 46 deletions(-) diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index c29942f4..4bfe562c 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -122,32 +122,14 @@ class AccountController < ApplicationController else @user.login = params[:user][:login] @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] - # TODO: Duplicated in open_id_authenticate action. A good sized refactoring would be good here + case Setting.self_registration when '1' - # Email activation - token = Token.new(:user => @user, :action => "register") - if @user.save and token.save - Mailer.deliver_register(token) - flash[:notice] = l(:notice_account_register_done) - redirect_to :action => 'login' - end + register_by_email_activation(@user) when '3' - # Automatic activation - @user.status = User::STATUS_ACTIVE - if @user.save - self.logged_user = @user - flash[:notice] = l(:notice_account_activated) - redirect_to :controller => 'my', :action => 'account' - end + register_automatically(@user) else - # Manual activation by the administrator - 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' - end + register_manually_by_administrator(@user) end end end @@ -208,35 +190,17 @@ private user.random_password user.status = User::STATUS_REGISTERED - # TODO: Duplicated in register action. A good sized refactoring would be good here case Setting.self_registration when '1' - # Email activation - token = Token.new(:user => user, :action => "register") - if user.save and token.save - Mailer.deliver_register(token) - flash[:notice] = l(:notice_account_register_done) - redirect_to :action => 'login' - else + register_by_email_activation(user) do onthefly_creation_failed(user, {:login => user.login, :identity_url => identity_url }) end when '3' - # Automatic activation - user.status = User::STATUS_ACTIVE - if user.save - flash[:notice] = l(:notice_account_activated) - successful_authentication(user) - else + register_automatically(user) do onthefly_creation_failed(user, {:login => user.login, :identity_url => identity_url }) end else - # Manual activation by the administrator - 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' - else + register_manually_by_administrator(user) do onthefly_creation_failed(user, {:login => user.login, :identity_url => identity_url }) end end @@ -266,4 +230,46 @@ private render :action => 'register' end + # Register a user for email activation. + # + # Pass a block for behavior when a user fails to save + def register_by_email_activation(user, &block) + token = Token.new(:user => user, :action => "register") + if user.save and token.save + Mailer.deliver_register(token) + flash[:notice] = l(:notice_account_register_done) + redirect_to :action => 'login' + else + yield if block_given? + end + end + + # Automatically register a user + # + # Pass a block for behavior when a user fails to save + def register_automatically(user, &block) + # Automatic activation + user.status = User::STATUS_ACTIVE + if user.save + self.logged_user = user + flash[:notice] = l(:notice_account_activated) + redirect_to :controller => 'my', :action => 'account' + else + yield if block_given? + end + end + + # Manual activation by the administrator + # + # Pass a block for behavior when a user fails to save + def register_manually_by_administrator(user, &block) + 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' + else + yield if block_given? + end + end end diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb index c665d319..edca1d2f 100644 --- a/test/functional/account_controller_test.rb +++ b/test/functional/account_controller_test.rb @@ -64,16 +64,23 @@ class AccountControllerTest < Test::Unit::TestCase :content => /Invalid user or password/ end - def test_login_with_openid + def test_login_with_openid_for_existing_user Setting.self_registration = '3' - post :login, :openid_url => 'http://openid.example.com/good_user' + existing_user = User.new(:firstname => 'Cool', + :lastname => 'User', + :mail => 'user@somedomain.com', + :identity_url => 'http://openid.example.com/good_user') + existing_user.login = 'cool_user' + assert existing_user.save! + + post :login, :openid_url => existing_user.identity_url 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' + assert_redirected_to 'my/account' user = User.find_by_login('cool_user') assert user assert_equal 'Cool', user.firstname