From 444f9a156bc7c95bb895cc63be353417d85cefe4 Mon Sep 17 00:00:00 2001 From: Developer <> Date: Sun, 28 Feb 2021 18:09:36 -0500 Subject: [PATCH] Partial revert 3f90b0be Partial revert 3f90b0be --- app/controllers/auth/registrations_controller.rb | 2 +- app/models/user.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb index 771db4fd..74524bde 100644 --- a/app/controllers/auth/registrations_controller.rb +++ b/app/controllers/auth/registrations_controller.rb @@ -43,7 +43,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController resource.locale = I18n.locale resource.agreement = true - resource.current_sign_in_ip = request.headers['True-Client-IP'] || request.remote_ip + resource.current_sign_in_ip = request.remote_ip resource.build_account if resource.account.nil? end diff --git a/app/models/user.rb b/app/models/user.rb index 8a8f9860..af4b1ff7 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -170,7 +170,7 @@ class User < ApplicationRecord self.current_sign_in_at = new_current old_current = current_sign_in_ip - new_current = request.headers['True-Client-IP'] || request.remote_ip + new_current = request.remote_ip self.last_sign_in_ip = old_current || new_current self.current_sign_in_ip = new_current @@ -234,7 +234,7 @@ class User < ApplicationRecord def activate_session(request) session_activations.activate(session_id: SecureRandom.hex, user_agent: request.user_agent, - ip: request.headers['True-Client-IP'] || request.remote_ip).session_id + ip: request.remote_ip).session_id end def exclusive_session(id)