Merge pull request #311 from whitesmith/connect-social

Connect social account when email exists

hawkpost/settings/common.py

@@ -179,6 +179,8 @@
  }
 }
 
+SOCIALACCOUNT_ADAPTER = 'humans.adapter.SocialAccountAdapter'
+
 # Authentication Limits Config (AXES)
 AXES_FAILURE_LIMIT = 5
 AXES_COOLOFF_TIME = 1 # hour

hawkpost/templates/account/verified_email_required.html

@@ -10,7 +10,7 @@
  <section class="text-lightest">
  <div class="row center-xs center-sm">
  <div class="col-offset-xs-1 col-xs-10 col-offset-sm-2 col-xs-8">
- <h1 class="title text-lightest">{{% trans "VERIFY YOUR E-MAIL ADDRESS" %}</h1>
+ <h1 class="title text-lightest">{% trans "VERIFY YOUR E-MAIL ADDRESS" %}</h1>
 
  {% url 'account_email' as email_url %}
 

humans/adapter.py

@@ -0,0 +1,14 @@
+from allauth.account.models import EmailAddress
+from allauth.socialaccount.adapter import DefaultSocialAccountAdapter
+
+class SocialAccountAdapter(DefaultSocialAccountAdapter):
+ def pre_social_login(self, request, sociallogin):
+ if sociallogin.is_existing:
+ return
+
+ try:
+ email = EmailAddress.objects.get(email=sociallogin.user.email)
+ except EmailAddress.DoesNotExist:
+ return
+
+ sociallogin.connect(request, email.user)