Simplify deny_access handling

[rails.git] / app / controllers / api_controller.rb

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 99afae6729e98a46be9dc27118db686c09617602..8ddb7242fe5ee3a78d5188dfec62b6204eb5a653 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -1,27 +1,17 @@
 class ApiController < ApplicationController
+  skip_before_action :verify_authenticity_token
 
-  def map
-
-
-    doc = XML::Document.new
-    doc.encoding = 'UTF-8' 
-    root = XML::Node.new 'osm'
-    root['version'] = '0.4'
-    root['generator'] = 'OpenStreetMap server'
-    doc.root = root
-
-    render :text => doc.to_s
-    
-    #el1 = XML::Node.new 'node'
-    #el1['id'] = self.id.to_s
-    #el1['lat'] = self.latitude.to_s
-    #el1['lon'] = self.longitude.to_s
-    #Node.split_tags(el1, self.tags)
-    #el1['visible'] = self.visible.to_s
-    #el1['timestamp'] = self.timestamp.xmlschema
-    #root << el1
+  def deny_access(_exception)
+    if current_token
+      set_locale
+      report_error t("oauth.permissions.missing"), :forbidden
+    elsif current_user
+      head :forbidden
+    else
+      realm = "Web Password"
+      errormessage = "Couldn't authenticate you"
+      response.headers["WWW-Authenticate"] = "Basic realm=\"#{realm}\""
+      render :plain => errormessage, :status => :unauthorized
+    end
   end
-
-
-
 end