From 0a7c6ac261e48222f371d34740dd68120046b69b Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Wed, 11 Dec 2013 14:45:46 -0500 Subject: [PATCH] Remove legacy /api/v1/update_pointer endpoint. (imported from commit 4e2d111cf00ab2064291b282795c4b89835d1c17) --- zerver/tests.py | 7 ++----- zerver/views/__init__.py | 4 ---- zproject/urls.py | 1 - 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/zerver/tests.py b/zerver/tests.py index 45f02c427b..fd9d9bb641 100644 --- a/zerver/tests.py +++ b/zerver/tests.py @@ -507,7 +507,6 @@ class PublicURLTest(TestCase): "/api/v1/users/me/subscriptions", ], 400: ["/api/v1/send_message", - "/api/v1/update_pointer", "/api/v1/external/github", "/api/v1/fetch_api_key", ], @@ -1037,12 +1036,10 @@ class PointerTest(AuthedTestCase): Same as above, but for the API view """ email = "hamlet@zulip.com" - api_key = self.get_api_key(email) self.assertEqual(get_user_profile_by_email(email).pointer, -1) msg_id = self.send_message("othello@zulip.com", "Verona", Recipient.STREAM) - result = self.client.post("/api/v1/update_pointer", {"email": email, - "api-key": api_key, - "pointer": msg_id}) + result = self.client_put("/api/v1/users/me/pointer", {"pointer": msg_id}, + **self.api_auth(email)) self.assert_json_success(result) self.assertEqual(get_user_profile_by_email(email).pointer, msg_id) diff --git a/zerver/views/__init__.py b/zerver/views/__init__.py index 5b48c7af7d..d1af57137f 100644 --- a/zerver/views/__init__.py +++ b/zerver/views/__init__.py @@ -858,10 +858,6 @@ def is_buggy_ua(agent): def get_pointer_backend(request, user_profile): return json_success({'pointer': user_profile.pointer}) -@authenticated_api_view -def api_update_pointer(request, user_profile): - return update_pointer_backend(request, user_profile) - @authenticated_json_post_view def json_update_pointer(request, user_profile): return update_pointer_backend(request, user_profile) diff --git a/zproject/urls.py b/zproject/urls.py index b815999165..f1640b47fd 100644 --- a/zproject/urls.py +++ b/zproject/urls.py @@ -141,7 +141,6 @@ urlpatterns += patterns('zerver.views', # These are json format views used by the API. They require an API key. url(r'^api/v1/send_message$', 'api_send_message'), - url(r'^api/v1/update_pointer$', 'api_update_pointer'), # This json format view used by the API accepts a username password/pair and returns an API key. url(r'^api/v1/fetch_api_key$', 'api_fetch_api_key'),