Make send_mail fn customizable

flask_security/changeable.py

@@ -14,7 +14,7 @@
 from werkzeug.local import LocalProxy
 
 from .signals import password_changed
-from .utils import config_value, hash_password, send_mail
+from .utils import config_value, hash_password
 
 # Convenient references
 _security = LocalProxy(lambda: current_app.extensions['security'])
@@ -29,7 +29,7 @@ def send_password_changed_notice(user):
     """
     if config_value('SEND_PASSWORD_CHANGE_EMAIL'):
         subject = config_value('EMAIL_SUBJECT_PASSWORD_CHANGE_NOTICE')
-        send_mail(subject, user.email, 'change_notice', user=user)
+        _security.send_mail(subject, user.email, 'change_notice', user=user)
 
 
 def change_user_password(user, password):

flask_security/confirmable.py

@@ -14,7 +14,7 @@
 from werkzeug.local import LocalProxy
 
 from .signals import confirm_instructions_sent, user_confirmed
-from .utils import config_value, get_token_status, hash_data, send_mail, \
+from .utils import config_value, get_token_status, hash_data, \
     url_for_security, verify_hash
 
 # Convenient references
@@ -39,9 +39,9 @@ def send_confirmation_instructions(user):
 
     confirmation_link, token = generate_confirmation_link(user)
 
-    send_mail(config_value('EMAIL_SUBJECT_CONFIRM'), user.email,
-              'confirmation_instructions', user=user,
-              confirmation_link=confirmation_link)
+    _security.send_mail(config_value('EMAIL_SUBJECT_CONFIRM'), user.email,
+                        'confirmation_instructions', user=user,
+                        confirmation_link=confirmation_link)
 
     confirm_instructions_sent.send(app._get_current_object(), user=user,
                                    token=token)

flask_security/core.py

@@ -30,7 +30,7 @@
     ResetPasswordForm, SendConfirmationForm
 from .utils import config_value as cv
 from .utils import _, get_config, hash_data, localize_callback, string_types, \
-    url_for_security, verify_hash
+    url_for_security, verify_hash, send_mail
 from .views import create_blueprint
 
 # Convenient references
@@ -539,6 +539,7 @@ def _register_i18n():
                 app.jinja_env.globals['_'] = state.i18n_domain.gettext
 
         state.render_template = self.render_template
+        state.send_mail = self.send_mail
         app.extensions['security'] = state
 
         if hasattr(app, 'cli'):
@@ -553,5 +554,8 @@ def _register_i18n():
     def render_template(self, *args, **kwargs):
         return render_template(*args, **kwargs)
 
+    def send_mail(self, *args, **kwargs):
+        return send_mail(*args, **kwargs)
+
     def __getattr__(self, name):
         return getattr(self._state, name, None)

flask_security/passwordless.py

@@ -13,7 +13,7 @@
 from werkzeug.local import LocalProxy
 
 from .signals import login_instructions_sent
-from .utils import config_value, get_token_status, send_mail, url_for_security
+from .utils import config_value, get_token_status, url_for_security
 
 # Convenient references
 _security = LocalProxy(lambda: app.extensions['security'])
@@ -30,8 +30,8 @@ def send_login_instructions(user):
     token = generate_login_token(user)
     login_link = url_for_security('token_login', token=token, _external=True)
 
-    send_mail(config_value('EMAIL_SUBJECT_PASSWORDLESS'), user.email,
-              'login_instructions', user=user, login_link=login_link)
+    _security.send_mail(config_value('EMAIL_SUBJECT_PASSWORDLESS'), user.email,
+                        'login_instructions', user=user, login_link=login_link)
 
     login_instructions_sent.send(app._get_current_object(), user=user,
                                  login_token=token)

flask_security/recoverable.py

@@ -14,7 +14,7 @@
 
 from .signals import password_reset, reset_password_instructions_sent
 from .utils import config_value, get_token_status, hash_data, hash_password, \
-    send_mail, url_for_security, verify_hash
+    url_for_security, verify_hash
 
 # Convenient references
 _security = LocalProxy(lambda: app.extensions['security'])
@@ -33,9 +33,9 @@ def send_reset_password_instructions(user):
     )
 
     if config_value('SEND_PASSWORD_RESET_EMAIL'):
-        send_mail(config_value('EMAIL_SUBJECT_PASSWORD_RESET'), user.email,
-                  'reset_instructions',
-                  user=user, reset_link=reset_link)
+        _security.send_mail(config_value('EMAIL_SUBJECT_PASSWORD_RESET'),
+                            user.email, 'reset_instructions',
+                            user=user, reset_link=reset_link)
 
     reset_password_instructions_sent.send(
         app._get_current_object(), user=user, token=token
@@ -48,8 +48,8 @@ def send_password_reset_notice(user):
     :param user: The user to send the notice to
     """
     if config_value('SEND_PASSWORD_RESET_NOTICE_EMAIL'):
-        send_mail(config_value('EMAIL_SUBJECT_PASSWORD_NOTICE'), user.email,
-                  'reset_notice', user=user)
+        _security.send_mail(config_value('EMAIL_SUBJECT_PASSWORD_NOTICE'),
+                            user.email, 'reset_notice', user=user)
 
 
 def generate_reset_password_token(user):

flask_security/registerable.py

@@ -14,8 +14,7 @@
 
 from .confirmable import generate_confirmation_link
 from .signals import user_registered
-from .utils import config_value, do_flash, get_message, hash_password, \
-    send_mail
+from .utils import config_value, do_flash, get_message, hash_password
 
 # Convenient references
 _security = LocalProxy(lambda: app.extensions['security'])
@@ -37,7 +36,8 @@ def register_user(**kwargs):
                          user=user, confirm_token=token)
 
     if config_value('SEND_REGISTER_EMAIL'):
-        send_mail(config_value('EMAIL_SUBJECT_REGISTER'), user.email,
-                  'welcome', user=user, confirmation_link=confirmation_link)
+        _security.send_mail(config_value('EMAIL_SUBJECT_REGISTER'), user.email,
+                            'welcome', user=user,
+                            confirmation_link=confirmation_link)
 
     return user