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

Move the authorize method to api_controller

Browse source
This commit is contained in:
Andy Allan 2019-03-20 14:36:43 +01:00
parent 742291a840
commit 94d19ae567
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/controllers/api_controller.rb
View file

@ -1,6 +1,19 @@
class ApiController < ApplicationController class ApiController < ApplicationController
skip_before_action :verify_authenticity_token skip_before_action :verify_authenticity_token
def authorize(realm = "Web Password", errormessage = "Couldn't authenticate you")
# make the current_user object from any auth sources we have
setup_user_auth
# handle authenticate pass/fail
unless current_user
# no auth, the user does not exist or the password was wrong
response.headers["WWW-Authenticate"] = "Basic realm=\"#{realm}\""
render :plain => errormessage, :status => :unauthorized
return false
end
end
def deny_access(_exception) def deny_access(_exception)
if current_token if current_token
set_locale set_locale

13
app/controllers/application_controller.rb
View file

@ -112,19 +112,6 @@ class ApplicationController < ActionController::Base
end end
end end
def authorize(realm = "Web Password", errormessage = "Couldn't authenticate you")
# make the current_user object from any auth sources we have
setup_user_auth
# handle authenticate pass/fail
unless current_user
# no auth, the user does not exist or the password was wrong
response.headers["WWW-Authenticate"] = "Basic realm=\"#{realm}\""
render :plain => errormessage, :status => :unauthorized
return false
end
end
def check_database_readable(need_api = false) def check_database_readable(need_api = false)
if Settings.status == "database_offline" || (need_api && Settings.status == "api_offline") if Settings.status == "database_offline" || (need_api && Settings.status == "api_offline")
if request.xhr? if request.xhr?