From 02320089aae21645b3243be15ffa49111aa53be0 Mon Sep 17 00:00:00 2001
From: oajulianclementson
 <51331324+oajulianclementson@users.noreply.github.com>
Date: Thu, 6 May 2021 21:27:12 +0100
Subject: [PATCH] LP#1842297: Only read active configuration

---
 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/OpenAthens.pm | 3 +--
 docs/RELEASE_NOTES_NEXT/Administration/OpenAthens_SignOn.adoc   | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/OpenAthens.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/OpenAthens.pm
index 4a5af936b9..22becd07e4 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/OpenAthens.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/OpenAthens.pm
@@ -60,7 +60,6 @@ sub perform_openathens_sso_if_required {
         $self->_get_openathens_config_for_org($ctx->{user}->home_ou);
 
     if ($openathens_config
-        && $U->is_true($openathens_config->{active})
         && $U->is_true($openathens_config->{auto_signon_enabled})
     ) {
         # Remove scheme and hostname from redirect_to (this may have been set
@@ -231,7 +230,7 @@ sub _get_openathens_config_for_org {
             }
         },
         where => {
-            '+coai' => { org_unit => $org_id }
+            '+coai' => { org_unit => $org_id, active => 't' }
         },
         order_by => { 'coai' => ['id'] }
     });
diff --git a/docs/RELEASE_NOTES_NEXT/Administration/OpenAthens_SignOn.adoc b/docs/RELEASE_NOTES_NEXT/Administration/OpenAthens_SignOn.adoc
index 1c526d3d50..7060645c87 100644
--- a/docs/RELEASE_NOTES_NEXT/Administration/OpenAthens_SignOn.adoc
+++ b/docs/RELEASE_NOTES_NEXT/Administration/OpenAthens_SignOn.adoc
@@ -51,7 +51,10 @@ for all libraries below it in your organisational hierarchy. A single
 OpenAthens sign-on configuration normally equates to a single *domain* in the 
 OpenAthens service. If in doubt refer to your OpenAthens account manager or 
 implementation partner.
-* *Active* - Enable this connection (enabled by default).
+* *Active* - Enable this connection (enabled by default). N.B. Evergreen
+  does not support more than one active connection to OpenAthens at a time. If
+  more than one connection is added here, Evergreen will use only the _first_
+  connection that has *Active* enabled.
 * *API key* - the 36-character OpenAthens *API key* that was generated in step 
   2 above.
 * *Connection ID* - the numerical *Connection ID* that was generated for the 
-- 
2.11.0