jro_apps/redmine Commit - r4379:cde02954c845

Moves password param to user hash param so that it can be set using the User API....

Jean-Philippe Lang -

r4379:cde02954c845

parent child

Context file:

r4379:cde02954c845

Collapse all files

app/controllers/users_controller.rb +9 -5

                 @user.safe_attributes = params[:user]
                 @user.admin = params[:user][:admin] || false
                 @user.login = params[:user][:login]
-                @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless @user.auth_source_id
+                @user.password, @user.password_confirmation = params[:user][:password], params[:user][:password_confirmation] unless @user.auth_source_id
                 # TODO: Similar to My#account
                 @user.mail_notification = params[:notification_option] || 'only_my_events'
                 else
                   @auth_sources = AuthSource.find(:all)
                   @notification_option = @user.mail_notification
+                  # Clear password input
+                  @user.password = @user.password_confirmation = nil
                   respond_to do |format|
                     format.html { render :action => 'new' }
                 @user.admin = params[:user][:admin] if params[:user][:admin]
                 @user.login = params[:user][:login] if params[:user][:login]
-                if params[:password].present? && (@user.auth_source_id.nil? || params[:user][:auth_source_id].blank?)
+                if params[:user][:password].present? && (@user.auth_source_id.nil? || params[:user][:auth_source_id].blank?)
-                  @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
+                  @user.password, @user.password_confirmation = params[:user][:password], params[:user][:password_confirmation]
                 end
                 @user.group_ids = params[:user][:group_ids] if params[:user][:group_ids]
                 @user.safe_attributes = params[:user]
                   if was_activated
                     Mailer.deliver_account_activated(@user)
-                  elsif @user.active? && params[:send_information] && !params[:password].blank? && @user.auth_source_id.nil?
+                  elsif @user.active? && params[:send_information] && !params[:user][:password].blank? && @user.auth_source_id.nil?
-                    Mailer.deliver_account_information(@user, params[:password])
+                    Mailer.deliver_account_information(@user, params[:user][:password])
                   end
                   respond_to do |format|
                 else
                   @auth_sources = AuthSource.find(:all)
                   @membership ||= Member.new
+                  # Clear password input
+                  @user.password = @user.password_confirmation = nil
                   respond_to do |format|
                     format.html { render :action => :edit }

app/views/users/_form.rhtml +2 -4

             <p><%= f.select :auth_source_id, ([[l(:label_internal), ""]] + @auth_sources.collect { |a| [a.name, a.id] }), {}, :onchange => "if (this.value=='') {Element.show('password_fields');} else {Element.hide('password_fields');}" %></p>
             <% end %>
             <div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
-            <p><label for="password"><%=l(:field_password)%><span class="required"> *</span></label>
+            <p><%= f.password_field :password, :required => true, :size => 25  %><br />
-            <%= password_field_tag 'password', nil, :size => 25  %><br />
             <em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
-            <p><label for="password_confirmation"><%=l(:field_password_confirmation)%><span class="required"> *</span></label>
+            <p><%= f.password_field :password_confirmation, :required => true, :size => 25  %></p>
-            <%= password_field_tag 'password_confirmation', nil, :size => 25  %></p>
             </div>
             </div>

test/functional/users_controller_test.rb +10 -5

                     user = User.last
                     assert_equal 'none', user.mail_notification
                   end
+                  should 'set the password' do
+                    user = User.first(:order => 'id DESC')
+                    assert user.check_password?('test')
+                  end
                 end
                 context "when unsuccessful" do
                 assert mail.body.include?(ll('fr', :notice_account_activated))
               end
-              def test_updat_with_password_change_should_send_a_notification
+              def test_update_with_password_change_should_send_a_notification
                 ActionMailer::Base.deliveries.clear
                 Setting.bcc_recipients = '1'
+                put :update, :id => 2, :user => {:password => 'newpass', :password_confirmation => 'newpass'}, :send_information => '1'
                 u = User.find(2)
-                put :update, :id => u.id, :user => {}, :password => 'newpass', :password_confirmation => 'newpass', :send_information => '1'
+                assert u.check_password?('newpass')
-                assert_equal User.hash_password('newpass'), u.reload.hashed_password
                 mail = ActionMailer::Base.deliveries.last
                 assert_not_nil mail
                 u.auth_source = AuthSource.find(1)
                 u.save!
-                put :update, :id => u.id, :user => {:auth_source_id => ''}, :password => 'newpass', :password_confirmation => 'newpass'
+                put :update, :id => u.id, :user => {:auth_source_id => '', :password => 'newpass'}, :password_confirmation => 'newpass'
                 assert_equal nil, u.reload.auth_source
-                assert_equal User.hash_password('newpass'), u.reload.hashed_password
+                assert u.check_password?('newpass')
               end
               def test_edit_membership

test/integration/api_test/users_test.rb +3 -2

               context "POST /users" do
                 context "with valid parameters" do
                   setup do
-                    @parameters = {:user => {:login => 'foo', :firstname => 'Firstname', :lastname => 'Lastname', :mail => 'foo@example.net'}}
+                    @parameters = {:user => {:login => 'foo', :firstname => 'Firstname', :lastname => 'Lastname', :mail => 'foo@example.net', :password => 'secret'}}
                   end
                   context ".xml" do
                     should_allow_api_authentication(:post,
                       '/users.xml',
-                      {:user => {:login => 'foo', :firstname => 'Firstname', :lastname => 'Lastname', :mail => 'foo@example.net'}},
+                      {:user => {:login => 'foo', :firstname => 'Firstname', :lastname => 'Lastname', :mail => 'foo@example.net', :password => 'secret'}},
                       {:success_code => :created})
                     should "create a user with the attributes" do
                       assert_equal 'Lastname', user.lastname
                       assert_equal 'foo@example.net', user.mail
                       assert !user.admin?
+                      assert user.check_password?('secret')
                       assert_response :created
                       assert_equal 'application/xml', @response.content_type

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