darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-24 16:24:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

notify-admin-1459

Browse Source
This commit is contained in:
Kenneth Kehl
2024-05-06 10:43:01 -07:00
parent c100f1cd25
commit 9ecbfb7e05
3 changed files with 59 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
app/main/views/sign_in.py
View File

@@ -4,27 +4,15 @@ import uuid
import jwt
import requests
from flask import (
Response,
abort,
current_app,
flash,
redirect,
render_template,
request,
session,
url_for,
)
from flask import Response, current_app, redirect, render_template, request, url_for
from flask_login import current_user
from markupsafe import Markup
from notifications_utils.url_safe_token import generate_token
from app import login_manager, user_api_client
from app.main import main
from app.main.forms import LoginForm
from app.main.views.index import error
from app.main.views.verify import activate_user
from app.models.user import InvitedUser, User
from app.models.user import User
from app.utils import hide_from_search_engines
from app.utils.login import is_safe_redirect_url
from app.utils.time import is_less_than_days_ago
@@ -129,6 +117,16 @@ def verify_email(user, redirect_url):
)
def _handle_e2e_tests(redirect_url):
current_app.logger.warning("E2E TESTS ARE ENABLED.")
current_app.logger.warning(
"If you are getting a 404 on signin, comment out E2E vars in .env file!"
)
user = user_api_client.get_user_by_email(os.getenv("NOTIFY_E2E_TEST_EMAIL"))
activate_user(user["id"])
return redirect(url_for("main.show_accounts_or_dashboard", next=redirect_url))
@main.route("/sign-in", methods=(["GET", "POST"]))
@hide_from_search_engines
def sign_in():
@@ -146,67 +144,60 @@ def sign_in():
redirect_url = request.args.get("next")
if os.getenv("NOTIFY_E2E_TEST_EMAIL"):
current_app.logger.warning("E2E TESTS ARE ENABLED.")
current_app.logger.warning(
"If you are getting a 404 on signin, comment out E2E vars in .env file!"
)
user = user_api_client.get_user_by_email(os.getenv("NOTIFY_E2E_TEST_EMAIL"))
activate_user(user["id"])
return redirect(url_for("main.show_accounts_or_dashboard", next=redirect_url))
return _handle_e2e_tests(redirect_url)
current_app.logger.info(f"current user is {current_user}")
if current_user and current_user.is_authenticated:
if redirect_url and is_safe_redirect_url(redirect_url):
return redirect(redirect_url)
return redirect(url_for("main.show_accounts_or_dashboard"))
form = LoginForm()
current_app.logger.info("Got the login form")
password_reset_url = url_for(".forgot_password", next=request.args.get("next"))
# form = LoginForm()
# current_app.logger.info("Got the login form")
# password_reset_url = url_for(".forgot_password", next=request.args.get("next"))
if form.validate_on_submit():
user = User.from_email_address_and_password_or_none(
form.email_address.data, form.password.data
)
# if form.validate_on_submit():
# user = User.from_email_address_and_password_or_none(
# form.email_address.data, form.password.data
# )
if user:
# add user to session to mark us as in the process of signing the user in
session["user_details"] = {"email": user.email_address, "id": user.id}
# if user:
# # add user to session to mark us as in the process of signing the user in
# session["user_details"] = {"email": user.email_address, "id": user.id}
if user.state == "pending":
return redirect(
url_for("main.resend_email_verification", next=redirect_url)
)
# if user.state == "pending":
# return redirect(
# url_for("main.resend_email_verification", next=redirect_url)
# )
if user.is_active:
if session.get("invited_user_id"):
invited_user = InvitedUser.from_session()
if user.email_address.lower() != invited_user.email_address.lower():
flash("You cannot accept an invite for another person.")
session.pop("invited_user_id", None)
abort(403)
else:
invited_user.accept_invite()
# if user.is_active:
# if session.get("invited_user_id"):
# invited_user = InvitedUser.from_session()
# if user.email_address.lower() != invited_user.email_address.lower():
# flash("You cannot accept an invite for another person.")
# session.pop("invited_user_id", None)
# abort(403)
# else:
# invited_user.accept_invite()
user.send_login_code()
# user.send_login_code()
if user.sms_auth:
return redirect(url_for(".two_factor_sms", next=redirect_url))
# if user.sms_auth:
# return redirect(url_for(".two_factor_sms", next=redirect_url))
if user.email_auth:
return redirect(
url_for(".two_factor_email_sent", next=redirect_url)
)
# if user.email_auth:
# return redirect(
# url_for(".two_factor_email_sent", next=redirect_url)
# )
# Vague error message for login in case of user not known, locked, inactive or password not verified
flash(
Markup(
(
f"The email address or password you entered is incorrect."
f"&ensp;<a href={password_reset_url} class='usa-link'>Forgot your password?</a>"
)
)
)
# # Vague error message for login in case of user not known, locked, inactive or password not verified
# flash(
# Markup(
# (
# f"The email address or password you entered is incorrect."
# f"&ensp;<a href={password_reset_url} class='usa-link'>Forgot your password?</a>"
# )
# )
# )
other_device = current_user.logged_in_elsewhere()
@@ -222,10 +213,10 @@ def sign_in():
url = url.replace("STATE", token)
return render_template(
"views/signin.html",
form=form,
# form=form,
again=bool(redirect_url),
other_device=other_device,
password_reset_url=password_reset_url,
# password_reset_url=password_reset_url,
initial_signin_url=url,
)