Use rails tokens for password resets

[rails.git] / app / controllers / api / old_controller.rb

diff --git a/app/controllers/api/old_controller.rb b/app/controllers/api/old_controller.rb
index 49fdcf1a3b4c13f13f8427e5336620753b95ed4d..ceed10978d9b614dbab6fa16298189ee9b5565ea 100644 (file)
--- a/app/controllers/api/old_controller.rb
+++ b/app/controllers/api/old_controller.rb
@@ -5,17 +5,19 @@ module Api
   class OldController < ApiController
     require "xml/libxml"
 
+    before_action :check_api_readable
+    before_action :check_api_writable, :only => [:redact]
     before_action :setup_user_auth, :only => [:history, :version]
     before_action :authorize, :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
     before_action :lookup_old_element, :except => [:history]
     before_action :lookup_old_element_versions, :only => [:history]
 
+    before_action :set_request_formats, :except => [:redact]
+
     def history
       # the .where() method used in the lookup_old_element_versions
       # call won't throw an error if no records are found, so we have
@@ -32,6 +34,7 @@ module Api
       # Render the result
       respond_to do |format|
         format.xml
+        format.json
       end
     end
 
@@ -45,6 +48,7 @@ module Api
         # Render the result
         respond_to do |format|
           format.xml
+          format.json
         end
       end
     end