X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/283e7b975b5a80d3f3e8091ce83e8f89b33bb06c..5ca24de0d04bef18353d3f0ecdd069d0bca34ce2:/app/controllers/api/users_controller.rb?ds=sidebyside diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb index 462b4ba3c..58b02a489 100644 --- a/app/controllers/api/users_controller.rb +++ b/app/controllers/api/users_controller.rb @@ -1,8 +1,7 @@ module Api class UsersController < ApiController - before_action :disable_terms_redirect, :only => [:details] before_action :setup_user_auth, :only => [:show, :index] - before_action :authorize, :only => [:details] + before_action -> { authorize(:skip_terms => true) }, :only => [:details] authorize_resource @@ -46,14 +45,5 @@ module Api format.json { render :show } end end - - private - - def disable_terms_redirect - # this is necessary otherwise going to the user terms page, when - # having not agreed already would cause an infinite redirect loop. - # it's .now so that this doesn't propagate to other pages. - flash.now[:skip_terms] = true - end end end