From cb7c5080467bf866accbd12ddfb68ec460ec4573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Capon?=
 <46624375+FrancoisCapon@users.noreply.github.com>
Date: Sat, 26 Oct 2024 09:22:18 +0200
Subject: [PATCH] fix: reset form and quiz color on reset lesson (#1903)

* ./mvnw spotless:apply

```
[INFO] --- spotless-maven-plugin:2.41.1:apply (default-cli) @ webgoat ---
[INFO] Writing clean file: /home/ulyssa/labs/WebGoat/WebGoat-bb6e84d/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson5a.java
```

* On reset lesson: reset form and quizzes colors
---
 .../sqlinjection/introduction/SqlInjectionLesson5a.java       | 4 ++--
 .../webgoat/static/js/goatApp/view/LessonContentView.js       | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson5a.java b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson5a.java
index 59a29ff10..65c103d0f 100644
--- a/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson5a.java
+++ b/src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson5a.java
@@ -41,8 +41,8 @@ public class SqlInjectionLesson5a extends AssignmentEndpoint {
           + " '1'</span> always evaluates to true (The string ending literal for '1 is closed by"
           + " the query itself, so you should not inject it). So the injected query basically looks"
           + " like this: <span style=\"font-style: italic\">SELECT * FROM user_data WHERE"
-          + " first_name = 'John' and last_name = '' or TRUE</span>, which will always evaluate to"
-          + " true, no matter what came before it.";
+          + " (first_name = 'John' and last_name = '') or (TRUE)</span>, which will always evaluate"
+          + " to true, no matter what came before it.";
   private final LessonDataSource dataSource;
 
   public SqlInjectionLesson5a(LessonDataSource dataSource) {
diff --git a/src/main/resources/webgoat/static/js/goatApp/view/LessonContentView.js b/src/main/resources/webgoat/static/js/goatApp/view/LessonContentView.js
index 66c01605a..5a7cb2ad5 100644
--- a/src/main/resources/webgoat/static/js/goatApp/view/LessonContentView.js
+++ b/src/main/resources/webgoat/static/js/goatApp/view/LessonContentView.js
@@ -147,7 +147,6 @@ define(['jquery',
             },
 
             markAssignmentComplete: function () {
-                this.curForm.reset();
                 $(this.curForm).siblings('.assignment-success').find('i').removeClass('hidden');
                 this.paginationControlView.updateCollection();
             },
@@ -222,6 +221,8 @@ define(['jquery',
             },
 
             resetLesson: function () {
+                this.$el.find(form).trigger("reset");
+                this.$el.find(".quiz_question").removeClass('correct incorrect');
                 this.$el.find('.attack-feedback').hide();
                 this.$el.find('.attack-output').hide();
                 this.markAssignmentIncomplete();