jro_apps/redmine Commit - r13867:68723c20d2ab

Merged r14245 (#19655)....

Jean-Philippe Lang -

r13867:68723c20d2ab

parent child

Context file:

r13867:68723c20d2ab

Collapse all files

app/controllers/application_controller.rb +2 -2

                 if session[:user_id]
                   if session_expired? && !try_to_autologin
                     set_localization(User.active.find_by_id(session[:user_id]))
-                    reset_session
+                    self.logged_user = nil
                     flash[:error] = l(:error_session_expired)
-                    redirect_to signin_url
+                    require_login
                   else
                     session[:atime] = Time.now.utc.to_i
                   end

test/functional/sessions_test.rb +5 -5

               def test_user_session_without_ctime_should_be_reset_if_lifetime_enabled
                 with_settings :session_lifetime => '720' do
                   get :index, {}, {:user_id => 2}
-                  assert_redirected_to '/login'
+                  assert_redirected_to 'http://test.host/login?back_url=http%3A%2F%2Ftest.host%2F'
                 end
               end
               def test_user_session_with_expired_ctime_should_be_reset_if_lifetime_enabled
                 with_settings :session_timeout => '720' do
                   get :index, {}, {:user_id => 2, :atime => 2.days.ago.utc.to_i}
-                  assert_redirected_to '/login'
+                  assert_redirected_to 'http://test.host/login?back_url=http%3A%2F%2Ftest.host%2F'
                 end
               end
               def test_user_session_without_atime_should_be_reset_if_timeout_enabled
                 with_settings :session_timeout => '60' do
                   get :index, {}, {:user_id => 2}
-                  assert_redirected_to '/login'
+                  assert_redirected_to 'http://test.host/login?back_url=http%3A%2F%2Ftest.host%2F'
                 end
               end
               def test_user_session_with_expired_atime_should_be_reset_if_timeout_enabled
                 with_settings :session_timeout => '60' do
                   get :index, {}, {:user_id => 2, :atime => 4.hours.ago.utc.to_i}
-                  assert_redirected_to '/login'
+                  assert_redirected_to 'http://test.host/login?back_url=http%3A%2F%2Ftest.host%2F'
                 end
               end
                 with_settings :session_timeout => '60' do
                   get :index, {}, {:user_id => user.id, :atime => 4.hours.ago.utc.to_i}
-                  assert_redirected_to '/login'
+                  assert_redirected_to 'http://test.host/login?back_url=http%3A%2F%2Ftest.host%2F'
                   assert_include "Veuillez vous reconnecter", flash[:error]
                   assert_equal :fr, current_language
                 end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages