From 89754a1cb3591c078f61713e7b401e87c866fae2 Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Wed, 17 Sep 2014 10:36:54 +0900 Subject: [PATCH] Integrate UserLocationUpdatesController into WebRequestsController. --- .../user_location_updates_controller.rb | 16 -------- app/controllers/web_requests_controller.rb | 15 +++++++ config/routes.rb | 7 ++-- .../user_location_updates_controller_spec.rb | 39 ------------------ .../web_requests_controller_spec.rb | 40 ++++++++++++++++++- 5 files changed, 57 insertions(+), 60 deletions(-) delete mode 100644 app/controllers/user_location_updates_controller.rb delete mode 100644 spec/controllers/user_location_updates_controller_spec.rb diff --git a/app/controllers/user_location_updates_controller.rb b/app/controllers/user_location_updates_controller.rb deleted file mode 100644 index 619449ad..00000000 --- a/app/controllers/user_location_updates_controller.rb +++ /dev/null @@ -1,16 +0,0 @@ -class UserLocationUpdatesController < ApplicationController - skip_before_filter :authenticate_user! - - def create - user = User.find_by_id(params[:user_id]) - if user - secret = params[:secret] - user.agents.of_type(Agents::UserLocationAgent).find_all {|agent| agent.options[:secret] == secret }.each do |agent| - agent.trigger_web_request(params.except(:action, :controller, :user_id, :format), request.method_symbol.to_s, request.format.to_s) - end - render :text => "ok" - else - render :text => "user not found", :status => :not_found - end - end -end diff --git a/app/controllers/web_requests_controller.rb b/app/controllers/web_requests_controller.rb index 8bafc9ae..3e49af6a 100644 --- a/app/controllers/web_requests_controller.rb +++ b/app/controllers/web_requests_controller.rb @@ -38,4 +38,19 @@ class WebRequestsController < ApplicationController render :text => "user not found", :status => 404 end end + + # legacy + def update_location + if user = User.find_by_id(params[:user_id]) + secret = params[:secret] + user.agents.of_type(Agents::UserLocationAgent).each { |agent| + if agent.options[:secret] == secret + agent.trigger_web_request(params.except(:action, :controller, :user_id, :format), request.method_symbol.to_s, request.format.to_s) + end + } + render :text => "ok" + else + render :text => "user not found", :status => :not_found + end + end end diff --git a/config/routes.rb b/config/routes.rb index 3048aa5f..fd7140b2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -62,10 +62,9 @@ Huginn::Application.routes.draw do get "/worker_status" => "worker_status#show" - post "/users/:user_id/update_location/:secret" => "user_location_updates#create" # legacy - - match "/users/:user_id/web_requests/:agent_id/:secret" => "web_requests#handle_request", :as => :web_requests, :via => [:get, :post, :put, :delete] - post "/users/:user_id/webhooks/:agent_id/:secret" => "web_requests#handle_request" # legacy + match "/users/:user_id/web_requests/:agent_id/:secret" => "web_requests#handle_request", :as => :web_requests, :via => [:get, :post, :put, :delete] + post "/users/:user_id/webhooks/:agent_id/:secret" => "web_requests#handle_request" # legacy + post "/users/:user_id/update_location/:secret" => "web_requests#update_location" # legacy devise_for :users, :sign_out_via => [ :post, :delete ] get '/auth/:provider/callback', to: 'services#callback' diff --git a/spec/controllers/user_location_updates_controller_spec.rb b/spec/controllers/user_location_updates_controller_spec.rb deleted file mode 100644 index 08ca9192..00000000 --- a/spec/controllers/user_location_updates_controller_spec.rb +++ /dev/null @@ -1,39 +0,0 @@ -require 'spec_helper' - -describe UserLocationUpdatesController do - before do - @agent = Agent.build_for_type("Agents::UserLocationAgent", users(:bob), :name => "something", :options => { :secret => "my_secret" }) - @agent.save! - end - - it "should create events without requiring login" do - post :create, :user_id => users(:bob).to_param, :secret => "my_secret", :longitude => 123, :latitude => 45, :something => "else" - @agent.events.last.payload.should == { 'longitude' => "123", 'latitude' => "45", 'something' => "else" } - @agent.events.last.lat.should == 45 - @agent.events.last.lng.should == 123 - end - - it "should only consider Agents::UserLocationAgents for the given user" do - @jane_agent = Agent.build_for_type("Agents::UserLocationAgent", users(:jane), :name => "something", :options => { :secret => "my_secret" }) - @jane_agent.save! - - post :create, :user_id => users(:bob).to_param, :secret => "my_secret", :longitude => 123, :latitude => 45, :something => "else" - @agent.events.last.payload.should == { 'longitude' => "123", 'latitude' => "45", 'something' => "else" } - @jane_agent.events.should be_empty - end - - it "should raise a 404 error when given an invalid user id" do - post :create, :user_id => "123", :secret => "not_my_secret", :longitude => 123, :latitude => 45, :something => "else" - response.should be_missing - end - - it "should only look at agents with the given secret" do - @agent2 = Agent.build_for_type("Agents::UserLocationAgent", users(:bob), :name => "something", :options => { :secret => "my_secret2" }) - @agent2.save! - - lambda { - post :create, :user_id => users(:bob).to_param, :secret => "my_secret2", :longitude => 123, :latitude => 45, :something => "else" - @agent2.events.last.payload.should == { 'longitude' => "123", 'latitude' => "45", 'something' => "else" } - }.should_not change { @agent.events.count } - end -end \ No newline at end of file diff --git a/spec/controllers/web_requests_controller_spec.rb b/spec/controllers/web_requests_controller_spec.rb index fdc6348a..a20084ab 100644 --- a/spec/controllers/web_requests_controller_spec.rb +++ b/spec/controllers/web_requests_controller_spec.rb @@ -94,4 +94,42 @@ describe WebRequestsController do post :handle_request, :user_id => users(:bob).to_param, :agent_id => 454545, :secret => "my_secret", :no => "go" response.should be_missing end -end \ No newline at end of file + + describe "legacy update_location endpoint" do + before do + @agent = Agent.build_for_type("Agents::UserLocationAgent", users(:bob), name: "something", options: { secret: "my_secret" }) + @agent.save! + end + + it "should create events without requiring login" do + post :update_location, user_id: users(:bob).to_param, secret: "my_secret", longitude: 123, latitude: 45, something: "else" + @agent.events.last.payload.should == { 'longitude' => "123", 'latitude' => "45", 'something' => "else" } + @agent.events.last.lat.should == 45 + @agent.events.last.lng.should == 123 + end + + it "should only consider Agents::UserLocationAgents for the given user" do + @jane_agent = Agent.build_for_type("Agents::UserLocationAgent", users(:jane), name: "something", options: { secret: "my_secret" }) + @jane_agent.save! + + post :update_location, user_id: users(:bob).to_param, secret: "my_secret", longitude: 123, latitude: 45, something: "else" + @agent.events.last.payload.should == { 'longitude' => "123", 'latitude' => "45", 'something' => "else" } + @jane_agent.events.should be_empty + end + + it "should raise a 404 error when given an invalid user id" do + post :update_location, user_id: "123", secret: "not_my_secret", longitude: 123, latitude: 45, something: "else" + response.should be_missing + end + + it "should only look at agents with the given secret" do + @agent2 = Agent.build_for_type("Agents::UserLocationAgent", users(:bob), name: "something", options: { secret: "my_secret2" }) + @agent2.save! + + lambda { + post :update_location, user_id: users(:bob).to_param, secret: "my_secret2", longitude: 123, latitude: 45, something: "else" + @agent2.events.last.payload.should == { 'longitude' => "123", 'latitude' => "45", 'something' => "else" } + }.should_not change { @agent.events.count } + end + end +end