From 5f4889cefed22ecd17ce4080e9445e547794f126 Mon Sep 17 00:00:00 2001
From: Nanne Baars <nanne.baars@owasp.org>
Date: Tue, 29 May 2018 09:29:50 +0200
Subject: [PATCH] Clicking link in first password reset link only switched back
 and forward

---
 .../main/resources/html/PasswordReset.html    | 19 +++++++++----------
 .../resources/js/password-reset-simple.js     | 17 ++++-------------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/webgoat-lessons/password-reset/src/main/resources/html/PasswordReset.html b/webgoat-lessons/password-reset/src/main/resources/html/PasswordReset.html
index 5dfc6f708..708c4c07f 100644
--- a/webgoat-lessons/password-reset/src/main/resources/html/PasswordReset.html
+++ b/webgoat-lessons/password-reset/src/main/resources/html/PasswordReset.html
@@ -21,11 +21,10 @@
             <div class="container-fluid">
 
                 <div class="row">
-
-                    <div class="col-md-2">
-                        <h4 style="border-bottom: 1px solid #c5c5c5;"><i class="glyphicon glyphicon-user"></i> Account
-                            Access</h4>
-                        <div style="padding: 20px;" id="form-olvidado">
+                    <div class="col-md-4">
+                        <div style="padding: 20px;" id="password-login-2">
+                            <h4 style="border-bottom: 1px solid #c5c5c5;"><i class="glyphicon glyphicon-user"></i> Account
+                                Access</h4>
                             <fieldset>
                                 <div class="form-group input-group">
                                     <span class="input-group-addon">@</span>
@@ -42,7 +41,7 @@
                                         Access
                                     </button>
                                     <p class="help-block">
-                                        <a class="pull-right text-muted" href="#" id="olvidado">
+                                        <a class="pull-right text-muted" href="#" id="olvidado" onclick="showPasswordReset()">
                                             <small>Forgot your password?</small>
                                         </a>
                                     </p>
@@ -50,7 +49,7 @@
                             </fieldset>
 
                         </div>
-                        <div style="display: none;" id="form-olvidado">
+                        <div style="display: none;" id="password-reset-2">
                             <h4 class="">Forgot your password?</h4>
 
                             <fieldset>
@@ -63,7 +62,7 @@
                                 <button type="submit" class="btn btn-primary btn-block" id="btn-olvidado">Continue
                                 </button>
                                 <p class="help-block">
-                                    <a class="text-muted" href="#" id="acceso">
+                                    <a class="text-muted" href="#" id="acceso" onclick="showPassword()">
                                         <small>Account Access</small>
                                     </a>
                                 </p>
@@ -99,7 +98,7 @@
               action="/WebGoat/PasswordReset/questions"
               enctype="application/json;charset=UTF-8">
             <div class="container-fluid">
-                <div class="col-md-2">
+                <div class="col-md-4">
                     <article class="card-body">
                         <a href="" class="float-right btn btn-outline-primary">Sign up</a>
                         <a href="" class="float-right btn btn-outline-primary">Login</a>
@@ -143,7 +142,7 @@
               enctype="application/json;charset=UTF-8">
             <div class="container-fluid">
                 <div class="row">
-                    <div class="col-md-3">
+                    <div class="col-md-4">
                         <h4 style="border-bottom: 1px solid #c5c5c5;">
                             <i class="glyphicon glyphicon-user"></i>
                             Account Access
diff --git a/webgoat-lessons/password-reset/src/main/resources/js/password-reset-simple.js b/webgoat-lessons/password-reset/src/main/resources/js/password-reset-simple.js
index bf374ac7f..65f1d20a0 100644
--- a/webgoat-lessons/password-reset/src/main/resources/js/password-reset-simple.js
+++ b/webgoat-lessons/password-reset/src/main/resources/js/password-reset-simple.js
@@ -1,22 +1,13 @@
-$(document).ready(function() {
-    $('#olvidado').click(function(e) {
-        e.preventDefault();
-        $('div#form-olvidado').toggle('500');
-    });
-    $('#acceso').click(function(e) {
-        e.preventDefault();
-        $('div#form-olvidado').toggle('500');
-    });
-});
-
 function showPasswordReset() {
-    console.log("clicking")
     $('#password-reset').show();
     $('#password-login').hide();
+    $('#password-reset-2').show();
+    $('#password-login-2').hide();
 }
 
 function showPassword() {
-    console.log("clicking")
     $('#password-login').show();
     $('#password-reset').hide();
+    $('#password-login-2').show();
+    $('#password-reset-2').hide();
 }
\ No newline at end of file