From 7a5e387665a01e3eb26a3c215828d81f64c14041 Mon Sep 17 00:00:00 2001 From: Michatec Date: Sat, 27 Sep 2025 20:59:08 +0200 Subject: [PATCH] Add the Oauth check --- main.py | 10 ++++++++-- routes/discord.py | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/main.py b/main.py index 3017a00..7c73990 100644 --- a/main.py +++ b/main.py @@ -16,7 +16,10 @@ from routes.friends import friends_bp from routes.notifications import noti_bp from routes.credits import credits_bp from models import db, User, Reward, Event, UserShopItem, ShopItem, SHOPITEM_ID_PREMIUM, SHOPITEM_ID_GOLDRAHMEN, SHOPITEM_ID_EXTRA_TYPES, SHOPITEM_ID_EXTRA_UPLOAD -from routes.oauth import oauth +try: + from routes.oauth import oauth +except ImportError: + pass import re import os @@ -34,7 +37,10 @@ app_login.login_view = 'log.login' app_login.login_message = _('Please log in to access this page.') app_login.login_message_category = 'info' babel = Babel(app) -oauth.init_app(app) +try: + oauth.init_app(app) +except NameError: + pass if not os.path.exists('instance/site.db'): with app.app_context(): diff --git a/routes/discord.py b/routes/discord.py index f1b8af2..362ad89 100644 --- a/routes/discord.py +++ b/routes/discord.py @@ -1,11 +1,17 @@ -from flask import Blueprint, render_template, redirect, url_for, flash, request +from flask import Blueprint, render_template, redirect, url_for, flash, request, abort from flask_login import login_required, current_user from models import db, User from werkzeug.security import generate_password_hash from flask_babel import gettext as _ -from routes.oauth import discord +try: + from routes.oauth import discord +except ImportError: + discord = None from routes.login import login_user +if discord is None: + abort("OAuth not configured. Please set up OAuth in routes/oauth.py") + discord_bp = Blueprint('discord', __name__) @discord_bp.route('/login/discord')