Merge branch 'new-improvements' into 'master'

Fix issues of getting default token

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

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java

@@ -1338,7 +1338,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
     @GET
     @Path("/{clientId}/{clientSecret}/default-token")
     @Override
-    public Response getDefaultToken(String clientId, String clientSecret) {
+    public Response getDefaultToken(@PathParam("clientId") String clientId, @PathParam("clientSecret") String clientSecret) {
         JWTClientManagerService jwtClientManagerService = DeviceMgtAPIUtils.getJWTClientManagerService();
         try {
             JWTClient jwtClient = jwtClientManagerService.getJWTClient();

components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/DefaultTokenHandler.java

@@ -104,10 +104,10 @@ public class DefaultTokenHandler extends HttpServlet {
                     newDefaultAuthData.setClientId(clientId);
                     newDefaultAuthData.setClientSecret(clientSecret);
 
-                    String defaultToken = jTokenResultAsJsonObject.get("access_token").getAsString();
+                    String defaultToken = jTokenResultAsJsonObject.get("accessToken").getAsString();
                     newDefaultAuthData.setAccessToken(defaultToken);
-                    newDefaultAuthData.setRefreshToken(jTokenResultAsJsonObject.get("refresh_token").getAsString());
+                    newDefaultAuthData.setRefreshToken(jTokenResultAsJsonObject.get("refreshToken").getAsString());
-                    newDefaultAuthData.setScope(jTokenResultAsJsonObject.get("scope").getAsString());
+                    newDefaultAuthData.setScope(jTokenResultAsJsonObject.get("scopes").getAsString());
                     httpSession.setAttribute(HandlerConstants.SESSION_DEFAULT_AUTH_DATA_KEY, newDefaultAuthData);
 
                     HandlerUtil.handleSuccess(resp, constructSuccessProxyResponse(defaultToken));