Merge pull request #3233 from jctanner/BACKPORT_GITHUB_USER_ID

Expose the true github ID in the v1 user serializer.

.github/workflows/ci_unit.yml

@@ -29,8 +29,8 @@ jobs:
       # - name: Install LDAP requirements
       #  run: sudo apt-get install -y libsasl2-dev python3 libldap2-dev libssl-dev build-essential
 
-      - name: Install docker-compose
-        run: pip3 install --upgrade docker-compose
+      # - name: Install docker-compose
+      #   run: pip3 install --upgrade docker-compose
 
       - name: build the image
         run: make dev/build

galaxy/api/serializers/users.py

@@ -3,6 +3,7 @@
 from collections import OrderedDict
 
 from allauth.account.models import EmailAddress
+from allauth.socialaccount.models import SocialAccount
 
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import AnonymousUser
@@ -18,7 +19,8 @@
 
 USER_FIELDS = (
     'id', 'url', 'related', 'summary_fields', 'created', 'modified',
-    'username', 'staff', 'full_name', 'date_joined', 'avatar_url'
+    'username', 'staff', 'full_name', 'date_joined', 'avatar_url',
+    'github_id'
 )
 
 __all__ = [
@@ -55,6 +57,7 @@ def get_primary_email(self, obj):
 
 class UserSerializer(BaseSerializer):
     staff = serializers.ReadOnlyField(source='is_staff')
+    github_id = serializers.SerializerMethodField()
 
     class Meta:
         model = User
@@ -93,3 +96,9 @@ def get_summary_fields(self, obj):
                 ('github_repo', g.repository.github_repo)
             ]) for g in obj.starred.select_related('repository').all()]
         return d
+
+    def get_github_id(self, obj):
+        social_user = SocialAccount.objects.filter(user_id=obj.id).first()
+        if social_user is None:
+            return None
+        return social_user.extra_data.get('id')