Skip to content

fix: updates get provider from pipeline wrong parameter #27079

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

Closed
nizarmah wants to merge 2 commits into from
Closed

fix: updates get provider from pipeline wrong parameter #27079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4eb8965
refactor: removes duplicate code for saml provider check
nizarmah Mar 19, 2021
3c0e083
fix: updates get provider from pipeline misuses
nizarmah Mar 19, 2021
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
11 changes: 3 additions & 8 deletions common/djangoapps/third_party_auth/pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,20 +586,15 @@ def should_force_account_creation():
return (current_provider and
(current_provider.skip_email_verification or current_provider.send_to_registration_first))

def is_provider_saml():
""" Verify that the third party provider uses SAML """
current_provider = provider.Registry.get_from_pipeline({'backend': current_partial.backend, 'kwargs': kwargs})
saml_providers_list = list(provider.Registry.get_enabled_by_backend_name('tpa-saml'))
return (current_provider and
current_provider.slug in [saml_provider.slug for saml_provider in saml_providers_list])

if current_partial:
strategy.session_set('partial_pipeline_token_', current_partial.token)
strategy.storage.partial.store(current_partial)

if not user:
# Use only email for user existence check in case of saml provider
if is_provider_saml():
saml_provider, _ = is_saml_provider(backend, kwargs)

if saml_provider:
user_details = {'email': details.get('email')} if details else None
else:
user_details = details
Expand Down
6 changes: 4 additions & 2 deletions common/djangoapps/third_party_auth/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,10 @@ def validate_uuid4_string(uuid_string):

def is_saml_provider(backend, kwargs):
""" Verify that the third party provider uses SAML """
current_provider = provider.Registry.get_from_pipeline({'backend': backend, 'kwargs': kwargs})
saml_providers_list = list(provider.Registry.get_enabled_by_backend_name('tpa-saml'))
current_provider = None
if backend:
current_provider = provider.Registry.get_from_pipeline({'backend': backend.name, 'kwargs': kwargs})
saml_providers_list = list(provider.Registry.get_enabled_by_backend_name('tpa-saml'))
return (current_provider and
current_provider.slug in [saml_provider.slug for saml_provider in saml_providers_list]), current_provider

Expand Down