refactored change password error handling

app/controllers/user/password_settings_controller.rb

@@ -11,21 +11,12 @@ def index
 
   # Change password action  
   def create
-		begin
-			if current_user.change_password!(params[:old_password], params[:password], params[:password_confirmation])
-	   		flash[:notice] = "Password successfully updated."
-	    	redirect_to user_profile_path(current_user)		
-			else
-				@old_password = nil
-	      flash.now[:error] = "Your password was not changed, you old password may be incorrect."
-	      render :action => 'index'
-			end
-		rescue Authentication::UserAbstraction::OpenidAccount
-			flash[:error] = "OpenID users cannot change their password."
-			redirect_to user_profile_path(current_user)
-		rescue Authentication::UserAbstraction::PasswordMismatch
-      @old_password = nil
-			flash.now[:error] = "New password does not match the password confirmation."
+		if current_user.change_password!(params[:old_password], params[:password], params[:password_confirmation])
+   		flash[:notice] = "Password successfully updated."
+    	redirect_to user_profile_path(current_user)		
+		else
+			@old_password = nil
+      flash.now[:error] = current_user.errors.on_base || "There was a problem updating your password."
       render :action => 'index'
 		end
 	end

app/views/user/password_settings/index.html.erb

@@ -12,7 +12,6 @@
   <%= password_field_tag 'password_confirmation', {}, :size => 45 %></p>
 
   <%= submit_tag 'Change Password' %>
-
 <% end %>
 
 

lib/authentication/user_abstraction.rb

@@ -157,9 +157,14 @@ def has_role?(role_in_question)
 		  end
 
 			def change_password!(old_password, new_password, new_confirmation)
-				raise OpenidAccount if (!self.identity_url.blank? && self.crypted_password.blank?)
-				raise PasswordMismatch if (new_password != new_confirmation)
-				return nil unless (!new_password.blank? && User.authenticate(self.login, old_password))
+				errors.add_to_base("OpenID users cannot change their password.") and
+					return false if (!self.identity_url.blank? && self.crypted_password.blank?)
+				errors.add_to_base("New password does not match the password confirmation.") and
+					return false if (new_password != new_confirmation)
+				errors.add_to_base("New password cannot be blank.") and
+					return false if new_password.blank? 
+				errors.add_to_base("You password was not changed, your old password is incorrect.") and
+					return false unless User.authenticate(self.login, old_password) 
         self.password, self.password_confirmation = new_password, new_confirmation
 				save
 			end