From 67c802c67f93ae313a238f4a3f16828502d31ec5 Mon Sep 17 00:00:00 2001
From: Tim Van Baak <tim.vanbaak@gmail.com>
Date: Wed, 15 Jan 2020 22:12:52 -0800
Subject: [PATCH] Switch to using user getattr for configs

---
 amanuensis/server/auth.py            | 2 +-
 amanuensis/server/home.py            | 2 +-
 amanuensis/templates/home/admin.html | 2 +-
 amanuensis/templates/home/home.html  | 4 ++--
 amanuensis/user.py                   | 3 ---
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/amanuensis/server/auth.py b/amanuensis/server/auth.py
index aed0509..6c2d2c8 100644
--- a/amanuensis/server/auth.py
+++ b/amanuensis/server/auth.py
@@ -33,7 +33,7 @@ def get_bp(login_manager):
 					remember_me = form.remember.data
 					login_user(u, remember=remember_me)
 					config.logger.info("Logged in user '{}' ({})".format(
-						u.get('username'), u.uid))
+						u.username, u.uid))
 					return redirect(url_for('home.home'))
 			flash("Login not recognized")
 		else:
diff --git a/amanuensis/server/home.py b/amanuensis/server/home.py
index d98c720..7d077b7 100644
--- a/amanuensis/server/home.py
+++ b/amanuensis/server/home.py
@@ -22,7 +22,7 @@ def get_bp():
 	@bp.route('/admin/', methods=['GET'])
 	@login_required
 	def admin():
-		if not current_user.get('admin'):
+		if not current_user.admin:
 			return redirect(url_for('home.home'))
 
 		with config.json_ro('config.json') as j:
diff --git a/amanuensis/templates/home/admin.html b/amanuensis/templates/home/admin.html
index 98172a8..b265f2f 100644
--- a/amanuensis/templates/home/admin.html
+++ b/amanuensis/templates/home/admin.html
@@ -2,7 +2,7 @@
 {% block title %}Admin | Amanuensis{% endblock %}
 {% block header %}<h2>Amanuensis - Admin Dashboard</h2>{% endblock %}
 
-{% block sb_topline %}<b>{{ current_user.get('displayname') }}</b>{% endblock %}
+{% block sb_topline %}<b>{{ current_user.displayname }}</b>{% endblock %}
 {% block sb_logout %}<a href="{{ url_for('auth.logout') }}">Log out</a>{% endblock %}
 {% block sb_home %}<a href="{{ url_for('home.home') }}">Home</a>{% endblock %}
 {% set template_sidebar_rows = [self.sb_topline(), self.sb_logout(), self.sb_home()] %}
diff --git a/amanuensis/templates/home/home.html b/amanuensis/templates/home/home.html
index 03c26f3..b4cec9b 100644
--- a/amanuensis/templates/home/home.html
+++ b/amanuensis/templates/home/home.html
@@ -2,11 +2,11 @@
 {% block title %}Home | Amanuensis{% endblock %}
 {% block header %}<h2>Amanuensis - Dashboard</h2>{% endblock %}
 
-{% block sb_topline %}<b>{{ current_user.get('displayname') }}</b>{% endblock %}
+{% block sb_topline %}<b>{{ current_user.displayname }}</b>{% endblock %}
 {% block sb_logout %}<a href="{{ url_for('auth.logout') }}">Log out</a>{% endblock %}
 {% set template_sidebar_rows = [self.sb_topline(), self.sb_logout()] %}
 
-{% if current_user.get('admin') %}
+{% if current_user.admin %}
 	{% block sb_admin %}<a href="{{ url_for('home.admin') }}">Admin</a>{% endblock %}
 	{% set template_sidebar_rows = template_sidebar_rows + [self.sb_admin()] %}
 {% endif %}
diff --git a/amanuensis/user.py b/amanuensis/user.py
index 54f74d1..ddbb89d 100644
--- a/amanuensis/user.py
+++ b/amanuensis/user.py
@@ -25,9 +25,6 @@ class User(UserMixin):
 	def get_id(self):
 		return self.uid
 
-	def get(self, key):
-		return self.config.get(key)
-
 	def set_password(self, pw):
 		h = generate_password_hash(pw)
 		with config.json_rw(self.config_path) as j: