Update APIs to support custom authentication management.

wso2 · Dec 2, 2024 · 0f82231 · 0f82231
1 parent b959007
commit 0f82231
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/...rg/wso2/carbon/identity/api/server/authenticators/common/AuthenticatorsServiceHolder.java b/...rg/wso2/carbon/identity/api/server/authenticators/common/AuthenticatorsServiceHolder.java
@@ -95,7 +95,7 @@ public ApplicationAuthenticatorService getApplicationAuthenticatorService() {
      *
      * @param applicationAuthenticatorService ApplicationAuthenticatorService.
      */
-    public void setApplicationCommonService(ApplicationAuthenticatorService applicationAuthenticatorService) {
+    public void setApplicationAuthenticatorService(ApplicationAuthenticatorService applicationAuthenticatorService) {
 
         AuthenticatorsServiceHolder.getInstance().applicationAuthenticatorService = applicationAuthenticatorService;
     }

diff --git a/...rbon/identity/api/server/authenticators/v1/core/ServerAuthenticatorManagementService.java b/...rbon/identity/api/server/authenticators/v1/core/ServerAuthenticatorManagementService.java
@@ -48,7 +48,6 @@
 import org.wso2.carbon.identity.application.common.model.LocalAuthenticatorConfig;
 import org.wso2.carbon.identity.application.common.model.RequestPathAuthenticatorConfig;
 import org.wso2.carbon.identity.application.common.model.UserDefinedLocalAuthenticatorConfig;
-import org.wso2.carbon.identity.base.AuthenticatorPropertyConstants;
 import org.wso2.carbon.identity.base.AuthenticatorPropertyConstants.DefinedByType;
 import org.wso2.carbon.identity.base.IdentityException;
 import org.wso2.carbon.identity.core.model.ExpressionNode;
@@ -214,8 +213,7 @@ public Authenticator addUserDefinedLocalAuthenticator(
             UserDefinedLocalAuthenticatorConfig createdConfig = AuthenticatorsServiceHolder.getInstance()
                     .getApplicationAuthenticatorService().addUserDefinedLocalAuthenticator(
                             LocalAuthenticatorConfigBuilderFactory.build(config),
-                            AuthenticatorPropertyConstants.AuthenticationType.valueOf(config.getAuthenticationType()
-                            .toString()), CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
+                            CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
             return LocalAuthenticatorConfigBuilderFactory.build(createdConfig);
         } catch (AuthenticatorMgtException e) {
             throw handleAuthenticatorException(e, Constants.ErrorMessage
@@ -231,8 +229,9 @@ public Authenticator addUserDefinedLocalAuthenticator(
     public void deleteUserDefinedLocalAuthenticator(String authenticatorId) {
 
         try {
-            AuthenticatorsServiceHolder.getInstance().getApplicationAuthenticatorService().deleteUserDefinedLocalAuthenticator(
-                    authenticatorId, CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
+            AuthenticatorsServiceHolder.getInstance().getApplicationAuthenticatorService()
+                    .deleteUserDefinedLocalAuthenticator(authenticatorId,
+                            CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
         } catch (AuthenticatorMgtException e) {
             throw handleAuthenticatorException(e, Constants.ErrorMessage.ERROR_CODE_ERROR_RETRIEVING_IDP_CONNECTED_APPS,
                     authenticatorId);

diff --git a/...on/identity/api/server/authenticators/v1/impl/LocalAuthenticatorConfigBuilderFactory.java b/...on/identity/api/server/authenticators/v1/impl/LocalAuthenticatorConfigBuilderFactory.java
@@ -77,6 +77,8 @@ public static UserDefinedLocalAuthenticatorConfig build(UserDefinedLocalAuthenti
         UserDefinedLocalAuthenticatorConfig authConfig = new UserDefinedLocalAuthenticatorConfig(
                 AuthenticatorPropertyConstants.AuthenticationType.valueOf(
                         config.getAuthenticationType().toString()));
+        authConfig.setAuthenticationType(AuthenticatorPropertyConstants.AuthenticationType.valueOf(
+                config.getAuthenticationType().toString()));
         authConfig.setName(config.getName());
         authConfig.setDisplayName(config.getDisplayName());
         authConfig.setEnabled(config.getIsEnabled());