Merge branch 'master' into userResExec

Author: KD23243

components/org.wso2.carbon.identity.application.authentication.handler.identifier/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.application.auth.basic</groupId>
         <artifactId>identity-application-auth-basicauth</artifactId>
-        <version>6.8.35-SNAPSHOT</version>
+        <version>6.8.37-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/org.wso2.carbon.identity.application.authentication.handler.identifier/src/main/java/org/wso2/carbon/identity/application/authentication/handler/identifier/IdentifierHandler.java

@@ -45,6 +45,7 @@
 import org.wso2.carbon.identity.application.authenticator.basicauth.util.BasicAuthErrorConstants.ErrorMessages;
 import org.wso2.carbon.identity.application.authenticator.basicauth.util.AutoLoginUtilities;
 import org.wso2.carbon.identity.application.common.model.User;
+import org.wso2.carbon.identity.base.IdentityConstants;
 import org.wso2.carbon.identity.base.IdentityRuntimeException;
 import org.wso2.carbon.identity.central.log.mgt.utils.LogConstants;
 import org.wso2.carbon.identity.central.log.mgt.utils.LoggerUtils;
@@ -651,7 +652,11 @@ protected void processAuthenticationResponse(HttpServletRequest request,
         username = FrameworkUtils.prependUserStoreDomainToName(username);
         authProperties.put("username", username);
 
-        persistUsername(context, username);
+        if (Boolean.parseBoolean(IdentityUtil.getProperty(IdentityConstants.ServerConfig.IDENTIFIER_AS_USERNAME))) {
+            persistUsername(context, identifierFromRequest);
+        } else {
+            persistUsername(context, username);
+        }
 
         if (userStoreDomain == null) {
             userStoreDomain = IdentityUtil.extractDomainFromName(username);

components/org.wso2.carbon.identity.application.authentication.handler.session/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.application.auth.basic</groupId>
         <artifactId>identity-application-auth-basicauth</artifactId>
-        <version>6.8.35-SNAPSHOT</version>
+        <version>6.8.37-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

components/org.wso2.carbon.identity.application.authenticator.basicauth.jwt/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-application-auth-basicauth</artifactId>
         <groupId>org.wso2.carbon.identity.application.auth.basic</groupId>
-        <version>6.8.35-SNAPSHOT</version>
+        <version>6.8.37-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

components/org.wso2.carbon.identity.application.authenticator.basicauth/pom.xml

@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.application.auth.basic</groupId>
         <artifactId>identity-application-auth-basicauth</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>6.8.35-SNAPSHOT</version>
+        <version>6.8.37-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/org.wso2.carbon.identity.application.authenticator.basicauth/src/test/java/org/wso2/carbon/identity/application/authenticator/basicauth/PasswordOnboardExecutorTest.java

@@ -53,7 +53,7 @@ public void setUp() {
     }
 
     @Test
-    public void testPasswordRequiredState() throws Exception {
+    public void testPasswordRequiredState() {
 
         Map<String, String> userInputData = new HashMap<>();
         when(mockFlowExecContext.getUserInputData()).thenReturn(userInputData);
@@ -65,7 +65,7 @@ public void testPasswordRequiredState() throws Exception {
     }
 
     @Test
-    public void testPasswordProvidedState() throws Exception {
+    public void testPasswordProvidedState() {
 
         Map<String, String> userInputData = new HashMap<>();
         userInputData.put(PASSWORD, "P@ssw0rd");

features/org.wso2.carbon.identity.application.authenticator.basicauth.server.feature/pom.xml

@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.application.auth.basic</groupId>
         <artifactId>identity-application-auth-basicauth</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>6.8.35-SNAPSHOT</version>
+        <version>6.8.37-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -26,7 +26,7 @@
 
     <groupId>org.wso2.carbon.identity.application.auth.basic</groupId>
     <modelVersion>4.0.0</modelVersion>
-    <version>6.8.35-SNAPSHOT</version>
+    <version>6.8.37-SNAPSHOT</version>
     <artifactId>identity-application-auth-basicauth</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - BasicAuth Identity Application Authenticator Module</name>