Clean partial pipeline on Stop exception. Closes #271

diff --git a/social_auth/backends/__init__.py b/social_auth/backends/__init__.py
index ea7e3a8b164d8bce12d589a084e50e999cd5438d..c71f92138ea0399019e2e1893805855619cf7e21 100644 (file)
--- a/social_auth/backends/__init__.py
+++ b/social_auth/backends/__init__.py
@@ -136,6 +136,11 @@ class SocialAuthBackend(ModelBackend):
                     try:
                         result = func(*args, **out) or {}
                     except StopPipeline:
+                        # Clean partial pipeline on stop
+                        if 'request' in kwargs:
+                            name = setting('SOCIAL_AUTH_PARTIAL_PIPELINE_KEY',
+                                           'partial_pipeline')
+                            kwargs['request'].session.pop(name, None)
                         break
 
                     if isinstance(result, dict):

diff --git a/social_auth/backends/pipeline/misc.py b/social_auth/backends/pipeline/misc.py
index 3b9615ed8428c44446be27330134edba03fd9f7a..03c834d58985a1f0d928e9329db8e64d78033d8c 100644 (file)
--- a/social_auth/backends/pipeline/misc.py
+++ b/social_auth/backends/pipeline/misc.py
@@ -21,4 +21,3 @@ def save_status_to_session(request, auth, *args, **kwargs):
 
     name = setting('SOCIAL_AUTH_PARTIAL_PIPELINE_KEY', 'partial_pipeline')
     request.session[name] = data
-    request.session.modified = True

diff --git a/social_auth/views.py b/social_auth/views.py
index 5561268432878609f79b2b612023d607e01c9a8f..14198028c8e0492f3bd49019293646389d5f8a68 100644 (file)
--- a/social_auth/views.py
+++ b/social_auth/views.py
@@ -201,7 +201,6 @@ def auth_complete(request, backend, user=None, *args, **kwargs):
     name = setting('SOCIAL_AUTH_PARTIAL_PIPELINE_KEY', 'partial_pipeline')
     if request.session.get(name):
         data = request.session.pop(name)
-        request.session.modified = True
         idx, args, kwargs = backend.from_session_dict(data, user=user,
                                                       request=request,
                                                       *args, **kwargs)