studio/people
Archived
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨(dimail) fix domain creation request to fit latest dimail

Browse Source 
Adapt domain creationg request to latest protocol version, also
make error reporting more robust: don't assume utf-8 but use the
response's encoding, don't assume the error is JSON (it won't be
when getting a 500) but reproduce the whole thing instead.
This commit is contained in:
Laurent Bossavit
2024-11-07 18:22:40 +01:00
committed by Marie
parent 9c894bdbe9
commit 1e45f1ffd1
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/mailbox_manager/utils/dimail.py
View File

@@ -82,9 +82,10 @@ class DimailAPIClient:
"""Send a domain creation request to dimail API.""" """Send a domain creation request to dimail API."""
payload = { payload = {
"domain": domain_name, "name": domain_name,
"context": domain_name, # for now, we put each domain on its own context "context_name": domain_name, # for now, we put each domain on its own context
"features": ["webmail", "mailboxes"], "features": ["webmail", "mailbox"],
"delivery": "virtual",
} }
try: try:
response = session.post( response = session.post(
@@ -159,7 +160,10 @@ class DimailAPIClient:
def pass_dimail_unexpected_response(self, response): def pass_dimail_unexpected_response(self, response):
"""Raise error when encountering an unexpected error in dimail.""" """Raise error when encountering an unexpected error in dimail."""
error_content = json.loads(response.content.decode(response.encoding).replace("'", '"')) try:
error_content = json.loads(response.content.decode(response.encoding).replace("'", '"'))
except:
error_content = response.content.decode(response.encoding)
logger.error( logger.error(
"[DIMAIL] unexpected error : %s %s", response.status_code, error_content "[DIMAIL] unexpected error : %s %s", response.status_code, error_content