Using logged user email as fallback to Discord integration

renzon · renzon · commit 7873ed2c3680 · 2022-09-14T06:56:43.000-03:00
Fixed #4766
diff --git a/pythonpro/discord/tests/test_discord_integration.py b/pythonpro/discord/tests/test_discord_integration.py
@@ -23,6 +23,24 @@ def test_user_added_to_discord_server(client_with_user, logged_user, mocker):
     assert discord_user.discord_email == discord_user_api_response['email']
 
 
+def test_user_missing_email_added_to_discord_server(client_with_user, logged_user, mocker):
+    mocker.patch(
+        'pythonpro.discord.views.add_user_to_discord_server',
+        return_value={'user': discord_user_missing_email_api_response}
+    )
+    subscription_type = baker.make(SubscriptionType, has_discord_access=True)
+    baker.make(
+        Subscription,
+        status=Subscription.Status.ACTIVE,
+        subscriber=logged_user,
+        subscription_types=[subscription_type]
+    )
+    client_with_user.get(reverse('discord:autorize'), data={'code': 'xpto'})
+    discord_user_id = discord_user_api_response['id']
+    discord_user = DiscordUser.objects.get(discord_id=discord_user_id)
+    assert discord_user.discord_email == logged_user.email
+
+
 def test_user_updated_to_discord_server(client_with_user, logged_user, mocker):
     mocker.patch(
         'pythonpro.discord.views.add_user_to_discord_server',
@@ -71,6 +89,22 @@ def test_user_without_subscription_access_not_added_to_discord_server(client_wit
     assert response.status_code == 403
 
 
+discord_user_missing_email_api_response = {
+    'id': '800764510645256242',
+    'username': 'renzopro',
+    'avatar': '824db4a9821e21f2609e03e5815c23c0',
+    'avatar_decoration': None,
+    'discriminator': '3978',
+    'public_flags': 0,
+    'flags': 0,
+    'banner': None,
+    'banner_color': None,
+    'accent_color': None,
+    'locale': 'pt-BR',
+    'mfa_enabled': True,
+    'verified': True
+}
+
 discord_user_api_response = {
     'id': '800764510645256242',
     'username': 'renzopro',
diff --git a/pythonpro/discord/views.py b/pythonpro/discord/views.py
@@ -24,7 +24,7 @@ def autorize(request):
         discord_user_dict = member['user']
         defaults = {
             'discord_id': discord_user_dict['id'],
-            'discord_email': discord_user_dict['email'],
+            'discord_email': discord_user_dict.get('email', user.email),
             'user': user
         }
         DiscordUser.objects.update_or_create(user=user, defaults=defaults)

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ def autorize(request):`
`24`	`24`	`discord_user_dict = member['user']`
`25`	`25`	`defaults = {`
`26`	`26`	`'discord_id': discord_user_dict['id'],`
`27`		`- 'discord_email': discord_user_dict['email'],`
	`27`	`+ 'discord_email': discord_user_dict.get('email', user.email),`
`28`	`28`	`'user': user`
`29`	`29`	`}`
`30`	`30`	`DiscordUser.objects.update_or_create(user=user, defaults=defaults)`