paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

auth: Store realm id in return_data of social_associate_user_helper.

Browse Source 
Realm object is not json-serializable; store the realm id instead
and retrieve the realm in social_auth_finish using
`Realm.objects.get(id=return_data["realm_id"])`.
This commit is contained in:
Shubham Padia
2018-07-10 15:59:06 +05:30
committed by Tim Abbott
parent d95364b94f
commit 79e590f50f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zproject/backends.py
View File

@@ -432,7 +432,7 @@ def social_associate_user_helper(backend: BaseAuth, return_data: Dict[str, Any],
if realm is None: if realm is None:
return_data["invalid_realm"] = True return_data["invalid_realm"] = True
return None return None
return_data["realm"] = realm return_data["realm_id"] = realm.id
if not auth_enabled_helper([backend.auth_backend_name], realm): if not auth_enabled_helper([backend.auth_backend_name], realm):
return_data["auth_backend_disabled"] = True return_data["auth_backend_disabled"] = True
@@ -545,7 +545,7 @@ def social_auth_finish(backend: Any,
full_name = return_data['full_name'] full_name = return_data['full_name']
is_signup = strategy.session_get('is_signup') == '1' is_signup = strategy.session_get('is_signup') == '1'
redirect_to = strategy.session_get('next') redirect_to = strategy.session_get('next')
realm = return_data["realm"] realm = Realm.objects.get(id=return_data["realm_id"])
mobile_flow_otp = strategy.session_get('mobile_flow_otp') mobile_flow_otp = strategy.session_get('mobile_flow_otp')
if mobile_flow_otp is not None: if mobile_flow_otp is not None: