/authenticators/system

Author: Eranda2001

components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/constant/AuthenticatorMgtSQLConstants.java

@@ -66,11 +66,11 @@ public static class Query {
                 ":NAME;, :IS_ENABLED;, :DEFINED_BY;, :AUTHENTICATION_TYPE;, :DISPLAY_NAME;, " +
                 ":IMAGE_URL;, :DESCRIPTION;)";
         public static final String ADD_SYSTEM_LOCAL_AUTHENTICATOR_SQL = "INSERT INTO IDP_AUTHENTICATOR " +
-                "(TENANT_ID, IDP_ID, NAME, IS_ENABLED, DEFINED_BY, AMR_VALUE, DISPLAY_NAME) " +
+                "(TENANT_ID, IDP_ID, NAME, IS_ENABLED, DEFINED_BY, AMR_VALUE, AUTHENTICATION_TYPE, DISPLAY_NAME) " +
                 "VALUES " +
-                "(:TENANT_ID, " +
+                "(:TENANT_ID;, " +
                 "(SELECT ID FROM IDP WHERE NAME = :IDP_NAME; AND TENANT_ID = :TENANT_ID;), " +
-                ":NAME;, :IS_ENABLED;, :DEFINED_BY;, :AMR_VALUE;, :DISPLAY_NAME;)";
+                ":NAME;, :IS_ENABLED;, :DEFINED_BY;, :AMR_VALUE;, :AUTHENTICATION_TYPE;, :DISPLAY_NAME;)";
         public static final String UPDATE_AUTHENTICATOR_SQL = "UPDATE IDP_AUTHENTICATOR SET IS_ENABLED = " +
                 ":IS_ENABLED;, DISPLAY_NAME = :DISPLAY_NAME;, IMAGE_URL = :IMAGE_URL;, DESCRIPTION = :DESCRIPTION;, " +
                 "AMR_VALUE = :AMR_VALUE" +

components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/dao/impl/AuthenticatorManagementDAOImpl.java

@@ -266,7 +266,7 @@ public boolean isExistingAuthenticatorName(String authenticatorName, int tenantI
     public LocalAuthenticatorConfig addSystemLocalAuthenticator(LocalAuthenticatorConfig authenticatorConfig, int tenantId) throws AuthenticatorMgtServerException {
         NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource());
         try {
-            int authenticatorConfigID = jdbcTemplate.withTransaction(template ->
+            jdbcTemplate.withTransaction(template ->
                 template.executeInsert(Query.ADD_SYSTEM_LOCAL_AUTHENTICATOR_SQL,
                     statement -> {
                         statement.setString(Column.NAME, authenticatorConfig.getName());
@@ -280,11 +280,6 @@ public LocalAuthenticatorConfig addSystemLocalAuthenticator(LocalAuthenticatorCo
                         statement.setInt(Column.TENANT_ID, tenantId);
                     }, null, true));
 
-            if (authenticatorConfigID == 0) {
-                authenticatorConfigID = getAuthenticatorEntryId(authenticatorConfig.getName(), tenantId);
-            }
-            addAuthenticatorProperty(authenticatorConfigID, authenticatorConfig.getProperties(), tenantId);
-
             return getSystemLocalAuthenticatorByName(authenticatorConfig.getName(), tenantId);
         } catch (TransactionException e) {
             throw buildServerException(AuthenticatorMgtError.ERROR_WHILE_ADDING_AUTHENTICATOR, e);