From ba4b392db8918da622e513f3ea7d17943b008e09 Mon Sep 17 00:00:00 2001
From: haskal <haskal@bepis.xyz>
Date: Fri, 31 May 2019 16:52:23 -0400
Subject: [PATCH] Get fake session working

---
 wikilain/adapters/session_simple.py |  8 ++++----
 wikilain/models.py                  |  1 +
 wikilain/templates/base.html        | 10 +++++++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/wikilain/adapters/session_simple.py b/wikilain/adapters/session_simple.py
index bf6661d..780f078 100644
--- a/wikilain/adapters/session_simple.py
+++ b/wikilain/adapters/session_simple.py
@@ -5,7 +5,7 @@ from ..models import User, db
 
 __all__ = ["session_provider"]
 
-session_provider = Blueprint("session_simple", __name__, template_folder='templates')
+session_provider = Blueprint("session", __name__, template_folder='templates')
 
 @session_provider.before_app_request
 def get_session_user():
@@ -38,12 +38,12 @@ def login():
             db.session.add(User(username=request.form["username"], email=secrets.token_hex(8) + "@example.com"))
             db.session.commit()
         session["username"] = request.form["username"]
-        del session["_csrf"]
+        session.pop("_csrf", None)
         return redirect("/", code=302)
 
 
 @session_provider.route("/logout", methods=["POST"])
 def logout():
-    del session["username"]
-    del session["_csrf"]
+    session.pop("username", None)
+    session.pop("_csrf", None)
     return redirect("/", code=302)
diff --git a/wikilain/models.py b/wikilain/models.py
index e350808..2327fbb 100644
--- a/wikilain/models.py
+++ b/wikilain/models.py
@@ -42,6 +42,7 @@ class ArticleRevision(db.Model):
     date = db.Column(db.DateTime, nullable=False)
     user_id = db.Column(db.Integer, db.ForeignKey("users.id"), nullable=False)
     user = db.relationship("User", lazy=True)
+    changelog = db.Column(db.String, nullable=False)
     content = db.Column(db.Text, nullable=False)
 
     def __repr__(self):
diff --git a/wikilain/templates/base.html b/wikilain/templates/base.html
index dcc6bec..d722b1a 100644
--- a/wikilain/templates/base.html
+++ b/wikilain/templates/base.html
@@ -16,7 +16,15 @@
                     </form>
                 </li>
                 <li><a href="/sections">Sections</a></li>
-                <li><a href="/user/login">Log In</a></li>
+                {% if not g.wl_user %}
+                    <li><a href="{{ url_for("session.login") }}">Log In</a></li>
+                {% else %}
+                    <li>
+                        <form action="{{ url_for("session.logout") }}" method="POST">
+                            <button type="submit">Log Out</button>
+                        </form>
+                    </li>
+                {% endif %}
             </ul>
         </nav>
         {% with messages = get_flashed_messages(with_categories=true) %}