Skip to content

Commit

Permalink
Move PersonController private methods
Browse files Browse the repository at this point in the history
Move private methods under `private` keyword to follow best practices.
  • Loading branch information
saraycp committed Mar 19, 2024
1 parent 08c1709 commit d090da6
Showing 1 changed file with 21 additions and 26 deletions.
47 changes: 21 additions & 26 deletions src/api/app/controllers/person_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,27 @@ def internal_register
raise e
end

def change_my_password
authorize @user, :update?
# FIXME3.0: remove this function
xml = REXML::Document.new(request.raw_post)

logger.debug("changepasswd XML: #{request.raw_post}")

login = xml.elements['/userchangepasswd/login'].text
password = xml.elements['/userchangepasswd/password'].text
login = CGI.unescape(login)

change_password(login, CGI.unescape(password))
render_ok
end

private

def set_user
@user = User.find_by(login: params[:login])
end

def update_watchlist(user, xml)
if xml.get('watchlist').empty?
projects = [xml.get('project')].flatten
Expand All @@ -241,8 +262,6 @@ def update_watchlist(user, xml)
end
end

private :update_watchlist

def update_globalroles(user, xml)
new_globalroles = []
xml.elements('globalrole') do |e|
Expand All @@ -252,23 +271,6 @@ def update_globalroles(user, xml)
user.update_globalroles(Role.global.where(title: new_globalroles))
end

private :update_globalroles

def change_my_password
authorize @user, :update?
# FIXME3.0: remove this function
xml = REXML::Document.new(request.raw_post)

logger.debug("changepasswd XML: #{request.raw_post}")

login = xml.elements['/userchangepasswd/login'].text
password = xml.elements['/userchangepasswd/password'].text
login = CGI.unescape(login)

change_password(login, CGI.unescape(password))
render_ok
end

def change_password(login, password)
unless User.session!
logger.debug 'No user logged in, permission to changing password denied'
Expand All @@ -295,11 +297,4 @@ def change_password(login, password)
@user.password = password
@user.save!
end
private :change_password

private

def set_user
@user = User.find_by(login: params[:login])
end
end

0 comments on commit d090da6

Please sign in to comment.