bug fixes

website/session.py

@@ -5,7 +5,7 @@
 
 
 def get_session():
-    if session["username"] is not None:
+    if "username" in session:
         user = db.session.query(Token).filter_by(active=True, username=session["username"]).first()
         if user is None:
             user = db.session.query(Token, username=session["username"]).first()
@@ -19,7 +19,7 @@ def get_session():
 
 
 def get_user():
-    if session["username"] is not None:
+    if "username" in session:
         user = db.session.query(Token).filter_by(username=session["username"]).first()
         return user
     else:

website/templates/auth/login.html

@@ -1,24 +1,24 @@
 {% extends 'base.html' %}
 {% block title %}
-Register
+Login
 {% endblock %}
 {% block body %}
     <div class="row justify-content-center text-center">
-        <h1>Register</h1>
+        <h1>Login</h1>
     </div>
     <form class="form p-3">
         <label class="label" for="username">Username:</label>
         <input id="username" class="form-control" required>
         <label class="label" for="password">Password:</label>
         <input id="password" class="form-control" type="password" required>
-        <button class="btn btn-primary" type="button" onclick="register()">Register</button>
+        <button class="btn btn-primary" type="button" onclick="register()">Login</button>
     </form>
     <script>
         function register() {
-            $.post("/register-api/", {"username": $("#username").val(), "password": $("#password").val()}).then(function () {
+            $.post("/login-api/", {"username": $("#username").val(), "password": $("#password").val()}).then(function () {
                 window.location.href = "/"
             });
         }
     </script>
 {% endblock %}
-{% block navid %}register{% endblock %}
+{% block navid %}login{% endblock %}

website/templates/auth/register.html

@@ -0,0 +1,24 @@
+{% extends 'base.html' %}
+{% block title %}
+Register
+{% endblock %}
+{% block body %}
+    <div class="row justify-content-center text-center">
+        <h1>Register</h1>
+    </div>
+    <form class="form p-3">
+        <label class="label" for="username">Username:</label>
+        <input id="username" class="form-control" required>
+        <label class="label" for="password">Password:</label>
+        <input id="password" class="form-control" type="password" required>
+        <button class="btn btn-primary" type="button" onclick="register()">Register</button>
+    </form>
+    <script>
+        function register() {
+            $.post("/register-api/", {"username": $("#username").val(), "password": $("#password").val()}).then(function () {
+                window.location.href = "/"
+            });
+        }
+    </script>
+{% endblock %}
+{% block navid %}register{% endblock %}

website/wrappers.py

@@ -51,7 +51,7 @@ def wrap(*args, **kwargs):
 
 def login_required(func):
     def wrap(*args, **kwargs):
-        if session["username"] is None:
+        if "username" not in session:
             flash("Not logged in", "danger")
             return redirect(url_for("auth.login"))
         result = func(*args, **kwargs, user=get_user())