From b2111f57534b7dbe2fe452f5b74375b99a144eaf Mon Sep 17 00:00:00 2001
From: Gaurav Pandey <gauravguitarrocks@gmail.com>
Date: Tue, 4 May 2021 15:04:11 +0530
Subject: [PATCH] api: Fix encoding of strings in default stream groups.

Remove unnecessary json_validator for string parameters.  This change
does not modify JavaScript because we don't have a frontend for these
API endpoints yet.

Fixes part of #18035.
---
 zerver/tests/test_subs.py | 10 +++++-----
 zerver/views/streams.py   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/zerver/tests/test_subs.py b/zerver/tests/test_subs.py
index f275fc07aa..cb59694195 100644
--- a/zerver/tests/test_subs.py
+++ b/zerver/tests/test_subs.py
@@ -2261,7 +2261,7 @@ class DefaultStreamGroupTest(ZulipTestCase):
 
         result = self.client_patch(
             "/json/default_stream_groups/12345",
-            {"op": "change", "new_description": orjson.dumps(new_description).decode()},
+            {"op": "change", "new_description": new_description},
         )
         self.assert_json_error(result, "Default stream group with id '12345' does not exist.")
 
@@ -2270,7 +2270,7 @@ class DefaultStreamGroupTest(ZulipTestCase):
             {
                 "group_name": group_name,
                 "op": "change",
-                "new_description": orjson.dumps(new_description).decode(),
+                "new_description": new_description,
             },
         )
         self.assert_json_success(result)
@@ -2284,7 +2284,7 @@ class DefaultStreamGroupTest(ZulipTestCase):
         do_create_default_stream_group(realm, "group2", "", [])
         result = self.client_patch(
             f"/json/default_stream_groups/{group_id}",
-            {"op": "change", "new_group_name": orjson.dumps("group2").decode()},
+            {"op": "change", "new_group_name": "group2"},
         )
         self.assert_json_error(result, "Default stream group 'group2' already exists")
         new_group = lookup_default_stream_groups(["group2"], realm)[0]
@@ -2292,13 +2292,13 @@ class DefaultStreamGroupTest(ZulipTestCase):
 
         result = self.client_patch(
             f"/json/default_stream_groups/{group_id}",
-            {"op": "change", "new_group_name": orjson.dumps(group_name).decode()},
+            {"op": "change", "new_group_name": group_name},
         )
         self.assert_json_error(result, "This default stream group is already named 'group1'")
 
         result = self.client_patch(
             f"/json/default_stream_groups/{group_id}",
-            {"op": "change", "new_group_name": orjson.dumps(new_group_name).decode()},
+            {"op": "change", "new_group_name": new_group_name},
         )
         self.assert_json_success(result)
         default_stream_groups = get_default_stream_groups(realm)
diff --git a/zerver/views/streams.py b/zerver/views/streams.py
index a0eb8cfaec..23d0c638b1 100644
--- a/zerver/views/streams.py
+++ b/zerver/views/streams.py
@@ -176,8 +176,8 @@ def update_default_stream_group_info(
     request: HttpRequest,
     user_profile: UserProfile,
     group_id: int,
-    new_group_name: Optional[str] = REQ(json_validator=check_string, default=None),
-    new_description: Optional[str] = REQ(json_validator=check_string, default=None),
+    new_group_name: Optional[str] = REQ(default=None),
+    new_description: Optional[str] = REQ(default=None),
 ) -> None:
     if not new_group_name and not new_description:
         return json_error(_('You must pass "new_description" or "new_group_name".'))