Merge 2a23f3b36c into e044c24952

config/src/test/java/org/springframework/security/config/annotation/web/configurers/ott/OneTimeTokenLoginConfigurerTests.java

@@ -177,7 +177,7 @@ public class OneTimeTokenLoginConfigurerTests {
 						          <input type="text" id="ott-username" name="username" placeholder="Username" required>
 						        </p>
 						<input name="_csrf" type="hidden" value="%s" />
-						        <button class="primary" type="submit" form="ott-form">Send Token</button>
+						        <button class="primary" type="submit">Send Token</button>
 						      </form>
 
 

web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLoginPageGeneratingFilter.java

@@ -604,7 +604,7 @@ public class DefaultLoginPageGeneratingFilter extends GenericFilterBean {
 			          {{usernameInput}}
 			        </p>
 			{{hiddenInputs}}
-			        <button class="primary" type="submit" form="ott-form">Send Token</button>
+			        <button class="primary" type="submit">Send Token</button>
 			      </form>
 			""";
 

web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java

@@ -199,7 +199,7 @@ public class DefaultLoginPageGeneratingFilterTests {
 				          <input type="text" id="ott-username" name="username" placeholder="Username" required>
 				        </p>
 
-				        <button class="primary" type="submit" form="ott-form">Send Token</button>
+				        <button class="primary" type="submit">Send Token</button>
 				      </form>
 				""");
 	}
@@ -225,7 +225,7 @@ public class DefaultLoginPageGeneratingFilterTests {
 				          <input type="text" id="ott-username" name="username" placeholder="Username" required>
 				        </p>
 
-				        <button class="primary" type="submit" form="ott-form">Send Token</button>
+				        <button class="primary" type="submit">Send Token</button>
 				      </form>
 				""");
 		assertThat(response.getContentAsString()).doesNotContain("Password");
@@ -254,7 +254,7 @@ public class DefaultLoginPageGeneratingFilterTests {
 				          <input type="text" id="ott-username" name="username" placeholder="Username" required>
 				        </p>
 
-				        <button class="primary" type="submit" form="ott-form">Send Token</button>
+				        <button class="primary" type="submit">Send Token</button>
 				      </form>
 				""");
 		assertThat(response.getContentAsString()).contains("Password");