feat: Add preset shift templates, admin SMTP settings, test email dispatch, and email verification opt-out option
This commit is contained in:
+143
-10
@@ -3,15 +3,67 @@ from rest_framework.response import Response
|
||||
from rest_framework.authtoken.models import Token
|
||||
from django.contrib.auth import authenticate, get_user_model
|
||||
from django.shortcuts import get_object_or_404
|
||||
from .models import RegistrationDomainRule, RegistrationRestrictionSetting, GuestClaimToken, EmailVerificationToken
|
||||
from django.core.mail import get_connection, EmailMultiAlternatives
|
||||
from .models import RegistrationDomainRule, RegistrationRestrictionSetting, GuestClaimToken, EmailVerificationToken, SMTPSetting
|
||||
from .serializers import (
|
||||
UserSerializer, AdminUserSerializer, RegisterSerializer,
|
||||
RegistrationDomainRuleSerializer, RegistrationRestrictionSettingSerializer
|
||||
RegistrationDomainRuleSerializer, RegistrationRestrictionSettingSerializer, SMTPSettingSerializer
|
||||
)
|
||||
from apps.events.models import ShiftSignup
|
||||
|
||||
User = get_user_model()
|
||||
|
||||
def send_verification_email_to_user(user, v_token_str, request_host=None):
|
||||
smtp = SMTPSetting.get_solo()
|
||||
host_str = request_host or 'localhost:3000'
|
||||
verify_url = f"http://{host_str}/?verify_email={v_token_str}"
|
||||
|
||||
subject = "E-Mail-Adresse bestätigen — Veranstaltungsschichtplaner"
|
||||
text_content = f"Hallo {user.get_display_name()},\n\nbitte bestätige deine E-Mail-Adresse durch Aufruf des folgenden Links:\n{verify_url}\n\nVielen Dank!"
|
||||
html_content = f"""
|
||||
<div style="font-family: sans-serif; padding: 20px; line-height: 1.6; color: #1f2937;">
|
||||
<h2 style="color: #4f46e5;">Willkommen beim Schichtplaner!</h2>
|
||||
<p>Hallo <strong>{user.get_display_name()}</strong>,</p>
|
||||
<p>vielen Dank für deine Registrierung. Bitte bestätige deine E-Mail-Adresse durch Klick auf den folgenden Button:</p>
|
||||
<p style="margin: 25px 0;">
|
||||
<a href="{verify_url}" style="background: #4f46e5; color: #ffffff; padding: 12px 24px; text-decoration: none; border-radius: 6px; font-weight: bold; display: inline-block;">
|
||||
E-Mail-Adresse Bestätigen
|
||||
</a>
|
||||
</p>
|
||||
<p style="color: #6b7280; font-size: 12px;">Oder kopiere diesen Link in deinen Browser:<br><a href="{verify_url}">{verify_url}</a></p>
|
||||
</div>
|
||||
"""
|
||||
|
||||
print("==================================================")
|
||||
print(f"[E-MAIL BESTÄTIGUNG]: {verify_url}")
|
||||
print("==================================================")
|
||||
|
||||
if smtp.is_active and smtp.host:
|
||||
try:
|
||||
connection = get_connection(
|
||||
host=smtp.host,
|
||||
port=smtp.port,
|
||||
username=smtp.username,
|
||||
password=smtp.password,
|
||||
use_tls=smtp.use_tls,
|
||||
use_ssl=smtp.use_ssl,
|
||||
fail_silently=False,
|
||||
)
|
||||
msg = EmailMultiAlternatives(
|
||||
subject=subject,
|
||||
body=text_content,
|
||||
from_email=smtp.from_email or 'noreply@schichtplaner.local',
|
||||
to=[user.email],
|
||||
connection=connection
|
||||
)
|
||||
msg.attach_alternative(html_content, "text/html")
|
||||
msg.send()
|
||||
return True, "E-Mail erfolgreich versendet."
|
||||
except Exception as e:
|
||||
return False, f"SMTP-Fehler: {str(e)}"
|
||||
|
||||
return True, "Bestätigungslink in Konsole ausgegeben."
|
||||
|
||||
class AdminUserViewSet(viewsets.ModelViewSet):
|
||||
queryset = User.objects.all().order_by('-date_joined')
|
||||
serializer_class = AdminUserSerializer
|
||||
@@ -70,16 +122,47 @@ class RegisterView(views.APIView):
|
||||
signup.save()
|
||||
assigned_count += 1
|
||||
|
||||
v_token = EmailVerificationToken.objects.create(user=user)
|
||||
print("==================================================")
|
||||
print(f"[E-MAIL BESTÄTIGUNG]: http://localhost:3000/?verify_email={v_token.token}")
|
||||
print("==================================================")
|
||||
if setting.require_email_verification:
|
||||
user.is_approved = False
|
||||
user.is_email_verified = False
|
||||
user.is_active = True
|
||||
user.save()
|
||||
|
||||
v_token = EmailVerificationToken.objects.create(user=user)
|
||||
req_host = request.get_host()
|
||||
send_verification_email_to_user(user, str(v_token.token), request_host=req_host)
|
||||
|
||||
return Response({
|
||||
'requires_verification': True,
|
||||
'verification_token': str(v_token.token),
|
||||
'claimed_shifts_count': assigned_count,
|
||||
'message': 'Konto erfolgreich erstellt! Bitte bestätige deine E-Mail-Adresse über den Link in der Bestätigungs-E-Mail oder warte auf die Admin-Freischaltung.'
|
||||
}, status=status.HTTP_201_CREATED)
|
||||
|
||||
# Opt-Out: Email verification not required!
|
||||
user.is_email_verified = True
|
||||
|
||||
if setting.require_admin_approval:
|
||||
user.is_approved = False
|
||||
user.is_active = False
|
||||
user.save()
|
||||
return Response({
|
||||
'requires_approval': True,
|
||||
'claimed_shifts_count': assigned_count,
|
||||
'message': 'Konto erfolgreich registriert! Ein Administrator muss dein Konto vor der ersten Anmeldung freischalten.'
|
||||
}, status=status.HTTP_201_CREATED)
|
||||
|
||||
user.is_approved = True
|
||||
user.is_active = True
|
||||
user.save()
|
||||
|
||||
token, _ = Token.objects.get_or_create(user=user)
|
||||
user_data = UserSerializer(user).data
|
||||
return Response({
|
||||
'requires_verification': True,
|
||||
'verification_token': str(v_token.token),
|
||||
'token': token.key,
|
||||
'user': user_data,
|
||||
'claimed_shifts_count': assigned_count,
|
||||
'message': 'Konto erfolgreich erstellt! Bitte bestätige deine E-Mail-Adresse über den Link in der Bestätigungs-E-Mail oder warte auf die Admin-Freischaltung.'
|
||||
'message': f'Konto erfolgreich erstellt! {assigned_count} Gast-Schichten wurden deinem Konto zugewiesen.' if assigned_count > 0 else 'Konto erfolgreich erstellt!'
|
||||
}, status=status.HTTP_201_CREATED)
|
||||
|
||||
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
|
||||
@@ -218,6 +301,7 @@ class RegistrationRestrictionSettingView(views.APIView):
|
||||
return Response({
|
||||
'is_restriction_enabled': setting.is_restriction_enabled,
|
||||
'require_admin_approval': setting.require_admin_approval,
|
||||
'require_email_verification': setting.require_email_verification,
|
||||
'active_domains': active_domains
|
||||
})
|
||||
|
||||
@@ -227,12 +311,61 @@ class RegistrationRestrictionSettingView(views.APIView):
|
||||
setting.is_restriction_enabled = request.data['is_restriction_enabled']
|
||||
if 'require_admin_approval' in request.data:
|
||||
setting.require_admin_approval = request.data['require_admin_approval']
|
||||
if 'require_email_verification' in request.data:
|
||||
setting.require_email_verification = request.data['require_email_verification']
|
||||
setting.save()
|
||||
return Response({
|
||||
'is_restriction_enabled': setting.is_restriction_enabled,
|
||||
'require_admin_approval': setting.require_admin_approval
|
||||
'require_admin_approval': setting.require_admin_approval,
|
||||
'require_email_verification': setting.require_email_verification
|
||||
})
|
||||
|
||||
class SMTPSettingView(views.APIView):
|
||||
permission_classes = [permissions.IsAdminUser]
|
||||
|
||||
def get(self, request):
|
||||
setting = SMTPSetting.get_solo()
|
||||
return Response(SMTPSettingSerializer(setting).data)
|
||||
|
||||
def post(self, request):
|
||||
setting = SMTPSetting.get_solo()
|
||||
serializer = SMTPSettingSerializer(setting, data=request.data, partial=True)
|
||||
if serializer.is_valid():
|
||||
serializer.save()
|
||||
return Response(serializer.data)
|
||||
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
|
||||
|
||||
class TestSMTPEmailView(views.APIView):
|
||||
permission_classes = [permissions.IsAdminUser]
|
||||
|
||||
def post(self, request):
|
||||
smtp = SMTPSetting.get_solo()
|
||||
target_email = request.data.get('email') or request.user.email
|
||||
if not target_email:
|
||||
return Response({'error': 'E-Mail-Adresse erforderlich.'}, status=status.HTTP_400_BAD_REQUEST)
|
||||
|
||||
try:
|
||||
connection = get_connection(
|
||||
host=smtp.host,
|
||||
port=smtp.port,
|
||||
username=smtp.username,
|
||||
password=smtp.password,
|
||||
use_tls=smtp.use_tls,
|
||||
use_ssl=smtp.use_ssl,
|
||||
fail_silently=False,
|
||||
)
|
||||
msg = EmailMultiAlternatives(
|
||||
subject="Test E-Mail — SMTP Konfiguration",
|
||||
body=f"Hallo,\n\ndies ist eine Test-E-Mail zur Überprüfung der SMTP-Einstellungen für {request.user.get_display_name()}.",
|
||||
from_email=smtp.from_email or 'noreply@schichtplaner.local',
|
||||
to=[target_email],
|
||||
connection=connection
|
||||
)
|
||||
msg.send()
|
||||
return Response({'message': f'Test E-Mail erfolgreich an {target_email} gesendet!'})
|
||||
except Exception as e:
|
||||
return Response({'error': f'SMTP-Verbindungsfehler: {str(e)}'}, status=status.HTTP_400_BAD_REQUEST)
|
||||
|
||||
class PendingUsersView(views.APIView):
|
||||
permission_classes = [permissions.IsAdminUser]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user