Move the authorize method to api_controller

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

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 9e3839697a5f099f74500f50cea76d367ec80115..cb3d71d490587f5641c27c0ca70ff528c42f0847 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -1,44 +1,30 @@
 class ApiController < ApplicationController
 class ApiController < ApplicationController

-
-  def map
-    bbox = params['bbox']
-    unless bbox and bbox.count(',') == 3
-      render :nothing => true, :status => 400
-      return
+  skip_before_action :verify_authenticity_token
+
+  def authorize(realm = "Web Password", errormessage = "Couldn't authenticate you")
+    # make the current_user object from any auth sources we have
+    setup_user_auth
+
+    # handle authenticate pass/fail
+    unless current_user
+      # no auth, the user does not exist or the password was wrong
+      response.headers["WWW-Authenticate"] = "Basic realm=\"#{realm}\""
+      render :plain => errormessage, :status => :unauthorized
+      return false

     end
     end

-
-    bbox = bbox.split(',')
-
-    min_lat = bbox[0].to_f
-    min_lon = bbox[1].to_f
-    max_lat = bbox[2].to_f
-    max_lon = bbox[3].to_f
-
-    nodes = Node.find(:all, :conditions => ['latitude > ? AND longitude > ? AND latitude < ? AND longitude < ? AND visible = 1', min_lat, min_lon, max_lat, max_lon])
-
-    node_ids = "(#{nodes.collect {|node| node.id }})"
-
-    segments = Segment.find(:all, :condtions => ['node_a in ? or node_b in ?', node_ids, node_ids])
-    render :text => node_ids.join(',')
-    return
-
-    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

   end
 
   end
 

+  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
 end