From bd9eedc630c74eb14b37d5558f04440ae03f12e5 Mon Sep 17 00:00:00 2001 From: iFargle Date: Sun, 19 Feb 2023 15:25:08 +0900 Subject: [PATCH] test --- renderer.py | 8 +++----- server.py | 11 +++++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/renderer.py b/renderer.py index e870c42..a18006e 100644 --- a/renderer.py +++ b/renderer.py @@ -8,12 +8,10 @@ from concurrent.futures import wait, ALL_COMPLETED from flask_executor import Executor from flask.logging import create_logger -AUTH_TYPE = os.environ["AUTH_TYPE"].replace('"', '') -STATIC_URL_PATH = "/static" +app = FlaskOIDC(__name__) +app.config.from_object(CustomConfig) -if AUTH_TYPE.lower() == "oidc": from flaskoidc import FlaskOIDC - -app = init_app() +app = Flask(__name__) LOG = create_logger(app) executor = Executor(app) diff --git a/server.py b/server.py index a8e34f3..5e81ff1 100644 --- a/server.py +++ b/server.py @@ -14,15 +14,18 @@ STATIC_URL_PATH = "/static" # Set Authentication type: if AUTH_TYPE.lower() == "oidc": - # Load OIDC libraries from flaskoidc import FlaskOIDC + from flaskoidc.config import BaseConfig + + # Custom configuration class, a subclass of BaseConfig + CustomConfig(BaseConfig): + DEBUG = True app = FlaskOIDC(__name__, static_url_path=STATIC_URL_PATH) LOG = create_logger(app) - + app.config.from_object(CustomConfig) LOG.error("Loading OIDC libraries and configuring app...") - # TODO: - # If OIDC is enabled, add user info and a logout button to the top bar. + elif AUTH_TYPE.lower() == "basic": app = Flask(__name__, static_url_path=STATIC_URL_PATH)