Merge pull request #820 from janakamarasena/bug-fixes-2

Added tenant domain to username in AccessToken grant
7 years ago · 96c650f699
parent 031c648a2e 7218174d46
commit 96c650f699
1 changed files with 1 additions and 1 deletions
--- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/AccessTokenGrantHandler.java
+++ b/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/AccessTokenGrantHandler.java
@ -96,7 +96,7 @@ public class AccessTokenGrantHandler extends AbstractAuthorizationGrantHandler {
                }
                if (response != null && response.isValid()) {
                    authStatus = true;
-                    username = response.getUserName();
+                    username = response.getUserName() + "@" + response.getTenantDomain();
                    userTenantDomain = MultitenantUtils.getTenantDomain(username);
                    spTenantDomain = response.getTenantDomain();
                } else if (response != null && !response.isValid()) {