bug fixes

website/bp/local.py

@@ -20,7 +20,7 @@
 @minify_html
 @login_required
 def add_token(user):
-    return render_template("local/create_user.html")
+    return render_template("local/add_token.html")
 
 
 @local_bp.route("/create-user-with-token/")
@@ -45,7 +45,7 @@ def create_user_with_token_api(user):
 @minify_html
 @login_required
 def select_token(user):
-    if db.session.query(User).count() == 0:
+    if db.session.query(Token).filter_by(user=user.id).count() == 0:
         flash("No tokens found, please create one", "info")
         return redirect(url_for("local.add_token"))
 
@@ -55,25 +55,25 @@ def __init__(self, token, id, active):
             self.id = id
             self.active = active
 
-    users = []
-    for user in db.session.query(User).filter_by(user=user.id).all():
+    tokens = []
+    for token in db.session.query(Token).filter_by(user=user.id).all():
         try:
-            a = Agent(AutoTradersSession(user.token))
-            a.active = user.active
-            a.id = user.id
-            users.append(a)
+            a = Agent(AutoTradersSession(token.token))
+            a.active = token.active
+            a.id = token.id
+            tokens.append(a)
         except Exception as e:
-            users.append(MockAgent(user.token, user.id, user.active))
-    return render_template("local/select_token.html", users=users)
+            tokens.append(MockAgent(token.token, token.id, token.active))
+    return render_template("local/select_token.html", tokens=tokens)
 
 
 @local_bp.route("/select-user-api/<token_id>")
 @login_required
 def select_user_api(token_id, user):
-    active_previous = db.session.query(User).filter_by(active=True, user=user.id).first()
+    active_previous = db.session.query(Token).filter_by(active=True, user=user.id).first()
     if active_previous is not None:
         active_previous.active = False
-    current = db.session.query(User).filter_by(id=token_id, user=user.id).first()
+    current = db.session.query(Token).filter_by(id=token_id, user=user.id).first()
     current.active = True
     db.session.commit()
     return jsonify({})

website/bp/main.py

@@ -1,7 +1,4 @@
-import pickle
-import time
 from datetime import datetime, timezone
-from functools import cache
 
 import autotraders
 from autotraders.agent import Agent
@@ -10,15 +7,6 @@
 from flask import *
 
 from website.model import db, User, Automation
-from website.search import (
-    weight,
-    read_query,
-    check_filters_system,
-    check_filters_waypoint,
-    check_filters_ship,
-    check_filters_contract,
-    check_filters_faction, quick_weight,
-)
 from website.session import get_session, anonymous_session
 from website.wrappers import token_required, minify_html
 

website/session.py

@@ -1,26 +1,28 @@
 from autotraders import session as asession
 from flask import session
 
-from website.model import db, Token
+from website.model import db, Token, User
 
 
 def get_session():
     if "username" in session:
-        user = db.session.query(Token).filter_by(active=True, user=session["username"]).first()
-        if user is None:
-            user = db.session.query(Token).filter_by(user=session["username"]).first()
-            if user is None:
+        user = db.session.query(User).filter_by(username=session["username"]).first()
+        user_id = user.id
+        token = db.session.query(Token).filter_by(active=True, user=user_id).first()
+        if token is None:
+            token = db.session.query(Token).filter_by(user=user_id).first()
+            if token is None:
                 return None
-            user.active = True
+            token.active = True
             db.session.commit()
-        return asession.AutoTradersSession(user.token)
+        return asession.AutoTradersSession(token.token)
     else:
         return None
 
 
 def get_user():
     if "username" in session:
-        user = db.session.query(Token).filter_by(user=session["username"]).first()
+        user = db.session.query(User).filter_by(username=session["username"]).first()
         return user
     else:
         return None

website/templates/local/create_user.html → website/templates/local/add_token.html

@@ -1,11 +1,11 @@
 {% extends 'base.html' %}
 {% block title %}
-Create User
+Add Token
 {% endblock %}
 {% block body %}
     <div class="container p-3">
         <div class="row justify-content-center text-center">
-            <h1>Create User</h1>
+            <h1>Add Token</h1>
         </div>
         <div class="row m-3 justify-content-center">
             <div class="card text-bg-info m-3" style="width: 18rem;">
@@ -35,4 +35,4 @@ <h5 class="card-title">Token</h5>
         </div>
     </div>
 {% endblock %}
-{% block navid %}select-user{% endblock %}
+{% block navid %}select-token{% endblock %}

website/templates/local/select_token.html

@@ -8,7 +8,7 @@
             <h1>Select User</h1>
         </div>
         <div class="list-group">
-            {% for user in users %}
+            {% for user in tokens %}
                 <div id="{{ user.id }}" class="list-group-item {% if user.active %}active{% endif %}">
                     {% if user.__class__.__name__ == "Agent" %}
                         <p class="text-truncate">
@@ -26,7 +26,7 @@ <h1>Select User</h1>
                     </div>
                 </div>
             {% endfor %}
-            {% if users.__len__() == 0 %}
+            {% if tokens.__len__() == 0 %}
                 <p>No users saved, you should create one ...</p>
             {% endif %}
         </div>
@@ -76,4 +76,4 @@ <h1 class="modal-title fs-5" id="helpModalTitle">Help</h1>
         }
     </script>
 {% endblock %}
-{% block navid %}select-user{% endblock %}
+{% block navid %}select-token{% endblock %}

website/wrappers.py

@@ -33,13 +33,8 @@ def wrap(*args, **kwargs):
 
 def token_required(func):
     def wrap(*args, **kwargs):
-        try:
-            session = get_session()
-        except Exception as e:
-            if type(e) == AttributeError:
-                flash("No active token found", "danger")
-            else:
-                flash(str(type(e)) + " - " + str(e), "danger")
+        session = get_session()
+        if session is None:
             return redirect(url_for("local.select_token"))
         result = func(*args, **kwargs, session=session)
         return result