mirror of
https://github.com/simple-login/app.git
synced 2024-09-29 21:21:29 +02:00
pass highlight_gen_email_id via url query instead of session. Remove HIGHLIGHT_GEN_EMAIL_ID
This commit is contained in:
parent
2760a178c6
commit
d6020d5fa0
@ -138,7 +138,6 @@ FACEBOOK_CLIENT_SECRET = os.environ["FACEBOOK_CLIENT_SECRET"]
|
|||||||
AVATAR_URL_EXPIRATION = 3600 * 24 * 7 # 1h*24h/d*7d=1week
|
AVATAR_URL_EXPIRATION = 3600 * 24 * 7 # 1h*24h/d*7d=1week
|
||||||
|
|
||||||
# session key
|
# session key
|
||||||
HIGHLIGHT_GEN_EMAIL_ID = "highlight_gen_email_id"
|
|
||||||
MFA_USER_ID = "mfa_user_id"
|
MFA_USER_ID = "mfa_user_id"
|
||||||
|
|
||||||
FLASK_PROFILER_PATH = os.environ.get("FLASK_PROFILER_PATH")
|
FLASK_PROFILER_PATH = os.environ.get("FLASK_PROFILER_PATH")
|
||||||
|
@ -2,7 +2,6 @@ from flask import render_template, redirect, url_for, flash, request, session
|
|||||||
from flask_login import login_required, current_user
|
from flask_login import login_required, current_user
|
||||||
|
|
||||||
from app.config import (
|
from app.config import (
|
||||||
HIGHLIGHT_GEN_EMAIL_ID,
|
|
||||||
DISABLE_ALIAS_SUFFIX,
|
DISABLE_ALIAS_SUFFIX,
|
||||||
ALIAS_DOMAINS,
|
ALIAS_DOMAINS,
|
||||||
)
|
)
|
||||||
@ -68,9 +67,9 @@ def custom_alias():
|
|||||||
db.session.commit()
|
db.session.commit()
|
||||||
flash(f"Alias {full_alias} has been created", "success")
|
flash(f"Alias {full_alias} has been created", "success")
|
||||||
|
|
||||||
session[HIGHLIGHT_GEN_EMAIL_ID] = gen_email.id
|
return redirect(
|
||||||
|
url_for("dashboard.index", highlight_gen_email_id=gen_email.id)
|
||||||
return redirect(url_for("dashboard.index"))
|
)
|
||||||
# only happen if the request has been "hacked"
|
# only happen if the request has been "hacked"
|
||||||
else:
|
else:
|
||||||
flash("something went wrong", "warning")
|
flash("something went wrong", "warning")
|
||||||
|
@ -1,10 +1,9 @@
|
|||||||
from flask import render_template, request, redirect, url_for, flash, session
|
from flask import render_template, request, redirect, url_for, flash
|
||||||
from flask_login import login_required, current_user
|
from flask_login import login_required, current_user
|
||||||
from sqlalchemy.exc import IntegrityError
|
from sqlalchemy.exc import IntegrityError
|
||||||
from sqlalchemy.orm import joinedload
|
from sqlalchemy.orm import joinedload
|
||||||
|
|
||||||
from app import email_utils
|
from app import email_utils
|
||||||
from app.config import HIGHLIGHT_GEN_EMAIL_ID
|
|
||||||
from app.dashboard.base import dashboard_bp
|
from app.dashboard.base import dashboard_bp
|
||||||
from app.extensions import db
|
from app.extensions import db
|
||||||
from app.log import LOG
|
from app.log import LOG
|
||||||
@ -35,14 +34,10 @@ class AliasInfo:
|
|||||||
@dashboard_bp.route("/", methods=["GET", "POST"])
|
@dashboard_bp.route("/", methods=["GET", "POST"])
|
||||||
@login_required
|
@login_required
|
||||||
def index():
|
def index():
|
||||||
# after creating a gen email, it's helpful to highlight it
|
|
||||||
highlight_gen_email_id = session.get(HIGHLIGHT_GEN_EMAIL_ID)
|
|
||||||
|
|
||||||
# reset as it should not persist
|
|
||||||
if highlight_gen_email_id:
|
|
||||||
del session[HIGHLIGHT_GEN_EMAIL_ID]
|
|
||||||
|
|
||||||
query = request.args.get("query") or ""
|
query = request.args.get("query") or ""
|
||||||
|
highlight_gen_email_id = None
|
||||||
|
if request.args.get("highlight_gen_email_id"):
|
||||||
|
highlight_gen_email_id = int(request.args.get("highlight_gen_email_id"))
|
||||||
|
|
||||||
# User generates a new email
|
# User generates a new email
|
||||||
if request.method == "POST":
|
if request.method == "POST":
|
||||||
@ -78,7 +73,14 @@ def index():
|
|||||||
|
|
||||||
LOG.d("generate new email %s for user %s", gen_email, current_user)
|
LOG.d("generate new email %s for user %s", gen_email, current_user)
|
||||||
flash(f"Alias {gen_email.email} has been created", "success")
|
flash(f"Alias {gen_email.email} has been created", "success")
|
||||||
session[HIGHLIGHT_GEN_EMAIL_ID] = gen_email.id
|
|
||||||
|
return redirect(
|
||||||
|
url_for(
|
||||||
|
"dashboard.index",
|
||||||
|
highlight_gen_email_id=gen_email.id,
|
||||||
|
query=query,
|
||||||
|
)
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
flash(f"You need to upgrade your plan to create new alias.", "warning")
|
flash(f"You need to upgrade your plan to create new alias.", "warning")
|
||||||
|
|
||||||
@ -94,8 +96,12 @@ def index():
|
|||||||
else:
|
else:
|
||||||
flash(f"Alias {gen_email.email} is disabled", "warning")
|
flash(f"Alias {gen_email.email} is disabled", "warning")
|
||||||
|
|
||||||
session[HIGHLIGHT_GEN_EMAIL_ID] = gen_email.id
|
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
return redirect(
|
||||||
|
url_for(
|
||||||
|
"dashboard.index", highlight_gen_email_id=gen_email.id, query=query
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
elif request.form.get("form-name") == "delete-email":
|
elif request.form.get("form-name") == "delete-email":
|
||||||
gen_email_id = request.form.get("gen-email-id")
|
gen_email_id = request.form.get("gen-email-id")
|
||||||
|
Loading…
Reference in New Issue
Block a user