Trying to cancel forgotten password after inputting the token doesn't cancel.

Fixed a problem where the temporary authentication wasn't getting cleared out, which was causing the change password page to keep being shown, even after clicking cancel.

src/main/java/password/pwm/http/servlet/ChangePasswordServlet.java

@@ -91,6 +91,7 @@ public class ChangePasswordServlet extends AbstractPwmServlet {
         form(HttpMethod.POST),
         agree(HttpMethod.POST),
         warnResponse(HttpMethod.POST),
+        reset(HttpMethod.POST),
 
         ;
 
@@ -178,6 +179,15 @@ public class ChangePasswordServlet extends AbstractPwmServlet {
 
                 case agree:
                     handleAgreeRequest(pwmRequest, changePasswordBean);
+
+                case reset:
+                    if (pwmSession.getUserInfoBean().isRequiresNewPassword()) {
+                        // Must have gotten here from the "Forgotton Password" link.  Better clear out the temporary authentication
+                        pwmRequest.getPwmSession().unauthenticateUser(pwmRequest);
+                    }
+
+                    pwmRequest.sendRedirect(pwmRequest.getHttpServletRequest().getContextPath());
+                    break;
             }
         }
 

src/main/webapp/WEB-INF/jsp/changepassword.jsp

@@ -115,7 +115,9 @@
                 <pwm:display key="Button_ChangePassword"/>
             </button>
             <% if (!passwordStatus.isExpired() && !passwordStatus.isPreExpired() && !passwordStatus.isViolatesPolicy()) { %>
-                <form action="<pwm:url addContext='true' url='/' />" method="GET">
+                <form action="<pwm:current-url/>" method="post" enctype="application/x-www-form-urlencoded" style="display: inline;">
+                    <input type="hidden" name="processAction" value="reset"/>
+                    <input type="hidden" name="pwmFormID" id="pwmFormID" value="<pwm:FormID/>"/>
                     <button type="submit" name="change" class="btn">
                         <pwm:if test="<%=PwmIfTest.showIcons%>"><span class="btn-icon pwm-icon pwm-icon-forward"></span></pwm:if>
                         <pwm:display key="Button_Cancel"/>