Link to previous/next nonempty user's changeset on changeset pages

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

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 89388c0bbf044db798f9c2f2258a61ca1cd25258..e4e156ee85a78fd2b6b23cf29e27bbf5910ddb85 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -112,8 +112,6 @@ class ApiController < ApplicationController
       # authenticate per-scheme
       self.current_user = if username.nil?
                             nil # no authentication provided - perhaps first connect (client should retry after 401)
       # authenticate per-scheme
       self.current_user = if username.nil?
                             nil # no authentication provided - perhaps first connect (client should retry after 401)

-                          elsif username == "token"
-                            User.authenticate(:token => passwd) # preferred - random token for user from db, passed in basic auth

                           else
                             User.authenticate(:username => username, :password => passwd) # basic auth
                           end
                           else
                             User.authenticate(:username => username, :password => passwd) # basic auth
                           end


@@ -166,18 +164,10 @@ class ApiController < ApplicationController
     report_error "#{e.class}: #{e.message}", :internal_server_error
   end
 
     report_error "#{e.class}: #{e.message}", :internal_server_error
   end
 

-  ##
-  # asserts that the request method is the +method+ given as a parameter
-  # or raises a suitable error. +method+ should be a symbol, e.g: :put or :get.
-  def assert_method(method)
-    ok = request.send(:"#{method.to_s.downcase}?")
-    raise OSM::APIBadMethodError, method unless ok
-  end
-

   ##
   # wrap an api call in a timeout
   def api_call_timeout(&block)
   ##
   # wrap an api call in a timeout
   def api_call_timeout(&block)

-    Timeout.timeout(Settings.api_timeout, Timeout::Error, &block)
+    Timeout.timeout(Settings.api_timeout, &block)

   rescue ActionView::Template::Error => e
     e = e.cause
 
   rescue ActionView::Template::Error => e
     e = e.cause
 


@@ -192,4 +182,14 @@ class ApiController < ApplicationController
     ActiveRecord::Base.connection.raw_connection.cancel
     raise OSM::APITimeoutError
   end
     ActiveRecord::Base.connection.raw_connection.cancel
     raise OSM::APITimeoutError
   end

+
+  ##
+  # check the api change rate limit
+  def check_rate_limit(new_changes = 1)
+    max_changes = ActiveRecord::Base.connection.select_value(
+      "SELECT api_rate_limit($1)", "api_rate_limit", [current_user.id]
+    )
+
+    raise OSM::APIRateLimitExceeded if new_changes > max_changes
+  end

 end
 end