Merge branch 'feature1277' into 'master'

Generate QR with access token for given user

See merge request entgra/carbon-device-mgt!867

components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/src/main/java/org/wso2/carbon/apimgt/application/extension/APIManagementProviderService.java

@@ -62,11 +62,13 @@ public interface APIManagementProviderService {
      * @param applicationName Application Name
      * @param tokenType Token Type
      * @param validityPeriod Validity Period
+     * @param username Name of the user to create the token. If null, set as carbon context user
      * @return {@link String} Access Token
      * @throws APIManagerException if error occurred while getting the access token for given scopes,
      * validity period etc.
      */
-    AccessTokenInfo getAccessToken(String scopes, String[] tags, String applicationName, String tokenType, String validityPeriod)
+    AccessTokenInfo getAccessToken(String scopes, String[] tags, String applicationName, String
+            tokenType, String validityPeriod, String username)
             throws APIManagerException;
 
 }

components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/src/main/java/org/wso2/carbon/apimgt/application/extension/APIManagementProviderServiceImpl.java

@@ -233,7 +233,7 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
 
     @Override
     public AccessTokenInfo getAccessToken(String scopes, String[] tags, String applicationName, String tokenType,
-            String validityPeriod) throws APIManagerException {
+            String validityPeriod, String username) throws APIManagerException {
         try {
             String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain(true);
             ApiApplicationKey clientCredentials = getClientCredentials(tenantDomain, tags, applicationName, tokenType,
@@ -245,15 +245,22 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
                 throw new APIManagerException(msg);
             }
 
-            String user =
+            if (username == null || username.isEmpty()) {
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername() + "@" + PrivilegedCarbonContext
+                username =
+                        PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername() + "@" + PrivilegedCarbonContext
+                                .getThreadLocalCarbonContext().getTenantDomain(true);
+            } else {
+                if (!username.contains("@")) {
+                    username += "@" + PrivilegedCarbonContext
                             .getThreadLocalCarbonContext().getTenantDomain(true);
+                }
+            }
 
             JWTClientManagerService jwtClientManagerService = APIApplicationManagerExtensionDataHolder.getInstance()
                     .getJwtClientManagerService();
             JWTClient jwtClient = jwtClientManagerService.getJWTClient();
             AccessTokenInfo accessTokenForAdmin = jwtClient
-                    .getAccessToken(clientCredentials.getConsumerKey(), clientCredentials.getConsumerSecret(), user,
+                    .getAccessToken(clientCredentials.getConsumerKey(), clientCredentials.getConsumerSecret(), username,
                             scopes);
 
             return accessTokenForAdmin;