Minor fixes

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/pom.xml

@@ -34,6 +34,14 @@
     <url>https://entgra.io</url>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.httpcomponents.wso2</groupId>
+            <artifactId>httpcore</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.orbit.org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.logging</artifactId>
@@ -119,6 +127,7 @@
                             org.osgi.service.*;version="${imp.package.version.osgi.service}",
                             org.wso2.carbon.core;version="4.6",
                             org.wso2.carbon.core.util;version="4.6",
+                            org.apache.commons.ssl,
                             org.wso2.carbon.apimgt.api.model,
                             okhttp3.*,
                             org.wso2.carbon.apimgt.impl;version="${carbon.api.mgt.version.range}",

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/src/main/java/io/entgra/device/mgt/core/apimgt/extension/rest/api/APIApplicationServicesImpl.java

@@ -60,19 +60,20 @@ public class APIApplicationServicesImpl implements APIApplicationServices {
             throws APIServicesException {
 
         String applicationEndpoint = config.getFirstProperty(Constants.DCR_END_POINT);
-        String owner = config.getFirstProperty(Constants.SERVER_USER);
+        String serverUser = config.getFirstProperty(Constants.SERVER_USER);
+        String serverPassword = config.getFirstProperty(Constants.SERVER_PASSWORD);
 
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("callbackUrl", Constants.EMPTY_STRING);
         jsonObject.put("clientName", Constants.CLIENT_NAME);
         jsonObject.put("grantType", Constants.GRANT_TYPE);
-        jsonObject.put("owner", owner);
+        jsonObject.put("owner", serverUser);
         jsonObject.put("saasApp", true);
 
         RequestBody requestBody = RequestBody.Companion.create(jsonObject.toString(), JSON);
         Request request = new Request.Builder()
                 .url(applicationEndpoint)
-                .addHeader(Constants.AUTHORIZATION_HEADER_NAME, Credentials.basic("admin", "admin"))
+                .addHeader(Constants.AUTHORIZATION_HEADER_NAME, Credentials.basic(serverUser, serverPassword))
                 .post(requestBody)
                 .build();
         try {

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/src/main/java/io/entgra/device/mgt/core/apimgt/extension/rest/api/PublisherRESTAPIServices.java

@@ -45,15 +45,13 @@ public class PublisherRESTAPIServices {
     private static final Log log = LogFactory.getLog(PublisherRESTAPIServices.class);
     private static final OkHttpClient client = getOkHttpClient();
     private static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-
     private static final String host = System.getProperty(Constants.IOT_CORE_HOST);
     private static final String port = System.getProperty(Constants.IOT_CORE_HTTPS_PORT);
 
     public JSONObject getScopes(APIApplicationKey apiApplicationKey, AccessTokenInfo accessTokenInfo)
             throws APIServicesException, BadRequestException {
 
-
-        String getAllScopesUrl = "https://" + "://" + host + ":" + port + Constants.GET_ALL_SCOPES;
+        String getAllScopesUrl = "https://" + host + ":" + port + Constants.GET_ALL_SCOPES;
         Request request = new Request.Builder()
                 .url(getAllScopesUrl)
                 .addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
@@ -90,16 +88,17 @@ public class PublisherRESTAPIServices {
             throws APIServicesException, BadRequestException {
 
         String keyValue = new String(Base64.encodeBase64((key).getBytes())).replace("=", "");
-        String getScopeUrl = "https://" + "://" + host + ":" + port + Constants.GET_SCOPE + keyValue;
+        String getScopeUrl = "https://" + host + ":" + port + Constants.GET_SCOPE + keyValue;
 
         Request request = new Request.Builder()
                 .url(getScopeUrl)
-                .addHeader(Constants.AUTHORIZATION_HEADER_NAME, "Bearer " + accessTokenInfo.getAccess_token())
+                .addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                        + accessTokenInfo.getAccess_token())
                 .head()
                 .build();
         try {
             Response response = client.newCall(request).execute();
-            if (response.code() == HttpStatus.SC_OK) {
+            if (HttpStatus.SC_OK == response.code()) {
                 return true;
             } else if (HttpStatus.SC_UNAUTHORIZED == response.code()) {
                 APIApplicationServices apiApplicationServices = new APIApplicationServicesImpl();
@@ -124,7 +123,7 @@ public class PublisherRESTAPIServices {
     public boolean updateSharedScope(APIApplicationKey apiApplicationKey, AccessTokenInfo accessTokenInfo, Scope scope)
             throws APIServicesException, BadRequestException {
 
-        String updateScopeUrl = "https://" + "://" + host + ":" + port + Constants.GET_SCOPE + scope.getId();
+        String updateScopeUrl = "https://" + host + ":" + port + Constants.GET_SCOPE + scope.getId();
 
         ScopeUtils scopeUtil = new ScopeUtils();
         scopeUtil.setKey(scope.getKey());
@@ -136,13 +135,14 @@ public class PublisherRESTAPIServices {
         RequestBody requestBody = RequestBody.create(JSON, scopeString);
         Request request = new Request.Builder()
                 .url(updateScopeUrl)
-                .addHeader(Constants.AUTHORIZATION_HEADER_NAME, "Bearer " + accessTokenInfo.getAccess_token())
+                .addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                        + accessTokenInfo.getAccess_token())
                 .put(requestBody)
                 .build();
 
         try {
             Response response = client.newCall(request).execute();
-            if (response.code() == HttpStatus.SC_OK) {
+            if (HttpStatus.SC_OK == response.code()) {
                 return true;
             } else if (HttpStatus.SC_UNAUTHORIZED == response.code()) {
                 APIApplicationServices apiApplicationServices = new APIApplicationServicesImpl();

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/src/main/java/io/entgra/device/mgt/core/apimgt/extension/rest/api/constants/Constants.java

@@ -26,7 +26,7 @@ public final class Constants {
     public static final String EMPTY_STRING = "";
     public static final String CLIENT_NAME = "rest_api_publisher_code";
     public static final String SERVER_USER = "WorkflowConfigurations.ServerUser";
-    public static final String SERVER_PASSWORD = "ServerPassword";
+    public static final String SERVER_PASSWORD = "WorkflowConfigurations.ServerPassword";
     public static final String GRANT_TYPE = "client_credentials password refresh_token";
     public static final String REFRESH_TOKEN_GRANT_TYPE_PARAM_NAME = "refresh_token";
     public static final String OAUTH_EXPIRES_IN = "expires_in";