Merge branch 'master' of https://github.com/knaperek/djangosaml2 into dev

Author: peppelinux

djangosaml2/views.py

@@ -25,7 +25,9 @@
                          HttpResponseRedirect, HttpResponseServerError)
 from django.shortcuts import render
 from django.template import TemplateDoesNotExist
+from django.urls import reverse
 from django.utils.decorators import method_decorator
+from django.utils.http import urlquote
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import View
 from django.utils.module_loading import import_string
@@ -166,7 +168,7 @@ def get(self, request, *args, **kwargs):
                               "Discovery Service: {}").format(discovery_service))
                 login_url = request.build_absolute_uri(reverse('saml2_login'))
                 login_url = '{0}?next={1}'.format(login_url,
-                                                  urlquote(came_from, safe=''))
+                                                  urlquote(next_path, safe=''))
                 ds_url = '{0}?entityID={1}&return={2}&returnIDParam=idp'
                 ds_url = ds_url.format(discovery_service,
                                        urlquote(