Fixed view for non admin users

app/views/main.py

@@ -2,7 +2,7 @@ import logging
 import datetime
 import os
 from flask import current_app
-from flask import render_template, Blueprint, request
+from flask import render_template, Blueprint
 from flask import redirect, session, url_for
 from app import auth
 
@@ -38,13 +38,10 @@ def token():
 @main_blueprint.route('/', methods=['GET', 'POST'])
 @auth.access_control('default')
 def index():
-    user_session = UserSession(session)
-    hs_user = user_session.userinfo['email'].split('@')[0]
+    hs_user = auth.username
     userNodeList = [n for n in Node().list().nodes if n.user.name == hs_user]
     return render_template('index.html',
-                           userNodeList=userNodeList,
-                           session=user_session,
-                           auth=auth)
+                           userNodeList=userNodeList)
 
 
 @main_blueprint.route('/logout')

app/views/rest.py

@@ -4,8 +4,6 @@ from flask import Blueprint, request
 from flask import redirect, url_for
 from app import auth
 
-# from ..lib import login_name, username
-
 from flask import jsonify
 
 from hsapi_client import Node, User, Route, PreAuthKey
@@ -14,8 +12,8 @@ from hsapi_client.preauthkeys import (v1CreatePreAuthKeyRequest,
 
 
 log = logging.getLogger()
-# REST calls
 
+# REST calls
 rest_blueprint = Blueprint(
     'rest', __name__, url_prefix=os.getenv('APPLICATION_ROOT', '/'))
 
@@ -30,7 +28,7 @@ def routeToggle(routeId: int):
         else:
             action = 'enabled'
         log.info(
-            f"route '{route.prefix}' via '{route.node.givenName}'"
+            f"route '{route.prefix}' via '{route.node.givenName}' "
             f"{action} by '{auth.username}'")
         Route().toggle(routeId)
     return redirect(request.referrer)