paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-11 01:16:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

stream_data: Fix exception when notifications_stream is private.

Browse Source 
If notifications_stream is private and the current user has never been
subscribed, then we would throw an exception when trying to look up
notifications_stream.  In this situation, we should just treat it like
the stream doesn't exist for the purposes of this user.
This commit is contained in:
Tim Abbott
2018-05-03 08:28:38 -07:00
parent 1e1b72f6c8
commit 0ada5fa9d8
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend_tests/node_tests/stream_data.js
View File

@@ -645,6 +645,13 @@ zrequire('marked', 'third/marked/lib/marked');
assert(!page_params.never_subscribed); assert(!page_params.never_subscribed);
assert.equal(page_params.notifications_stream, ""); assert.equal(page_params.notifications_stream, "");
// Simulate a private stream the user isn't subscribed to
initialize();
page_params.realm_notifications_stream_id = 89;
stream_data.initialize_from_page_params();
assert.equal(page_params.notifications_stream, "");
// Now actually subscribe the user to the stream
initialize(); initialize();
var foo = { var foo = {
name: 'foo', name: 'foo',
@@ -652,7 +659,6 @@ zrequire('marked', 'third/marked/lib/marked');
}; };
stream_data.add_sub('foo', foo); stream_data.add_sub('foo', foo);
page_params.realm_notifications_stream_id = 89;
stream_data.initialize_from_page_params(); stream_data.initialize_from_page_params();
assert.equal(page_params.notifications_stream, "foo"); assert.equal(page_params.notifications_stream, "foo");

11
static/js/stream_data.js
View File

@@ -520,8 +520,15 @@ exports.initialize_from_page_params = function () {
// Migrate the notifications stream from the new API structure to // Migrate the notifications stream from the new API structure to
// what the frontend expects. // what the frontend expects.
if (page_params.realm_notifications_stream_id !== -1) { if (page_params.realm_notifications_stream_id !== -1) {
page_params.notifications_stream = var notifications_stream_obj =
exports.get_sub_by_id(page_params.realm_notifications_stream_id).name; exports.get_sub_by_id(page_params.realm_notifications_stream_id);
if (notifications_stream_obj) {
// This happens when the notifications stream is a private
// stream the current user is not subscribed to.
page_params.notifications_stream = notifications_stream_obj.name;
} else {
page_params.notifications_stream = "";
}
} else { } else {
page_params.notifications_stream = ""; page_params.notifications_stream = "";
} }