v7.0.0.0

Changelog: https://roxy-wi.org/changelog#7.0.0

app/__init__.py

@@ -12,6 +12,7 @@ app.jinja_env.add_extension('jinja2.ext.loopcontrols')
 cache = Cache(config={'CACHE_TYPE': 'SimpleCache', "CACHE_DEFAULT_TIMEOUT": 3000})
 cache.init_app(app)
 login_manager = LoginManager(app)
+login_manager.login_view = 'app.login.login_page'
 
 app.config['SITEMAP_INCLUDE_RULES_WITHOUT_PARAMS'] = True
 app.config['PERMANENT_SESSION_LIFETIME'] = timedelta(days=3)
@@ -63,3 +64,5 @@ app.register_blueprint(server_bp, url_prefix='/server')
 
 from app.routes.admin import bp as admin_bp
 app.register_blueprint(admin_bp, url_prefix='/admin')
+
+from app import login

app/login.py

@@ -1,5 +1,3 @@
-import os
-import sys
 import uuid
 
 import distro
@@ -8,14 +6,11 @@ from flask import render_template, request, redirect, url_for, flash, make_respo
 from flask_login import login_user, login_required, logout_user, current_user
 
 from app import app, login_manager, cache
-
-sys.path.append(os.path.join(sys.path[0], '/var/www/haproxy-wi/app'))
-
-import modules.db.sql as sql
-from modules.db.db_model import *
-import modules.server.server as server_mod
-import modules.roxywi.common as roxywi_common
-import modules.roxywi.auth as roxywi_auth
+import app.modules.db.sql as sql
+import app.modules.server.server as server_mod
+import app.modules.roxywi.common as roxywi_common
+import app.modules.roxywi.auth as roxywi_auth
+import app.modules.roxy_wi_tools as roxy_wi_tools
 
 
 @app.before_request
@@ -41,7 +36,7 @@ def load_user(user_id):
     user_obj = cache.get(user)
 
     if user_obj is None:
-        query = User.get(User.user_id == user_id)
+        query = sql.get_user_id(user_id)
         cache.set(user, query, timeout=360)
         return query
 

app/modules/db/sql.py

@@ -731,6 +731,15 @@ def get_user_name_by_uuid(uuid):
 			return user.username
 
 
+def get_user_id(user_id: int) -> int:
+	try:
+		query = User.get(User.user_id == user_id)
+	except Exception as e:
+		out_error(e)
+	else:
+		return query
+
+
 def get_user_id_by_uuid(uuid):
 	try:
 		query = User.select(User.user_id).join(UUID, on=(User.user_id == UUID.user_id)).where(UUID.uuid == uuid)

app/routes/main/routes.py

@@ -2,7 +2,7 @@ import os
 import sys
 import pytz
 
-from flask import render_template, request, redirect, url_for, make_response
+from flask import render_template, request, redirect, url_for
 from flask_login import login_required
 
 sys.path.append(os.path.join(sys.path[0], '/var/www/haproxy-wi/app'))