[airavata-data-catalog] branch custos-integration updated: Fix super tenant query for resolving user

[machristie]

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

machristie pushed a commit to branch custos-integration
in repository https://gitbox.apache.org/repos/asf/airavata-data-catalog.git


The following commit(s) were added to refs/heads/custos-integration by this 
push:
     new 7d6349b  Fix super tenant query for resolving user
7d6349b is described below

commit 7d6349bab4b6fa27289b081cf01e2a510fc114a9
Author: Marcus Christie <machris...@apache.org>
AuthorDate: Tue May 9 18:11:51 2023 -0400

    Fix super tenant query for resolving user
---
 .../api/sharing/CustosTestDataBootstrap.java       | 23 +++++++++++++++-------
 .../api/sharing/SharingManagerImpl.java            |  4 ++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git 
a/data-catalog-api/server/custos-sharing/src/main/java/org/apache/airavata/datacatalog/api/sharing/CustosTestDataBootstrap.java
 
b/data-catalog-api/server/custos-sharing/src/main/java/org/apache/airavata/datacatalog/api/sharing/CustosTestDataBootstrap.java
index 02b26dc..6e17bb2 100644
--- 
a/data-catalog-api/server/custos-sharing/src/main/java/org/apache/airavata/datacatalog/api/sharing/CustosTestDataBootstrap.java
+++ 
b/data-catalog-api/server/custos-sharing/src/main/java/org/apache/airavata/datacatalog/api/sharing/CustosTestDataBootstrap.java
@@ -12,9 +12,11 @@ public class CustosTestDataBootstrap {
         // Super tenant
         // String clientId = System.getenv("CUSTOS_SUPER_CLIENT_ID");
         // String clientSec = System.getenv("CUSTOS_SUPER_CLIENT_SEC");
-        String childClientId = System.getenv("CUSTOS_CLIENT_ID");
+        // String childClientId = System.getenv("CUSTOS_CLIENT_ID");
+
         String clientId = System.getenv("CUSTOS_CLIENT_ID");
         String clientSec = System.getenv("CUSTOS_CLIENT_SEC");
+
         CustosClientProvider custosClientProvider = new 
CustosClientProvider.Builder().setServerHost("localhost")
                 .setServerPort(7000)
                 .setClientId(clientId) // client Id generated from above step 
or any active tenant id
@@ -23,13 +25,20 @@ public class CustosTestDataBootstrap {
                 .build();
         UserManagementClient userManagementClient = 
custosClientProvider.getUserManagementClient();
         String testUsername = "demouser";
-        // userManagementClient.registerUser(testUsername, "Demo", "User",
-        // "testpassword", "demou...@gmail.com", false);
-        // userManagementClient.enableUser(testUsername);
+        FindUsersResponse findUsersResponse = 
userManagementClient.findUser(testUsername, null, null, null, 0, 1);
+        if (findUsersResponse.getUsersCount() == 0) {
+            // Create an enable a demo user
+            System.out.println("Creating " + testUsername + " user in client " 
+ clientId);
+            userManagementClient.registerUser(testUsername, "Demo", "User",
+                    "testpassword", "demou...@gmail.com", false);
+            userManagementClient.enableUser(testUsername);
+            // Should find it now
+            findUsersResponse = userManagementClient.findUser(testUsername, 
null, null, null, 0, 1);
+        }
+        // Super tenant user query
         // FindUsersResponse findUsersResponse =
-        // userManagementClient.findUser(testUsername, null, null, null, 0, 1);
-        FindUsersResponse findUsersResponse = 
userManagementClient.findUser(childClientId, testUsername, null, null,
-                null, 0, 1);
+        // userManagementClient.findUsers(childClientId, null, testUsername, 
null,
+        // null, null, 0, 1);
         System.out.println("findUsersResponse=" + findUsersResponse);
     }
 
diff --git 
a/data-catalog-api/server/custos-sharing/src/main/java/org/apache/airavata/datacatalog/api/sharing/SharingManagerImpl.java
 
b/data-catalog-api/server/custos-sharing/src/main/java/org/apache/airavata/datacatalog/api/sharing/SharingManagerImpl.java
index 9bd3f18..fe96700 100644
--- 
a/data-catalog-api/server/custos-sharing/src/main/java/org/apache/airavata/datacatalog/api/sharing/SharingManagerImpl.java
+++ 
b/data-catalog-api/server/custos-sharing/src/main/java/org/apache/airavata/datacatalog/api/sharing/SharingManagerImpl.java
@@ -136,8 +136,8 @@ public class SharingManagerImpl implements SharingManager {
             return maybeUserEntity.get();
         } else {
             try (UserManagementClient userManagementClient = 
custosClientProvider.getUserManagementClient()) {
-                FindUsersResponse findUsersResponse = 
userManagementClient.findUser(userInfo.getTenantId(),
-                        userInfo.getUserId(), null, null, null, 0, 1);
+                FindUsersResponse findUsersResponse = 
userManagementClient.findUsers(userInfo.getTenantId(),
+                        null, userInfo.getUserId(), null, null, null, 0, 1);
                 if (!findUsersResponse.getUsersList().isEmpty()) {
                     UserRepresentation userProfile = 
findUsersResponse.getUsersList().get(0);
                     TenantEntity tenantEntity = resolveTenant(userInfo);