X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ff97501ed01488f8ff8e9d2e7b93b4f295f71725..e7f943c715d7104fd4f22fe59a79a5d52e71a7c4:/app/controllers/old_controller.rb

diff --git a/app/controllers/old_controller.rb b/app/controllers/old_controller.rb
index f41a94a33..74fe0883b 100644
--- a/app/controllers/old_controller.rb
+++ b/app/controllers/old_controller.rb
@@ -6,9 +6,11 @@ class OldController < ApplicationController
 
   skip_before_action :verify_authenticity_token
   before_action :setup_user_auth, :only => [:history, :version]
+  before_action :api_deny_access_handler
   before_action :authorize, :only => [:redact]
-  before_action :authorize_moderator, :only => [:redact]
-  before_action :require_allow_write_api, :only => [:redact]
+
+  authorize_resource
+
   before_action :check_api_readable
   before_action :check_api_writable, :only => [:redact]
   around_action :api_call_handle_error, :api_call_timeout
@@ -19,7 +21,7 @@ class OldController < ApplicationController
     # the .where() method used in the lookup_old_element_versions
     # call won't throw an error if no records are found, so we have
     # to do that ourselves.
-    raise OSM::APINotFoundError.new if @elements.empty?
+    raise OSM::APINotFoundError if @elements.empty?
 
     doc = OSM::API.new.get_xml_doc
 
@@ -64,12 +66,12 @@ class OldController < ApplicationController
     end
 
     # just return an empty 200 OK for success
-    render :nothing => true
+    head :ok
   end
 
   private
 
   def show_redactions?
-    @user && @user.moderator? && params[:show_redactions] == "true"
+    current_user&.moderator? && params[:show_redactions] == "true"
   end
 end