From 33ac29beffa23c844900ae0b8f189e955bbde9d2 Mon Sep 17 00:00:00 2001 From: Jefferson Stachelski Date: Tue, 20 Oct 2015 21:08:29 -0200 Subject: Refactored the welcome mail logic and add a test --- service/pixelated/application.py | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'service/pixelated/application.py') diff --git a/service/pixelated/application.py b/service/pixelated/application.py index 51763fa2..dfeb8d82 100644 --- a/service/pixelated/application.py +++ b/service/pixelated/application.py @@ -19,13 +19,10 @@ from twisted.internet import defer from twisted.internet import ssl from OpenSSL import SSL from OpenSSL import crypto -from email import message_from_file -import os -from pixelated.adapter.model.mail import InputMail from pixelated.config import arguments from pixelated.config.services import Services -from pixelated.config.leap import initialize_leap, CREATE_WELCOME_MAIL +from pixelated.config.leap import initialize_leap from pixelated.config import logger from pixelated.config.site import PixelatedSite from pixelated.resources.loading_page import LoadingResource @@ -77,18 +74,6 @@ def _ssl_options(sslkey, sslcert): return options -def welcome_mail(leap_session): - if CREATE_WELCOME_MAIL(): - 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) - - leap_session.mail_store.add_mail('INBOX', input_mail.raw) - return leap_session - - def initialize(): args = arguments.parse_user_agent_args() logger.init(debug=args.debug) @@ -100,7 +85,6 @@ def initialize(): args.organization_mode, args.leap_home) - deferred.addCallback(welcome_mail) deferred.addCallback( lambda leap_session: start_user_agent( loading_app, -- cgit v1.2.3