Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/controllers/users/sessions_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,14 @@ def active

def timeout
analytics.track_event(Analytics::SESSION_TIMED_OUT)
request_id = sp_session[:request_id]
sign_out
flash[:notice] = t(
'session_timedout',
app: APP_NAME,
minutes: Figaro.env.session_timeout_in_minutes
)
redirect_to root_url
redirect_to root_url(request_id: request_id)
end

private
Expand Down
6 changes: 4 additions & 2 deletions spec/features/saml/loa1_sso_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,10 @@

visit saml_authn_request
sp_request_id = ServiceProviderRequest.last.uuid
page.set_rack_session(sp: {})
visit new_user_session_url(request_id: sp_request_id)

visit timeout_path
expect(current_url).to eq root_url(request_id: sp_request_id)

fill_in_credentials_and_submit(user.email, user.password)
click_submit_default
click_continue
Expand Down