Introduce new property AuthenticationType.

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

@@ -18,8 +18,6 @@
 
 package org.wso2.carbon.identity.application.common;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.identity.application.common.model.FederatedAuthenticatorConfig;
 import org.wso2.carbon.identity.application.common.model.LocalAuthenticatorConfig;
 import org.wso2.carbon.identity.application.common.model.RequestPathAuthenticatorConfig;
@@ -33,7 +31,6 @@
 public class ApplicationAuthenticatorService {
 
     private static volatile ApplicationAuthenticatorService instance;
-    private static final Log LOG = LogFactory.getLog(ApplicationAuthenticatorService.class);
 
     private List<LocalAuthenticatorConfig> localAuthenticators = new ArrayList<>();
     private List<FederatedAuthenticatorConfig> federatedAuthenticators = new ArrayList<>();
@@ -91,9 +88,6 @@ public RequestPathAuthenticatorConfig getRequestPathAuthenticatorByName(String n
 
     public void addLocalAuthenticator(LocalAuthenticatorConfig authenticator) {
         if (authenticator != null) {
-            if (authenticator.getDefinedByType() == null) {
-                LOG.debug("The defined by type is not set for the : " + authenticator.getName());
-            }
             localAuthenticators.add(authenticator);
         }
     }
@@ -106,9 +100,6 @@ public void removeLocalAuthenticator(LocalAuthenticatorConfig authenticator) {
 
     public void addFederatedAuthenticator(FederatedAuthenticatorConfig authenticator) {
         if (authenticator != null) {
-            if (authenticator.getDefinedByType() == null) {
-                LOG.debug("The defined by type is not set for the : " + authenticator.getName());
-            }
             federatedAuthenticators.add(authenticator);
         }
     }

components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/model/FederatedAuthenticatorConfig.java

@@ -70,6 +70,9 @@ public class FederatedAuthenticatorConfig implements Serializable {
     @XmlElement(name = "DefinedBy")
     protected IdentityConstants.DefinedByType definedByType;
 
+    @XmlElement(name = "AuthenticationType")
+    protected IdentityConstants.AuthenticationType authenticationType;
+
     public static FederatedAuthenticatorConfig build(OMElement federatedAuthenticatorConfigOM) {
 
         if (federatedAuthenticatorConfigOM == null) {
@@ -114,11 +117,11 @@ public static FederatedAuthenticatorConfig build(OMElement federatedAuthenticato
             }
         }
 
-        // TODO: Remove warn log, once feature is ready.
         if (federatedAuthenticatorConfig.getDefinedByType() == null) {
             federatedAuthenticatorConfig.setDefinedByType(IdentityConstants.DefinedByType.SYSTEM);
             LOG.debug("The defined by type is not set for the : " + federatedAuthenticatorConfig.getName());
         }
+        federatedAuthenticatorConfig.setAuthenticationType(IdentityConstants.AuthenticationType.EXTERNAL_ACCOUNT);
 
         return federatedAuthenticatorConfig;
     }
@@ -248,22 +251,42 @@ public void setTags(String[] tagList) {
     }
 
     /**
-     * Get the tag list of the Local authenticator.
+     * Get the defined by type of the federated authenticator config.
      *
-     * @return String[]
+     * @return IdentityConstants.DefinedByType
      */
     public IdentityConstants.DefinedByType getDefinedByType() {
 
         return definedByType;
     }
 
     /**
-     * Set the tag list for Local authenticator config.
+     * Set the defined by type of the federated authenticator config.
      *
-     * @param type  authenticator.
+     * @param type The defined by type of the authenticator config.
      */
     public void setDefinedByType(IdentityConstants.DefinedByType type) {
 
         definedByType = type;
     }
+
+    /**
+     * Get the authentication type of the federated authenticator config.
+     *
+     * @return IdentityConstants.AuthenticationType
+     */
+    public IdentityConstants.AuthenticationType getAuthenticationType() {
+
+        return authenticationType;
+    }
+
+    /**
+     * Set the authentication type of the federated authenticator config.
+     *
+     * @param type  The authentication type.
+     */
+    public void setAuthenticationType(IdentityConstants.AuthenticationType type) {
+
+        authenticationType = type;
+    }
 }

components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/model/IdentityProvider.java

@@ -58,7 +58,6 @@
 public class IdentityProvider implements Serializable {
 
     private static final long serialVersionUID = 2199048941051702943L;
-    private static final Log LOG = LogFactory.getLog(IdentityProvider.class);
 
     private static final Log log = LogFactory.getLog(IdentityProvider.class);
     private static final String FILE_ELEMENT_IDENTITY_PROVIDER_NAME = "IdentityProviderName";
@@ -420,13 +419,6 @@ public void setFederatedAuthenticatorConfigs(
         if (federatedAuthenticatorConfigs == null) {
             return;
         }
-
-        // TODO: Remove warn log, once feature is ready.
-        for (FederatedAuthenticatorConfig config: federatedAuthenticatorConfigs) {
-            if (config.getDefinedByType() == null) {
-                LOG.debug("The defined by type is not set for the : " + config.getName());
-            }
-        }
         Set<FederatedAuthenticatorConfig> propertySet =
                 new HashSet<FederatedAuthenticatorConfig>(Arrays.asList(federatedAuthenticatorConfigs));
         this.federatedAuthenticatorConfigs = propertySet.toArray(new FederatedAuthenticatorConfig[propertySet.size()]);

components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/model/LocalAuthenticatorConfig.java

@@ -39,6 +39,8 @@
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 
+import static org.wso2.carbon.identity.base.IdentityConstants.TAG_2FA;
+
 /**
  * Local authenticator configuration of an application.
  */
@@ -69,6 +71,9 @@ public class LocalAuthenticatorConfig implements Serializable {
     @XmlElement(name = "DefinedBy")
     protected IdentityConstants.DefinedByType definedByType;
 
+    @XmlElement(name = "AuthenticationType")
+    protected IdentityConstants.AuthenticationType authenticationType;
+
     /*
      * <LocalAuthenticatorConfig> <Name></Name> <DisplayName></DisplayName> <IsEnabled></IsEnabled>
      * <Properties></Properties> </LocalAuthenticatorConfig>
@@ -119,12 +124,27 @@ public static LocalAuthenticatorConfig build(OMElement localAuthenticatorConfigO
                 }
             } else if ("DefinedBy".equals(member.getLocalName())) {
                 localAuthenticatorConfig.setDefinedByType(IdentityConstants.DefinedByType.valueOf(member.getText()));
+            } else if ("AuthenticationType".equals(member.getLocalName())) {
+                localAuthenticatorConfig.setAuthenticationType(
+                        IdentityConstants.AuthenticationType.valueOf(member.getText()));
             }
         }
 
         if (localAuthenticatorConfig.getDefinedByType() == null) {
             localAuthenticatorConfig.setDefinedByType(IdentityConstants.DefinedByType.SYSTEM);
-            LOG.debug("The defined by type is not set for the : " + localAuthenticatorConfig.getName());
+            LOG.debug("The defined by type is not set for the {}. Hence setting default SYSTEM value.",
+                    localAuthenticatorConfig.getName());
+        }
+        if (localAuthenticatorConfig.getAuthenticationType() == null && localAuthenticatorConfig.getTags() != null) {
+            if (localAuthenticatorConfig.getTags() != null &&
+                    Arrays.stream(localAuthenticatorConfig.getTags()).anyMatch(s -> s.equalsIgnoreCase(TAG_2FA))) {
+                localAuthenticatorConfig.setAuthenticationType(
+                        IdentityConstants.AuthenticationType.FACTOR_VERIFICATION);
+            } else {
+                localAuthenticatorConfig.setAuthenticationType(IdentityConstants.AuthenticationType.INTERNAL_ACCOUNT);
+            }
+            LOG.debug("The defined by type is not set for the: {}. Hence setting value based on the factor for the: {}",
+                    localAuthenticatorConfig.getName(), localAuthenticatorConfig.getAuthenticationType().toString());
         }
 
         return localAuthenticatorConfig;
@@ -240,22 +260,42 @@ public void setTags(String[] tagList) {
     }
 
     /**
-     * Get the tag list of the Local authenticator.
+     * Get the defined by type of the Local authenticator config.
      *
-     * @return String[]
+     * @return IdentityConstants.DefinedByType
      */
     public IdentityConstants.DefinedByType getDefinedByType() {
 
         return definedByType;
     }
 
     /**
-     * Set the tag list for Local authenticator config.
+     * Set the defined by type of the Local authenticator config.
      *
-     * @param type  authenticator.
+     * @param type The defined by type of the authenticator config.
      */
     public void setDefinedByType(IdentityConstants.DefinedByType type) {
 
         definedByType = type;
     }
+
+    /**
+     * Get the authentication type of the Local authenticator config .
+     *
+     * @return IdentityConstants.AuthenticationType
+     */
+    public IdentityConstants.AuthenticationType getAuthenticationType() {
+
+        return authenticationType;
+    }
+
+    /**
+     * Set the authentication type of the Local authenticator config.
+     *
+     * @param type  The authentication type.
+     */
+    public void setAuthenticationType(IdentityConstants.AuthenticationType type) {
+
+        authenticationType = type;
+    }
 }

components/application-mgt/org.wso2.carbon.identity.application.mgt/src/main/java/org/wso2/carbon/identity/application/mgt/ApplicationConstants.java

@@ -51,6 +51,7 @@ private ApplicationConstants() {
     public static final String IDP_AUTHENTICATOR_NAME = "authenticatorName";
     public static final String IDP_AUTHENTICATOR_DISPLAY_NAME = "authenticatorDisplayName";
     public static final String IDP_AUTHENTICATOR_DEFINED_BY_TYPE = "definedByType";
+    public static final String IDP_AUTHENTICATOR_AUTHENTICATION_TYPE = "authenticationType";
     public static final String APPLICATION_DOMAIN = "Application";
     // Regex for validating application name.
     public static final String APP_NAME_VALIDATING_REGEX = "^[a-zA-Z0-9 ._-]*$";

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

@@ -3100,6 +3100,8 @@ private LocalAndOutboundAuthenticationConfig getLocalAndOutboundAuthenticationCo
                             .get(ApplicationConstants.IDP_AUTHENTICATOR_DISPLAY_NAME));
                     localAuthenticator.setDefinedByType(IdentityConstants.DefinedByType.valueOf(
                             authenticatorInfo.get(ApplicationConstants.IDP_AUTHENTICATOR_DEFINED_BY_TYPE)));
+                    localAuthenticator.setAuthenticationType(IdentityConstants.AuthenticationType.valueOf(
+                            authenticatorInfo.get(ApplicationConstants.IDP_AUTHENTICATOR_AUTHENTICATION_TYPE)));
                     stepLocalAuth.get(step).add(localAuthenticator);
                 } else {
                     Map<String, List<FederatedAuthenticatorConfig>> stepFedIdps = stepFedIdPAuthenticators
@@ -3120,6 +3122,7 @@ private LocalAndOutboundAuthenticationConfig getLocalAndOutboundAuthenticationCo
                             .get(ApplicationConstants.IDP_AUTHENTICATOR_DISPLAY_NAME));
                     fedAuthenticator.setDefinedByType(IdentityConstants.DefinedByType.valueOf(
                             authenticatorInfo.get(ApplicationConstants.IDP_AUTHENTICATOR_DEFINED_BY_TYPE)));
+                    fedAuthenticator.setAuthenticationType(IdentityConstants.AuthenticationType.EXTERNAL_ACCOUNT);
                     idpAuths.add(fedAuthenticator);
                 }
 
@@ -5031,7 +5034,7 @@ private Map<String, String> getAuthenticatorInfo(Connection conn, int tenantId,
                 returnData
                         .put(ApplicationConstants.IDP_AUTHENTICATOR_DISPLAY_NAME, rs.getString(3));
             }
-            // TODO: Read from database and set the DefinedBy property to the authenticator.
+            // TODO: Read from database and set the DefinedBy and authenticationType properties to the authenticator.
             returnData.put(ApplicationConstants.IDP_AUTHENTICATOR_DEFINED_BY_TYPE,
                     IdentityConstants.DefinedByType.SYSTEM.toString());
         } finally {
@@ -5068,6 +5071,7 @@ private int addAuthenticator(Connection conn, int tenantId, String idpName,
             prepStmt.setString(5, "1");
             prepStmt.setString(6, authenticatorDispalyName);
             //TODO: prepStmt.setString(7, IdentityConstants.DefinedByType.SYSTEM.toString());
+            //TODO: prepStmt.setString(8, IdentityConstants.AuthenticationType.<TYPE>.toString());
             prepStmt.execute();
             rs = prepStmt.getGeneratedKeys();
             if (rs.next()) {

components/application-mgt/org.wso2.carbon.identity.application.mgt/src/test/java/org/wso2/carbon/identity/application/mgt/ApplicationManagementServiceImplTest.java

@@ -107,7 +107,6 @@
 import java.util.List;
 import java.util.Map;
 
-
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
 import static org.mockito.ArgumentMatchers.any;

components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/src/main/java/org/wso2/carbon/identity/application/authentication/framework/ApplicationAuthenticator.java

@@ -181,4 +181,14 @@ default IdentityConstants.DefinedByType getDefinedByType() {
 
         return IdentityConstants.DefinedByType.SYSTEM;
     }
+
+    /**
+     * Get the authenticator type. Default value will be SYSTEM.
+     *
+     * @return Authenticator Type.
+     */
+    default IdentityConstants.AuthenticationType getAuthenticationType() {
+
+        return null;
+    }
 }

components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/src/main/java/org/wso2/carbon/identity/application/authentication/framework/FederatedApplicationAuthenticator.java

@@ -18,9 +18,17 @@
 
 package org.wso2.carbon.identity.application.authentication.framework;
 
+import org.wso2.carbon.identity.base.IdentityConstants;
+
 /**
  * Federated application authenticator.
  */
 public interface FederatedApplicationAuthenticator extends ApplicationAuthenticator {
 
+    @Override
+    default IdentityConstants.AuthenticationType getAuthenticationType() {
+
+        return IdentityConstants.AuthenticationType.EXTERNAL_ACCOUNT;
+    }
+
 }

components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/src/main/java/org/wso2/carbon/identity/application/authentication/framework/LocalApplicationAuthenticator.java

@@ -18,9 +18,24 @@
 
 package org.wso2.carbon.identity.application.authentication.framework;
 
+import org.wso2.carbon.identity.base.IdentityConstants;
+
+import java.util.Arrays;
+
+import static org.wso2.carbon.identity.base.IdentityConstants.TAG_2FA;
+
 /**
  * Local authenticator for applications.
  */
 public interface LocalApplicationAuthenticator extends ApplicationAuthenticator {
 
+    @Override
+    default IdentityConstants.AuthenticationType getAuthenticationType() {
+
+        if (getTags() != null && Arrays.stream(getTags()).anyMatch(s -> s.equalsIgnoreCase(TAG_2FA))) {
+            return IdentityConstants.AuthenticationType.FACTOR_VERIFICATION;
+        }
+
+        return IdentityConstants.AuthenticationType.INTERNAL_ACCOUNT;
+    }
 }

components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/src/main/java/org/wso2/carbon/identity/application/authentication/framework/internal/FrameworkServiceComponent.java

@@ -121,13 +121,16 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
 import javax.servlet.Servlet;
 
 import static org.wso2.carbon.identity.application.authentication.framework.util.FrameworkUtils.promptOnLongWait;
+import static org.wso2.carbon.identity.base.IdentityConstants.AuthenticationType;
+import static org.wso2.carbon.identity.base.IdentityConstants.TAG_2FA;
 import static org.wso2.carbon.identity.base.IdentityConstants.TRUE;
 
 /**
@@ -508,6 +511,12 @@ protected void setAuthenticator(ApplicationAuthenticator authenticator) {
             localAuthenticatorConfig.setDisplayName(authenticator.getFriendlyName());
             localAuthenticatorConfig.setTags(getTags(authenticator));
             localAuthenticatorConfig.setDefinedByType(IdentityConstants.DefinedByType.SYSTEM);
+            if (localAuthenticatorConfig.getTags() != null &&
+                    Arrays.stream(localAuthenticatorConfig.getTags()).anyMatch(s -> s.equalsIgnoreCase(TAG_2FA))) {
+                localAuthenticatorConfig.setAuthenticationType(AuthenticationType.FACTOR_VERIFICATION);
+            } else {
+                localAuthenticatorConfig.setAuthenticationType(AuthenticationType.INTERNAL_ACCOUNT);
+            }
             AuthenticatorConfig fileBasedConfig = getAuthenticatorConfig(authenticator.getName());
             localAuthenticatorConfig.setEnabled(fileBasedConfig.isEnabled());
             ApplicationAuthenticatorService.getInstance().addLocalAuthenticator(localAuthenticatorConfig);
@@ -518,6 +527,7 @@ protected void setAuthenticator(ApplicationAuthenticator authenticator) {
             federatedAuthenticatorConfig.setDisplayName(authenticator.getFriendlyName());
             federatedAuthenticatorConfig.setTags(getTags(authenticator));
             federatedAuthenticatorConfig.setDefinedByType(IdentityConstants.DefinedByType.SYSTEM);
+            federatedAuthenticatorConfig.setAuthenticationType(IdentityConstants.AuthenticationType.EXTERNAL_ACCOUNT);
             ApplicationAuthenticatorService.getInstance().addFederatedAuthenticator(federatedAuthenticatorConfig);
         } else if (authenticator instanceof RequestPathApplicationAuthenticator) {
             RequestPathAuthenticatorConfig reqPathAuthenticatorConfig = new RequestPathAuthenticatorConfig();