Allow signing in without a team workgroup

This allows users to sign in to any team that's part of an organisation,
even if they're not part of the workgroup for that team.

This is necessary to allow release 2.17 to be deployed even if the SAIS
teams haven't yet updated their CIS2 workgroups. This change will need
to be reverted in 2.18.

Author: thomasleese

app/controllers/users/omniauth_callbacks_controller.rb

@@ -109,7 +109,8 @@ def set_cis2_session_info
       role_name: selected_cis2_nrbac_role["role_name"],
       role_code: selected_cis2_nrbac_role["role_code"],
       workgroups: selected_cis2_nrbac_role["workgroups"],
-      has_other_roles: raw_cis2_info["nhsid_nrbac_roles"].length > 1
+      has_other_roles: raw_cis2_info["nhsid_nrbac_roles"].length > 1,
+      team_workgroup: nil
     )
   end
 

app/forms/select_team_form.rb

@@ -31,7 +31,7 @@ def save
   def teams
     @teams ||=
       if Settings.cis2.enabled
-        cis2_info.organisation.teams.where(workgroup: cis2_info.workgroups)
+        cis2_info.organisation.teams
       else
         current_user.teams.includes(:organisation)
       end

app/models/cis2_info.rb

@@ -28,8 +28,7 @@ def organisation
 
   def team
     @team ||=
-      if (workgroup = team_workgroup).present? &&
-           workgroups&.include?(workgroup)
+      if (workgroup = team_workgroup).present?
         Team.find_by(organisation:, workgroup:)
       end
   end

spec/features/user_cis2_authentication_with_wrong_organisation_spec.rb

@@ -11,7 +11,7 @@
 
     given_my_team_has_been_setup_in_mavis
     when_i_click_the_change_role_button
-    then_i_see_the_team_selection_page
+    then_i_see_the_sessions_page
   end
 
   context "user has no other orgs to select" do
@@ -35,7 +35,7 @@ def given_i_am_setup_in_cis2_but_not_mavis
   end
 
   def given_my_team_has_been_setup_in_mavis
-    @team = create :team, ods_code: "A9A5A"
+    @team = create(:team, ods_code: "A9A5A")
   end
 
   def when_i_go_to_the_start_page
@@ -46,10 +46,6 @@ def when_i_click_the_cis2_login_button
     click_button "Care Identity"
   end
 
-  def when_i_click_the_cis2_login_button
-    click_button "Care Identity"
-  end
-
   def then_i_am_on_the_start_page
     expect(page).to have_current_path start_path
   end
@@ -58,8 +54,8 @@ def when_i_go_to_the_sessions_page
     visit sessions_path
   end
 
-  def then_i_see_the_team_selection_page
-    expect(page).to have_current_path(new_users_teams_path)
+  def then_i_see_the_sessions_page
+    expect(page).to have_current_path(sessions_path)
   end
 
   def given_i_am_setup_in_cis2_with_only_one_role

spec/features/user_cis2_authentication_with_wrong_role_spec.rb

@@ -9,7 +9,7 @@
     then_i_see_the_wrong_role_error
 
     when_i_click_the_change_role_button_and_select_the_right_role
-    then_i_see_the_team_selection_page
+    then_i_see_the_sessions_page
   end
 
   def given_i_am_setup_in_mavis_and_cis2_but_with_the_wrong_role
@@ -30,8 +30,8 @@ def when_i_go_to_the_sessions_page
     visit sessions_path
   end
 
-  def then_i_see_the_team_selection_page
-    expect(page).to have_current_path(new_users_teams_path)
+  def then_i_see_the_sessions_page
+    expect(page).to have_current_path(sessions_path)
   end
 
   def then_i_see_the_wrong_role_error

spec/features/user_cis2_authentication_with_wrong_workgroup_spec.rb

@@ -9,7 +9,7 @@
     then_i_see_the_wrong_workgroup_error
 
     when_i_click_the_change_role_button_and_select_the_right_role
-    then_i_see_the_team_selection_page
+    then_i_see_the_sessions_page
   end
 
   def given_i_am_setup_in_mavis_and_cis2_but_with_the_wrong_role
@@ -30,8 +30,8 @@ def when_i_go_to_the_sessions_page
     visit sessions_path
   end
 
-  def then_i_see_the_team_selection_page
-    expect(page).to have_current_path(new_users_teams_path)
+  def then_i_see_the_sessions_page
+    expect(page).to have_current_path(sessions_path)
   end
 
   def then_i_see_the_wrong_workgroup_error