Skip to content

Allow the pipeline to change the redirect url. #449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
omab merged 1 commit into from
Nov 22, 2014
Merged

Allow the pipeline to change the redirect url. #449

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions social/actions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@ def do_auth(backend, redirect_name='next'):

def do_complete(backend, login, user=None, redirect_name='next',
*args, **kwargs):
# pop redirect value before the session is trashed on login()
data = backend.strategy.request_data()
redirect_value = backend.strategy.session_get(redirect_name, '') or \
data.get(redirect_name, '')

is_authenticated = user_is_authenticated(user)
user = is_authenticated and user or None
Expand All @@ -42,6 +39,12 @@ def do_complete(backend, login, user=None, redirect_name='next',
else:
user = backend.complete(user=user, *args, **kwargs)


# pop redirect value before the session is trashed on login(), but after
# the pipeline so that the pipeline can change the redirect if needed
redirect_value = backend.strategy.session_get(redirect_name, '') or \
data.get(redirect_name, '')

user_model = backend.strategy.storage.user.user_model()
if user and not isinstance(user, user_model):
return user
Expand Down