Skip to content
Snippets Groups Projects
Commit a544853f authored by Ivan Procaccini's avatar Ivan Procaccini
Browse files

Refactor: Rename User to AuthenticatedUser

parent 89061990
No related branches found
No related tags found
No related merge requests found
from .administration import *
from .project import *
from ..database import db
class User(db.Model):
class AuthenticatedUser(db.Model):
username = db.Column(db.String(10), primary_key=True)
firstname = db.Column(db.String)
surname = db.Column(db.String)
......
......@@ -9,7 +9,7 @@ from .. import messages, login_manager, ldap_service
from ..database import db
from ..forms import LoginForm
from ..ldap_authentication.authenticator import NAME, SURNAME
from ..models import User
from ..models import AuthenticatedUser
bp = Blueprint("auth", __name__)
......@@ -21,7 +21,7 @@ def get_current_user():
@login_manager.user_loader
def load_user(user_id):
return User.query.get(user_id)
return AuthenticatedUser.query.get(user_id)
@bp.route("/login", methods=("GET", "POST"))
......@@ -44,9 +44,9 @@ def login():
if attributes is None:
flash(messages.LOGIN_UNSUCCESSFUL_ERROR)
return render_template("pages/login.html", form=form)
user = User.query.filter_by(username=username).first()
user = AuthenticatedUser.query.filter_by(username=username).first()
if not user:
user = User(
user = AuthenticatedUser(
username=username,
firstname=attributes.get(NAME, username.upper()),
surname=attributes.get(SURNAME, ""),
......@@ -66,7 +66,7 @@ def login():
@bp.route("/logout")
def logout():
if not current_user.is_anonymous:
db.session.delete(User.query.get(current_user.username))
db.session.delete(AuthenticatedUser.query.get(current_user.username))
db.session.commit()
logout_user()
return redirect(url_for("auth.login"))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment