User refactoring

web/models.py

@@ -34,15 +34,26 @@ class User(LDAPObjectHelper):
         return user
 
     @classmethod
-    def login(cls, login, password):
+    def authenticate(cls, login, password, signin=False):
         filter = current_app.config["LDAP"].get("USER_FILTER").format(login=login)
         user = User.get(filter=filter)
         if not user or not user.check_password(password):
             return None
 
-        session["user_dn"] = user.dn
+        if signin:
+            user.login()
+
         return user
 
+    def login(self):
+        session["user_dn"] = self.dn
+
+    def logout(self):
+        try:
+            del session["user_dn"]
+        except KeyError:
+            pass
+
     def check_password(self, password):
         conn = ldap.initialize(current_app.config["LDAP"]["URI"])
         try:

web/oauth.py

@@ -21,7 +21,9 @@ def authorize():
         if request.method == "GET":
             return render_template("login.html", form=form, menu=False)
 
-        if not form.validate() or not User.login(form.login.data, form.password.data):
+        if not form.validate() or not User.authenticate(
+            form.login.data, form.password.data, True
+        ):
             flash(gettext("Login failed, please check your information"), "error")
             return render_template("login.html", form=form, menu=False)
 

web/oauth2utils.py

@@ -82,7 +82,7 @@ class OpenIDCode(_OpenIDCode):
 
 class PasswordGrant(_ResourceOwnerPasswordCredentialsGrant):
     def authenticate_user(self, username, password):
-        return User.login(username, password)
+        return User.authenticate(username, password)
 
 
 class RefreshTokenGrant(_RefreshTokenGrant):

web/routes.py

@@ -24,7 +24,9 @@ def login():
     form = LoginForm(request.form or None)
 
     if request.form:
-        if not form.validate() or not User.login(form.login.data, form.password.data):
+        if not form.validate() or not User.authenticate(
+            form.login.data, form.password.data, True
+        ):
             flash(gettext("Login failed, please check your information"), "error")
             return render_template("login.html", form=form)
 
@@ -35,8 +37,8 @@ def login():
 
 @bp.route("/logout")
 def logout():
-    if "user_dn" in session:
-        del session["user_dn"]
+    if current_user():
+        current_user().logout()
     return redirect("/")