Development

docker/routlin-dash/app/pages/accountlogin/action.py

@@ -1,10 +1,13 @@
+from pathlib import Path
 from flask import Blueprint, request, session, redirect, flash
 import json, bcrypt
 from auth import require_level
 from config_utils import ACCOUNTS_FILE
 import sanitize
 
-bp = Blueprint('accountlogin', __name__)
+_PAGE = Path(__file__).parent.name
+
+bp = Blueprint(_PAGE, __name__)
 
 
 
@@ -16,35 +19,35 @@ def _load_accounts():
         return {'accounts': []}
 
 
-@bp.route('/action/log_in', methods=['POST'])
+@bp.route('/action/accountlogin/form_login', methods=['POST'])
 @require_level('nothing')
-def log_in():
+def form_login():
     # Abort if already logged in
     if session.get('access_level', 'nothing') != 'nothing':
-        return redirect('/view/view_overview')
+        return redirect('/overview')
 
     email    = sanitize.email(request.form.get('email', ''))
     password = request.form.get('password', '')
 
     if not email or not password:
         flash('Email address and password are required.', 'error')
-        return redirect('/view/view_login')
+        return redirect(f'/{_PAGE}')
 
     accounts = _load_accounts().get('accounts', [])
     account  = next((a for a in accounts if a.get('email_address', '').lower() == email), None)
 
     if account is None:
         flash('Email address not recognised.', 'error')
-        return redirect('/view/view_login')
+        return redirect(f'/{_PAGE}')
 
     if not account.get('hashed_password'):
         flash('Account setup is not complete. Please use Create Account to set your password first.', 'error')
-        return redirect('/view/view_login')
+        return redirect(f'/{_PAGE}')
 
     stored_hash = account['hashed_password'].encode('utf-8')
     if not bcrypt.checkpw(password.encode('utf-8'), stored_hash):
         flash('Invalid email address or password.', 'error')
-        return redirect('/view/view_login')
+        return redirect(f'/{_PAGE}')
 
     session.clear()
     session['email_address'] = account['email_address']
@@ -53,4 +56,4 @@ def log_in():
     session['apply_changes_immediately'] = False
     session.permanent        = True
 
-    return redirect('/view/view_overview')
+    return redirect('/overview')