Merge pull request #102 from evelyndooley/develop

Update to flask-pyoidc version 2.0.0

Author: devinmatte

packet/__init__.py

@@ -10,6 +10,7 @@
 from flask import Flask
 from flask_migrate import Migrate
 from flask_pyoidc.flask_pyoidc import OIDCAuthentication
+from flask_pyoidc.provider_configuration import ProviderConfiguration, ClientMetadata
 from flask_sqlalchemy import SQLAlchemy
 
 app = Flask(__name__)
@@ -37,11 +38,11 @@
 migrate = Migrate(app, db)
 app.logger.info("SQLAlchemy pointed at " + repr(db.engine.url))
 
-auth = OIDCAuthentication(app, issuer=app.config["OIDC_ISSUER"], client_registration_info={
-    "client_id": app.config["OIDC_CLIENT_ID"],
-    "client_secret": app.config["OIDC_CLIENT_SECRET"],
-    "post_logout_redirect_uris": "/logout/"
-})
+APP_CONFIG = ProviderConfiguration(issuer=app.config["OIDC_ISSUER"],
+                          client_metadata=ClientMetadata(app.config["OIDC_CLIENT_ID"],
+                                                            app.config["OIDC_CLIENT_SECRET"]))
+
+auth = OIDCAuthentication({'app': APP_CONFIG}, app)
 
 # LDAP
 _ldap = csh_ldap.CSHLDAP(app.config["LDAP_BIND_DN"], app.config["LDAP_BIND_PASS"])

packet/utils.py

@@ -56,7 +56,7 @@ def packet_auth(func):
     """
     Decorator for easily configuring oidc
     """
-    @auth.oidc_auth
+    @auth.oidc_auth('app')
     @wraps(func)
     def wrapped_function(*args, **kwargs):
         if app.config["REALM"] == "csh":

requirements.txt

@@ -1,5 +1,5 @@
 Flask==1.0.2
-Flask-pyoidc==1.3.0
+Flask-pyoidc==2.0.0
 flask_sqlalchemy==2.3.2
 psycopg2-binary==2.7.5
 Flask-Migrate==2.2.1