From f24810fc15444385a0932b24a38f646318fcca94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Pelay?=
 <45865185+jpelay@users.noreply.github.com>
Date: Mon, 10 Jun 2024 10:56:41 -0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=AA=B2=20Fix=20make=5Fresponse=20incorrec?=
 =?UTF-8?q?tly=20sending=20`text`=20instead=20of=20JSON=20(#5599)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#5558 Introduced an error where some calls where expecting a JSON, and got text instead. I checked the places where this happened and fix the calls.

If I'm missing some, please add them 😄

**How to test**
Perform the following:

* Update an adventure
* Update  a class customization
* Create students account
* Reset password
* Reset a student's password
* Update your public profile

And all of them should show the success modal!

Also:
Fixes #5550
---
 app.py                                        | 14 +++++----
 templates/incl/menubar.html                   |  2 +-
 .../cypress/e2e/feedback/feedback_modal.cy.js |  2 +-
 website/achievements.py                       |  2 +-
 website/admin.py                              |  3 +-
 website/auth_pages.py                         |  4 +--
 website/classes.py                            | 29 ++++++++++---------
 website/feedback.py                           |  2 +-
 website/for_teachers.py                       |  7 +++--
 website/programs.py                           |  2 +-
 website/user_activity.py                      |  2 +-
 11 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/app.py b/app.py
index a0c4fe8f529..cd5b09fd2af 100644
--- a/app.py
+++ b/app.py
@@ -727,6 +727,12 @@ def prepare_files():
     threader = textwrap.dedent("""
         import time
         from turtlethread import Turtle
+        def int_with_error(value, error_message):
+            try:
+                return int(value)
+            except ValueError:
+                raise ValueError(error_message.format(value))
+
         t = Turtle()
         t.left(90)
         with t.running_stitch(stitch_length=20):
@@ -751,7 +757,6 @@ def prepare_files():
         for file in [x for x in files if x[:len(filename)] == filename and x[-3:] != 'zip']:
             zip_file.write('machine_files/' + file)
     zip_file.close()
-
     return make_response({'filename': filename}, 200)
 
 
@@ -788,7 +793,6 @@ def generate_microbit_file():
         save_transpiled_code_for_microbit(transpile_result)
         return make_response({'filename': 'Micro-bit.py', 'microbit': True}, 200)
     else:
-        # TODO
         return make_response({'message': 'Microbit feature is disabled'}, 403)
 
 
@@ -827,7 +831,6 @@ def remove_file(response):
 
         return send_file(os.path.join(micro_bit_directory, "micropython.hex"), as_attachment=True)
     else:
-        # TODO
         return make_response({'message': 'Microbit feature is disabled'}, 403)
 
 
@@ -2604,9 +2607,10 @@ def update_public_profile(user):
             body['tags'].append('admin')
 
     DATABASE.update_public_profile(user['username'], body)
+    response = {"message": gettext("public_profile_updated")}
     if achievement:
-        utils.add_pending_achievement({"achievement": achievement})
-    return make_response(gettext("public_profile_updated"), 200)
+        response["achievement"] = achievement
+    return response
 
 
 @app.route('/translating')
diff --git a/templates/incl/menubar.html b/templates/incl/menubar.html
index 939651587ff..efb726ba59a 100644
--- a/templates/incl/menubar.html
+++ b/templates/incl/menubar.html
@@ -56,7 +56,7 @@
           </a>
           <div class="dropdown-menu dropdown-blue" id="language_dropdown" style="display: none;"
           _="on mutation of @style
-                set arrow to #language-arrow
+                set arrow to #language_arrow
                 if *display == 'none'
                     remove .rotate-180 from arrow
                 else if not arrow.classList.contains('rotate-180')
diff --git a/tests/cypress/e2e/feedback/feedback_modal.cy.js b/tests/cypress/e2e/feedback/feedback_modal.cy.js
index bc034741888..f00ca00f16d 100644
--- a/tests/cypress/e2e/feedback/feedback_modal.cy.js
+++ b/tests/cypress/e2e/feedback/feedback_modal.cy.js
@@ -61,6 +61,6 @@ describe("Test the feedback feature", () => {
         cy.getDataCy('modal_feedback_input')
             .should("not.be.visible")
 
-        cy.wait("@postFeedback").should('have.nested.property', 'response.statusCode', 204)
+        cy.wait("@postFeedback").should('have.nested.property', 'response.statusCode', 200)
     });
 });
\ No newline at end of file
diff --git a/website/achievements.py b/website/achievements.py
index 8eb05723e49..7f56ea1f945 100644
--- a/website/achievements.py
+++ b/website/achievements.py
@@ -280,4 +280,4 @@ def push_new_achievement(self, user):
                         )
                     }
                 )
-        return make_response('', 204)
+        return make_response('', 200)
diff --git a/website/admin.py b/website/admin.py
index 0885f693a77..d82ca4eb55c 100644
--- a/website/admin.py
+++ b/website/admin.py
@@ -265,8 +265,7 @@ def change_user_email(self, user):
                 )
             except BaseException:
                 return make_response(gettext("mail_error_change_processed"), 400)
-
-        return make_response('', 204)
+        return make_response('', 200)
 
     @route("/getUserTags", methods=["POST"])
     @requires_admin
diff --git a/website/auth_pages.py b/website/auth_pages.py
index 42e68294dbc..fd04d86530c 100644
--- a/website/auth_pages.py
+++ b/website/auth_pages.py
@@ -288,7 +288,7 @@ def change_student_password(self, user):
         hashed = password_hash(body["password"], make_salt())
         self.db.update_user(body["username"], {"password": hashed})
 
-        return make_response(gettext("password_change_success"), 200)
+        return make_response({"success": gettext("password_change_success")}, 200)
 
     @ route("/change_password", methods=["POST"])
     @ requires_login
@@ -467,5 +467,5 @@ def store_new_account(self, account, email):
                 )
             except BaseException:
                 return user, make_response({gettext("mail_error_change_processed")}, 400)
-            resp = make_response('', 204)
+            resp = make_response('', 200)
         return user, resp
diff --git a/website/classes.py b/website/classes.py
index f73bd8aee10..f3a4cba3a2b 100644
--- a/website/classes.py
+++ b/website/classes.py
@@ -55,9 +55,9 @@ def create_class(self, user):
 
         self.db.store_class(Class)
         achievement = self.achievements.add_single_achievement(user["username"], "ready_set_education")
-        if achievement:
-            utils.add_pending_achievement({"achievement": achievement})
-        return make_response({"id": Class["id"]}, 200)
+        response = {"id": Class["id"]}
+        response["achievement"] = achievement
+        return make_response(response, 200)
 
     @route("/<class_id>", methods=["PUT"])
     @requires_teacher
@@ -87,8 +87,8 @@ def update_class(self, user, class_id):
         self.db.update_class(class_id, body["name"])
         achievement = self.achievements.add_single_achievement(user["username"], "on_second_thoughts")
         if achievement:
-            utils.add_pending_achievement({"achievement": achievement})
-        return make_response('', 204)
+            return make_response({"achievement": achievement}, 200)
+        return make_response('', 200)
 
     @route("/<class_id>", methods=["DELETE"])
     @requires_login
@@ -197,7 +197,7 @@ def join_class(self):
             session["messages"] = session["messages"] - 1 if session["messages"] else 0
 
         if achievement:
-            utils.add_pending_achievement({"achievement": achievement})
+            return make_response({"achievement": achievement}, 200)
         return make_response('', 200)
 
     @route("/<class_id>/student/<student_id>", methods=["DELETE"])
@@ -213,8 +213,8 @@ def leave_class(self, user, class_id, student_id):
         if Class["teacher"] == user["username"]:
             achievement = self.achievements.add_single_achievement(user["username"], "detention")
         if achievement:
-            utils.add_pending_achievement({"achievement": achievement})
-        return make_response('', 204)
+            return make_response({"achievement": achievement}, 200)
+        return make_response('', 200)
 
     @route("/<class_id>/second-teacher/<second_teacher>", methods=["DELETE"])
     @requires_login
@@ -230,8 +230,8 @@ def remove_second_teacher(self, user, class_id, second_teacher):
         if Class["teacher"] == user["username"]:
             achievement = self.achievements.add_single_achievement(user["username"], "detention")
         if achievement:
-            utils.add_pending_achievement({"achievement": achievement, "reload": True})
-        return make_response('', 205)
+            return make_response({"achievement": achievement, "reload": True}, 200)
+        return make_response('', 200)
 
 
 class MiscClassPages(WebsiteModule):
@@ -305,11 +305,12 @@ def duplicate_class(self, user):
             new_second_teachers = Class.get("second_teachers")
 
         achievement = self.achievements.add_single_achievement(current_user()["username"], "one_for_money")
+        response = {"id": new_class["id"]}
         if achievement:
-            utils.add_pending_achievement({"achievement": achievement})
+            response['achievement'] = achievement
         if new_second_teachers:
-            return make_response({"id": new_class["id"], "second_teachers": new_second_teachers}, 200)
-        return make_response({"id": new_class["id"]}, 200)
+            response["second_teachers"] = new_second_teachers
+        return make_response(response, 200)
 
     @route("/invite-student", methods=["POST"])
     @requires_teacher
@@ -358,7 +359,7 @@ def invite_student(self, user):
 
     @route("/invite-second-teacher", methods=["POST"])
     @requires_teacher
-    def invite_second_teaceher(self, user):
+    def invite_second_teacher(self, user):
         teacher = user
         body = request.json
         # Validations
diff --git a/website/feedback.py b/website/feedback.py
index d6bf60a443e..4a73c979202 100644
--- a/website/feedback.py
+++ b/website/feedback.py
@@ -46,7 +46,7 @@ def teacher_feedback(self, user):
             print(e)
             return make_response(gettext('feedback_message_error'), 500)
 
-        response = make_response('', 204)
+        response = make_response('', 200)
         response.headers["HX-Push-URL"] = 'false'
         response.headers["HX-Trigger"] = json.dumps({"hideFeedbackModal": True})
 
diff --git a/website/for_teachers.py b/website/for_teachers.py
index ce0480b083b..54b37e5b767 100644
--- a/website/for_teachers.py
+++ b/website/for_teachers.py
@@ -914,9 +914,10 @@ def update_customizations(self, user, class_id):
         self.db.update_class_customizations(customizations)
 
         achievement = self.achievements.add_single_achievement(user["username"], "my_class_my_rules")
+        response = {"success": gettext("class_customize_success")}
         if achievement:
-            utils.add_pending_achievement({"achievement": achievement})
-        return make_response(gettext("class_customize_success"), 200)
+            response["achievement"] = achievement
+        return make_response(response, 200)
 
     @route("/create-accounts/<class_id>", methods=["GET"])
     @requires_teacher
@@ -1186,7 +1187,7 @@ def update_adventure(self, user):
                 elif class_id not in current_classes:
                     self.add_adventure_to_class_level(user, class_id, body["id"], level, False)
 
-        return make_response(gettext("adventure_updated"), 200)
+        return make_response({"success": gettext("adventure_updated")}, 200)
 
     @route("/customize-adventure/<adventure_id>", methods=["DELETE"])
     @route("/customize-adventure/<adventure_id>/<owner>", methods=["DELETE"])
diff --git a/website/programs.py b/website/programs.py
index 9d26c380ac7..687fc1679a7 100644
--- a/website/programs.py
+++ b/website/programs.py
@@ -377,7 +377,7 @@ def report_program(self, user):
             '<a href="' + link + '">Program link</a>',
         )
 
-        return make_response(gettext("report_success"), 200)
+        return make_response({"message": gettext("report_success")}, 200)
 
 
 class NotYourProgramError(RuntimeError):
diff --git a/website/user_activity.py b/website/user_activity.py
index ca5aeb2a09e..50db6b7d604 100644
--- a/website/user_activity.py
+++ b/website/user_activity.py
@@ -60,6 +60,6 @@ def index(self, user):
 
         try:
             logger.log(data)
-            return make_response('', 204)
+            return make_response({}, 200)
         except IOError:
             return make_response(gettext("request_invalid"), 400)