From e29aa58e198105e45bf9ff8c387f2795e195cb26 Mon Sep 17 00:00:00 2001
From: Milan Perera <milan@wso2.com>
Date: Tue, 24 Jan 2017 14:22:12 +0530
Subject: [PATCH] Removed tenant domain from Basic Authenticator

---
 .../framework/authenticator/BasicAuthAuthenticator.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/BasicAuthAuthenticator.java b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/BasicAuthAuthenticator.java
index 908613cf359..3b06468fe92 100644
--- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/BasicAuthAuthenticator.java
+++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/BasicAuthAuthenticator.java
@@ -28,6 +28,7 @@ import org.apache.tomcat.util.buf.CharChunk;
 import org.apache.tomcat.util.buf.MessageBytes;
 import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.user.api.UserStoreManager;
+import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
 import org.wso2.carbon.webapp.authenticator.framework.AuthenticationException;
 import org.wso2.carbon.webapp.authenticator.framework.AuthenticatorFrameworkDataHolder;
 import org.wso2.carbon.webapp.authenticator.framework.Constants;
@@ -68,7 +69,8 @@ public class BasicAuthAuthenticator implements WebappAuthenticator {
             int tenantId = Utils.getTenantIdOFUser(credentials.getUsername());
             UserStoreManager userStore = AuthenticatorFrameworkDataHolder.getInstance().getRealmService().
                     getTenantUserRealm(tenantId).getUserStoreManager();
-            boolean authenticated = userStore.authenticate(credentials.getUsername(), credentials.getPassword());
+            String username = MultitenantUtils.getTenantAwareUsername(credentials.getUsername());
+            boolean authenticated = userStore.authenticate(username, credentials.getPassword());
             if (authenticated) {
                 authenticationInfo.setStatus(Status.CONTINUE);
                 authenticationInfo.setUsername(credentials.getUsername());