X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d83cc0f15b50bb4e7dbc28be9e1cdfd85bc36de1..7f05783949ce561d58904da133efd37438ebffe8:/app/controllers/site_controller.rb diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 42f041662..aa284ecdc 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -8,19 +8,12 @@ class SiteController < ApplicationController before_action :redirect_map_params, :only => [:index, :edit, :export] before_action :require_user, :only => [:welcome] before_action :require_oauth, :only => [:index] + before_action :update_totp, :only => [:index] def index unless STATUS == :database_readonly || STATUS == :database_offline session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"]) end - - if defined?(TOTP_KEY) - cookies["_osm_totp_token"] = { - :value => ROTP::TOTP.new(TOTP_KEY, :interval => 3600).now, - :domain => ".openstreetmap.org", - :expires => 1.hour.from_now - } - end end def permalink @@ -91,7 +84,7 @@ class SiteController < ApplicationController @lat = note.lat @lon = note.lon @zoom = 17 - elsif params[:gpx] + elsif params[:gpx] && @user trace = Trace.visible_to(@user).find(params[:gpx]) @lat = trace.latitude @lon = trace.longitude