From 6bc6f947dd5301f57f013cc3a246d61f8433c614 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Tue, 7 Jul 2020 15:36:25 +0200 Subject: [PATCH] stages/invitation: move invite signals from core to app --- passbook/admin/views/stages_invitations.py | 2 +- passbook/audit/signals.py | 53 +++++++++++++++------- passbook/core/signals.py | 2 - passbook/stages/invitation/signals.py | 5 ++ passbook/stages/invitation/stage.py | 2 + 5 files changed, 44 insertions(+), 20 deletions(-) create mode 100644 passbook/stages/invitation/signals.py diff --git a/passbook/admin/views/stages_invitations.py b/passbook/admin/views/stages_invitations.py index cfca9e5ae..f81bb28b9 100644 --- a/passbook/admin/views/stages_invitations.py +++ b/passbook/admin/views/stages_invitations.py @@ -11,10 +11,10 @@ from django.views.generic import ListView from guardian.mixins import PermissionListMixin, PermissionRequiredMixin from passbook.admin.views.utils import DeleteMessageView -from passbook.core.signals import invitation_created from passbook.lib.views import CreateAssignPermView from passbook.stages.invitation.forms import InvitationForm from passbook.stages.invitation.models import Invitation +from passbook.stages.invitation.signals import invitation_created class InvitationListView(LoginRequiredMixin, PermissionListMixin, ListView): diff --git a/passbook/audit/signals.py b/passbook/audit/signals.py index 1e30fea62..7dd97db0e 100644 --- a/passbook/audit/signals.py +++ b/passbook/audit/signals.py @@ -1,5 +1,6 @@ """passbook audit signal listener""" -from typing import Dict +from threading import Thread +from typing import Any, Dict, Optional from django.contrib.auth.signals import ( user_logged_in, @@ -11,21 +12,43 @@ from django.http import HttpRequest from passbook.audit.models import Event, EventAction from passbook.core.models import User -from passbook.core.signals import invitation_created, invitation_used, user_signed_up +from passbook.core.signals import user_signed_up +from passbook.stages.invitation.signals import invitation_created, invitation_used + +class EventNewThread(Thread): + """Create Event in background thread""" + + action: EventAction + request: HttpRequest + kwargs: Dict[str, Any] + user: Optional[User] + + def __init__(self, action: EventAction, request: HttpRequest, **kwargs): + super().__init__() + self.action = action + self.request = request + self.kwargs = kwargs + + def run(self): + Event.new(self.action, **self.kwargs).from_http(self.request, user=self.user) @receiver(user_logged_in) # pylint: disable=unused-argument def on_user_logged_in(sender, request: HttpRequest, user: User, **_): """Log successful login""" - Event.new(EventAction.LOGIN).from_http(request) + thread = EventNewThread(EventAction.LOGIN, request) + thread.user = user + thread.run() @receiver(user_logged_out) # pylint: disable=unused-argument def on_user_logged_out(sender, request: HttpRequest, user: User, **_): """Log successfully logout""" - Event.new(EventAction.LOGOUT).from_http(request) + thread = EventNewThread(EventAction.LOGOUT, request) + thread.user = user + thread.run() @receiver(user_login_failed) @@ -34,29 +57,25 @@ def on_user_login_failed( sender, credentials: Dict[str, str], request: HttpRequest, **_ ): """Failed Login""" - Event.new(EventAction.LOGIN_FAILED, **credentials).from_http(request) - - -@receiver(user_signed_up) -# pylint: disable=unused-argument -def on_user_signed_up(sender, request: HttpRequest, user: User, **_): - """Log successfully signed up""" - Event.new(EventAction.SIGN_UP).from_http(request) + thread = EventNewThread(EventAction.LOGIN_FAILED, request, **credentials) + thread.run() @receiver(invitation_created) # pylint: disable=unused-argument def on_invitation_created(sender, request: HttpRequest, invitation, **_): """Log Invitation creation""" - Event.new( - EventAction.INVITE_CREATED, invitation_uuid=invitation.uuid.hex - ).from_http(request) + thread = EventNewThread( + EventAction.INVITE_CREATED, request, invitation_uuid=invitation.uuid.hex + ) + thread.run() @receiver(invitation_used) # pylint: disable=unused-argument def on_invitation_used(sender, request: HttpRequest, invitation, **_): """Log Invitation usage""" - Event.new(EventAction.INVITE_USED, invitation_uuid=invitation.uuid.hex).from_http( - request + thread = EventNewThread( + EventAction.INVITE_USED, request, invitation_uuid=invitation.uuid.hex ) + thread.run() diff --git a/passbook/core/signals.py b/passbook/core/signals.py index 74b6b49f1..1126efd9a 100644 --- a/passbook/core/signals.py +++ b/passbook/core/signals.py @@ -2,6 +2,4 @@ from django.core.signals import Signal user_signed_up = Signal(providing_args=["request", "user"]) -invitation_created = Signal(providing_args=["request", "invitation"]) -invitation_used = Signal(providing_args=["request", "invitation", "user"]) password_changed = Signal(providing_args=["user", "password"]) diff --git a/passbook/stages/invitation/signals.py b/passbook/stages/invitation/signals.py new file mode 100644 index 000000000..99b7fa0d1 --- /dev/null +++ b/passbook/stages/invitation/signals.py @@ -0,0 +1,5 @@ +"""passbook invitation signals""" +from django.core.signals import Signal + +invitation_created = Signal(providing_args=["request", "invitation"]) +invitation_used = Signal(providing_args=["request", "invitation"]) diff --git a/passbook/stages/invitation/stage.py b/passbook/stages/invitation/stage.py index be1582775..ec3f98b37 100644 --- a/passbook/stages/invitation/stage.py +++ b/passbook/stages/invitation/stage.py @@ -5,6 +5,7 @@ from django.shortcuts import get_object_or_404 from passbook.flows.stage import StageView from passbook.stages.invitation.models import Invitation, InvitationStage from passbook.stages.prompt.stage import PLAN_CONTEXT_PROMPT +from passbook.stages.invitation.signals import invitation_used INVITATION_TOKEN_KEY = "token" INVITATION_IN_EFFECT = "invitation_in_effect" @@ -25,4 +26,5 @@ class InvitationStageView(StageView): invite: Invitation = get_object_or_404(Invitation, pk=token) self.executor.plan.context[PLAN_CONTEXT_PROMPT] = invite.fixed_data self.executor.plan.context[INVITATION_IN_EFFECT] = True + invitation_used.send(sender=self, request=request, invitation=invite) return self.executor.stage_ok()