Merge pull request #424 from ComputerScienceHouse/cole-dev

fix: minor version and auth fix

Author: costowell

conditional/__init__.py

@@ -40,8 +40,12 @@
                app.config['LDAP_BIND_PW'],
                ro=app.config['LDAP_RO'])
 
-client_metadata = ClientMetadata(app.config["OIDC_CLIENT_CONFIG"])
-provider_config = ProviderConfiguration(issuer=app.config["OIDC_ISSUER"], client_registration_info=client_metadata)
+client_metadata = ClientMetadata(
+    client_id = app.config['OIDC_CLIENT_ID'],
+    client_secret = app.config['OIDC_CLIENT_SECRET'],
+    post_logout_redirect_uris = app.config['OIDC_POST_LOGOUT_REDIRECT_URIS'],
+)
+provider_config = ProviderConfiguration(issuer=app.config["OIDC_ISSUER"], client_metadata=client_metadata)
 
 auth = OIDCAuthentication({'default': provider_config}, app)
 

config.env.py

@@ -37,11 +37,9 @@
 
 # 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")]
-}
+OIDC_CLIENT_ID= env.get("CONDITIONAL_OIDC_CLIENT_ID", "conditional")
+OIDC_CLIENT_SECRET = env.get("CONDITIONAL_OIDC_CLIENT_SECRET", "")
+OIDC_POST_LOGOUT_REDIRECT_URIS = [env.get("CONDITIONAL_OIDC_CLIENT_LOGOUT", "http://0.0.0.0:6969/logout")]
 
 # Openshift secret
 SECRET_KEY = env.get("CONDITIONAL_SECRET_KEY", default=''.join(secrets.token_hex(16)))

requirements.in

@@ -1,7 +1,6 @@
 alembic~=1.15.1
 astroid~=3.3.9
 blinker~=1.4
-click~=7.1
 csh_ldap>=2.3.1
 ddtrace~=3.2.1
 Flask~=3.1.0
@@ -29,3 +28,4 @@ SQLAlchemy~=2.0.40
 structlog~=18.1.0
 Werkzeug~=3.1.3
 wrapt~=1.17.2
+click~=8.1

requirements.txt

@@ -1,16 +1,12 @@
-#
-# This file is autogenerated by pip-compile with Python 3.13
-# by the following command:
-#
-#    pip-compile requirements.in
-#
-alembic==1.15.1
+# This file was autogenerated by uv via the following command:
+#    uv pip compile requirements.in
+alembic==1.15.2
     # via
     #   -r requirements.in
     #   flask-migrate
 annotated-types==0.7.0
     # via pydantic
-astroid==3.3.9
+astroid==3.3.11
     # via
     #   -r requirements.in
     #   pylint
@@ -19,36 +15,38 @@ blinker==1.9.0
     #   -r requirements.in
     #   flask
     #   sentry-sdk
-certifi==2022.5.18.1
+build==1.3.0
+    # via pip-tools
+bytecode==0.17.0
+    # via ddtrace
+certifi==2025.10.5
     # via
     #   requests
     #   sentry-sdk
-cffi==1.15.0
+cffi==2.0.0
     # via cryptography
-charset-normalizer==2.0.12
+charset-normalizer==3.4.4
     # via requests
-click==8.1.8
+click==8.3.0
     # via
     #   -r requirements.in
     #   flask
     #   pip-tools
-cryptography==37.0.2
+cryptography==46.0.3
     # via oic
-csh-ldap==2.3.1
+csh-ldap==2.4.0
     # via -r requirements.in
-ddtrace==3.2.2
+ddtrace==3.2.3
     # via -r requirements.in
 defusedxml==0.7.1
     # via oic
-deprecated==1.2.18
-    # via opentelemetry-api
-dill==0.3.9
+dill==0.4.0
     # via pylint
-dnspython==2.2.1
+dnspython==2.8.0
     # via srvlookup
 envier==0.6.1
     # via ddtrace
-flask==3.1.0
+flask==3.1.2
     # via
     #   -r requirements.in
     #   flask-gzip
@@ -66,15 +64,15 @@ flask-sqlalchemy==3.1.1
     # via
     #   -r requirements.in
     #   flask-migrate
-future==0.18.2
+future==1.0.0
     # via pyjwkest
-greenlet==3.1.1
+greenlet==3.2.4
     # via sqlalchemy
 gunicorn==20.1.0
     # via -r requirements.in
-idna==3.3
+idna==3.11
     # via requests
-importlib-metadata==8.6.1
+importlib-metadata==8.7.0
     # via opentelemetry-api
 importlib-resources==6.5.2
     # via flask-pyoidc
@@ -90,22 +88,17 @@ jinja2==3.1.6
     # via
     #   -r requirements.in
     #   flask
-jmespath==1.0.1
-    # via
-    #   boto3
-    #   botocore
 lazy-object-proxy==1.4.3
     # via -r requirements.in
-legacy-cgi==2.6.3
-    # via ddtrace
 mako==1.0.14
     # via
     #   -r requirements.in
     #   alembic
     #   oic
-markupsafe==3.0.2
+markupsafe==3.0.3
     # via
     #   -r requirements.in
+    #   flask
     #   jinja2
     #   mako
     #   sentry-sdk
@@ -118,70 +111,72 @@ oic==1.6.1
     # via
     #   -r requirements.in
     #   flask-pyoidc
-opentelemetry-api==1.31.1
+opentelemetry-api==1.38.0
     # via ddtrace
-packaging==24.2
+packaging==25.0
     # via build
+pip==25.2
+    # via pip-tools
 pip-tools==7.4.1
     # via -r requirements.in
-platformdirs==4.3.7
+platformdirs==4.5.0
     # via pylint
-protobuf==3.20.1
+protobuf==6.33.0
     # via ddtrace
-psycopg2-binary==2.9.3
+psycopg2-binary==2.9.11
     # via -r requirements.in
-pyasn1==0.4.8
+pyasn1==0.6.1
     # via
     #   pyasn1-modules
     #   python-ldap
-pyasn1-modules==0.2.8
+pyasn1-modules==0.4.2
     # via python-ldap
-pycparser==2.21
+pycparser==2.23
     # via cffi
-pycryptodomex==3.14.1
+pycryptodomex==3.23.0
     # via
     #   oic
     #   pyjwkest
-pydantic==2.11.0
+pydantic==2.12.3
     # via pydantic-settings
-pydantic-core==2.33.0
+pydantic-core==2.41.4
     # via pydantic
-pydantic-settings==2.8.1
+pydantic-settings==2.11.0
     # via oic
-pyjwkest==1.4.2
+pyjwkest==1.4.4
     # via oic
-pylint==3.3.6
+pylint==3.3.9
     # via -r requirements.in
 pyproject-hooks==1.2.0
     # via
     #   build
     #   pip-tools
 python-dateutil==2.6.1
-    # via
-    #   -r requirements.in
-    #   botocore
-python-dotenv==1.1.0
+    # via -r requirements.in
+python-dotenv==1.1.1
     # via pydantic-settings
 python-editor==1.0.4
     # via -r requirements.in
-python-ldap==3.0.0
+python-ldap==3.4.0
     # via csh-ldap
-requests==2.27.1
+requests==2.32.5
     # via
     #   flask-pyoidc
     #   oic
     #   pyjwkest
-s3transfer==0.10.4
-    # via boto3
-sentry-sdk[flask]==2.24.1
+sentry-sdk==2.24.1
     # via -r requirements.in
+setuptools==80.9.0
+    # via
+    #   gunicorn
+    #   pip-tools
 six==1.17.0
     # via
     #   -r requirements.in
     #   pyjwkest
     #   python-dateutil
     #   structlog
-sqlalchemy==2.0.40
+sqlalchemy==2.0.44
     # via
     #   -r requirements.in
     #   alembic
@@ -190,39 +185,36 @@ srvlookup==2.0.0
     # via csh-ldap
 structlog==18.1.0
     # via -r requirements.in
-tomlkit==0.13.2
+tomlkit==0.13.3
     # via pylint
-typing-extensions==4.13.0
+typing-extensions==4.15.0
     # via
     #   alembic
     #   ddtrace
+    #   opentelemetry-api
     #   pydantic
     #   pydantic-core
     #   sqlalchemy
     #   typing-inspection
-typing-inspection==0.4.0
-    # via pydantic
-urllib3==1.26.20
+typing-inspection==0.4.2
+    # via
+    #   pydantic
+    #   pydantic-settings
+urllib3==2.5.0
     # via
-    #   botocore
     #   requests
     #   sentry-sdk
 werkzeug==3.1.3
     # via
     #   -r requirements.in
     #   flask
-wheel==0.37.1
+wheel==0.45.1
     # via pip-tools
-wrapt==1.17.2
+wrapt==1.17.3
     # via
     #   -r requirements.in
     #   ddtrace
-    #   deprecated
-xmltodict==0.14.2
+xmltodict==1.0.2
     # via ddtrace
-zipp==3.21.0
+zipp==3.23.0
     # via importlib-metadata
-
-# The following packages are considered to be unsafe in a requirements file:
-# pip
-# setuptools