No need to filter configurations based on FICAM setting. And don't warn if providers aren't found because of this setting.

Author: labkey-adam

api/src/org/labkey/api/security/AuthenticationConfigurationCache.java

@@ -82,8 +82,6 @@ protected Set<AuthenticationConfiguration<?>> createCollection()
 
         private AuthenticationConfigurationCollections()
         {
-            boolean acceptOnlyFicamProviders = AuthenticationManager.isAcceptOnlyFicamProviders();
-
             // Select the configurations stored in the core.AuthenticationConfigurations table, add the database
             // authentication configuration, map each to the appropriate AuthenticationConfiguration, and add to the maps.
 
@@ -99,7 +97,6 @@ private AuthenticationConfigurationCollections()
             configs
                 .map(this::getAuthenticationConfiguration)
                 .filter(Objects::nonNull)
-                .filter(c->!acceptOnlyFicamProviders || c.getAuthenticationProvider().isFicamApproved())
                 .forEach(this::addConfiguration);
 
             // MultiValuedMap of domains to AuthenticationConfigurations that claim them
@@ -113,15 +110,18 @@ private AuthenticationConfigurationCollections()
             _activeDomains = Collections.unmodifiableCollection(activeDomains);
         }
 
-        // Little helper method simplifies the stream handling above
+        // Little helper method simplifies the stream handling above. Filters out configurations based on FICAM-only setting.
         private @Nullable AuthenticationConfiguration<?> getAuthenticationConfiguration(Map<String, Object> map)
         {
             String providerName = (String)map.get("Provider");
             AuthenticationProvider provider = AuthenticationProviderCache.getProvider(AuthenticationProvider.class, providerName);
             if (null == provider)
             {
-                String description = (String)map.get("Description");
-                LOG.warn("A saved authentication configuration requires the \"{}\" authentication provider, but that provider is not present in this deployment. Authentication via {} will not be available.", providerName, null != description ? "\"" + description + "\"" : "this mechanism");
+                if (!AuthenticationManager.isAcceptOnlyFicamProviders()) // Don't warn if FICAM-only is checked
+                {
+                    String description = (String)map.get("Description");
+                    LOG.warn("A saved authentication configuration requires the \"{}\" authentication provider, but that provider is not present in this deployment. Authentication via {} will not be available.", providerName, null != description ? "\"" + description + "\"" : "this mechanism");
+                }
                 return null;
             }