Minor fixes in application registration flow

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/src/main/java/io/entgra/device/mgt/core/apimgt/application/extension/APIManagementProviderServiceImpl.java

@@ -112,6 +112,7 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
             }
 
             Map<String, APIInfo> uniqueApiSet = new HashMap<>();
+            if (tags != null) {
                 for (String tag : tags) {
                     Map<String, String> queryParams = new HashMap<>();
                     queryParams.put("tag", tag);
@@ -119,6 +120,7 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
                     APIInfo[] apiInfos = consumerRESTAPIServices.getAllApis(apiApplicationInfo, queryParams, headerParams);
                     Arrays.stream(apiInfos).forEach(apiInfo -> uniqueApiSet.putIfAbsent(apiInfo.getName(), apiInfo));
                 }
+            }
 
             List<APIInfo> uniqueApiList = new ArrayList<>(uniqueApiSet.values());
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/src/main/java/io/entgra/device/mgt/core/apimgt/keymgt/extension/service/KeyMgtServiceImpl.java

@@ -135,7 +135,8 @@ public class KeyMgtServiceImpl implements KeyMgtService {
             //todo --> can use requestingUserAccessToken token here to get application data - modify getApplication
             // method signature
 
-            io.entgra.device.mgt.core.apimgt.extension.rest.api.bean.APIMConsumer.Application application = getApplication(clientName, owner);
+            io.entgra.device.mgt.core.apimgt.extension.rest.api.bean.APIMConsumer.Application application =
+                    getApplication(clientName, requestingUserAccessToken);
             String applicationUUID = application.getApplicationId();
 
             // do app key mapping