lib/rhoconnect/server.rb in rhoconnect-3.0.5 vs lib/rhoconnect/server.rb in rhoconnect-3.0.6

- old
+ new

@@ -218,23 +218,10 @@ before do cache_control :no_cache headers({'pragma'=>'no-cache'}) - begin - if params["cud"] - cud = JSON.parse(params["cud"]) - params.delete("cud") - params.merge!(cud) - end - rescue JSON::ParserError => jpe - log jpe.message + jpe.backtrace.join("\n") - throw :halt, [500, "Server error while processing client data"] - rescue Exception => e - log e.message + e.backtrace.join("\n") - throw :halt, [500, "Internal server error"] - end if params[:version] and params[:version].to_i < 3 throw :halt, [404, "Server supports version 3 or higher of the protocol."] end end @@ -249,20 +236,25 @@ get '/' do erb :index end - # Collection routes + # old routes post '/login' do mark_deprecated_call_and_reroute(:login, :admin, self, params) end - - # Member routes get '/application' do mark_deprecated_call_and_reroute(:query, :application, self, params) end - post '/application' do + mark_deprecated_call_and_reroute(:queue_updates, :application, self, params) + end + # confusion routes - only because Rhodes didn't switch + # to new style API yet + get '/api/application' do + mark_deprecated_call_and_reroute(:query, :application, self, params) + end + post '/api/application' do mark_deprecated_call_and_reroute(:queue_updates, :application, self, params) end def self.api(name, namespace = nil, verb = :post, &block) old_api_prefix = (namespace == :application) ? :application : :api