[Fixes #13672] Update group role at each login via oAuth (#13673)

* [Fixes #13672] refresh group detail on login

---------

Co-authored-by: G.Allegri <[email protected]>

Author: sijandh35

geonode/people/adapters.py

@@ -279,6 +279,29 @@ def handle_user_invalid_email(user):
 ID_TOKEN_ISSUER = getattr(settings, "SOCIALACCOUNT_PROVIDERS", {}).get(PROVIDER_ID, {}).get("ID_TOKEN_ISSUER", "")
 
 
+def _update_user_groups_from_social(sociallogin, user):
+    extractor = get_data_extractor(sociallogin.account.provider)
+    group_role_mapper = get_group_role_mapper(sociallogin.account.provider)
+    try:
+        groups = extractor.extract_groups(sociallogin.account.extra_data) or extractor.extract_roles(
+            sociallogin.account.extra_data
+        )
+
+        # check here if user is member already of other groups and remove it form the ones that are not declared here...
+        for groupprofile in user.group_list_all():
+            groupprofile.leave(user)
+        for group_role_name in groups:
+            group_name, role_name = group_role_mapper.parse_group_and_role(group_role_name)
+            groupprofile = GroupProfile.objects.filter(slug=group_name).first()
+            if groupprofile:
+                groupprofile.join(user)
+                if group_role_mapper.is_manager(role_name):
+                    groupprofile.promote(user)
+    except (AttributeError, NotImplementedError):
+        pass  # extractor doesn't define a method for extracting field
+    return user
+
+
 class GenericOpenIDConnectAdapter(OAuth2Adapter, SocialAccountAdapter):
     provider_id = PROVIDER_ID
     access_token_url = ACCESS_TOKEN_URL
@@ -347,23 +370,12 @@ def complete_login(self, request, app, token, response, **kwargs):
 
     def save_user(self, request, sociallogin, form=None):
         user = super(SocialAccountAdapter, self).save_user(request, sociallogin, form=form)
-        extractor = get_data_extractor(sociallogin.account.provider)
-        group_role_mapper = get_group_role_mapper(sociallogin.account.provider)
-        try:
-            groups = extractor.extract_groups(sociallogin.account.extra_data) or extractor.extract_roles(
-                sociallogin.account.extra_data
-            )
-
-            # check here if user is member already of other groups and remove it form the ones that are not declared here...
-            for groupprofile in user.group_list_all():
-                groupprofile.leave(user)
-            for group_role_name in groups:
-                group_name, role_name = group_role_mapper.parse_group_and_role(group_role_name)
-                groupprofile = GroupProfile.objects.filter(slug=group_name).first()
-                if groupprofile:
-                    groupprofile.join(user)
-                    if group_role_mapper.is_manager(role_name):
-                        groupprofile.promote(user)
-        except (AttributeError, NotImplementedError):
-            pass  # extractor doesn't define a method for extracting field
+        user = _update_user_groups_from_social(sociallogin, user)
         return user
+
+    def pre_social_login(self, request, sociallogin):
+        """update user groups on each social login"""
+        super().pre_social_login(request, sociallogin)
+        user = sociallogin.user
+        if user.pk:
+            _update_user_groups_from_social(sociallogin, user)