JSON output added to permissions endpoint

diff --git a/app/controllers/api/permissions_controller.rb b/app/controllers/api/permissions_controller.rb
index 73b84f8edf341933483a9ee68341f9a2ec94b984..07685ed6806546e58a795f7cdb74ba61774e9be5 100644 (file)
--- a/app/controllers/api/permissions_controller.rb
+++ b/app/controllers/api/permissions_controller.rb
@@ -4,6 +4,7 @@ module Api
 
     before_action :check_api_readable
     before_action :setup_user_auth
+    before_action :set_request_formats
     around_action :api_call_handle_error, :api_call_timeout
 
     # External apps that use the api are able to query which permissions
@@ -21,6 +22,11 @@ module Api
                      else
                        []
                      end
+
+      respond_to do |format|
+        format.xml
+        format.json
+      end
     end
   end
 end

diff --git a/app/views/api/permissions/show.json.jbuilder b/app/views/api/permissions/show.json.jbuilder
new file mode 100644 (file)
index 0000000..ae048bf
--- /dev/null
+++ b/app/views/api/permissions/show.json.jbuilder
@@ -0,0 +1,3 @@
+json.partial! "api/root_attributes"
+
+json.permissions @permissions

diff --git a/app/views/api/permissions/show.builder b/app/views/api/permissions/show.xml.builder
similarity index 100%
rename from app/views/api/permissions/show.builder
rename to app/views/api/permissions/show.xml.builder

diff --git a/test/controllers/api/permissions_controller_test.rb b/test/controllers/api/permissions_controller_test.rb
index 3101abee2bfcab3a427924597852971c8b815059..cca85b404f8519e61c25a1567745548905c5cca5 100644 (file)
--- a/test/controllers/api/permissions_controller_test.rb
+++ b/test/controllers/api/permissions_controller_test.rb
@@ -9,6 +9,10 @@ module Api
         { :path => "/api/0.6/permissions", :method => :get },
         { :controller => "api/permissions", :action => "show" }
       )
+      assert_routing(
+        { :path => "/api/0.6/permissions.json", :method => :get },
+        { :controller => "api/permissions", :action => "show", :format => "json" }
+      )
     end
 
     def test_permissions_anonymous
@@ -17,6 +21,15 @@ module Api
       assert_select "osm > permissions", :count => 1 do
         assert_select "permission", :count => 0
       end
+
+      # Test json
+      get permissions_path(:format => "json")
+      assert_response :success
+      assert_equal "application/json", @response.media_type
+
+      js = ActiveSupport::JSON.decode(@response.body)
+      assert_not_nil js
+      assert_equal 0, js["permissions"].count
     end
 
     def test_permissions_basic_auth
@@ -29,6 +42,18 @@ module Api
           assert_select "permission[name='#{p}']", :count => 1
         end
       end
+
+      # Test json
+      get permissions_path(:format => "json"), :headers => auth_header
+      assert_response :success
+      assert_equal "application/json", @response.media_type
+
+      js = ActiveSupport::JSON.decode(@response.body)
+      assert_not_nil js
+      assert_equal ClientApplication.all_permissions.size, js["permissions"].count
+      ClientApplication.all_permissions.each do |p|
+        assert_includes js["permissions"], p.to_s
+      end
     end
 
     def test_permissions_oauth1