federico/django-mailbox
1
0
Fork 0
forked from mirror/django-mailbox
Code Activity

fix import

Browse source
This commit is contained in:
Pietro Mingo 2022-07-29 17:26:28 +02:00
parent 8f944190ad
commit 9bfc3e5df1
5 changed files with 20 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/lib/django_mailbox/models.py
View file

@ -251,8 +251,6 @@ class Mailbox(models.Model):
conn = Office365Transport(
self.location,
self.username,
port=self.port if self.port else None,
ssl=True,
folder=self.folder
)
conn.connect(self.client_id, self.client_secret, self.tenant_id)

4
build/lib/django_mailbox/transports/base.py
View file

@ -10,7 +10,3 @@ class EmailTransport:
return message
def get_email_from_string(self, contents):
message = email.message_from_string(contents)
return message

25
build/lib/django_mailbox/transports/office365.py
View file

@ -1,4 +1,3 @@
import O365
import logging
from django.conf import settings
@ -10,13 +9,8 @@ logger = logging.getLogger(__name__)
class Office365Transport(EmailTransport):
def __init__(
self, hostname, username, port=None, ssl=False, tls=False, folder=None
self, hostname, username, folder=None
):
self.max_message_size = getattr(
settings,
'DJANGO_MAILBOX_MAX_MESSAGE_SIZE',
False
)
self.integration_testing_subject = getattr(
settings,
'DJANGO_MAILBOX_INTEGRATION_TESTING_SUBJECT',
@ -24,19 +18,16 @@ class Office365Transport(EmailTransport):
)
self.hostname = hostname
self.username = username
self.port = port
self.folder = folder
self.tls = tls
if ssl:
#self.transport = imaplib.IMAP4_SSL
if not self.port:
self.port = 993
else:
#self.transport = imaplib.IMAP4
if not self.port:
self.port = 143
def connect(self, client_id, client_secret, tenant_id):
try:
import O365
except ImportError:
raise ValueError(
"Install o365 to use oauth2 auth for office365"
)
credentials = (client_id, client_secret)
self.account = O365.Account(credentials, auth_flow_type='credentials', tenant_id=tenant_id)

2
django_mailbox/models.py
View file

@ -251,8 +251,6 @@ class Mailbox(models.Model):
conn = Office365Transport(
self.location,
self.username,
port=self.port if self.port else None,
ssl=True,
folder=self.folder
)
conn.connect(self.client_id, self.client_secret, self.tenant_id)

29
django_mailbox/transports/office365.py
View file

@ -1,4 +1,3 @@
import O365
import logging
from django.conf import settings
@ -10,13 +9,8 @@ logger = logging.getLogger(__name__)
class Office365Transport(EmailTransport):
def __init__(
self, hostname, username, port=None, ssl=False, tls=False, folder=None
self, hostname, username, folder=None
):
self.max_message_size = getattr(
settings,
'DJANGO_MAILBOX_MAX_MESSAGE_SIZE',
False
)
self.integration_testing_subject = getattr(
settings,
'DJANGO_MAILBOX_INTEGRATION_TESTING_SUBJECT',
@ -24,19 +18,16 @@ class Office365Transport(EmailTransport):
)
self.hostname = hostname
self.username = username
self.port = port
self.folder = folder
self.tls = tls
if ssl:
#self.transport = imaplib.IMAP4_SSL
if not self.port:
self.port = 993
else:
#self.transport = imaplib.IMAP4
if not self.port:
self.port = 143
def connect(self, client_id, client_secret, tenant_id):
try:
import O365
except ImportError:
raise ValueError(
"Install o365 to use oauth2 auth for office365"
)
credentials = (client_id, client_secret)
self.account = O365.Account(credentials, auth_flow_type='credentials', tenant_id=tenant_id)
@ -56,8 +47,12 @@ class Office365Transport(EmailTransport):
if condition and not condition(message):
continue
#TODO: implement archive function
yield message
except MessageParseError:
continue
# TODO: delete all messages
return