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

Remove legacy /api/v1/get_subscribers endpoint. 

(imported from commit 52ab7b1200c2a62d1f8c251ab8d2f187cd2eb50b)
This commit is contained in:
Tim Abbott 2013-12-11 13:42:27 -05:00
parent cacd60860a
commit 23a3b078d6
3 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
zerver/tests.py
View File

@ -485,6 +485,8 @@ class PublicURLTest(TestCase):
# through Tornado. # through Tornado.
get_urls = {200: ["/accounts/home/", "/accounts/login/"], get_urls = {200: ["/accounts/home/", "/accounts/login/"],
302: ["/"], 302: ["/"],
401: ["/api/v1/streams/Denmark/members",
"/api/v1/users/me/subscriptions",],
} }
post_urls = {200: ["/accounts/login/"], post_urls = {200: ["/accounts/login/"],
302: ["/accounts/logout/"], 302: ["/accounts/logout/"],
@ -507,7 +509,6 @@ class PublicURLTest(TestCase):
"/api/v1/get_public_streams", "/api/v1/get_public_streams",
"/api/v1/subscriptions/add", "/api/v1/subscriptions/add",
"/api/v1/subscriptions/remove", "/api/v1/subscriptions/remove",
"/api/v1/get_subscribers",
"/api/v1/send_message", "/api/v1/send_message",
"/api/v1/update_pointer", "/api/v1/update_pointer",
"/api/v1/external/github", "/api/v1/external/github",
@ -2766,28 +2767,29 @@ class InviteOnlyStreamTest(AuthedTestCase):
def test_inviteonly(self): def test_inviteonly(self):
# Creating an invite-only stream is allowed # Creating an invite-only stream is allowed
email = 'hamlet@zulip.com' email = 'hamlet@zulip.com'
stream_name = "Saxony"
result = self.common_subscribe_to_streams(email, ["Saxony"], invite_only=True) result = self.common_subscribe_to_streams(email, [stream_name], invite_only=True)
self.assert_json_success(result) self.assert_json_success(result)
json = ujson.loads(result.content) json = ujson.loads(result.content)
self.assertEqual(json["subscribed"], {email: ['Saxony']}) self.assertEqual(json["subscribed"], {email: [stream_name]})
self.assertEqual(json["already_subscribed"], {}) self.assertEqual(json["already_subscribed"], {})
# Subscribing oneself to an invite-only stream is not allowed # Subscribing oneself to an invite-only stream is not allowed
email = "othello@zulip.com" email = "othello@zulip.com"
self.login(email) self.login(email)
result = self.common_subscribe_to_streams(email, ["Saxony"]) result = self.common_subscribe_to_streams(email, [stream_name])
self.assert_json_error(result, 'Unable to access stream (Saxony).') self.assert_json_error(result, 'Unable to access stream (Saxony).')
# authorization_errors_fatal=False works # authorization_errors_fatal=False works
email = "othello@zulip.com" email = "othello@zulip.com"
self.login(email) self.login(email)
result = self.common_subscribe_to_streams(email, ["Saxony"], result = self.common_subscribe_to_streams(email, [stream_name],
extra_post_data={'authorization_errors_fatal': ujson.dumps(False)}) extra_post_data={'authorization_errors_fatal': ujson.dumps(False)})
self.assert_json_success(result) self.assert_json_success(result)
json = ujson.loads(result.content) json = ujson.loads(result.content)
self.assertEqual(json["unauthorized"], ['Saxony']) self.assertEqual(json["unauthorized"], [stream_name])
self.assertEqual(json["subscribed"], {}) self.assertEqual(json["subscribed"], {})
self.assertEqual(json["already_subscribed"], {}) self.assertEqual(json["already_subscribed"], {})
@ -2795,17 +2797,16 @@ class InviteOnlyStreamTest(AuthedTestCase):
email = 'hamlet@zulip.com' email = 'hamlet@zulip.com'
self.login(email) self.login(email)
result = self.common_subscribe_to_streams( result = self.common_subscribe_to_streams(
email, ["Saxony"], email, [stream_name],
extra_post_data={'principals': ujson.dumps(["othello@zulip.com"])}) extra_post_data={'principals': ujson.dumps(["othello@zulip.com"])})
self.assert_json_success(result) self.assert_json_success(result)
json = ujson.loads(result.content) json = ujson.loads(result.content)
self.assertEqual(json["subscribed"], {"othello@zulip.com": ['Saxony']}) self.assertEqual(json["subscribed"], {"othello@zulip.com": [stream_name]})
self.assertEqual(json["already_subscribed"], {}) self.assertEqual(json["already_subscribed"], {})
# Make sure both users are subscribed to this stream # Make sure both users are subscribed to this stream
result = self.client.post("/api/v1/get_subscribers", {'email':email, result = self.client.get("/api/v1/streams/%s/members" % (stream_name,),
'api-key': self.get_api_key(email), **self.api_auth(email))
'stream': 'Saxony'})
self.assert_json_success(result) self.assert_json_success(result)
json = ujson.loads(result.content) json = ujson.loads(result.content)
@ -2816,7 +2817,6 @@ class GetSubscribersTest(AuthedTestCase):
def setUp(self): def setUp(self):
self.email = "hamlet@zulip.com" self.email = "hamlet@zulip.com"
self.api_key = self.get_api_key(self.email)
self.user_profile = get_user_profile_by_email(self.email) self.user_profile = get_user_profile_by_email(self.email)
self.login(self.email) self.login(self.email)
@ -2836,9 +2836,8 @@ class GetSubscribersTest(AuthedTestCase):
self.assertItemsEqual(result["subscribers"], true_subscribers) self.assertItemsEqual(result["subscribers"], true_subscribers)
def make_subscriber_request(self, stream_name): def make_subscriber_request(self, stream_name):
return self.client.post("/json/get_subscribers", return self.client.get("/api/v1/streams/%s/members" % (stream_name,),
{'email': self.email, 'api-key': self.api_key, **self.api_auth(self.email))
'stream': stream_name})
def make_successful_subscriber_request(self, stream_name): def make_successful_subscriber_request(self, stream_name):
result = self.make_subscriber_request(stream_name) result = self.make_subscriber_request(stream_name)

4
zerver/views/__init__.py
View File

@ -1774,10 +1774,6 @@ def get_members_backend(request, user_profile):
members.append(member) members.append(member)
return json_success({'members': members}) return json_success({'members': members})
@authenticated_api_view
def api_get_subscribers(request, user_profile):
return get_subscribers_backend(request, user_profile)
@authenticated_json_post_view @authenticated_json_post_view
def json_get_subscribers(request, user_profile): def json_get_subscribers(request, user_profile):
return get_subscribers_backend(request, user_profile) return get_subscribers_backend(request, user_profile)

1
zproject/urls.py
View File

@ -145,7 +145,6 @@ urlpatterns += patterns('zerver.views',
url(r'^api/v1/get_public_streams$', 'api_get_public_streams'), url(r'^api/v1/get_public_streams$', 'api_get_public_streams'),
url(r'^api/v1/subscriptions/add$', 'api_add_subscriptions'), url(r'^api/v1/subscriptions/add$', 'api_add_subscriptions'),
url(r'^api/v1/subscriptions/remove$', 'api_remove_subscriptions'), url(r'^api/v1/subscriptions/remove$', 'api_remove_subscriptions'),
url(r'^api/v1/get_subscribers$', 'api_get_subscribers'),
url(r'^api/v1/send_message$', 'api_send_message'), url(r'^api/v1/send_message$', 'api_send_message'),
url(r'^api/v1/update_pointer$', 'api_update_pointer'), url(r'^api/v1/update_pointer$', 'api_update_pointer'),