Skip to content

Commit

Permalink
add redirect for users without security question responses (#2560)
Browse files Browse the repository at this point in the history
* add redirect for users without security question responses

* move method to user model

* add comment for redirect

---------

Co-authored-by: Sri Harsha <sriharsha.poosa@gmail.com>
  • Loading branch information
RyanEddyIC and sri49 authored Feb 9, 2024
1 parent 79b9f18 commit 7023a0d
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 0 deletions.
3 changes: 3 additions & 0 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,9 @@ def require_login

def after_sign_in_path_for(resource)
if request.referrer =~ /sign_in/
# Redirect the user to the main page to ensure that they submit missing security question responses
return root_path if resource&.is_active_without_security_question_responses?

session[:portal] || resource.try(:last_portal_visited) || root_path
else
session[:portal] || request.referer || root_path
Expand Down
4 changes: 4 additions & 0 deletions app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,10 @@ def get_announcements_by_roles_and_portal(portal_path="")
announcements.uniq
end

def is_active_without_security_question_responses?
needs_to_provide_security_questions? && person&.primary_family&.enrollments&.detect{|a| a.active_during?(TimeKeeper.date_of_record) }.present?
end

class << self
def find_for_database_authentication(warden_conditions)
#TODO: Another explicit oim_id dependency
Expand Down
11 changes: 11 additions & 0 deletions spec/controllers/application_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ def index
it "should return the root url in dev environment" do
expect( controller.send(:after_sign_out_path_for, user) ).to eq logout_saml_index_path
end

context "when user has active enrollments but no security question responses" do
before do
user.security_question_responses = []
user.save
end

it "after_sign_in_path_for should return the root path" do
expect(controller.send(:after_sign_in_path_for, user)).to eq root_path
end
end
end

context "when signed in" do
Expand Down

0 comments on commit 7023a0d

Please sign in to comment.