Filter available authentication providers for FICAM setting

Author: labkey-adam

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

@@ -662,6 +662,12 @@ public static void deleteConfiguration(User user, int rowId)
     {
         // Delete any logos attached to the configuration
         AuthenticationConfiguration<?> configuration = AuthenticationConfigurationCache.getConfiguration(AuthenticationConfiguration.class, rowId);
+
+        if (null == configuration)
+        {
+            throw new NotFoundException("Unable to delete authentication configuration");
+        }
+
         AttachmentService.get().deleteAttachments(configuration);
 
         // Delete configuration
@@ -746,6 +752,7 @@ public static void setAcceptOnlyFicamProviders(User user, boolean enable)
         if (isAcceptOnlyFicamProviders() != enable)
         {
             saveAuthSetting(user, ACCEPT_ONLY_FICAM_PROVIDERS_KEY, enable);
+            AuthenticationProviderCache.clear();
             AuthenticationConfigurationCache.clear();
         }
     }

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

@@ -234,6 +234,12 @@ interface ResetPasswordProvider extends AuthenticationProvider
          * @param isAdminCopy true for sending admin a copy of reset password email
          */
         @Nullable SecurityMessage getAPIResetPasswordMessage(User user, boolean isAdminCopy);
+
+        @Override
+        default boolean isFicamApproved()
+        {
+            return true;
+        }
     }
 
     interface SecondaryAuthenticationProvider<SAC extends SecondaryAuthenticationConfiguration<?>> extends ConfigurableAuthenticationProvider<SAC>
@@ -286,11 +292,23 @@ interface DisableLoginProvider extends AuthenticationProvider
         void addUserDelay(HttpServletRequest request, String id, int addCount);
 
         void resetUserDelay(String id);
+
+        @Override
+        default boolean isFicamApproved()
+        {
+            return true;
+        }
     }
 
     interface ExpireAccountProvider extends AuthenticationProvider
     {
         boolean isEnabled();
+
+        @Override
+        default boolean isFicamApproved()
+        {
+            return true;
+        }
     }
 
     class AuthenticationResponse

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

@@ -56,13 +56,14 @@ protected Set<AuthenticationProvider> createCollection()
 
         private AuthenticationProviderCollections()
         {
-            for (AuthenticationProvider provider : AuthenticationManager.getAllProviders())
-            {
-                AuthenticationProvider.ALL_PROVIDER_INTERFACES
+            boolean acceptOnlyFicamProviders = AuthenticationManager.isAcceptOnlyFicamProviders();
+
+            AuthenticationManager.getAllProviders().stream()
+                .filter(provider -> !acceptOnlyFicamProviders || provider.isFicamApproved())
+                .forEach(provider -> AuthenticationProvider.ALL_PROVIDER_INTERFACES
                     .stream()
                     .filter(providerClass -> providerClass.isInstance(provider))
-                    .forEach(providerClass -> _map.put(providerClass, provider));
-            }
+                    .forEach(providerClass -> _map.put(providerClass, provider)));
         }
 
         private <T extends AuthenticationProvider> Collection<T> get(Class<T> clazz)

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

@@ -136,9 +136,16 @@ protected AC getFromCache(int rowId)
         return (AC)AuthenticationConfigurationCache.getConfiguration(AuthenticationConfiguration.class, rowId);
     }
 
-    protected Map<String, Object> getConfigurationMap(int rowId)
+    protected final Map<String, Object> getConfigurationMap(int rowId)
     {
         AC configuration = getFromCache(rowId);
+        if (null == configuration)
+            throw new NotFoundException("Unable to save configuration");
+        return getConfigurationMap(configuration);
+    }
+
+    protected Map<String, Object> getConfigurationMap(@NotNull AC configuration)
+    {
         return AuthenticationManager.getConfigurationMap(configuration);
     }
 }

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

@@ -120,9 +120,8 @@ public static void logLogoAction(User user, SSOAuthenticationConfiguration<?> co
     }
 
     @Override
-    protected Map<String, Object> getConfigurationMap(int rowId)
+    protected Map<String, Object> getConfigurationMap(@NotNull AC configuration)
     {
-        AC configuration = getFromCache(rowId);
         return AuthenticationManager.getSsoConfigurationMap(configuration);
     }
 

core/src/client/components/AuthRow.tsx

@@ -145,7 +145,15 @@ export default class AuthRow extends PureComponent<Props, Partial<State>> {
                     this.onToggleModal('deleteModalOpen', this.state.deleteModalOpen);
                     toggleModalOpen(false);
                 }}
-                onConfirm={onDelete}
+                onConfirm={() => {
+                    // Close the confirmation modal as soon as the user confirms, regardless of whether the
+                    // delete succeeds. On success the row unmounts anyway; on failure (e.g. the configuration
+                    // was already removed, or FICAM-only mode was enabled in another tab and the provider is no
+                    // longer available) the error is surfaced in the main window and the modal should not linger.
+                    this.onToggleModal('deleteModalOpen', this.state.deleteModalOpen);
+                    toggleModalOpen(false);
+                    onDelete?.();
+                }}
                 title={`Permanently delete ${authConfig.provider} configuration?`}
             >
                 <div className="auth-row__delete-modal__textBox">