Authenticate with Proton
Alternatively you can use your Proton credentials to ensure it's you.
Authenticate with Proton
@@ -38,4 +38,4 @@
{% endif %}
- {% endblock %}
+ {% endblock %}
\ No newline at end of file
diff --git a/app/tests/events/event_test_utils.py b/app/tests/events/event_test_utils.py
new file mode 100644
index 0000000..3a5342c
--- /dev/null
+++ b/app/tests/events/event_test_utils.py
@@ -0,0 +1,32 @@
+from app.events.event_dispatcher import Dispatcher
+from app.models import PartnerUser, User
+from app.proton.utils import get_proton_partner
+from tests.utils import create_new_user, random_token
+from typing import Tuple
+
+
+class OnMemoryDispatcher(Dispatcher):
+ def __init__(self):
+ self.memory = []
+
+ def send(self, event: bytes):
+ self.memory.append(event)
+
+ def clear(self):
+ self.memory = []
+
+
+def _create_unlinked_user() -> User:
+ return create_new_user()
+
+
+def _create_linked_user() -> Tuple[User, PartnerUser]:
+ user = _create_unlinked_user()
+ partner_user = PartnerUser.create(
+ partner_id=get_proton_partner().id,
+ user_id=user.id,
+ external_user_id=random_token(10),
+ flush=True,
+ )
+
+ return user, partner_user
diff --git a/app/tests/events/test_event_dispatcher.py b/app/tests/events/test_event_dispatcher.py
index 810e147..c142970 100644
--- a/app/tests/events/test_event_dispatcher.py
+++ b/app/tests/events/test_event_dispatcher.py
@@ -1,33 +1,10 @@
-from app.events.event_dispatcher import EventDispatcher, Dispatcher
+from app.events.event_dispatcher import EventDispatcher
from app.events.generated.event_pb2 import EventContent, UserDeleted
-from app.models import PartnerUser, User
-from app.proton.utils import get_proton_partner
-from tests.utils import create_new_user, random_token
-from typing import Tuple
-
-
-class OnMemoryDispatcher(Dispatcher):
- def __init__(self):
- self.memory = []
-
- def send(self, event: bytes):
- self.memory.append(event)
-
-
-def _create_unlinked_user() -> User:
- return create_new_user()
-
-
-def _create_linked_user() -> Tuple[User, PartnerUser]:
- user = _create_unlinked_user()
- partner_user = PartnerUser.create(
- partner_id=get_proton_partner().id,
- user_id=user.id,
- external_user_id=random_token(10),
- flush=True,
- )
-
- return user, partner_user
+from .event_test_utils import (
+ _create_unlinked_user,
+ OnMemoryDispatcher,
+ _create_linked_user,
+)
def test_event_dispatcher_stores_events():
diff --git a/app/tests/events/test_sent_events.py b/app/tests/events/test_sent_events.py
new file mode 100644
index 0000000..ab946dd
--- /dev/null
+++ b/app/tests/events/test_sent_events.py
@@ -0,0 +1,100 @@
+from app import config, alias_utils
+from app.db import Session
+from app.events.event_dispatcher import GlobalDispatcher
+from app.events.generated import event_pb2
+from app.models import Alias, User, PartnerUser
+from tests.utils import random_token
+from .event_test_utils import (
+ OnMemoryDispatcher,
+ _create_linked_user,
+)
+
+on_memory_dispatcher = OnMemoryDispatcher()
+
+
+def setup_module():
+ GlobalDispatcher.set_dispatcher(on_memory_dispatcher)
+ config.EVENT_WEBHOOK = "http://test"
+
+
+def teardown_module():
+ GlobalDispatcher.set_dispatcher(None)
+ config.EVENT_WEBHOOK = None
+
+
+def setup_function(func):
+ on_memory_dispatcher.clear()
+
+
+def _get_event_from_string(
+ data: str, user: User, pu: PartnerUser
+) -> event_pb2.EventContent:
+ event = event_pb2.Event()
+ event.ParseFromString(data)
+ assert user.id == event.user_id
+ assert pu.external_user_id == event.external_user_id
+ assert pu.partner_id == event.partner_id
+ return event.content
+
+
+def test_fire_event_on_alias_creation():
+ (user, pu) = _create_linked_user()
+ alias = Alias.create_new_random(user)
+ Session.flush()
+ assert len(on_memory_dispatcher.memory) == 1
+ event_data = on_memory_dispatcher.memory[0]
+ event_content = _get_event_from_string(event_data, user, pu)
+ assert event_content.alias_created is not None
+ alias_created = event_content.alias_created
+ assert alias.id == alias_created.alias_id
+ assert alias.email == alias_created.alias_email
+ assert "" == alias_created.alias_note
+ assert alias.enabled == alias_created.enabled
+
+
+def test_fire_event_on_alias_creation_with_note():
+ (user, pu) = _create_linked_user()
+ note = random_token(10)
+ alias = Alias.create_new_random(user, note=note)
+ Session.flush()
+ assert len(on_memory_dispatcher.memory) == 1
+ event_data = on_memory_dispatcher.memory[0]
+ event_content = _get_event_from_string(event_data, user, pu)
+ assert event_content.alias_created is not None
+ alias_created = event_content.alias_created
+ assert alias.id == alias_created.alias_id
+ assert alias.email == alias_created.alias_email
+ assert note == alias_created.alias_note
+ assert alias.enabled == alias_created.enabled
+
+
+def test_fire_event_on_alias_deletion():
+ (user, pu) = _create_linked_user()
+ alias = Alias.create_new_random(user)
+ alias_id = alias.id
+ Session.flush()
+ on_memory_dispatcher.clear()
+ alias_utils.delete_alias(alias, user)
+ assert len(on_memory_dispatcher.memory) == 1
+ event_data = on_memory_dispatcher.memory[0]
+ event_content = _get_event_from_string(event_data, user, pu)
+ assert event_content.alias_deleted is not None
+ alias_deleted = event_content.alias_deleted
+ assert alias_id == alias_deleted.alias_id
+ assert alias.email == alias_deleted.alias_email
+
+
+def test_fire_event_on_alias_status_change():
+ (user, pu) = _create_linked_user()
+ alias = Alias.create_new_random(user)
+ Session.flush()
+ on_memory_dispatcher.clear()
+ alias_utils.change_alias_status(alias, True)
+ assert len(on_memory_dispatcher.memory) == 1
+ event_data = on_memory_dispatcher.memory[0]
+ event_content = _get_event_from_string(event_data, user, pu)
+ assert event_content.alias_status_change is not None
+ event = event_content.alias_status_change
+ assert alias.id == event.alias_id
+ assert alias.email == event.alias_email
+ assert event.enabled
diff --git a/app/tests/proton/test_proton_callback_handler.py b/app/tests/proton/test_proton_callback_handler.py
index fd7f8bb..9916f99 100644
--- a/app/tests/proton/test_proton_callback_handler.py
+++ b/app/tests/proton/test_proton_callback_handler.py
@@ -1,4 +1,6 @@
from arrow import Arrow
+
+from app import config
from app.account_linking import (
SLPlan,
SLPlanType,
@@ -8,7 +10,7 @@ from app.proton.proton_callback_handler import (
ProtonCallbackHandler,
generate_account_not_allowed_to_log_in,
)
-from app.models import User, PartnerUser
+from app.models import User, PartnerUser, Job, JobState
from app.proton.utils import get_proton_partner
from app.utils import random_string
from typing import Optional
@@ -23,6 +25,17 @@ class MockProtonClient(ProtonClient):
return self.user
+def check_initial_sync_job(user: User):
+ for job in Job.yield_per_query(10).filter_by(
+ name=config.JOB_SEND_ALIAS_CREATION_EVENTS,
+ state=JobState.ready.value,
+ ):
+ if job.payload.get("user_id") == user.id:
+ Job.delete(job.id)
+ return
+ assert False
+
+
def test_proton_callback_handler_unexistant_sl_user():
email = random_email()
name = random_string()
@@ -56,6 +69,7 @@ def test_proton_callback_handler_unexistant_sl_user():
)
assert partner_user is not None
assert partner_user.external_user_id == external_id
+ check_initial_sync_job(res.user)
def test_proton_callback_handler_existant_sl_user():
@@ -84,6 +98,7 @@ def test_proton_callback_handler_existant_sl_user():
sa = PartnerUser.get_by(user_id=sl_user.id, partner_id=get_proton_partner().id)
assert sa is not None
assert sa.partner_email == user.email
+ check_initial_sync_job(res.user)
def test_proton_callback_handler_none_user_login():