From d08ce9f9eea4a61fcf3e91884eb842cf759c408a Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Wed, 20 Nov 2019 11:17:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E5=88=87=E6=8D=A2=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E7=99=BB=E5=BD=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb |  7 ++++++-
 app/controllers/concerns/login_helper.rb  | 12 +++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1bc2bad7d..d26a87c12 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -292,7 +292,12 @@ class ApplicationController < ActionController::Base
 	# and starts a session if needed
 	def find_current_user
 		uid_logger("user setup start: session[:user_id] is #{session[:user_id]}")
-		if session[:user_id]
+		if current_laboratory.main_site?
+
+		end
+
+		Rails.logger.info("find current_user: subdomain is #{request.subdomain} and user session is #{session[:user_id]} -- #{session[:"#{requst.subdomain}_user_id"]}")
+		if session[:"#{requst.subdomain}_user_id"]
 			# existing session
 			(User.active.find(session[:user_id]) rescue nil)
 		elsif autologin_user = try_to_autologin
diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb
index e94cf8a21..a95723690 100644
--- a/app/controllers/concerns/login_helper.rb
+++ b/app/controllers/concerns/login_helper.rb
@@ -62,7 +62,17 @@ module LoginHelper
   end
 
   def start_user_session(user)
-    session[:user_id] = 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[:user_id] = user.id
     session[:ctime] = Time.now.utc.to_i
     session[:atime] = Time.now.utc.to_i
   end