Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ENT-4034 Added more detail in exception (#26299)

Browse Source
This commit is contained in:
Zaman Afzal
2021-02-02 13:54:20 +05:00
committed by GitHub
parent 44664d6a52
commit 712a6bcc0c
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/djangoapps/third_party_auth/pipeline.py
View File

@@ -772,11 +772,11 @@ def associate_by_email_if_saml(auth_entry, backend, details, user, strategy, *ar
enterprise_customer_user = is_enterprise_customer_user(current_provider.provider_id, current_user)
logger.info(
u'[Multiple_SSO_SAML_Accounts_Association_to_User] Enterprise user verification:'
u'Email: {email}, user_id: {user_id}, Provider: {provider},'
u' enterprise_customer_user: {enterprise_customer_user}'.format(
u'User Email: {email}, User ID: {user_id}, Provider ID: {provider_id},'
u' is_enterprise_customer_user: {enterprise_customer_user}'.format(
email=current_user.email,
user_id=current_user.id,
provider=current_provider.provider_id,
provider_id=current_provider.provider_id,
enterprise_customer_user=enterprise_customer_user,
)
)
@@ -803,11 +803,11 @@ def associate_by_email_if_saml(auth_entry, backend, details, user, strategy, *ar
):
logger.info(
u'[Multiple_SSO_SAML_Accounts_Association_to_User] User association account is not'
u' active: Email: {email}, user_id: {user_id}, Provider: {provider},'
u' enterprise_customer_user: {enterprise_customer_user}'.format(
u' active: User Email: {email}, User ID: {user_id}, Provider ID: {provider_id},'
u' is_enterprise_customer_user: {enterprise_customer_user}'.format(
email=current_user.email,
user_id=current_user.id,
provider=current_provider.provider_id,
provider_id=current_provider.provider_id,
enterprise_customer_user=enterprise_customer_user
)
)
@@ -815,7 +815,9 @@ def associate_by_email_if_saml(auth_entry, backend, details, user, strategy, *ar
except Exception as ex: # pylint: disable=broad-except
logger.exception('[Multiple_SSO_SAML_Accounts_Association_to_User] Error in'
' saml multiple accounts association: %s:, %s:', current_user.id, ex)
' saml multiple accounts association: User ID: %s, User Email: %s:,'
'Provider ID: %s, Exception: %s', current_user.id, current_user.email,
current_provider.provider_id, ex)
# this is waffle switch to enable and disable this functionality from admin panel.
if is_multiple_sso_accounts_association_to_saml_user_enabled():