yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-03 23:29:15 +02:00
Code Issues Releases Wiki Activity

See #1039: resend confirmation email on login if email is unverified

Browse source
This commit is contained in:
Eliot Berriot 2020-04-01 15:24:40 +02:00
parent 372bd4a6ee
commit b07bd83fa1
No known key found for this signature in database
GPG key ID: 6B501DFD73514E14
9 changed files with 82 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
api/funkwhale_api/users/serializers.py
View file

@ -7,8 +7,10 @@ from django.utils.translation import gettext_lazy as _
from rest_auth.serializers import PasswordResetSerializer as PRS
from rest_auth.registration.serializers import RegisterSerializer as RS, get_adapter
from rest_framework import serializers
from rest_framework_jwt import serializers as jwt_serializers
from funkwhale_api.activity import serializers as activity_serializers
from funkwhale_api.common import authentication
from funkwhale_api.common import models as common_models
from funkwhale_api.common import preferences
from funkwhale_api.common import serializers as common_serializers
@ -36,6 +38,15 @@ username_validators = [ASCIIUsernameValidator()]
NOOP = object()
class JSONWebTokenSerializer(jwt_serializers.JSONWebTokenSerializer):
def validate(self, data):
try:
return super().validate(data)
except authentication.UnverifiedEmail as e:
authentication.send_email_confirmation(self.context["request"], e.user)
raise serializers.ValidationError("Please verify your email address.")
class RegisterSerializer(RS):
invitation = serializers.CharField(
required=False, allow_null=True, allow_blank=True