Merging with OIDC PR

Author: devinmatte

conditional/__init__.py

@@ -5,22 +5,18 @@
 import subprocess
 from datetime import datetime
 
-import structlog
 from csh_ldap import CSHLDAP
-from flask import Flask, redirect, request, render_template, g
+from flask import Flask, redirect, render_template, g
 from flask_migrate import Migrate
 from flask_pyoidc.flask_pyoidc import OIDCAuthentication
 from flask_sqlalchemy import SQLAlchemy
 from raven.contrib.flask import Sentry
-from raven.exceptions import InvalidGitRepository
 import structlog
 
 from conditional import config
 
 app = Flask(__name__)
 
-config = os.path.join(app.config.get('ROOT_DIR', os.getcwd()), "config.py")
-
 app.config.from_object(config)
 if os.path.exists(os.path.join(os.getcwd(), "config.py")):
     app.config.from_pyfile(os.path.join(os.getcwd(), "config.py"))
@@ -45,12 +41,14 @@
 
 app.secret_key = app.config["SECRET_KEY"]
 
+
 def start_of_year():
     start = datetime(datetime.today().year, 6, 1)
     if datetime.today() < start:
         start = datetime(datetime.today().year - 1, 6, 1)
     return start
 
+
 # pylint: disable=C0413
 from .models.models import UserLog
 
@@ -84,6 +82,7 @@ def database_processor(logger, log_method, event_dict):  # pylint: disable=unuse
         del event_dict['request']
     return event_dict
 
+
 structlog.configure(processors=[
     request_processor,
     database_processor,
@@ -132,9 +131,17 @@ def static_proxy(path):
 
 
 @app.route('/')
+@auth.oidc_auth
 def default_route():
     return redirect('/dashboard')
 
+
+@app.route("/logout")
+@auth.oidc_logout
+def logout():
+    return redirect("/", 302)
+
+
 @app.errorhandler(404)
 @app.errorhandler(500)
 @auth.oidc_auth

conditional/config.py

@@ -23,5 +23,13 @@
     'release': __version__,
 }
 
+# OIDC Config
+OIDC_ISSUER = env.get("CONDITIONAL_OIDC_ISSUER", "https://sso.csh.rit.edu/auth/realms/csh")
+OIDC_CLIENT_CONFIG = {
+    'client_id': env.get("CONDITIONAL_OIDC_CLIENT_ID", "conditional"),
+    'client_secret': env.get("CONDITIONAL_OIDC_CLIENT_SECRET", ""),
+    'post_logout_redirect_uris': [env.get("CONDITIONAL_OIDC_CLIENT_LOGOUT", "http://0.0.0.0:6969/logout")]
+}
+
 # General config
 DUES_PER_SEMESTER = env.get("CONDITIONAL_DUES_PER_SEMESTER", 80)

requirements.txt

@@ -8,7 +8,6 @@ Flask-Migrate==2.1.1
 Flask-pyoidc==1.2.0
 Flask-SQLAlchemy==2.3.2
 gunicorn==19.7.1
-isort==4.2.15
 isort==4.3.4
 itsdangerous==0.24
 Jinja2==2.10