From 75fb68c4d1eb647a268890c080da2dc3875c0e77 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Tue, 29 Jan 2013 16:44:47 +0100
Subject: Get rid of @current_user. The use of current_user is better.

---
 app/controllers/application_controller.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'app/controllers/application_controller.rb')

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e4165f3..2d49890 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -106,7 +106,7 @@ class ApplicationController < ActionController::Base
   end
   
   rescue_from CanCan::AccessDenied do |exception|
-    if @current_user
+    if current_user
       redirect_to root_url, :alert => 'Access denied! Please ask your admin to grant you the necessary rights.'
     else
       if Tenant.count == 0 && User.count == 0
@@ -121,13 +121,13 @@ class ApplicationController < ActionController::Base
   
   private  
   
-  def current_user  
-    begin
-      @current_user ||= User.find(session[:user_id]) if session[:user_id]
-    rescue ActiveRecord::RecordNotFound
+  def current_user
+    if session[:user_id] && User.where(:id => session[:user_id]).any?
+      return User.where(:id => session[:user_id]).first
+    else
       session[:user_id] = nil
+      return nil
     end
-    @current_user
   end  
   
   def go_to_setup_if_new_installation
-- 
cgit v1.2.3


From bf3af8f8a444365f3040da2928837986409fa016 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Tue, 29 Jan 2013 18:43:06 +0100
Subject: Single Sign On via a ENV['USER_NAME'] mechanism.

---
 app/controllers/application_controller.rb | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'app/controllers/application_controller.rb')

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2d49890..2aadf19 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -122,11 +122,21 @@ class ApplicationController < ActionController::Base
   private  
   
   def current_user
-    if session[:user_id] && User.where(:id => session[:user_id]).any?
-      return User.where(:id => session[:user_id]).first
+    if session[:user_id] || GsParameter.get('SingleSignOnEnvUserNameKey').blank?
+      if session[:user_id] && User.where(:id => session[:user_id]).any?
+        return User.where(:id => session[:user_id]).first
+      else
+        session[:user_id] = nil
+        return nil
+      end
     else
-      session[:user_id] = nil
-      return nil
+      if User.where(:user_name => request.env[GsParameter.get('SingleSignOnEnvUserNameKey')]).any?
+        auth_user = User.where(:user_name => request.env[GsParameter.get('SingleSignOnEnvUserNameKey')]).first
+        session[:user_id] = auth_user.id
+        return auth_user
+      else
+        return nil
+      end
     end
   end  
   
-- 
cgit v1.2.3