HYP-186 - Tweaked "public or DBMI user" to not always boot users back to login when their JWT expires

app/contact/views.py

@@ -14,11 +14,12 @@
 from django.core.mail import EmailMultiAlternatives
 from django.shortcuts import render
 from django.template.loader import render_to_string
+from hypatio.dbmiauthn_services import DBMIAuthn
 
 # Get an instance of a logger
 logger = logging.getLogger(__name__)
 
-@public_user_auth_and_jwt
+@DBMIAuthn.public_user_auth_and_jwt
 def contact_form(request, project_key=None):
 
     # If this is a POST request we need to process the form data.

app/hypatio/dbmiauthn_services.py

@@ -0,0 +1,33 @@
+from functools import wraps
+from pyauth0jwt.auth0authenticate import validate_request, jwt_login
+from django.conf import settings
+from django.contrib import auth
+import logging
+logger = logging.getLogger(__name__)
+
+
+class DBMIAuthn:
+
+    def public_user_auth_and_jwt(function):
+
+        @wraps(function)
+        def wrap(request, *args, **kwargs):
+            """
+            Here we see if the user is logged in but let them stay on the page if they aren't.
+            """
+
+            # Validates the JWT and returns its payload if valid.
+            jwt_payload = validate_request(request)
+
+            # If user is logged in, make sure they have a valid JWT
+            if request.user.is_authenticated and jwt_payload is None:
+                logger.debug('User ' + request.user.email + ' is authenticated but does not have a valid JWT. Logging them out.')
+                auth.logout(request)
+
+            # User has a JWT session open but not a Django session. Try to start a Django session and continue the request.
+            if not request.user.is_authenticated and jwt_payload is not None:
+                jwt_login(request, jwt_payload)
+
+            return function(request, *args, **kwargs)
+
+        return wrap

app/hypatio/views.py

@@ -1,9 +1,8 @@
 from django.shortcuts import render
 
-from pyauth0jwt.auth0authenticate import public_user_auth_and_jwt
+from hypatio.dbmiauthn_services import DBMIAuthn
 
-
-@public_user_auth_and_jwt
+@DBMIAuthn.public_user_auth_and_jwt
 def index(request, template_name='index.html'):
     """
     Homepage for the DBMI Portal

app/projects/views.py

@@ -17,7 +17,7 @@
 
 from profile.forms import RegistrationForm
 
-from pyauth0jwt.auth0authenticate import public_user_auth_and_jwt
+from hypatio.dbmiauthn_services import DBMIAuthn
 from pyauth0jwt.auth0authenticate import user_auth_and_jwt
 
 from projects.models import AGREEMENT_FORM_TYPE_EXTERNAL_LINK
@@ -72,7 +72,7 @@ def signed_agreement_form(request):
         return HttpResponse(403)
 
 
-@public_user_auth_and_jwt
+@DBMIAuthn.public_user_auth_and_jwt
 def list_data_projects(request, template_name='projects/list-data-projects.html'):
     """
     Displays all visible data projects.
@@ -84,7 +84,7 @@ def list_data_projects(request, template_name='projects/list-data-projects.html'
     return render(request, template_name, context=context)
 
 
-@public_user_auth_and_jwt
+@DBMIAuthn.public_user_auth_and_jwt
 def list_data_challenges(request, template_name='projects/list-data-challenges.html'):
     """
     Displays all visible data challenges.
@@ -96,7 +96,7 @@ def list_data_challenges(request, template_name='projects/list-data-challenges.h
     return render(request, template_name, context=context)
 
 
-@public_user_auth_and_jwt
+@DBMIAuthn.public_user_auth_and_jwt
 def list_software_projects(request, template_name='projects/list-software-projects.html'):
     """
     Displays all visible software projects.
@@ -108,7 +108,7 @@ def list_software_projects(request, template_name='projects/list-software-projec
     return render(request, template_name, context=context)
 
 
-@method_decorator(public_user_auth_and_jwt, name='dispatch')
+@method_decorator(DBMIAuthn.public_user_auth_and_jwt, name='dispatch')
 class DataProjectView(TemplateView):
     """
     Builds and renders screens related to DataProject signup and participation.