Merge pull request #77 from akatsoulas/minor-fixes

Simplify the logout view.

mozilla_django_oidc/contrib/auth0/utils.py

@@ -4,8 +4,6 @@
 except ImportError:
     from urllib.parse import urlencode
 
-from django.http import HttpResponseRedirect
-
 from mozilla_django_oidc.utils import import_from_settings
 
 
@@ -26,11 +24,11 @@ def refresh_id_token(id_token):
     return None
 
 
-def logout(request):
+def logout_url():
     """Log out the user from Auth0."""
     url = 'https//' + import_from_settings('OIDC_OP_DOMAIN') + '/v2/logout'
     url += '?' + urlencode({
-        'returnTo': import_from_settings('OIDC_OP_LOGOUT_URL', '/'),
+        'returnTo': import_from_settings('LOGOUT_REDIRECT_URL', '/'),
         'client_id': import_from_settings('OIDC_RP_CLIENT_ID')
     })
-    return HttpResponseRedirect(url)
+    return url

mozilla_django_oidc/views.py

@@ -116,10 +116,13 @@ def dispatch(self, request, *args, **kwargs):
         """Log out the user."""
 
         if request.user.is_authenticated():
-            auth.logout(request)
+            logout_url = self.redirect_url
+
+            # Check if a method exists to build the url to logout the user from the OP
+            logout_from_op = import_from_settings('OIDC_OP_LOGOUT_URL_METHOD', '')
+            if logout_from_op:
+                logout_url = import_string(logout_from_op)
 
-            logout_view_path = import_from_settings('OIDC_OP_LOGOUT_VIEW', '')
-            if logout_view_path:
-                logout_view = import_string(logout_view_path)
-                return logout_view(request)
-        return HttpResponseRedirect(self.redirect_url)
+            # Log out the Django user.
+            auth.logout(request)
+        return HttpResponseRedirect(logout_url)