diff options
author | Jefferson Stachelski <jeffhsta@riseup.net> | 2015-10-20 21:08:29 -0200 |
---|---|---|
committer | Jefferson Stachelski <jeffhsta@riseup.net> | 2015-10-20 21:11:21 -0200 |
commit | 33ac29beffa23c844900ae0b8f189e955bbde9d2 (patch) | |
tree | 1b7d9a0551593405d79a951b05212917e037bcff /service/pixelated/config | |
parent | bae4d080349faa50e54de2c7c13b4503afac798d (diff) |
Refactored the welcome mail logic and add a test
Diffstat (limited to 'service/pixelated/config')
-rw-r--r-- | service/pixelated/config/leap.py | 49 |
1 files changed, 33 insertions, 16 deletions
diff --git a/service/pixelated/config/leap.py b/service/pixelated/config/leap.py index 83b913a8..0409e54f 100644 --- a/service/pixelated/config/leap.py +++ b/service/pixelated/config/leap.py @@ -1,18 +1,19 @@ from __future__ import absolute_import +from leap.common.events import (server as events_server, + register, catalog as events) +from email import message_from_file from pixelated.config import credentials -from leap.common.events import server as events_server, register, catalog as events from pixelated.bitmask_libraries.config import LeapConfig from pixelated.bitmask_libraries.certs import LeapCertificate from pixelated.bitmask_libraries.provider import LeapProvider from pixelated.bitmask_libraries.session import LeapSessionFactory +from pixelated.adapter.model.mail import InputMail from twisted.internet import defer +import os +import logging -_CREATE_WELCOME_MAIL = False - - -def CREATE_WELCOME_MAIL(): - return _CREATE_WELCOME_MAIL +fresh_account = False @defer.inlineCallbacks @@ -24,9 +25,12 @@ def initialize_leap(leap_provider_cert, initial_sync=True): init_monkeypatches() events_server.ensure_server() - check_new_account() - provider, username, password = credentials.read(organization_mode, credentials_file) - LeapCertificate.set_cert_and_fingerprint(leap_provider_cert, leap_provider_cert_fingerprint) + register(events.KEYMANAGER_FINISHED_KEY_GENERATION, + set_fresh_account) + provider, username, password = credentials.read(organization_mode, + credentials_file) + LeapCertificate.set_cert_and_fingerprint(leap_provider_cert, + leap_provider_cert_fingerprint) config = LeapConfig(leap_home=leap_home, start_background_jobs=True) provider = LeapProvider(provider, config) @@ -36,17 +40,30 @@ def initialize_leap(leap_provider_cert, if initial_sync: leap_session = yield leap_session.initial_sync() + global fresh_account + if fresh_account: + add_welcome_mail(leap_session.mail_store) + defer.returnValue(leap_session) -def init_monkeypatches(): - import pixelated.extensions.requests_urllib3 +def add_welcome_mail(mail_store): + current_path = os.path.dirname(os.path.abspath(__file__)) + with open(os.path.join(current_path, + '..', + 'assets', + 'welcome.mail')) as mail_template_file: + mail_template = message_from_file(mail_template_file) + + input_mail = InputMail.from_python_mail(mail_template) + logging.getLogger('pixelated.config.leap').info('Adding the welcome mail') + mail_store.add_mail('INBOX', input_mail.raw) -def mark_to_create_welcome_mail(_, x): - global _CREATE_WELCOME_MAIL - _CREATE_WELCOME_MAIL = True +def init_monkeypatches(): + import pixelated.extensions.requests_urllib3 -def check_new_account(): - register(events.KEYMANAGER_FINISHED_KEY_GENERATION, mark_to_create_welcome_mail) +def set_fresh_account(_, x): + global fresh_account + fresh_account = True |