Skip to content

Commit

Permalink
[Fixes #10830] Reset password rises 502 gatweay error if any error oc…
Browse files Browse the repository at this point in the history
…curs
  • Loading branch information
afabiani committed Mar 22, 2023
1 parent 8212636 commit de062c0
Showing 1 changed file with 24 additions and 16 deletions.
40 changes: 24 additions & 16 deletions geonode/people/adapters.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@

from invitations.adapters import BaseInvitationsAdapter

from django.conf import settings
from django.core.exceptions import ValidationError
from django.urls import reverse
from django.conf import settings
from django.contrib import messages
from django.http import HttpResponseRedirect
from django.core.exceptions import ValidationError
from django.utils.module_loading import import_string

# from django.contrib.auth.models import Group
from geonode.groups.models import GroupProfile

logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -132,25 +132,33 @@ def send_invitation_email(self, email_template, email, context):
def send_mail(self, template_prefix, email, context):
enh_context = self.enhanced_invitation_context(context)
msg = self.render_mail(template_prefix, email, enh_context)
msg.send()
try:
msg.send()
except Exception as e:
logger.exception(e)
messages.warning(context.get("request"), f"An error occurred while trying to send the email: {e}")

def enhanced_invitation_context(self, context):
user = context.get("inviter") if context.get("inviter") else context.get("user")
full_name = " ".join((user.first_name, user.last_name)) if user.first_name or user.last_name else None
user_groups = GroupProfile.objects.filter(slug__in=user.groupmember_set.values_list("group__slug", flat=True))
enhanced_context = context.copy()
enhanced_context.update(
{
"username": user.username,
"inviter_name": full_name or str(user),
"inviter_first_name": user.first_name or str(user),
"inviter_id": user.id,
"groups": user_groups,
"MEDIA_URL": settings.MEDIA_URL,
"SITEURL": settings.SITEURL,
"STATIC_URL": settings.STATIC_URL,
}
{"MEDIA_URL": settings.MEDIA_URL, "SITEURL": settings.SITEURL, "STATIC_URL": settings.STATIC_URL}
)
if user:
full_name = " ".join((user.first_name, user.last_name)) if user.first_name or user.last_name else None
user_groups = GroupProfile.objects.filter(
slug__in=user.groupmember_set.values_list("group__slug", flat=True)
)
enhanced_context = context.copy()
enhanced_context.update(
{
"username": user.username,
"inviter_name": full_name or str(user),
"inviter_first_name": user.first_name or str(user),
"inviter_id": user.id,
"groups": user_groups,
}
)
return enhanced_context

def save_user(self, request, user, form, commit=True):
Expand Down

0 comments on commit de062c0

Please sign in to comment.