jro_apps/redmine Commit - r1167:87742f23edb3

Jean-Philippe Lang -

r1167:87742f23edb3

parent child

Context file:

r1167:87742f23edb3

app/controllers/account_controller.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class AccountController < ApplicationController
               layout 'base'
               helper :custom_fields
               include CustomFieldsHelper
               # prevents login action to be filtered by check_if_login_required application scope filter
               skip_before_filter :check_if_login_required, :only => [:login, :lost_password, :register, :activate]
               # Show user's account
               def show
                 @user = User.find_active(params[:id])
                 @custom_values = @user.custom_values.find(:all, :include => :custom_field)
                 # show only public projects and private projects that the logged in user is also a member of
                 @memberships = @user.memberships.select do |membership|
                   membership.project.is_public? || (User.current.member_of?(membership.project))
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Login request and validation
               def login
                 if request.get?
                   # Logout user
                   self.logged_user = nil
                 else
                   # Authenticate user
-                  user = User.try_to_login(params[:login], params[:password])
+                  user = User.try_to_login(params[:username], params[:password])
                   if user
                     self.logged_user = user
                     # generate a key and set cookie if autologin
                     if params[:autologin] && Setting.autologin?
                       token = Token.create(:user => user, :action => 'autologin')
                       cookies[:autologin] = { :value => token.value, :expires => 1.year.from_now }
                     end
                     redirect_back_or_default :controller => 'my', :action => 'page'
                   else
                     flash.now[:error] = l(:notice_account_invalid_creditentials)
                   end
                 end
               end
               # Log out current user and redirect to welcome page
               def logout
                 cookies.delete :autologin
                 Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin']) if User.current.logged?
                 self.logged_user = nil
                 redirect_to home_url
               end
               # Enable user to choose a new password
               def lost_password
                 redirect_to(home_url) && return unless Setting.lost_password?
                 if params[:token]
                   @token = Token.find_by_action_and_value("recovery", params[:token])
                   redirect_to(home_url) && return unless @token and !@token.expired?
                   @user = @token.user
                   if request.post?
                     @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
                     if @user.save
                       @token.destroy
                       flash[:notice] = l(:notice_account_password_updated)
                       redirect_to :action => 'login'
                       return
                     end
                   end
                   render :template => "account/password_recovery"
                   return
                 else
                   if request.post?
                     user = User.find_by_mail(params[:mail])
                     # user not found in db
                     flash.now[:error] = l(:notice_account_unknown_email) and return unless user
                     # user uses an external authentification
                     flash.now[:error] = l(:notice_can_t_change_password) and return if user.auth_source_id
                     # create a new token for password recovery
                     token = Token.new(:user => user, :action => "recovery")
                     if token.save
                       Mailer.deliver_lost_password(token)
                       flash[:notice] = l(:notice_account_lost_email_sent)
                       redirect_to :action => 'login'
                       return
                     end
                   end
                 end
               end
               # User self-registration
               def register
                 redirect_to(home_url) && return unless Setting.self_registration?
                 if request.get?
                   @user = User.new(:language => Setting.default_language)
                   @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }
                 else
                   @user = User.new(params[:user])
                   @user.admin = false
                   @user.login = params[:user][:login]
                   @user.status = User::STATUS_REGISTERED
                   @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
                   @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x,
                                                                                             :customized => @user,
                                                                                             :value => (params["custom_fields"] ? params["custom_fields"][x.id.to_s] : nil)) }
                   @user.custom_values = @custom_values
                   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
                   when '3'
                     # Automatic activation
                     @user.status = User::STATUS_ACTIVE
                     if @user.save
                       flash[:notice] = l(:notice_account_activated)
                       redirect_to :action => 'login'
                     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'
                     end
                   end
                 end
               end
               # Token based account activation
               def activate
                 redirect_to(home_url) && return unless Setting.self_registration? && params[:token]
                 token = Token.find_by_action_and_value('register', params[:token])
                 redirect_to(home_url) && return unless token and !token.expired?
                 user = token.user
                 redirect_to(home_url) && return unless user.status == User::STATUS_REGISTERED
                 user.status = User::STATUS_ACTIVE
                 if user.save
                   token.destroy
                   flash[:notice] = l(:notice_account_activated)
                 end
                 redirect_to :action => 'login'
               end
             private
               def logged_user=(user)
                 if user && user.is_a?(User)
                   User.current = user
                   session[:user_id] = user.id
                 else
                   User.current = User.anonymous
                   session[:user_id] = nil
                 end
               end
             end

app/views/account/login.rhtml +3 -3

             <div id="login-form">
             <% form_tag({:action=> "login"}) do %>
             <table>
             <tr>
-                <td align="right"><label for="login"><%=l(:field_login)%>:</label></td>
+                <td align="right"><label for="username"><%=l(:field_login)%>:</label></td>
-                <td align="left"><p><%= text_field_tag 'login', nil, :size => 40 %></p></td>
+                <td align="left"><p><%= text_field_tag 'username', nil, :size => 40 %></p></td>
             </tr>
             <tr>
                 <td align="right"><label for="password"><%=l(:field_password)%>:</label></td>
                 <td align="left"><%= password_field_tag 'password', nil, :size => 40 %></td>
             </tr>
             <tr>
                 <td></td>
                 <td align="left">
                     <% if Setting.autologin? %>
                     <label for="autologin"><%= check_box_tag 'autologin' %> <%= l(:label_stay_logged_in) %></label>
                     <% end %>
                 </td>
             </tr>
             <tr>
                 <td align="left">
                     <% if Setting.lost_password? %>
                         <%= link_to l(:label_password_lost), :controller => 'account', :action => 'lost_password' %>
                     <% end %>
                 </td>
                 <td align="right">
                     <input type="submit" name="login" value="<%=l(:button_login)%> &#187;" />
                 </td>
             </tr>
             </table>
-            <%= javascript_tag "Form.Element.focus('login');" %>
+            <%= javascript_tag "Form.Element.focus('username');" %>
             <% end %>
             </div>

test/functional/account_controller_test.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             require 'account_controller'
             # Re-raise errors caught by the controller.
             class AccountController; def rescue_action(e) raise e end; end
             class AccountControllerTest < Test::Unit::TestCase
               fixtures :users
               def setup
                 @controller = AccountController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
               def test_show
                 get :show, :id => 2
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:user)
               end
               def test_show_inactive
                 get :show, :id => 5
                 assert_response 404
                 assert_nil assigns(:user)
               end
               def test_login_with_wrong_password
-                post :login, :login => 'admin', :password => 'bad'
+                post :login, :username => 'admin', :password => 'bad'
                 assert_response :success
                 assert_template 'login'
                 assert_tag 'div',
                            :attributes => { :class => "flash error" },
                            :content => /Invalid user or password/
               end
               def test_autologin
                 Setting.autologin = "7"
                 Token.delete_all
-                post :login, :login => 'admin', :password => 'admin', :autologin => 1
+                post :login, :username => 'admin', :password => 'admin', :autologin => 1
                 assert_redirected_to 'my/page'
                 token = Token.find :first
                 assert_not_nil token
                 assert_equal User.find_by_login('admin'), token.user
                 assert_equal 'autologin', token.action
               end
               def test_logout
                 @request.session[:user_id] = 2
                 get :logout
                 assert_redirected_to ''
                 assert_nil @request.session[:user_id]
               end
             end

test/test_helper.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             ENV["RAILS_ENV"] ||= "test"
             require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
             require 'test_help'
             require File.expand_path(File.dirname(__FILE__) + '/helper_testcase')
             class Test::Unit::TestCase
               # Transactional fixtures accelerate your tests by wrapping each test method
               # in a transaction that's rolled back on completion.  This ensures that the
               # test database remains unchanged so your fixtures don't have to be reloaded
               # between every test method.  Fewer database queries means faster tests.
               #
               # Read Mike Clark's excellent walkthrough at
               #   http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting
               #
               # Every Active Record database supports transactions except MyISAM tables
               # in MySQL.  Turn off transactional fixtures in this case; however, if you
               # don't care one way or the other, switching from MyISAM to InnoDB tables
               # is recommended.
               self.use_transactional_fixtures = true
               # Instantiated fixtures are slow, but give you @david where otherwise you
               # would need people(:david).  If you don't want to migrate your existing
               # test cases which use the @david style and don't mind the speed hit (each
               # instantiated fixtures translates to a database query per test method),
               # then set this back to true.
               self.use_instantiated_fixtures  = false
               # Add more helper methods to be used by all tests here...
               def log_user(login, password)
                 get "/account/login"
                 assert_equal nil, session[:user_id]
                 assert_response :success
                 assert_template "account/login"
-                post "/account/login", :login => login, :password => password
+                post "/account/login", :username => login, :password => password
                 assert_redirected_to "my/page"
                 assert_equal login, User.find(session[:user_id]).login
               end
               def test_uploaded_file(name, mime)
                 ActionController::TestUploadedFile.new(Test::Unit::TestCase.fixture_path + "/files/#{name}", mime)
               end
             end
             # ActionController::TestUploadedFile bug
             # see http://dev.rubyonrails.org/ticket/4635
             class String
               def original_filename
                 "testfile.txt"
               end
               def content_type
                 "text/plain"
               end
               def read
                 self.to_s
               end
             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