Merge branch 'develop' into cole-dev

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)))