minor tweaks

Author: apdavison

validation_service_api/validation_service/auth.py

@@ -119,7 +119,6 @@ async def _has_role(self, role, collab_name, client):
                                  # for robustness, perhaps just log
         for user in res.json():
             if self.username == user["username"]:
-                print(collab_name)
                 return True
         return False
 
@@ -138,7 +137,9 @@ async def get_teams(self):
                 item["name"] for item in res.json()
                 if not (
                     item["name"].startswith("d-")  # ignore dataset collabs
+                    or item["name"].startswith("m-")  # ignore model collabs
                     or item["name"].startswith("nmc-test")  # ignore NMC test collabs
+                    or item["name"].startswith("nmc-gd2022-guest")
                 )
             )
             for role in ("administrator", "editor"):
@@ -173,7 +174,13 @@ def get_person(self, kg_client):
         identity = self.get_identity()
         family_name = identity["family_name"]
         given_name = identity["given_name"]
-        person = omcore.Person.list(kg_client, family_name=family_name, given_name=given_name, release_status="any")
+        person = omcore.Person.list(
+            kg_client,
+            family_name=family_name,
+            given_name=given_name,
+            release_status="any",
+            space="common"
+        )
         if person:
             if isinstance(person, list):
                 if len(person) > 1:

validation_service_api/validation_service/resources/auth.py

@@ -68,6 +68,7 @@ async def list_projects(
                 )
             else:
                 raise
+        print(teams)   # for debugging
         projects = {}
         for role in teams:
             if role.startswith("collab-"):