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

UX: improve message when admin login is blocked because of admin ip address whitelisting

Browse Source
This commit is contained in:
Neil Lalonde
2015-03-02 12:13:10 -05:00
parent 1bf4f34049
commit 7c14db44cc
8 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/users/omniauth_callbacks_controller.rb
View File

@ -85,8 +85,10 @@ class Users::OmniauthCallbacksController < ApplicationController
user.toggle(:active).save
end
if ScreenedIpAddress.block_login?(user, request.remote_ip)
if ScreenedIpAddress.should_block?(request.remote_ip)
@data.not_allowed_from_ip_address = true
elsif ScreenedIpAddress.block_admin_login?(user, request.remote_ip)
@data.admin_not_allowed_from_ip_address = true
elsif Guardian.new(user).can_access_forum? && user.active # log on any account that is active with forum access
log_on_user(user)
Invite.invalidate_for_email(user.email) # invite link can't be used to log in anymore