Self hosted FLOSS fitness/workout, nutrition and weight tracker
Make accessing the user's allauth email more robust
Roland Geider357e2c943ff7
diff --git a/wger/core/api/serializers.py b/wger/core/api/serializers.pyindex 31ab7b7a6..fa01c23f8 100644--- a/wger/core/api/serializers.py+++ b/wger/core/api/serializers.py@@ -50,7 +50,7 @@ class UserprofileSerializer(serializers.ModelSerializer):email = serializers.EmailField(source='user.email', read_only=True)username = serializers.EmailField(source='user.username', read_only=True)date_joined = serializers.EmailField(source='user.date_joined', read_only=True)- email_verified = serializers.SerializerMethodField()+ email_verified = serializers.BooleanField(source='is_verified', read_only=True)class Meta:model = UserProfile@@ -88,16 +88,6 @@ class UserprofileSerializer(serializers.ModelSerializer):'num_days_weight_reminder',)- def get_email_verified(self, obj):- """- Check Allauth's EmailAddress table for the verification status- """- try:- email_obj = EmailAddress.objects.get_for_user(user=obj.user, email=obj.user.email)- return email_obj.verified- except EmailAddress.DoesNotExist:- return False-class UserLoginSerializer(serializers.ModelSerializer):"""Serializer to map to User model in relation to api user"""diff --git a/wger/core/api/views.py b/wger/core/api/views.pyindex 34642cc38..11f45b77d 100644--- a/wger/core/api/views.py+++ b/wger/core/api/views.py@@ -159,10 +159,13 @@ class UserProfileViewSet(viewsets.ModelViewSet):@action(detail=False, url_name='verify-email', url_path='verify-email')def verify_email(self, request):"""- Return the username+ Verify the user's email address"""+ email_obj = request.user.userprofile.get_allauth_email++ if email_obj is None:+ return Response({'result': 'not sent', 'message': 'The user has no associated email'})- email_obj = EmailAddress.objects.get_for_user(request.user, request.user.email)if email_obj.verified:return Response({'status': 'verified', 'message': 'This email is already verified'})diff --git a/wger/core/models/profile.py b/wger/core/models/profile.pyindex 674b987eb..50128afee 100644--- a/wger/core/models/profile.py+++ b/wger/core/models/profile.py@@ -381,6 +381,18 @@ by the US Department of Agriculture. It is extremely complete, with around)"""Flag to enable or disable trophies for this user"""+ @property+ def get_allauth_email(self) -> EmailAddress | None:+ try:+ return EmailAddress.objects.get_for_user(user=self.user, email=self.user.email)+ except EmailAddress.DoesNotExist:+ return None++ @property+ def is_verified(self) -> bool:+ email_obj = self.get_allauth_email+ return email_obj is not None and email_obj.verified+@propertydef is_trustworthy(self) -> bool:"""@@ -401,9 +413,7 @@ by the US Department of Agriculture. It is extremely complete, with arounddays_since_joined = datetime.date.today() - self.user.date_joined.date()minimum_account_age = settings.WGER_SETTINGS['MIN_ACCOUNT_AGE_TO_TRUST']- email_obj = EmailAddress.objects.get_for_user(user=self.user, email=self.user.email)-- return days_since_joined.days > minimum_account_age and email_obj.verified+ return days_since_joined.days > minimum_account_age and self.is_verified@propertydef weight(self):diff --git a/wger/core/views/user.py b/wger/core/views/user.pyindex d64209b42..33f0a3f77 100644--- a/wger/core/views/user.py+++ b/wger/core/views/user.py@@ -275,7 +275,13 @@ def registration(request):django_login(request, user)# Email the user with the activation link- EmailAddress.objects.add_email(request, request.user, request.user.email, confirm=True)+ if email:+ EmailAddress.objects.add_email(+ request,+ request.user,+ request.user.email,+ confirm=True,+ )# Redirect to the dashboardmessages.success(request, _('You were successfully registered'))@@ -301,7 +307,7 @@ def preferences(request):context.update(csrf(request))redirect = False- email_obj = EmailAddress.objects.get_for_user(request.user, request.user.email)+ email_verified = request.user.userprofile.is_verified# Process the preferences formif request.method == 'POST':@@ -345,7 +351,7 @@ def preferences(request):redirect = Falsecontext['form'] = form- context['email_verified'] = email_obj.verified+ context['email_verified'] = email_verifiedif redirect:messages.success(request, _('Settings successfully updated'))