Update APIs to support custom authentication management.

wso2 · Dec 4, 2024 · 942975c · 942975c
1 parent 660f2fd
commit 942975c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/...rbon/identity/api/server/authenticators/v1/core/ServerAuthenticatorManagementService.java b/...rbon/identity/api/server/authenticators/v1/core/ServerAuthenticatorManagementService.java
@@ -115,7 +115,13 @@ public List<Authenticator> getAuthenticators(String filter, Integer limit, Integ
             LocalAuthenticatorConfig[] localAuthenticatorConfigs = AuthenticatorsServiceHolder.getInstance()
                     .getApplicationManagementService().getAllLocalAuthenticators(ContextLoader
                             .getTenantDomainFromContext());
-
+            List<UserDefinedLocalAuthenticatorConfig> userDefinedLocalAuthConfigs =
+                    AuthenticatorsServiceHolder.getInstance().getApplicationAuthenticatorService()
+                    .getAllUserDefinedLocalAuthenticators(ContextLoader.getTenantDomainFromContext());
+            if (CollectionUtils.isNotEmpty(userDefinedLocalAuthConfigs)) {
+                localAuthenticatorConfigs = (LocalAuthenticatorConfig[]) ArrayUtils.addAll(localAuthenticatorConfigs,
+                        userDefinedLocalAuthConfigs.toArray(new LocalAuthenticatorConfig[0]));
+            }
             int localAuthenticatorsCount = localAuthenticatorConfigs.length;
             RequestPathAuthenticatorConfig[] requestPathAuthenticatorConfigs = new RequestPathAuthenticatorConfig[0];
 
@@ -155,6 +161,8 @@ public List<Authenticator> getAuthenticators(String filter, Integer limit, Integ
                     null);
         } catch (IdentityProviderManagementException e) {
             throw handleIdPException(e, Constants.ErrorMessage.ERROR_CODE_ERROR_LISTING_IDPS, null);
+        } catch (AuthenticatorMgtException e) {
+            throw handleAuthenticatorException(e);
         }
     }
 
@@ -207,8 +215,7 @@ public ConnectedApps getConnectedAppsOfLocalAuthenticator(String authenticatorId
      * @param config          The user defined local authenticator update request.
      * @return The created authenticator.
      */
-    public Authenticator addUserDefinedLocalAuthenticator(
-            UserDefinedLocalAuthenticatorCreation config) {
+    public Authenticator addUserDefinedLocalAuthenticator(UserDefinedLocalAuthenticatorCreation config) {
 
         try {
             UserDefinedLocalAuthenticatorConfig createdConfig = AuthenticatorsServiceHolder.getInstance()
@@ -1002,7 +1009,7 @@ private APIError handleAuthenticatorException(AuthenticatorMgtException e) {
                                 errorCode : Constants.AUTHENTICATOR_ERROR_PREFIX + errorCode;
                 errorResponse.setCode(errorCode);
             }
-            errorResponse.setDescription(e.getMessage());
+            errorResponse.setDescription(e.getDescription());
             status = Response.Status.BAD_REQUEST;
         } else if (e instanceof AuthenticatorMgtServerException) {
             if (e.getErrorCode() != null) {
@@ -1012,7 +1019,7 @@ private APIError handleAuthenticatorException(AuthenticatorMgtException e) {
                                 errorCode : Constants.AUTHENTICATOR_ERROR_PREFIX + errorCode;
                 errorResponse.setCode(errorCode);
             }
-            errorResponse.setDescription(e.getMessage());
+            errorResponse.setDescription(e.getDescription());
             status = Response.Status.INTERNAL_SERVER_ERROR;
         } else {
             status = Response.Status.INTERNAL_SERVER_ERROR;

diff --git a/...on/identity/api/server/authenticators/v1/impl/LocalAuthenticatorConfigBuilderFactory.java b/...on/identity/api/server/authenticators/v1/impl/LocalAuthenticatorConfigBuilderFactory.java
@@ -77,11 +77,12 @@ public static Authenticator build(UserDefinedLocalAuthenticatorConfig config) {
     public static UserDefinedLocalAuthenticatorConfig build(UserDefinedLocalAuthenticatorCreation config)
             throws AuthenticatorMgtClientException {
 
+        String authenticationType = AuthenticatorPropertyConstants.AuthenticationType.IDENTIFICATION.toString();
+        if (config.getAuthenticationType() != null) {
+            authenticationType = config.getAuthenticationType().toString();
+        }
         UserDefinedLocalAuthenticatorConfig authConfig = new UserDefinedLocalAuthenticatorConfig(
-                AuthenticatorPropertyConstants.AuthenticationType.valueOf(
-                        config.getAuthenticationType().toString()));
-        authConfig.setAuthenticationType(AuthenticatorPropertyConstants.AuthenticationType.valueOf(
-                config.getAuthenticationType().toString()));
+                AuthenticatorPropertyConstants.AuthenticationType.valueOf(authenticationType));
         authConfig.setName(config.getName());
         authConfig.setDisplayName(config.getDisplayName());
         authConfig.setEnabled(config.getIsEnabled());
@@ -123,9 +124,9 @@ private static UserDefinedAuthenticatorEndpointConfig buildEndpointConfig(Endpoi
                     .entrySet().stream().collect(Collectors.toMap(
                             Map.Entry::getKey, entry -> entry.getValue().toString())));
             return endpointConfigBuilder.build();
-        } catch (NoSuchElementException e) {
+        } catch (NoSuchElementException | IllegalArgumentException e) {
             Constants.ErrorMessage error = ERROR_CODE_INVALID_ENDPOINT_CONFIG;
-            throw new AuthenticatorMgtClientException(error.getCode(), error.getMessage(), error.getMessage());
+            throw new AuthenticatorMgtClientException(error.getCode(), error.getMessage(), e.getMessage());
         }
     }