From 63bc151b39abcf7f74505bf259dde1272d848a48 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Wed, 20 Nov 2019 19:50:18 +0800
Subject: [PATCH] reset

---
 app/controllers/application_controller.rb | 10 +++------
 app/controllers/concerns/login_helper.rb  | 25 ++++++++++-------------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index adef28e03..1bc2bad7d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -291,14 +291,10 @@ class ApplicationController < ActionController::Base
 	# Returns the current user or nil if no user is logged in
 	# and starts a session if needed
 	def find_current_user
-		re_subdomain = "#{request.subdomain.split('.').first}_user_id"
-
-		Rails.logger.info("find current_user: subdomain is #{re_subdomain} and user session is #{session[:user_id]} -- #{session[:"#{re_subdomain}"]}")
-		Rails.logger.info("-----------------------------")
-		Rails.logger.info("domain session is:  #{session[:"#{request.subdomain.split('.').first}_user_id"]}")
-		if session[:"#{re_subdomain}"]
+		uid_logger("user setup start: session[:user_id] is #{session[:user_id]}")
+		if session[:user_id]
 			# existing session
-			(User.active.find(session[:"#{re_subdomain}"]) rescue nil)
+			(User.active.find(session[:user_id]) rescue nil)
 		elsif autologin_user = try_to_autologin
 			autologin_user
 		elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?
diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb
index 0126eb6b0..b3ec6da63 100644
--- a/app/controllers/concerns/login_helper.rb
+++ b/app/controllers/concerns/login_helper.rb
@@ -62,21 +62,18 @@ module LoginHelper
   end
 
   def start_user_session(user)
-    re_subdomain = "#{request.subdomain.split('.').first}_user_id"
+    # re_subdomain = "#{request.subdomain.split('.').first}_user_id"
+    # session[:"#{request.subdomain}_user_id"] = user.id
+    # Rails.logger.info("domain_user_id session is: 3333332222111#{session[:"#{request.subdomain}_user_id"]}")
+    # Rails.logger.info("user_id session is: 3333332222111#{session[:"#{request.subdomain}_user_id"]}")
+    #
+    # # if current_laboratory.main_site?
+    # #   session[:user_id] = user.id
+    # # else
+    # #   session[:"#{request.subdomain}_user_id"] = user.id
+    # # end
 
-    session[:"#{re_subdomain}"] = nil
-    session[:user_id] = nil
-    # session[:"#{re_subdomain}"] = user.id
-    Rails.logger.info("domain_user_id session is: 3333332222111#{session[:"#{re_subdomain}"]}")
-    Rails.logger.info("user_id session is: 3333332222111#{session[:user_id]}")
-
-    # if current_laboratory.main_site?
-    #   session[:user_id] = user.id
-    # else
-    #   session[:"#{request.subdomain}_user_id"] = user.id
-    # end
-
-    # session[:user_id] = user.id
+    session[:user_id] = user.id
     session[:ctime] = Time.now.utc.to_i
     session[:atime] = Time.now.utc.to_i
   end