cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stop using session flash to communicate with callbacks

Browse source
This commit is contained in:
Tom Hughes 2025-02-12 00:03:32 +00:00
parent b44399fb7c
commit 43f40c5d03
7 changed files with 12 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/api/users_controller.rb
View file

@ -1,8 +1,7 @@
module Api
class UsersController < ApiController
before_action :disable_terms_redirect, :only => [:details]
before_action :setup_user_auth, :only => [:show, :index]
before_action :authorize, :only => [:details]
before_action -> { authorize(:skip_terms => true) }, :only => [:details]
authorize_resource
@ -46,14 +45,5 @@ module Api
format.json { render :show }
end
end
private
def disable_terms_redirect
# this is necessary otherwise going to the user terms page, when
# having not agreed already would cause an infinite redirect loop.
# it's .now so that this doesn't propagate to other pages.
flash.now[:skip_terms] = true
end
end
end