From 6bb3cad3014e7b06e6207bb038eb7a45b67f56d1 Mon Sep 17 00:00:00 2001
From: Nate Dooley <ephesix@gmail.com>
Date: Tue, 18 Sep 2018 19:59:24 -0400
Subject: [PATCH 1/2] Update to flask-pyoidc version 2.0.0

---
 packet/__init__.py | 11 ++++++-----
 packet/utils.py    |  2 +-
 requirements.txt   |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packet/__init__.py b/packet/__init__.py
index a53ee060..60e2b1c4 100644
--- a/packet/__init__.py
+++ b/packet/__init__.py
@@ -8,6 +8,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
 
 from ._version import __version__
@@ -27,11 +28,11 @@
 db = SQLAlchemy(app)
 migrate = Migrate(app, db)
 
-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"])
diff --git a/packet/utils.py b/packet/utils.py
index 3be18129..d391792a 100644
--- a/packet/utils.py
+++ b/packet/utils.py
@@ -75,7 +75,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":
diff --git a/requirements.txt b/requirements.txt
index 98275fbd..9e33a2d7 100644
--- a/requirements.txt
+++ b/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

From ee7199c0ef6f42b619cb7994f403bb61f8fe2ea2 Mon Sep 17 00:00:00 2001
From: Evelyn Dooley <31457788+evelyndooley@users.noreply.github.com>
Date: Wed, 19 Sep 2018 11:33:54 -0400
Subject: [PATCH 2/2] Update requirements.txt

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 9e33a2d7..df0a1186 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 Flask==1.0.2
-Flask-pyoidc>=2.0.0
+Flask-pyoidc==2.0.0
 flask_sqlalchemy==2.3.2
 psycopg2-binary==2.7.5
 Flask-Migrate==2.2.1