Handle deleted and disabled configurations more gracefully

Author: labkey-adam

core/src/org/labkey/core/login/LoginController.java

@@ -1642,6 +1642,8 @@ protected URLHelper getUrl(SSOAuthenticationConfiguration<?> configuration, View
         }
     }
 
+    private static final String CONFIGURATION_ADVICE = ". Please Sign Out and Sign In again.";
+
     @SuppressWarnings("unused") // Called from client code
     @RequiresLogin
     public static class GetAuthenticationConfigurationAction extends ReadOnlyApiAction<ReturnUrlForm>
@@ -1652,7 +1654,11 @@ public Object execute(ReturnUrlForm form, BindException errors)
             PrimaryAuthenticationConfiguration<?> configuration = AuthenticationManager.getConfiguration(getViewContext().getSession());
             if (configuration == null)
             {
-                throw new NotFoundException("No configuration found");
+                throw new NotFoundException("Configuration was not found" + CONFIGURATION_ADVICE);
+            }
+            if (!configuration.isEnabled())
+            {
+                throw new NotFoundException("Configuration is no longer active" + CONFIGURATION_ADVICE);
             }
             JSONObject resp = new JSONObject();
             resp.put("description", configuration.getDescription());

devtools/src/org/labkey/devtools/view/testReauth.jsp

@@ -34,19 +34,21 @@
             success: function(response) {
                 const needReauth = <%=form.reauthToken() == null%>;
                 const data = JSON.parse(response.responseText).data;
-                document.getElementById("description").textContent = data.description;
+                document.getElementById("description").textContent = data.description; // Setting textContent HTML encodes the value
                 if (needReauth) {
                     document.getElementById("link").href = data.reauthUrl;
                 }
             },
-            failure: function() {
-                alert('Failed to retrieve configuration!');
-            }
+            failure: LABKEY.Utils.getCallbackWrapper(function(response) {
+                document.getElementById("content").innerHTML = '<span>' + LABKEY.Utils.encodeHtml(response.exception) + '</span>';
+            }, this, true)
         });
     });
 </script>
 
-You authenticated with: <span id="description"></span><br/>
+<div id="content">
+
+    You authenticated with: <span id="description"></span><br/>
 
 <%
     if (form.reauthToken() != null)
@@ -79,3 +81,5 @@ You need to re-authenticate.
 <%
     }
 %>
+
+</div>