paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

auth: Pass is_signup option around.

Browse Source
This commit is contained in:
Tim Abbott
2017-05-05 10:54:36 -07:00
parent ce3974b40e
commit 5019b53492
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/views/auth.py
View File

@@ -391,10 +391,12 @@ def log_into_subdomain(request):
email_address = data['email'] email_address = data['email']
full_name = data['name'] full_name = data['name']
is_signup = data['is_signup']
user_profile, return_data = authenticate_remote_user(request, email_address) user_profile, return_data = authenticate_remote_user(request, email_address)
invalid_subdomain = bool(return_data.get('invalid_subdomain')) invalid_subdomain = bool(return_data.get('invalid_subdomain'))
return login_or_register_remote_user(request, email_address, user_profile, return login_or_register_remote_user(request, email_address, user_profile,
full_name, invalid_subdomain) full_name, invalid_subdomain=invalid_subdomain,
is_signup=is_signup)
def get_dev_users(extra_users_count=10): def get_dev_users(extra_users_count=10):
# type: (int) -> List[UserProfile] # type: (int) -> List[UserProfile]

8
zproject/backends.py
View File

@@ -220,19 +220,21 @@ class SocialAuthMixin(ZulipAuthMixin):
request = strategy.request request = strategy.request
email_address = self.get_email_address(*args, **kwargs) email_address = self.get_email_address(*args, **kwargs)
full_name = self.get_full_name(*args, **kwargs) full_name = self.get_full_name(*args, **kwargs)
is_signup = strategy.session_get('is_signup') == '1'
subdomain = strategy.session_get('subdomain') subdomain = strategy.session_get('subdomain')
if not subdomain: if not subdomain:
return login_or_register_remote_user(request, email_address, return login_or_register_remote_user(request, email_address,
user_profile, full_name, user_profile, full_name,
bool(invalid_subdomain)) invalid_subdomain=bool(invalid_subdomain),
is_signup=is_signup)
try: try:
realm = Realm.objects.get(string_id=subdomain) realm = Realm.objects.get(string_id=subdomain)
except Realm.DoesNotExist: except Realm.DoesNotExist:
return redirect_to_subdomain_login_url() return redirect_to_subdomain_login_url()
return redirect_and_log_into_subdomain(realm, full_name, email_address) return redirect_and_log_into_subdomain(realm, full_name, email_address,
is_signup=is_signup)
def auth_complete(self, *args, **kwargs): def auth_complete(self, *args, **kwargs):
# type: (*Any, **Any) -> Optional[HttpResponse] # type: (*Any, **Any) -> Optional[HttpResponse]

2
zproject/settings.py
View File

@@ -187,7 +187,7 @@ DEFAULT_SETTINGS = {'TWITTER_CONSUMER_KEY': '',
'SOCIAL_AUTH_GITHUB_KEY': None, 'SOCIAL_AUTH_GITHUB_KEY': None,
'SOCIAL_AUTH_GITHUB_ORG_NAME': None, 'SOCIAL_AUTH_GITHUB_ORG_NAME': None,
'SOCIAL_AUTH_GITHUB_TEAM_ID': None, 'SOCIAL_AUTH_GITHUB_TEAM_ID': None,
'SOCIAL_AUTH_FIELDS_STORED_IN_SESSION': ['subdomain'], 'SOCIAL_AUTH_FIELDS_STORED_IN_SESSION': ['subdomain', 'is_signup'],
'DBX_APNS_CERT_FILE': None, 'DBX_APNS_CERT_FILE': None,
'DBX_APNS_KEY_FILE': None, 'DBX_APNS_KEY_FILE': None,
'PERSONAL_ZMIRROR_SERVER': None, 'PERSONAL_ZMIRROR_SERVER': None,