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 +38 -4

                    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
                        user.mail = registration['email'] unless registration['email'].nil?
                        user.firstname, user.lastname = registration['fullname'].split(' ') unless registration['fullname'].nil?
                        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
+                           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
-                         # Onthefly creation failed, display the registration form to fill/fix attributes
-                         @user = user
-                         session[:auth_source_registration] = {:login => user.login, :identity_url => identity_url }
-                         render :action => 'register'
+                           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
+                           onthefly_creation_failed(user, {:login => user.login, :identity_url => identity_url })
+                         end
                        end
                      else
                        # Existing record
                  redirect_back_or_default :controller => 'my', :action => 'page'
                end
+               # Onthefly creation failed, display the registration form to fill/fix attributes
+               def onthefly_creation_failed(user, auth_source_options = { })
+                 @user = user
+                 session[:auth_source_registration] = auth_source_options unless auth_source_options.empty?
+                 render :action => 'register'
+               end
              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