github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 14:01:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "DEV: Add context in AdminConstraint (#15838)" (#15845)

Browse Source 
This reverts commit 492226a9737fc6c8d672383316569b7d2c523a55.
This commit is contained in:
Osama Sayegh
2022-02-07 21:05:19 +03:00
committed by GitHub
parent c8c23ba557
commit 9bfe5e58d3
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/admin_constraint.rb
View File

@ -4,16 +4,12 @@ class AdminConstraint
def initialize(options = {})
@require_master = options[:require_master]
# @context isn't used here, but it exists to give plugins extra context
# about the destination of the request.
# possible values are: sidekiq, logster and app (default).
@context = options[:context] || "app"
end
def matches?(request)
return false if @require_master && RailsMultisite::ConnectionManagement.current_db != "default"
@current_user = CurrentUser.lookup_from_env(request.env)
@current_user&.admin? && custom_admin_check(request)
current_user = CurrentUser.lookup_from_env(request.env)
current_user&.admin? && custom_admin_check(request)
rescue Discourse::InvalidAccess, Discourse::ReadOnly
false
end