Fix/issue 142

backend/dataall/api/Objects/Environment/queries.py

@@ -116,16 +116,6 @@
     resolver=list_environment_invited_groups,
 )
 
-listEnvironmentNotInvitedGroups = gql.QueryField(
-    name='listEnvironmentNotInvitedGroups',
-    type=gql.Ref('GroupSearchResult'),
-    args=[
-        gql.Argument(name='environmentUri', type=gql.NonNullableType(gql.String)),
-        gql.Argument(name='filter', type=gql.Ref('GroupFilter')),
-    ],
-    resolver=list_environment_not_invited_groups,
-)
-
 listEnvironmentGroups = gql.QueryField(
     name='listEnvironmentGroups',
     type=gql.Ref('GroupSearchResult'),

backend/dataall/api/Objects/Environment/resolvers.py

@@ -168,22 +168,6 @@ def list_environment_invited_groups(
         )
 
 
-def list_environment_not_invited_groups(
-    context: Context, source, environmentUri=None, filter=None
-):
-    if filter is None:
-        filter = {}
-    with context.engine.scoped_session() as session:
-        return db.api.Environment.not_environment_groups(
-            session=session,
-            username=context.username,
-            groups=context.groups,
-            uri=environmentUri,
-            data=filter,
-            check_perm=True,
-        )
-
-
 def list_environment_groups(context: Context, source, environmentUri=None, filter=None):
     if filter is None:
         filter = {}

backend/dataall/api/Objects/Group/input_types.py

@@ -8,3 +8,11 @@
         gql.Argument(name='pageSize', type=gql.Integer),
     ],
 )
+
+CognitoGroupFilter = gql.InputType(
+    name='CognitoGroupFilter',
+    arguments=[
+        gql.Argument(name='type', type=gql.String),
+        gql.Argument(name='uri', type=gql.String),
+    ],
+)

backend/dataall/api/Objects/Group/queries.py

@@ -1,5 +1,5 @@
 from ... import gql
-from .resolvers import get_group, list_datasets_owned_by_env_group, list_data_items_shared_with_env_group
+from .resolvers import get_group, list_datasets_owned_by_env_group, list_data_items_shared_with_env_group, list_cognito_groups
 
 getGroup = gql.QueryField(
     name='getGroup',
@@ -33,3 +33,12 @@
     type=gql.Ref('EnvironmentPublishedItemSearchResults'),
     test_scope='Dataset',
 )
+
+listCognitoGroups = gql.QueryField(
+    name='listCognitoGroups',
+    args=[
+        gql.Argument(name='filter', type=gql.Ref('CognitoGroupFilter')),
+    ],
+    type=gql.ArrayType(gql.Ref('CognitoGroup')),
+    resolver=list_cognito_groups
+)

backend/dataall/api/Objects/Group/resolvers.py

@@ -1,7 +1,12 @@
+import os
+import logging
 from .... import db
 from ....db import exceptions
 from ....db.models import Group
-from ...constants import *
+from ....aws.handlers.cognito import Cognito
+
+
+log = logging.getLogger()
 
 
 def resolve_group_environment_permissions(context, source, environmentUri):
@@ -70,3 +75,36 @@ def list_data_items_shared_with_env_group(
             data=filter,
             check_perm=True,
         )
+
+
+def list_cognito_groups(context, source, filter: dict = None):
+    envname = os.getenv('envname', 'local')
+    if envname in ['dkrcompose']:
+        return [{"groupName": 'Docker'}]
+    current_region = os.getenv('AWS_REGION', 'eu-west-1')
+    groups = Cognito.list_cognito_groups(envname=envname, region=current_region)
+    category, category_uri = filter.get("type"), filter.get("uri")
+    if category and category_uri:
+        if category == 'environment':
+            with context.engine.scoped_session() as session:
+                invited_groups = db.api.Environment.query_all_environment_groups(
+                    session=session,
+                    username=context.username,
+                    groups=context.groups,
+                    uri=category_uri,
+                    filter=None,
+                ).all()
+        if category == 'organization':
+            with context.engine.scoped_session() as session:
+                organization = db.api.Organization.get_organization_by_uri(session, category_uri)
+                invited_groups = db.api.Organization.query_organization_groups(
+                    session=session,
+                    uri=organization.organizationUri,
+                    filter=None,
+                ).all()
+    invited_group_uris = [item.groupUri for item in invited_groups]
+    res = []
+    for group in groups:
+        if group['GroupName'] not in invited_group_uris:
+            res.append({"groupName": group['GroupName']})
+    return res

backend/dataall/api/Objects/Group/schema.py

@@ -46,3 +46,10 @@
         gql.Field(name='nodes', type=gql.ArrayType(Group)),
     ],
 )
+
+CognitoGroup = gql.ObjectType(
+    name='CognitoGroup',
+    fields=[
+        gql.Field(name='groupName', type=gql.String),
+    ],
+)

backend/dataall/api/Objects/Organization/queries.py

@@ -33,16 +33,6 @@
     resolver=list_organization_invited_groups,
 )
 
-listOrganizationNotInvitedGroups = gql.QueryField(
-    name='listOrganizationNotInvitedGroups',
-    type=gql.Ref('GroupSearchResult'),
-    args=[
-        gql.Argument(name='organizationUri', type=gql.NonNullableType(gql.String)),
-        gql.Argument(name='filter', type=gql.Ref('GroupFilter')),
-    ],
-    resolver=list_organization_not_invited_groups,
-)
-
 listOrganizationGroups = gql.QueryField(
     name='listOrganizationGroups',
     type=gql.Ref('GroupSearchResult'),

backend/dataall/api/Objects/Organization/resolvers.py

@@ -161,22 +161,6 @@ def list_organization_invited_groups(
         )
 
 
-def list_organization_not_invited_groups(
-    context: Context, source, organizationUri=None, filter=None
-):
-    if filter is None:
-        filter = {}
-    with context.engine.scoped_session() as session:
-        return db.api.Organization.not_organization_groups(
-            session=session,
-            username=context.username,
-            groups=context.groups,
-            uri=organizationUri,
-            data=filter,
-            check_perm=True,
-        )
-
-
 def list_organization_groups(
     context: Context, source, organizationUri=None, filter=None
 ):

backend/dataall/aws/handlers/cognito.py

@@ -0,0 +1,29 @@
+import logging
+import boto3
+
+from .sts import SessionHelper
+
+
+log = logging.getLogger(__name__)
+
+
+class Cognito:
+    @staticmethod
+    def client(account_id: str, region_name: str, client_type: str):
+        session = SessionHelper.remote_session(account_id)
+        return session.client(client_type, region_name=region_name)
+
+    @staticmethod
+    def list_cognito_groups(envname: str, region: str):
+        try:
+            parameter_path = f'/dataall/{envname}/cognito/userpool'
+            ssm = boto3.client('ssm', region_name=region)
+            user_pool_id = ssm.get_parameter(Name=parameter_path)['Parameter']['Value']
+            cognito = boto3.client('cognito-idp', region_name=region)
+            groups = cognito.list_groups(UserPoolId=user_pool_id)['Groups']
+        except Exception as e:
+            log.error(
+                f'Failed to list groups of user pool {user_pool_id} due to {e}'
+            )
+        else:
+            return groups

backend/dataall/aws/handlers/ecs.py

@@ -9,7 +9,7 @@
 from ... import db
 from ...db import models
 from ...utils import Parameter
-from ...tasks.share_manager import ShareManager
+from ...tasks.data_sharing.data_sharing_service import DataSharingService
 
 log = logging.getLogger('aws:ecs')
 
@@ -23,7 +23,7 @@ def __init__(self):
     def approve_share(engine, task: models.Task):
         envname = os.environ.get('envname', 'local')
         if envname in ['local', 'dkrcompose']:
-            return ShareManager.approve_share(engine, task.targetUri)
+            return DataSharingService.approve_share(engine, task.targetUri)
         else:
             return Ecs.run_share_management_ecs_task(
                 envname, task.targetUri, 'approve_share'
@@ -34,7 +34,7 @@ def approve_share(engine, task: models.Task):
     def reject_share(engine, task: models.Task):
         envname = os.environ.get('envname', 'local')
         if envname in ['local', 'dkrcompose']:
-            return ShareManager.reject_share(engine, task.targetUri)
+            return DataSharingService.reject_share(engine, task.targetUri)
         else:
             return Ecs.run_share_management_ecs_task(
                 envname, task.targetUri, 'reject_share'