[airavata-custos] branch baremetal updated: Bug fix in resource manager

[isjarana]

This is an automated email from the ASF dual-hosted git repository.

isjarana pushed a commit to branch baremetal
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git


The following commit(s) were added to refs/heads/baremetal by this push:
     new ad776a506 Bug fix in resource manager
     new fba1118a6 Merge pull request #352 from isururanawaka/baremetal
ad776a506 is described below

commit ad776a506f9040f1899868845d7fad85b69f0a09
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Wed Feb 8 22:28:07 2023 -0500

    Bug fix in resource manager
---
 .../org/apache/custos/scim/resource/manager/ResourceManager.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git 
a/custos-services/custos-integration-services/scim-service/src/main/java/org/apache/custos/scim/resource/manager/ResourceManager.java
 
b/custos-services/custos-integration-services/scim-service/src/main/java/org/apache/custos/scim/resource/manager/ResourceManager.java
index ce4090abb..6ed685941 100644
--- 
a/custos-services/custos-integration-services/scim-service/src/main/java/org/apache/custos/scim/resource/manager/ResourceManager.java
+++ 
b/custos-services/custos-integration-services/scim-service/src/main/java/org/apache/custos/scim/resource/manager/ResourceManager.java
@@ -322,7 +322,8 @@ public class ResourceManager implements UserManager {
 
             if (token != null && token.getAccessToken() != null) {
 
-                FindUsersRequest findUsersRequest = 
FindUsersRequest.newBuilder().setAccessToken(token.getAccessToken())
+                FindUsersRequest findUsersRequest = 
FindUsersRequest.newBuilder()
+                        .setAccessToken(token.getAccessToken())
                         .setOffset(searchRequest.getStartIndex() - 1)
                         .setTenantId(tenant)
                         .setLimit(searchRequest.getCount())
@@ -337,11 +338,15 @@ public class ResourceManager implements UserManager {
                         throw new RuntimeException(e);
                     }
                 }).collect(Collectors.toList());
+                List<Object> users = new ArrayList<>();
+
+                users.add(userList.size());
 
                 for (UserRepresentation representation : 
userRep.getUsersList()) {
                     userList.add(convert(representation));
                 }
-                return userList;
+                users.addAll(userList);
+                return users;
             } else {
                 throw new CustosSCIMException("Invalid Credentials", new 
UnauthorizedException());
             }