added additional logging

VERSION

@@ -1 +1 @@
-2.5
+2.6

spectacles/webapp/VERSION

@@ -1 +1 @@
-2.5
+2.6

spectacles/webapp/auth/openid_login.py

@@ -1,3 +1,4 @@
+import logging
 import random
 
 import requests
@@ -7,6 +8,11 @@
 from spectacles.webapp.app.models import users, groups, groupmembers
 from spectacles.webapp.run import db, oidc
 from . import auth
+from ...helpers.app_logger import AppLogger
+
+logging.setLoggerClass(AppLogger)
+
+logger = logging.getLogger(__name__)
 
 
 @auth.route("/oidc_login")
@@ -17,6 +23,8 @@ def oidc_login():
 
     info = oidc.user_getinfo(["trigram", "client_roles", "realm_roles", "groups"])
 
+    logger.info(f"Retrieved userinfo: {info}")
+
     username = info.get("trigram", None)
 
     username = username.lower()
@@ -37,6 +45,8 @@ def oidc_login():
 
     account = users.query.filter_by(username=username).first()
 
+    logger.info(f"Got account: {account}")
+
     if account:
         # Check role and group accordingly; alter when needed and save to backend
         if account.role != role:
@@ -89,25 +99,28 @@ def oidc_login():
 
 def oidc_logout():
 
-    with requests.session() as session:
-
-        if oidc is not None:
-            headers = {
-                "Authorization": f"Bearer {oidc.get_access_token()}",
-                "Content-Type": "application/x-www-form-urlencoded",
-            }
-
-            data = {
-                "client_id": f"{oidc.client_secrets.get('client_id')}",
-                "client_secret": f"{oidc.client_secrets.get('client_secret')}",
-                "refresh_token": f"{oidc.get_refresh_token()}",
-            }
-
-            session.post(
-                url=f"{oidc.client_secrets.get('issuer')}/protocol/openid-connect/logout",
-                data=data,
-                headers=headers,
-                verify=False,
-            )
-
-    oidc.logout()
+    try:
+        with requests.session() as session:
+
+            if oidc is not None:
+                headers = {
+                    "Authorization": f"Bearer {oidc.get_access_token()}",
+                    "Content-Type": "application/x-www-form-urlencoded",
+                }
+
+                data = {
+                    "client_id": f"{oidc.client_secrets.get('client_id')}",
+                    "client_secret": f"{oidc.client_secrets.get('client_secret')}",
+                    "refresh_token": f"{oidc.get_refresh_token()}",
+                }
+
+                session.post(
+                    url=f"{oidc.client_secrets.get('issuer')}/protocol/openid-connect/logout",
+                    data=data,
+                    headers=headers,
+                    verify=False,
+                )
+
+        oidc.logout()
+    except Exception:
+        raise

spectacles/webapp/auth/views.py

@@ -37,6 +37,8 @@ def logout():
         oidc_logout()
     except ImportError:
         pass
+    except Exception:
+        pass
 
     # Redirect to login page
     return redirect(url_for("auth.func_login"))

spectacles/webapp/run.py

@@ -49,7 +49,7 @@ def create_app(version):
     app.config["SQLALCHEMY_POOL_TIMEOUT"] = 20
 
     # Cache-control
-    app.config['SEND_FILE_MAX_AGE_DEFAULT'] = 300
+    app.config["SEND_FILE_MAX_AGE_DEFAULT"] = 300
 
     if not config.DEBUG:
         app.config["SESSION_COOKIE_NAME"] = "spectacles.session"