diff --git a/app/auth/views/activate.py b/app/auth/views/activate.py index cacb8ab7..61f663c0 100644 --- a/app/auth/views/activate.py +++ b/app/auth/views/activate.py @@ -1,6 +1,7 @@ from flask import request, redirect, url_for, flash, render_template from flask_login import login_user, current_user +from app import email_utils from app.auth.base import auth_bp from app.extensions import db from app.log import LOG @@ -38,6 +39,7 @@ def activate(): user = activation_code.user user.activated = True login_user(user) + email_utils.send_welcome_email(user.email, user.name) # activation code is to be used only once ActivationCode.delete(activation_code.id) diff --git a/app/auth/views/facebook.py b/app/auth/views/facebook.py index 52a55a88..f29213ff 100644 --- a/app/auth/views/facebook.py +++ b/app/auth/views/facebook.py @@ -1,9 +1,9 @@ -import arrow from flask import request, session, redirect, url_for, flash from flask_login import login_user from requests_oauthlib import OAuth2Session from requests_oauthlib.compliance_fixes import facebook_compliance_fix +from app import email_utils from app.auth.base import auth_bp from app.auth.views.google import create_file_from_url from app.config import URL, FACEBOOK_CLIENT_ID, FACEBOOK_CLIENT_SECRET @@ -11,7 +11,6 @@ from app.email_utils import notify_admin from app.extensions import db from app.log import LOG from app.models import User -from app.utils import random_string _authorization_base_url = "https://www.facebook.com/dialog/oauth" _token_url = "https://graph.facebook.com/oauth/access_token" @@ -106,6 +105,7 @@ def facebook_callback(): db.session.commit() login_user(user) + email_utils.send_welcome_email(user.email, user.name) flash(f"Welcome to SimpleLogin {user.name}!", "success") diff --git a/app/auth/views/github.py b/app/auth/views/github.py index 9f60f63f..4a3ca5d5 100644 --- a/app/auth/views/github.py +++ b/app/auth/views/github.py @@ -3,6 +3,7 @@ from flask import request, session, redirect, url_for, flash from flask_login import login_user from requests_oauthlib import OAuth2Session +from app import email_utils from app.auth.base import auth_bp from app.config import GITHUB_CLIENT_ID, GITHUB_CLIENT_SECRET, URL from app.email_utils import notify_admin @@ -90,6 +91,7 @@ def github_callback(): user = User.create(email=email, name=github_user_data["name"], activated=True) db.session.commit() login_user(user) + email_utils.send_welcome_email(user.email, user.name) flash(f"Welcome to SimpleLogin {user.name}!", "success") diff --git a/app/auth/views/google.py b/app/auth/views/google.py index adb18c82..a41aeef4 100644 --- a/app/auth/views/google.py +++ b/app/auth/views/google.py @@ -1,9 +1,8 @@ -import arrow from flask import request, session, redirect, url_for, flash from flask_login import login_user from requests_oauthlib import OAuth2Session -from app import s3 +from app import s3, email_utils from app.auth.base import auth_bp from app.config import URL, GOOGLE_CLIENT_ID, GOOGLE_CLIENT_SECRET from app.email_utils import notify_admin @@ -105,6 +104,7 @@ def google_callback(): db.session.commit() login_user(user) + email_utils.send_welcome_email(user.email, user.name) flash(f"Welcome to SimpleLogin {user.name}!", "success")