Merge branch 'develop' into dev_aliyun

app/controllers/accounts_controller.rb

@@ -127,7 +127,7 @@ class AccountsController < ApplicationController
     end
   end
 
-  def successful_authentication(user)
+  def  successful_authentication(user)
     uid_logger("Successful authentication start: '#{user.login}' from #{request.remote_ip} at #{Time.now.utc}")
     # Valid user
     self.logged_user = user

app/controllers/concerns/laboratory_helper.rb

@@ -6,6 +6,7 @@ module LaboratoryHelper
 
     helper_method :current_laboratory
     helper_method :default_setting
+    helper_method :default_yun_session
   end
 
   def current_laboratory
@@ -23,4 +24,8 @@ module LaboratoryHelper
   def setup_laboratory
     Laboratory.current = current_laboratory
   end
+
+  def default_yun_session
+    @_default_yun_session = "#{request.subdomain.split('.').first}_user_id"
+  end
 end

app/controllers/concerns/login_helper.rb

@@ -74,6 +74,7 @@ module LoginHelper
     # # end
 
     session[:user_id] = user.id
+    # session[:"#{default_yun_session}"] = user.id
     session[:ctime] = Time.now.utc.to_i
     session[:atime] = Time.now.utc.to_i
   end