Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

urls: Reorder where the accounts/login/google/ endpoint is defined. 

Needed so that the google entry in social_backends in /server_settings
shows the new url rather than the legacy accounts/login/google/ url as
the login url.
This commit is contained in:
Mateusz Mandera 2019-11-02 00:05:57 +01:00 committed by Tim Abbott
parent 29314f3195
commit a4838d8b97
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/openapi/zulip.yaml
View File

@ -2248,7 +2248,7 @@ paths:
"name": "google",
"display_name": "Google",
"display_logo": "/static/images/landing-page/logos/googl_e-icon.png",
"login_url": "/accounts/login/google/",
"login_url": "/accounts/login/social/google",
"signup_url": "/accounts/register/social/google",
"sort_order": 150
},

13
zproject/urls.py
View File

@ -419,12 +419,6 @@ i18n_urls = [
url(r'^desktop_home/$', zerver.views.home.desktop_home,
name='zerver.views.home.desktop_home'),
url(r'^accounts/login/sso/$', zerver.views.auth.remote_user_sso, name='login-sso'),
url(r'^accounts/login/jwt/$', zerver.views.auth.remote_user_jwt, name='login-jwt'),
url(r'^accounts/login/social/([\w,-]+)$', zerver.views.auth.start_social_login,
name='login-social'),
url(r'^accounts/login/social/([\w,-]+)/([\w,-]+)$', zerver.views.auth.start_social_login,
name='login-social-extra-arg'),
# Backwards-compatibility (legacy) Google auth URL for the mobile
# apps; see https://github.com/zulip/zulip/issues/13081 for
# background. We can remove this once older versions of the
@ -432,6 +426,13 @@ i18n_urls = [
url(r'^accounts/login/(google)/$', zerver.views.auth.start_social_login,
name='login-social'),
url(r'^accounts/login/sso/$', zerver.views.auth.remote_user_sso, name='login-sso'),
url(r'^accounts/login/jwt/$', zerver.views.auth.remote_user_jwt, name='login-jwt'),
url(r'^accounts/login/social/([\w,-]+)$', zerver.views.auth.start_social_login,
name='login-social'),
url(r'^accounts/login/social/([\w,-]+)/([\w,-]+)$', zerver.views.auth.start_social_login,
name='login-social-extra-arg'),
url(r'^accounts/register/social/([\w,-]+)$',
zerver.views.auth.start_social_signup,
name='signup-social'),