Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1233 as the system owner subscribers can registed with uppercase #1235

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions subscribie/blueprints/subscriber/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import functools
import binascii
import os
from sqlalchemy.sql import func
from pathlib import Path
from flask import (
Blueprint,
Expand Down Expand Up @@ -71,7 +72,7 @@ def wrapped_view(**kwargs):


def check_password_login(email, password):
subscriber = Person.query.filter_by(email=email).first()
subscriber = Person.query.filter(func.lower(email) == email).first()
if subscriber.check_password(password):
return True
return False
Expand All @@ -83,7 +84,7 @@ def login():
if request.args.get("email"):
email = request.args.get("email").lower()
# Check if password expired, send password reset email if expired.
subscriber = Person.query.filter_by(email=email).first()
subscriber = Person.query.filter(func.lower(email) == email).first()
if subscriber is not None and subscriber.password_expired:
requests.post(
url_for("subscriber.forgot_password", _external=True),
Expand All @@ -95,9 +96,9 @@ def login():
if form.validate_on_submit():
email = form.data["email"].lower()
password = form.data["password"]
subscriber = Person.query.filter_by(email=email).first()
subscriber = Person.query.filter(func.lower(email) == email).first()
if subscriber is None:
shopowner = User.query.filter_by(email=email).first()
shopowner = User.query.filter(func.lower(email) == email).first()
if shopowner is not None:
flash("You are a shop admin, please login here")
return redirect(url_for("auth.login", email=email))
Expand Down Expand Up @@ -126,7 +127,7 @@ def forgot_password():
form = SubscriberForgotPasswordForm()
if form.validate_on_submit() or form.data.get("email"):
email = form.data["email"].lower()
subscriber = Person.query.filter_by(email=email).first()
subscriber = Person.query.filter(func.lower(email) == email).first()
if subscriber is None:
flash("Person not found with that email")
return redirect(url_for("subscriber.forgot_password"))
Expand Down
Loading