From 841c3d5fb8cbf8f2b4c5ccc5435e8fdabd81101d Mon Sep 17 00:00:00 2001 From: mcbloch Date: Wed, 20 Apr 2022 01:34:19 +0200 Subject: [PATCH] add flag to disable microsoft login --- app/app.py | 11 +++++++++-- app/config.example.py | 2 ++ app/templates/layout.html | 11 +++++++---- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/app/app.py b/app/app.py index 72415f6..4f63596 100755 --- a/app/app.py +++ b/app/app.py @@ -16,6 +16,8 @@ from flask_migrate import Migrate, MigrateCommand from flask_script import Manager, Server from auth.login import init_login from markupsafe import Markup + +from config import Configuration from models import db from models.anonymous_user import AnonymouseUser from utils import euro_string, price_range_string @@ -108,8 +110,9 @@ def add_routes(application: Flask) -> None: application.register_blueprint(order_bp, url_prefix="/order") application.register_blueprint(stats_blueprint, url_prefix="/stats") application.register_blueprint(auth_bp, url_prefix="/") - application.register_blueprint(auth_microsoft_bp, - url_prefix="/users/auth/microsoft_graph_auth") # "/auth/microsoft") + if Configuration.ENABLE_MICROSOFT_AUTH: + application.register_blueprint(auth_microsoft_bp, + url_prefix="/users/auth/microsoft_graph_auth") # "/auth/microsoft") application.register_blueprint(auth_zeus_bp, url_prefix="/auth/zeus") if application.debug: @@ -167,6 +170,10 @@ def create_app(): add_routes(app) add_template_filters(app) + @app.context_processor + def inject_config(): + return dict(configuration=Configuration) + return app_manager diff --git a/app/config.example.py b/app/config.example.py index 5c1110a..78d3565 100644 --- a/app/config.example.py +++ b/app/config.example.py @@ -14,5 +14,7 @@ class Configuration: LOGFILE = "haldis.log" ZEUS_KEY = "tomtest" ZEUS_SECRET = "blargh" + + ENABLE_MICROSOFT_AUTH = False MICROSOFT_AUTH_ID = "" MICROSOFT_AUTH_SECRET = "" diff --git a/app/templates/layout.html b/app/templates/layout.html index 9ba62c9..ab5d5c2 100644 --- a/app/templates/layout.html +++ b/app/templates/layout.html @@ -63,7 +63,8 @@