niyasraphy
086dcefbc8
The orginal PR and it's forward ports https://github.com/odoo/odoo/pull/121048 intorduced an unexpected AttributeError when using OAuth for incoming mail servers (fetchmail.server). Since `smtp_user` is not a defined field in fetchmail.server (it uses the field `user` instead), we had to change the approach. To prevent this error, we move the UserError call into the respective ir_mail_server models, which should check the contrains at that level. This means that before the form gets saved, trying to connect using an OAuth account, should prompt the user to first specify an smtp_user before proceeding. X-original-commit: fcfd72a5e5663fa6b08c80a8a22ec15c8a09456f Original author: niyasraphy <niyasraphyk@gmail.com> Conflict resolution for saas-15.2, 16.0, saas-16.2, saas-16.3 closes odoo/odoo#123660 X-original-commit: b0749e430847d2f49e07b119915e8dee0c4e7f00 Signed-off-by: Stéphane Debauche (std) <std@odoo.com>
80 lines
3.7 KiB
Python
80 lines
3.7 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
import base64
|
|
|
|
from odoo import _, fields, models, api
|
|
from odoo.exceptions import UserError
|
|
|
|
|
|
class IrMailServer(models.Model):
|
|
"""Represents an SMTP server, able to send outgoing emails, with SSL and TLS capabilities."""
|
|
|
|
_name = 'ir.mail_server'
|
|
_inherit = ['ir.mail_server', 'google.gmail.mixin']
|
|
|
|
smtp_authentication = fields.Selection(
|
|
selection_add=[('gmail', 'Gmail OAuth Authentication')],
|
|
ondelete={'gmail': 'set default'})
|
|
|
|
def _compute_smtp_authentication_info(self):
|
|
gmail_servers = self.filtered(lambda server: server.smtp_authentication == 'gmail')
|
|
gmail_servers.smtp_authentication_info = _(
|
|
'Connect your Gmail account with the OAuth Authentication process. \n'
|
|
'By default, only a user with a matching email address will be able to use this server. '
|
|
'To extend its use, you should set a "mail.default.from" system parameter.')
|
|
super(IrMailServer, self - gmail_servers)._compute_smtp_authentication_info()
|
|
|
|
@api.onchange('smtp_encryption')
|
|
def _onchange_encryption(self):
|
|
"""Do not change the SMTP configuration if it's a Gmail server
|
|
(e.g. the port which is already set)"""
|
|
if self.smtp_authentication != 'gmail':
|
|
super(IrMailServer, self)._onchange_encryption()
|
|
|
|
@api.onchange('smtp_authentication')
|
|
def _onchange_smtp_authentication_gmail(self):
|
|
if self.smtp_authentication == 'gmail':
|
|
self.smtp_host = 'smtp.gmail.com'
|
|
self.smtp_encryption = 'starttls'
|
|
self.smtp_port = 587
|
|
else:
|
|
self.google_gmail_authorization_code = False
|
|
self.google_gmail_refresh_token = False
|
|
self.google_gmail_access_token = False
|
|
self.google_gmail_access_token_expiration = False
|
|
|
|
@api.onchange('smtp_user', 'smtp_authentication')
|
|
def _on_change_smtp_user_gmail(self):
|
|
"""The Gmail mail servers can only be used for the user personal email address."""
|
|
if self.smtp_authentication == 'gmail':
|
|
self.from_filter = self.smtp_user
|
|
|
|
@api.constrains('smtp_authentication', 'smtp_pass', 'smtp_encryption', 'from_filter', 'smtp_user')
|
|
def _check_use_google_gmail_service(self):
|
|
gmail_servers = self.filtered(lambda server: server.smtp_authentication == 'gmail')
|
|
for server in gmail_servers:
|
|
if server.smtp_pass:
|
|
raise UserError(_(
|
|
'Please leave the password field empty for Gmail mail server %r. '
|
|
'The OAuth process does not require it', server.name))
|
|
|
|
if server.smtp_encryption != 'starttls':
|
|
raise UserError(_(
|
|
'Incorrect Connection Security for Gmail mail server %r. '
|
|
'Please set it to "TLS (STARTTLS)".', server.name))
|
|
|
|
if not server.smtp_user:
|
|
raise UserError(_(
|
|
'Please fill the "Username" field with your Gmail username (your email address). '
|
|
'This should be the same account as the one used for the Gmail OAuthentication Token.'))
|
|
|
|
def _smtp_login(self, connection, smtp_user, smtp_password):
|
|
if len(self) == 1 and self.smtp_authentication == 'gmail':
|
|
auth_string = self._generate_oauth2_string(smtp_user, self.google_gmail_refresh_token)
|
|
oauth_param = base64.b64encode(auth_string.encode()).decode()
|
|
connection.ehlo()
|
|
connection.docmd('AUTH', f'XOAUTH2 {oauth_param}')
|
|
else:
|
|
super(IrMailServer, self)._smtp_login(connection, smtp_user, smtp_password)
|