|
|
|---|
| 381 |
local_part = local_part.replace(" ", "_") |
381 |
local_part = local_part.replace(" ", "_") |
| 382 |
else: |
382 |
else: |
| 383 |
local_part = self.get_random_ascii_string() |
383 |
local_part = self.get_random_ascii_string() |
| 384 |
domain_part = self.get_primary_domain_from_disk() |
384 |
|
| 385 |
new_email = "{}@{}".format(local_part, domain_part) |
385 |
customer_domains = self.list_domains() |
|
|
386 |
for domain in customer_domains: |
| 387 |
if domain["domainName"] == domain_part: |
| 388 |
# A valid domain was given, do not modify mail address |
| 389 |
self.logger.debug("fix_email: valid found in email address %s" % email) |
| 390 |
return email |
| 391 |
|
| 392 |
# Domain not found in google account, modify given email to use primary domain part |
| 393 |
primary_domain_part = self.get_primary_domain_from_disk() |
| 394 |
new_email = "{}@{}".format(local_part, primary_domain_part) |
| 386 |
if email != new_email: |
395 |
if email != new_email: |
| 387 |
self.logger.error("Email address %r invalid, changed to %r.", email, new_email) |
396 |
self.logger.error("Email address %r invalid, changed to %r.", email, new_email) |
| 388 |
return new_email |
397 |
return new_email |