cleanup and small improvement

dojo/group/utils.py

@@ -2,7 +2,7 @@
 from django.contrib.auth.models import Group
 from django.db.models.signals import post_save, post_delete
 from django.dispatch import receiver
-from dojo.models import Dojo_Group, Dojo_Group_Member, Role
+from dojo.models import Dojo_Group, Dojo_Group_Member, Role, Dojo_User
 from django.conf import settings
 
 
@@ -41,7 +41,8 @@ def group_post_save_handler(sender, **kwargs):
         group.save()
 
         user = get_current_user()
-        if user and not settings.AZUREAD_TENANT_OAUTH2_GET_GROUPS and not settings.KEYCLOAK_TENANT_OAUTH2_GET_GROUPS:
+        if user and isinstance(user, Dojo_User):
+        #if user and not settings.AZUREAD_TENANT_OAUTH2_GET_GROUPS and not settings.KEYCLOAK_TENANT_OAUTH2_GET_GROUPS:
             # Add the current user as the owner of the group
             member = Dojo_Group_Member()
             member.user = user

dojo/pipeline.py

@@ -68,15 +68,11 @@ def modify_permissions(backend, uid, user=None, social=None, *args, **kwargs):
 
 def update_keycloak_groups(backend, uid, user=None, social=None, *args, **kwargs):
     if settings.KEYCLOAK_OAUTH2_ENABLED and settings.KEYCLOAK_TENANT_OAUTH2_GET_GROUPS and isinstance(backend, OpenIdConnectAuth):
-        soc = user.social_auth.order_by("-created").first()
-        token = soc.extra_data['access_token']
-        #print("accesstoken: " + str(token))
-        #print("response raw: " + str(kwargs['response']))
         group_names = []
         if 'groups' not in kwargs['response'] or kwargs['response']['groups'] == "":
             logger.warning("No groups in response. Stopping to update groups of user based on azureAD")
             return
-        group_ids = kwargs['response']['groups'] # probably need another setting with a regex ?
+        group_ids = kwargs['response']['groups']
         for group_from_response in group_ids:
             if settings.KEYCLOAK_TENANT_OAUTH2_GROUPS_FILTER == "" or re.search(settings.KEYCLOAK_TENANT_OAUTH2_GROUPS_FILTER, group_from_response):
                 group_names.append(group_from_response)