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

Django 1.10: Upgrade zproject urls.

This commit is contained in:
Umair Khan 2016-10-27 17:52:56 +05:00
parent 010ab0637d
commit da78f27934
1 changed files with 91 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
zproject/urls.py
View File

@ -10,6 +10,20 @@ from zproject.legacy_urls import legacy_urls
from zerver.views.integrations import IntegrationView, APIView, HelpView from zerver.views.integrations import IntegrationView, APIView, HelpView
from zerver.lib.integrations import WEBHOOK_INTEGRATIONS from zerver.lib.integrations import WEBHOOK_INTEGRATIONS
from django.contrib.auth.views import (login, password_reset,
password_reset_done, password_reset_confirm, password_reset_complete)
import zerver.views
import zerver.views.auth
import zerver.views.zephyr
import zerver.views.users
import zerver.views.unsubscribe
import zerver.views.integrations
import confirmation.views
from zerver.lib.rest import rest_dispatch
from zerver import tornadoviews
# NB: There are several other pieces of code which route requests by URL: # NB: There are several other pieces of code which route requests by URL:
# #
# - legacy_urls.py contains API endpoint written before the redesign # - legacy_urls.py contains API endpoint written before the redesign
@ -28,75 +42,81 @@ from zerver.lib.integrations import WEBHOOK_INTEGRATIONS
# If you're adding a new page to the website (as opposed to a new # If you're adding a new page to the website (as opposed to a new
# endpoint for use by code), you should add it here. # endpoint for use by code), you should add it here.
i18n_urls = [ i18n_urls = [
url(r'^$', 'zerver.views.home'), url(r'^$', zerver.views.home, name='zerver.views.home'),
# We have a desktop-specific landing page in case we change our / # We have a desktop-specific landing page in case we change our /
# to not log in in the future. We don't want to require a new # to not log in in the future. We don't want to require a new
# desktop app build for everyone in that case # desktop app build for everyone in that case
url(r'^desktop_home/$', 'zerver.views.desktop_home'), url(r'^desktop_home/$', zerver.views.desktop_home, name='zerver.views.desktop_home'),
url(r'^accounts/login/sso/$', 'zerver.views.auth.remote_user_sso', name='login-sso'), 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/jwt/$', zerver.views.auth.remote_user_jwt, name='login-jwt'),
url(r'^accounts/login/google/$', 'zerver.views.auth.start_google_oauth2'), url(r'^accounts/login/google/$', zerver.views.auth.start_google_oauth2, name='zerver.views.auth.start_google_oauth2'),
url(r'^accounts/login/google/send/$', 'zerver.views.auth.send_oauth_request_to_google'), url(r'^accounts/login/google/send/$',
url(r'^accounts/login/google/done/$', 'zerver.views.auth.finish_google_oauth2'), zerver.views.auth.send_oauth_request_to_google,
url(r'^accounts/login/subdomain/$', 'zerver.views.auth.log_into_subdomain'), name='zerver.views.auth.send_oauth_request_to_google'),
url(r'^accounts/login/local/$', 'zerver.views.auth.dev_direct_login'), url(r'^accounts/login/google/done/$', zerver.views.auth.finish_google_oauth2, name='zerver.views.auth.finish_google_oauth2'),
url(r'^accounts/login/subdomain/$', zerver.views.auth.log_into_subdomain, name='zerver.views.auth.log_into_subdomain'),
url(r'^accounts/login/local/$', zerver.views.auth.dev_direct_login, name='zerver.views.auth.dev_direct_login'),
# We have two entries for accounts/login to allow reverses on the Django # We have two entries for accounts/login to allow reverses on the Django
# view we're wrapping to continue to function. # view we're wrapping to continue to function.
url(r'^accounts/login/', 'zerver.views.auth.login_page', {'template_name': 'zerver/login.html'}), url(r'^accounts/login/', zerver.views.auth.login_page, {'template_name': 'zerver/login.html'}, name='zerver.views.auth.login_page'),
url(r'^accounts/login/', 'django.contrib.auth.views.login', {'template_name': 'zerver/login.html'}), url(r'^accounts/login/', login, {'template_name': 'zerver/login.html'},
url(r'^accounts/logout/', 'zerver.views.auth.logout_then_login'), name='django.contrib.auth.views.login'),
url(r'^accounts/logout/', zerver.views.auth.logout_then_login, name='zerver.views.auth.logout_then_login'),
url(r'^accounts/webathena_kerberos_login/', 'zerver.views.zephyr.webathena_kerberos_login'), url(r'^accounts/webathena_kerberos_login/',
zerver.views.zephyr.webathena_kerberos_login,
name='zerver.views.zephyr.webathena_kerberos_login'),
url(r'^accounts/password/reset/$', 'django.contrib.auth.views.password_reset', url(r'^accounts/password/reset/$', password_reset,
{'post_reset_redirect': '/accounts/password/reset/done/', {'post_reset_redirect': '/accounts/password/reset/done/',
'template_name': 'zerver/reset.html', 'template_name': 'zerver/reset.html',
'email_template_name': 'registration/password_reset_email.txt', 'email_template_name': 'registration/password_reset_email.txt',
'password_reset_form': zerver.forms.ZulipPasswordResetForm, 'password_reset_form': zerver.forms.ZulipPasswordResetForm,
}), }, name='django.contrib.auth.views.password_reset'),
url(r'^accounts/password/reset/done/$', 'django.contrib.auth.views.password_reset_done', url(r'^accounts/password/reset/done/$', password_reset_done,
{'template_name': 'zerver/reset_emailed.html'}), {'template_name': 'zerver/reset_emailed.html'}),
url(r'^accounts/password/reset/(?P<uidb64>[0-9A-Za-z]+)/(?P<token>.+)/$', url(r'^accounts/password/reset/(?P<uidb64>[0-9A-Za-z]+)/(?P<token>.+)/$',
'django.contrib.auth.views.password_reset_confirm', password_reset_confirm,
{'post_reset_redirect' : '/accounts/password/done/', {'post_reset_redirect' : '/accounts/password/done/',
'template_name': 'zerver/reset_confirm.html', 'template_name': 'zerver/reset_confirm.html',
'set_password_form' : zerver.forms.LoggingSetPasswordForm}), 'set_password_form' : zerver.forms.LoggingSetPasswordForm},
url(r'^accounts/password/done/$', 'django.contrib.auth.views.password_reset_complete', name='django.contrib.auth.views.password_reset_confirm'),
url(r'^accounts/password/done/$', password_reset_complete,
{'template_name': 'zerver/reset_done.html'}), {'template_name': 'zerver/reset_done.html'}),
# Avatar # Avatar
url(r'^avatar/(?P<email>[\S]+)?', 'zerver.views.users.avatar'), url(r'^avatar/(?P<email>[\S]+)?', zerver.views.users.avatar, name='zerver.views.users.avatar'),
# Registration views, require a confirmation ID. # Registration views, require a confirmation ID.
url(r'^accounts/home/', 'zerver.views.accounts_home'), url(r'^accounts/home/', zerver.views.accounts_home, name='zerver.views.accounts_home'),
url(r'^accounts/send_confirm/(?P<email>[\S]+)?', url(r'^accounts/send_confirm/(?P<email>[\S]+)?',
TemplateView.as_view(template_name='zerver/accounts_send_confirm.html'), name='send_confirm'), TemplateView.as_view(template_name='zerver/accounts_send_confirm.html'), name='send_confirm'),
url(r'^accounts/register/', 'zerver.views.accounts_register'), url(r'^accounts/register/', zerver.views.accounts_register, name='zerver.views.accounts_register'),
url(r'^accounts/do_confirm/(?P<confirmation_key>[\w]+)', 'confirmation.views.confirm'), url(r'^accounts/do_confirm/(?P<confirmation_key>[\w]+)', confirmation.views.confirm, name='confirmation.views.confirm'),
# Email unsubscription endpoint. Allows for unsubscribing from various types of emails, # Email unsubscription endpoint. Allows for unsubscribing from various types of emails,
# including the welcome emails (day 1 & 2), missed PMs, etc. # including the welcome emails (day 1 & 2), missed PMs, etc.
url(r'^accounts/unsubscribe/(?P<type>[\w]+)/(?P<token>[\w]+)', url(r'^accounts/unsubscribe/(?P<type>[\w]+)/(?P<token>[\w]+)',
'zerver.views.unsubscribe.email_unsubscribe'), zerver.views.unsubscribe.email_unsubscribe, name='zerver.views.unsubscribe.email_unsubscribe'),
# Portico-styled page used to provide email confirmation of terms acceptance. # Portico-styled page used to provide email confirmation of terms acceptance.
url(r'^accounts/accept_terms/$', 'zerver.views.accounts_accept_terms'), url(r'^accounts/accept_terms/$', zerver.views.accounts_accept_terms, name='zerver.views.accounts_accept_terms'),
# Realm Creation # Realm Creation
url(r'^create_realm/$', 'zerver.views.create_realm'), url(r'^create_realm/$', zerver.views.create_realm, name='zerver.views.create_realm'),
url(r'^create_realm/(?P<creation_key>[\w]+)$', 'zerver.views.create_realm'), url(r'^create_realm/(?P<creation_key>[\w]+)$', zerver.views.create_realm, name='zerver.views.create_realm'),
# Login/registration # Login/registration
url(r'^register/$', 'zerver.views.accounts_home', name='register'), url(r'^register/$', zerver.views.accounts_home, name='register'),
url(r'^login/$', 'zerver.views.auth.login_page', {'template_name': 'zerver/login.html'}), url(r'^login/$', zerver.views.auth.login_page, {'template_name': 'zerver/login.html'}, name='zerver.views.auth.login_page'),
# A registration page that passes through the domain, for totally open realms. # A registration page that passes through the domain, for totally open realms.
url(r'^register/(?P<domain>\S+)/$', 'zerver.views.accounts_home_with_domain'), url(r'^register/(?P<domain>\S+)/$', zerver.views.accounts_home_with_domain, name='zerver.views.accounts_home_with_domain'),
# API and integrations documentation # API and integrations documentation
url(r'^api/$', APIView.as_view(template_name='zerver/api.html')), url(r'^api/$', APIView.as_view(template_name='zerver/api.html')),
url(r'^api/endpoints/$', 'zerver.views.integrations.api_endpoint_docs'), url(r'^api/endpoints/$', zerver.views.integrations.api_endpoint_docs, name='zerver.views.integrations.api_endpoint_docs'),
url(r'^integrations/$', IntegrationView.as_view()), url(r'^integrations/$', IntegrationView.as_view()),
url(r'^about/$', TemplateView.as_view(template_name='zerver/about.html')), url(r'^about/$', TemplateView.as_view(template_name='zerver/about.html')),
url(r'^apps/$', TemplateView.as_view(template_name='zerver/apps.html')), url(r'^apps/$', TemplateView.as_view(template_name='zerver/apps.html')),
@ -129,120 +149,120 @@ urls = list(i18n_urls)
# All of these paths are accessed by either a /json or /api prefix # All of these paths are accessed by either a /json or /api prefix
v1_api_and_json_patterns = [ v1_api_and_json_patterns = [
# realm-level calls # realm-level calls
url(r'^realm$', 'zerver.lib.rest.rest_dispatch', url(r'^realm$', rest_dispatch,
{'PATCH': 'zerver.views.realm.update_realm'}), {'PATCH': 'zerver.views.realm.update_realm'}),
# Returns a 204, used by desktop app to verify connectivity status # Returns a 204, used by desktop app to verify connectivity status
url(r'generate_204$', 'zerver.views.generate_204'), url(r'generate_204$', zerver.views.generate_204, name='zerver.views.generate_204'),
# realm/emoji -> zerver.views.realm_emoji # realm/emoji -> zerver.views.realm_emoji
url(r'^realm/emoji$', 'zerver.lib.rest.rest_dispatch', url(r'^realm/emoji$', rest_dispatch,
{'GET': 'zerver.views.realm_emoji.list_emoji', {'GET': 'zerver.views.realm_emoji.list_emoji',
'PUT': 'zerver.views.realm_emoji.upload_emoji'}), 'PUT': 'zerver.views.realm_emoji.upload_emoji'}),
url(r'^realm/emoji/(?P<emoji_name>[0-9a-zA-Z.\-_]+(?<![.\-_]))$', 'zerver.lib.rest.rest_dispatch', url(r'^realm/emoji/(?P<emoji_name>[0-9a-zA-Z.\-_]+(?<![.\-_]))$', rest_dispatch,
{'DELETE': 'zerver.views.realm_emoji.delete_emoji'}), {'DELETE': 'zerver.views.realm_emoji.delete_emoji'}),
# users -> zerver.views.users # users -> zerver.views.users
url(r'^users$', 'zerver.lib.rest.rest_dispatch', url(r'^users$', rest_dispatch,
{'GET': 'zerver.views.users.get_members_backend', {'GET': 'zerver.views.users.get_members_backend',
'PUT': 'zerver.views.users.create_user_backend'}), 'PUT': 'zerver.views.users.create_user_backend'}),
url(r'^users/(?P<email>(?!me)[^/]*)/reactivate$', 'zerver.lib.rest.rest_dispatch', url(r'^users/(?P<email>(?!me)[^/]*)/reactivate$', rest_dispatch,
{'POST': 'zerver.views.users.reactivate_user_backend'}), {'POST': 'zerver.views.users.reactivate_user_backend'}),
url(r'^users/(?P<email>(?!me)[^/]*)$', 'zerver.lib.rest.rest_dispatch', url(r'^users/(?P<email>(?!me)[^/]*)$', rest_dispatch,
{'PATCH': 'zerver.views.users.update_user_backend', {'PATCH': 'zerver.views.users.update_user_backend',
'DELETE': 'zerver.views.users.deactivate_user_backend'}), 'DELETE': 'zerver.views.users.deactivate_user_backend'}),
url(r'^bots$', 'zerver.lib.rest.rest_dispatch', url(r'^bots$', rest_dispatch,
{'GET': 'zerver.views.users.get_bots_backend', {'GET': 'zerver.views.users.get_bots_backend',
'POST': 'zerver.views.users.add_bot_backend'}), 'POST': 'zerver.views.users.add_bot_backend'}),
url(r'^bots/(?P<email>(?!me)[^/]*)/api_key/regenerate$', 'zerver.lib.rest.rest_dispatch', url(r'^bots/(?P<email>(?!me)[^/]*)/api_key/regenerate$', rest_dispatch,
{'POST': 'zerver.views.users.regenerate_bot_api_key'}), {'POST': 'zerver.views.users.regenerate_bot_api_key'}),
url(r'^bots/(?P<email>(?!me)[^/]*)$', 'zerver.lib.rest.rest_dispatch', url(r'^bots/(?P<email>(?!me)[^/]*)$', rest_dispatch,
{'PATCH': 'zerver.views.users.patch_bot_backend', {'PATCH': 'zerver.views.users.patch_bot_backend',
'DELETE': 'zerver.views.users.deactivate_bot_backend'}), 'DELETE': 'zerver.views.users.deactivate_bot_backend'}),
# messages -> zerver.views.messages # messages -> zerver.views.messages
# GET returns messages, possibly filtered, POST sends a message # GET returns messages, possibly filtered, POST sends a message
url(r'^messages$', 'zerver.lib.rest.rest_dispatch', url(r'^messages$', rest_dispatch,
{'GET': 'zerver.views.messages.get_old_messages_backend', {'GET': 'zerver.views.messages.get_old_messages_backend',
'PATCH': 'zerver.views.messages.update_message_backend', 'PATCH': 'zerver.views.messages.update_message_backend',
'POST': 'zerver.views.messages.send_message_backend'}), 'POST': 'zerver.views.messages.send_message_backend'}),
url(r'^messages/render$', 'zerver.lib.rest.rest_dispatch', url(r'^messages/render$', rest_dispatch,
{'GET': 'zerver.views.messages.render_message_backend'}), {'GET': 'zerver.views.messages.render_message_backend'}),
url(r'^messages/flags$', 'zerver.lib.rest.rest_dispatch', url(r'^messages/flags$', rest_dispatch,
{'POST': 'zerver.views.messages.update_message_flags'}), {'POST': 'zerver.views.messages.update_message_flags'}),
# typing -> zerver.views.typing # typing -> zerver.views.typing
# POST sends a typing notification event to recipients # POST sends a typing notification event to recipients
url(r'^typing$', 'zerver.lib.rest.rest_dispatch', url(r'^typing$', rest_dispatch,
{'POST': 'zerver.views.typing.send_notification_backend'}), {'POST': 'zerver.views.typing.send_notification_backend'}),
# user_uploads -> zerver.views.upload # user_uploads -> zerver.views.upload
url(r'^user_uploads$', 'zerver.lib.rest.rest_dispatch', url(r'^user_uploads$', rest_dispatch,
{'POST': 'zerver.views.upload.upload_file_backend'}), {'POST': 'zerver.views.upload.upload_file_backend'}),
# users/me -> zerver.views # users/me -> zerver.views
url(r'^users/me$', 'zerver.lib.rest.rest_dispatch', url(r'^users/me$', rest_dispatch,
{'GET': 'zerver.views.pointer.get_profile_backend', {'GET': 'zerver.views.pointer.get_profile_backend',
'DELETE':'zerver.views.users.deactivate_user_own_backend'}), 'DELETE':'zerver.views.users.deactivate_user_own_backend'}),
url(r'^users/me/pointer$', 'zerver.lib.rest.rest_dispatch', url(r'^users/me/pointer$', rest_dispatch,
{'GET': 'zerver.views.pointer.get_pointer_backend', {'GET': 'zerver.views.pointer.get_pointer_backend',
'PUT': 'zerver.views.pointer.update_pointer_backend'}), 'PUT': 'zerver.views.pointer.update_pointer_backend'}),
url(r'^users/me/presence$', 'zerver.lib.rest.rest_dispatch', url(r'^users/me/presence$', rest_dispatch,
{'POST': 'zerver.views.presence.update_active_status_backend'}), {'POST': 'zerver.views.presence.update_active_status_backend'}),
# Endpoint used by mobile devices to register their push # Endpoint used by mobile devices to register their push
# notification credentials # notification credentials
url(r'^users/me/apns_device_token$', 'zerver.lib.rest.rest_dispatch', url(r'^users/me/apns_device_token$', rest_dispatch,
{'POST': 'zerver.views.push_notifications.add_apns_device_token', {'POST': 'zerver.views.push_notifications.add_apns_device_token',
'DELETE': 'zerver.views.push_notifications.remove_apns_device_token'}), 'DELETE': 'zerver.views.push_notifications.remove_apns_device_token'}),
url(r'^users/me/android_gcm_reg_id$', 'zerver.lib.rest.rest_dispatch', url(r'^users/me/android_gcm_reg_id$', rest_dispatch,
{'POST': 'zerver.views.push_notifications.add_android_reg_id', {'POST': 'zerver.views.push_notifications.add_android_reg_id',
'DELETE': 'zerver.views.push_notifications.remove_android_reg_id'}), 'DELETE': 'zerver.views.push_notifications.remove_android_reg_id'}),
# users/me -> zerver.views.user_settings # users/me -> zerver.views.user_settings
url(r'^users/me/api_key/regenerate$', 'zerver.lib.rest.rest_dispatch', url(r'^users/me/api_key/regenerate$', rest_dispatch,
{'POST': 'zerver.views.user_settings.regenerate_api_key'}), {'POST': 'zerver.views.user_settings.regenerate_api_key'}),
url(r'^users/me/enter-sends$', 'zerver.lib.rest.rest_dispatch', url(r'^users/me/enter-sends$', rest_dispatch,
{'POST': 'zerver.views.user_settings.change_enter_sends'}), {'POST': 'zerver.views.user_settings.change_enter_sends'}),
# users/me/alert_words -> zerver.views.alert_words # users/me/alert_words -> zerver.views.alert_words
url(r'^users/me/alert_words$', 'zerver.lib.rest.rest_dispatch', url(r'^users/me/alert_words$', rest_dispatch,
{'GET': 'zerver.views.alert_words.list_alert_words', {'GET': 'zerver.views.alert_words.list_alert_words',
'POST': 'zerver.views.alert_words.set_alert_words', 'POST': 'zerver.views.alert_words.set_alert_words',
'PUT': 'zerver.views.alert_words.add_alert_words', 'PUT': 'zerver.views.alert_words.add_alert_words',
'DELETE': 'zerver.views.alert_words.remove_alert_words'}), 'DELETE': 'zerver.views.alert_words.remove_alert_words'}),
url(r'^users/me/(?P<stream_id>\d+)/topics$', 'zerver.lib.rest.rest_dispatch', url(r'^users/me/(?P<stream_id>\d+)/topics$', rest_dispatch,
{'GET': 'zerver.views.streams.get_topics_backend'}), {'GET': 'zerver.views.streams.get_topics_backend'}),
# streams -> zerver.views.streams # streams -> zerver.views.streams
# (this API is only used externally) # (this API is only used externally)
url(r'^streams$', 'zerver.lib.rest.rest_dispatch', url(r'^streams$', rest_dispatch,
{'GET': 'zerver.views.streams.get_streams_backend'}), {'GET': 'zerver.views.streams.get_streams_backend'}),
# GET returns "stream info" (undefined currently?), HEAD returns whether stream exists (200 or 404) # GET returns "stream info" (undefined currently?), HEAD returns whether stream exists (200 or 404)
url(r'^streams/(?P<stream_name>.*)/members$', 'zerver.lib.rest.rest_dispatch', url(r'^streams/(?P<stream_name>.*)/members$', rest_dispatch,
{'GET': 'zerver.views.streams.get_subscribers_backend'}), {'GET': 'zerver.views.streams.get_subscribers_backend'}),
url(r'^streams/(?P<stream_name>.*)$', 'zerver.lib.rest.rest_dispatch', url(r'^streams/(?P<stream_name>.*)$', rest_dispatch,
{'HEAD': 'zerver.views.streams.stream_exists_backend', {'HEAD': 'zerver.views.streams.stream_exists_backend',
'GET': 'zerver.views.streams.stream_exists_backend', 'GET': 'zerver.views.streams.stream_exists_backend',
'PATCH': 'zerver.views.streams.update_stream_backend', 'PATCH': 'zerver.views.streams.update_stream_backend',
'DELETE': 'zerver.views.streams.deactivate_stream_backend'}), 'DELETE': 'zerver.views.streams.deactivate_stream_backend'}),
url(r'^default_streams$', 'zerver.lib.rest.rest_dispatch', url(r'^default_streams$', rest_dispatch,
{'PUT': 'zerver.views.streams.add_default_stream', {'PUT': 'zerver.views.streams.add_default_stream',
'DELETE': 'zerver.views.streams.remove_default_stream'}), 'DELETE': 'zerver.views.streams.remove_default_stream'}),
# GET lists your streams, POST bulk adds, PATCH bulk modifies/removes # GET lists your streams, POST bulk adds, PATCH bulk modifies/removes
url(r'^users/me/subscriptions$', 'zerver.lib.rest.rest_dispatch', url(r'^users/me/subscriptions$', rest_dispatch,
{'GET': 'zerver.views.streams.list_subscriptions_backend', {'GET': 'zerver.views.streams.list_subscriptions_backend',
'POST': 'zerver.views.streams.add_subscriptions_backend', 'POST': 'zerver.views.streams.add_subscriptions_backend',
'PATCH': 'zerver.views.streams.update_subscriptions_backend'}), 'PATCH': 'zerver.views.streams.update_subscriptions_backend'}),
# used to register for an event queue in tornado # used to register for an event queue in tornado
url(r'^register$', 'zerver.lib.rest.rest_dispatch', url(r'^register$', rest_dispatch,
{'POST': 'zerver.views.events_register.api_events_register'}), {'POST': 'zerver.views.events_register.api_events_register'}),
# events -> zerver.tornadoviews # events -> zerver.tornadoviews
url(r'^events$', 'zerver.lib.rest.rest_dispatch', url(r'^events$', rest_dispatch,
{'GET': 'zerver.tornadoviews.get_events_backend', {'GET': 'zerver.tornadoviews.get_events_backend',
'DELETE': 'zerver.tornadoviews.cleanup_event_queue'}), 'DELETE': 'zerver.tornadoviews.cleanup_event_queue'}),
] ]
@ -262,7 +282,7 @@ urls += [
# having to rewrite URLs, and is implemented using the # having to rewrite URLs, and is implemented using the
# 'override_api_url_scheme' flag passed to rest_dispatch # 'override_api_url_scheme' flag passed to rest_dispatch
urls += url(r'^user_uploads/(?P<realm_id_str>(\d*|unk))/(?P<filename>.*)', urls += url(r'^user_uploads/(?P<realm_id_str>(\d*|unk))/(?P<filename>.*)',
'zerver.lib.rest.rest_dispatch', rest_dispatch,
{'GET': ('zerver.views.upload.serve_file_backend', {'GET': ('zerver.views.upload.serve_file_backend',
{'override_api_url_scheme'})}), {'override_api_url_scheme'})}),
@ -274,19 +294,21 @@ for incoming_webhook in WEBHOOK_INTEGRATIONS:
urls += [ urls += [
# This json format view used by the mobile apps lists which authentication # This json format view used by the mobile apps lists which authentication
# backends the server allows, to display the proper UI and check for server existence # backends the server allows, to display the proper UI and check for server existence
url(r'^api/v1/get_auth_backends', 'zerver.views.auth.api_get_auth_backends'), url(r'^api/v1/get_auth_backends', zerver.views.auth.api_get_auth_backends, name='zerver.views.auth.api_get_auth_backends'),
# This json format view used by the mobile apps accepts a username # This json format view used by the mobile apps accepts a username
# password/pair and returns an API key. # password/pair and returns an API key.
url(r'^api/v1/fetch_api_key$', 'zerver.views.auth.api_fetch_api_key'), url(r'^api/v1/fetch_api_key$', zerver.views.auth.api_fetch_api_key, name='zerver.views.auth.api_fetch_api_key'),
# This is for the signing in through the devAuthBackEnd on mobile apps. # This is for the signing in through the devAuthBackEnd on mobile apps.
url(r'^api/v1/dev_fetch_api_key$', 'zerver.views.auth.api_dev_fetch_api_key'), url(r'^api/v1/dev_fetch_api_key$', zerver.views.auth.api_dev_fetch_api_key, name='zerver.views.auth.api_dev_fetch_api_key'),
# This is for fetching the emails of the admins and the users. # This is for fetching the emails of the admins and the users.
url(r'^api/v1/dev_get_emails$', 'zerver.views.auth.api_dev_get_emails'), url(r'^api/v1/dev_get_emails$', zerver.views.auth.api_dev_get_emails, name='zerver.views.auth.api_dev_get_emails'),
# Used to present the GOOGLE_CLIENT_ID to mobile apps # Used to present the GOOGLE_CLIENT_ID to mobile apps
url(r'^api/v1/fetch_google_client_id$', 'zerver.views.auth.api_fetch_google_client_id'), url(r'^api/v1/fetch_google_client_id$',
zerver.views.auth.api_fetch_google_client_id,
name='zerver.views.auth.api_fetch_google_client_id'),
] ]
# Include URL configuration files for site-specified extra installed # Include URL configuration files for site-specified extra installed
@ -300,7 +322,7 @@ for app_name in settings.EXTRA_INSTALLED_APPS:
# Tornado views # Tornado views
urls += [ urls += [
# Used internally for communication between Django and Tornado processes # Used internally for communication between Django and Tornado processes
url(r'^notify_tornado$', 'zerver.tornadoviews.notify'), url(r'^notify_tornado$', tornadoviews.notify, name='zerver.tornadoviews.notify'),
] ]
# Python Social Auth # Python Social Auth