|
|
@@ -1,5 +1,5 @@
|
|
|
/*
|
|
|
- * Copyright 2002-2023 the original author or authors.
|
|
|
+ * Copyright 2002-2024 the original author or authors.
|
|
|
*
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
@@ -67,6 +67,141 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
|
|
|
@ExtendWith(SpringTestContextExtension.class)
|
|
|
public class DefaultLoginPageConfigurerTests {
|
|
|
|
|
|
+ //@formatter:off
|
|
|
+ public static final String EXPECTED_HTML_HEAD = " <head>\n"
|
|
|
+ + " <meta charset=\"utf-8\">\n"
|
|
|
+ + " <meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\">\n"
|
|
|
+ + " <meta name=\"description\" content=\"\">\n"
|
|
|
+ + " <meta name=\"author\" content=\"\">\n"
|
|
|
+ + " <title>Please sign in</title>\n"
|
|
|
+ + " <style>\n"
|
|
|
+ + " /* General layout */\n"
|
|
|
+ + " body {\n"
|
|
|
+ + " font-family: system-ui, \"Segoe UI\", Roboto, \"Helvetica Neue\", Arial, sans-serif;\n"
|
|
|
+ + " background-color: #eee;\n"
|
|
|
+ + " padding: 40px 0;\n"
|
|
|
+ + " margin: 0;\n"
|
|
|
+ + " line-height: 1.5;\n"
|
|
|
+ + " }\n"
|
|
|
+ + " \n"
|
|
|
+ + " h2 {\n"
|
|
|
+ + " margin-top: 0;\n"
|
|
|
+ + " margin-bottom: 0.5rem;\n"
|
|
|
+ + " font-size: 2rem;\n"
|
|
|
+ + " font-weight: 500;\n"
|
|
|
+ + " line-height: 2rem;\n"
|
|
|
+ + " }\n"
|
|
|
+ + " \n"
|
|
|
+ + " .content {\n"
|
|
|
+ + " margin-right: auto;\n"
|
|
|
+ + " margin-left: auto;\n"
|
|
|
+ + " padding-right: 15px;\n"
|
|
|
+ + " padding-left: 15px;\n"
|
|
|
+ + " width: 100%;\n"
|
|
|
+ + " box-sizing: border-box;\n"
|
|
|
+ + " }\n"
|
|
|
+ + " \n"
|
|
|
+ + " @media (min-width: 800px) {\n"
|
|
|
+ + " .content {\n"
|
|
|
+ + " max-width: 760px;\n"
|
|
|
+ + " }\n"
|
|
|
+ + " }\n"
|
|
|
+ + " \n"
|
|
|
+ + " /* Components */\n"
|
|
|
+ + " a,\n"
|
|
|
+ + " a:visited {\n"
|
|
|
+ + " text-decoration: none;\n"
|
|
|
+ + " color: #06f;\n"
|
|
|
+ + " }\n"
|
|
|
+ + " \n"
|
|
|
+ + " a:hover {\n"
|
|
|
+ + " text-decoration: underline;\n"
|
|
|
+ + " color: #003c97;\n"
|
|
|
+ + " }\n"
|
|
|
+ + " \n"
|
|
|
+ + " input[type=\"text\"],\n"
|
|
|
+ + " input[type=\"password\"] {\n"
|
|
|
+ + " height: auto;\n"
|
|
|
+ + " width: 100%;\n"
|
|
|
+ + " font-size: 1rem;\n"
|
|
|
+ + " padding: 0.5rem;\n"
|
|
|
+ + " box-sizing: border-box;\n"
|
|
|
+ + " }\n"
|
|
|
+ + " \n"
|
|
|
+ + " button {\n"
|
|
|
+ + " padding: 0.5rem 1rem;\n"
|
|
|
+ + " font-size: 1.25rem;\n"
|
|
|
+ + " line-height: 1.5;\n"
|
|
|
+ + " border: none;\n"
|
|
|
+ + " border-radius: 0.1rem;\n"
|
|
|
+ + " width: 100%;\n"
|
|
|
+ + " }\n"
|
|
|
+ + " \n"
|
|
|
+ + " button.primary {\n"
|
|
|
+ + " color: #fff;\n"
|
|
|
+ + " background-color: #06f;\n"
|
|
|
+ + " }\n"
|
|
|
+ + " \n"
|
|
|
+ + " .alert {\n"
|
|
|
+ + " padding: 0.75rem 1rem;\n"
|
|
|
+ + " margin-bottom: 1rem;\n"
|
|
|
+ + " line-height: 1.5;\n"
|
|
|
+ + " border-radius: 0.1rem;\n"
|
|
|
+ + " width: 100%;\n"
|
|
|
+ + " box-sizing: border-box;\n"
|
|
|
+ + " border-width: 1px;\n"
|
|
|
+ + " border-style: solid;\n"
|
|
|
+ + " }\n"
|
|
|
+ + " \n"
|
|
|
+ + " .alert.alert-danger {\n"
|
|
|
+ + " color: #6b1922;\n"
|
|
|
+ + " background-color: #f7d5d7;\n"
|
|
|
+ + " border-color: #eab6bb;\n"
|
|
|
+ + " }\n"
|
|
|
+ + " \n"
|
|
|
+ + " .alert.alert-success {\n"
|
|
|
+ + " color: #145222;\n"
|
|
|
+ + " background-color: #d1f0d9;\n"
|
|
|
+ + " border-color: #c2ebcb;\n"
|
|
|
+ + " }\n"
|
|
|
+ + " \n"
|
|
|
+ + " .screenreader {\n"
|
|
|
+ + " position: absolute;\n"
|
|
|
+ + " clip: rect(0 0 0 0);\n"
|
|
|
+ + " height: 1px;\n"
|
|
|
+ + " width: 1px;\n"
|
|
|
+ + " padding: 0;\n"
|
|
|
+ + " border: 0;\n"
|
|
|
+ + " overflow: hidden;\n"
|
|
|
+ + " }\n"
|
|
|
+ + " \n"
|
|
|
+ + " table {\n"
|
|
|
+ + " width: 100%;\n"
|
|
|
+ + " max-width: 100%;\n"
|
|
|
+ + " margin-bottom: 2rem;\n"
|
|
|
+ + " }\n"
|
|
|
+ + " \n"
|
|
|
+ + " .table-striped tr:nth-of-type(2n + 1) {\n"
|
|
|
+ + " background-color: #e1e1e1;\n"
|
|
|
+ + " }\n"
|
|
|
+ + " \n"
|
|
|
+ + " td {\n"
|
|
|
+ + " padding: 0.75rem;\n"
|
|
|
+ + " vertical-align: top;\n"
|
|
|
+ + " }\n"
|
|
|
+ + " \n"
|
|
|
+ + " /* Login / logout layouts */\n"
|
|
|
+ + " .login-form,\n"
|
|
|
+ + " .logout-form {\n"
|
|
|
+ + " max-width: 340px;\n"
|
|
|
+ + " padding: 0 15px 15px 15px;\n"
|
|
|
+ + " margin: 0 auto 2rem auto;\n"
|
|
|
+ + " box-sizing: border-box;\n"
|
|
|
+ + " }\n"
|
|
|
+ + " </style>\n"
|
|
|
+ + " </head>\n";
|
|
|
+ //@formatter:on
|
|
|
+
|
|
|
public final SpringTestContext spring = new SpringTestContext(this);
|
|
|
|
|
|
@Autowired
|
|
|
@@ -89,29 +224,21 @@ public class DefaultLoginPageConfigurerTests {
|
|
|
CsrfToken token = (CsrfToken) result.getRequest().getAttribute(CsrfToken.class.getName());
|
|
|
assertThat(result.getResponse().getContentAsString()).isEqualTo("<!DOCTYPE html>\n"
|
|
|
+ "<html lang=\"en\">\n"
|
|
|
- + " <head>\n"
|
|
|
- + " <meta charset=\"utf-8\">\n"
|
|
|
- + " <meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\">\n"
|
|
|
- + " <meta name=\"description\" content=\"\">\n"
|
|
|
- + " <meta name=\"author\" content=\"\">\n"
|
|
|
- + " <title>Please sign in</title>\n"
|
|
|
- + " <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" crossorigin=\"anonymous\">\n"
|
|
|
- + " <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" rel=\"stylesheet\" integrity=\"sha384-oOE/3m0LUMPub4kaC09mrdEhIc+e3exm4xOGxAmuFXhBNF4hcg/6MiAXAf5p0P56\" crossorigin=\"anonymous\"/>\n"
|
|
|
- + " </head>\n"
|
|
|
+ + EXPECTED_HTML_HEAD
|
|
|
+ " <body>\n"
|
|
|
- + " <div class=\"container\">\n"
|
|
|
- + " <form class=\"form-signin\" method=\"post\" action=\"/login\">\n"
|
|
|
- + " <h2 class=\"form-signin-heading\">Please sign in</h2>\n"
|
|
|
+ + " <div class=\"content\">\n"
|
|
|
+ + " <form class=\"login-form\" method=\"post\" action=\"/login\">\n"
|
|
|
+ + " <h2>Please sign in</h2>\n"
|
|
|
+ " <p>\n"
|
|
|
- + " <label for=\"username\" class=\"sr-only\">Username</label>\n"
|
|
|
- + " <input type=\"text\" id=\"username\" name=\"username\" class=\"form-control\" placeholder=\"Username\" required autofocus>\n"
|
|
|
+ + " <label for=\"username\" class=\"screenreader\">Username</label>\n"
|
|
|
+ + " <input type=\"text\" id=\"username\" name=\"username\" placeholder=\"Username\" required autofocus>\n"
|
|
|
+ " </p>\n"
|
|
|
+ " <p>\n"
|
|
|
- + " <label for=\"password\" class=\"sr-only\">Password</label>\n"
|
|
|
- + " <input type=\"password\" id=\"password\" name=\"password\" class=\"form-control\" placeholder=\"Password\" required>\n"
|
|
|
+ + " <label for=\"password\" class=\"screenreader\">Password</label>\n"
|
|
|
+ + " <input type=\"password\" id=\"password\" name=\"password\" placeholder=\"Password\" required>\n"
|
|
|
+ " </p>\n"
|
|
|
+ "<input name=\"" + token.getParameterName() + "\" type=\"hidden\" value=\"" + token.getToken() + "\" />\n"
|
|
|
- + " <button class=\"btn btn-lg btn-primary btn-block\" type=\"submit\">Sign in</button>\n"
|
|
|
+ + " <button type=\"submit\" class=\"primary\">Sign in</button>\n"
|
|
|
+ " </form>\n"
|
|
|
+ "</div>\n"
|
|
|
+ "</body></html>");
|
|
|
@@ -138,28 +265,20 @@ public class DefaultLoginPageConfigurerTests {
|
|
|
CsrfToken token = (CsrfToken) result.getRequest().getAttribute(CsrfToken.class.getName());
|
|
|
assertThat(result.getResponse().getContentAsString()).isEqualTo("<!DOCTYPE html>\n"
|
|
|
+ "<html lang=\"en\">\n"
|
|
|
- + " <head>\n"
|
|
|
- + " <meta charset=\"utf-8\">\n"
|
|
|
- + " <meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\">\n"
|
|
|
- + " <meta name=\"description\" content=\"\">\n"
|
|
|
- + " <meta name=\"author\" content=\"\">\n"
|
|
|
- + " <title>Please sign in</title>\n"
|
|
|
- + " <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" crossorigin=\"anonymous\">\n"
|
|
|
- + " <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" rel=\"stylesheet\" integrity=\"sha384-oOE/3m0LUMPub4kaC09mrdEhIc+e3exm4xOGxAmuFXhBNF4hcg/6MiAXAf5p0P56\" crossorigin=\"anonymous\"/>\n"
|
|
|
- + " </head>\n"
|
|
|
+ + EXPECTED_HTML_HEAD
|
|
|
+ " <body>\n"
|
|
|
- + " <div class=\"container\">\n"
|
|
|
- + " <form class=\"form-signin\" method=\"post\" action=\"/login\">\n"
|
|
|
- + " <h2 class=\"form-signin-heading\">Please sign in</h2>\n"
|
|
|
+ + " <div class=\"content\">\n"
|
|
|
+ + " <form class=\"login-form\" method=\"post\" action=\"/login\">\n"
|
|
|
+ + " <h2>Please sign in</h2>\n"
|
|
|
+ "<div class=\"alert alert-danger\" role=\"alert\">Bad credentials</div> <p>\n"
|
|
|
- + " <label for=\"username\" class=\"sr-only\">Username</label>\n"
|
|
|
- + " <input type=\"text\" id=\"username\" name=\"username\" class=\"form-control\" placeholder=\"Username\" required autofocus>\n"
|
|
|
+ + " <label for=\"username\" class=\"screenreader\">Username</label>\n"
|
|
|
+ + " <input type=\"text\" id=\"username\" name=\"username\" placeholder=\"Username\" required autofocus>\n"
|
|
|
+ " </p>\n" + " <p>\n"
|
|
|
- + " <label for=\"password\" class=\"sr-only\">Password</label>\n"
|
|
|
- + " <input type=\"password\" id=\"password\" name=\"password\" class=\"form-control\" placeholder=\"Password\" required>\n"
|
|
|
+ + " <label for=\"password\" class=\"screenreader\">Password</label>\n"
|
|
|
+ + " <input type=\"password\" id=\"password\" name=\"password\" placeholder=\"Password\" required>\n"
|
|
|
+ " </p>\n"
|
|
|
+ "<input name=\"" + token.getParameterName() + "\" type=\"hidden\" value=\"" + token.getToken() + "\" />\n"
|
|
|
- + " <button class=\"btn btn-lg btn-primary btn-block\" type=\"submit\">Sign in</button>\n"
|
|
|
+ + " <button type=\"submit\" class=\"primary\">Sign in</button>\n"
|
|
|
+ " </form>\n"
|
|
|
+ "</div>\n"
|
|
|
+ "</body></html>");
|
|
|
@@ -190,29 +309,21 @@ public class DefaultLoginPageConfigurerTests {
|
|
|
CsrfToken token = (CsrfToken) result.getRequest().getAttribute(CsrfToken.class.getName());
|
|
|
assertThat(result.getResponse().getContentAsString()).isEqualTo("<!DOCTYPE html>\n"
|
|
|
+ "<html lang=\"en\">\n"
|
|
|
- + " <head>\n"
|
|
|
- + " <meta charset=\"utf-8\">\n"
|
|
|
- + " <meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\">\n"
|
|
|
- + " <meta name=\"description\" content=\"\">\n"
|
|
|
- + " <meta name=\"author\" content=\"\">\n"
|
|
|
- + " <title>Please sign in</title>\n"
|
|
|
- + " <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" crossorigin=\"anonymous\">\n"
|
|
|
- + " <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" rel=\"stylesheet\" integrity=\"sha384-oOE/3m0LUMPub4kaC09mrdEhIc+e3exm4xOGxAmuFXhBNF4hcg/6MiAXAf5p0P56\" crossorigin=\"anonymous\"/>\n"
|
|
|
- + " </head>\n"
|
|
|
+ + EXPECTED_HTML_HEAD
|
|
|
+ " <body>\n"
|
|
|
- + " <div class=\"container\">\n"
|
|
|
- + " <form class=\"form-signin\" method=\"post\" action=\"/login\">\n"
|
|
|
- + " <h2 class=\"form-signin-heading\">Please sign in</h2>\n"
|
|
|
+ + " <div class=\"content\">\n"
|
|
|
+ + " <form class=\"login-form\" method=\"post\" action=\"/login\">\n"
|
|
|
+ + " <h2>Please sign in</h2>\n"
|
|
|
+ "<div class=\"alert alert-success\" role=\"alert\">You have been signed out</div> <p>\n"
|
|
|
- + " <label for=\"username\" class=\"sr-only\">Username</label>\n"
|
|
|
- + " <input type=\"text\" id=\"username\" name=\"username\" class=\"form-control\" placeholder=\"Username\" required autofocus>\n"
|
|
|
+ + " <label for=\"username\" class=\"screenreader\">Username</label>\n"
|
|
|
+ + " <input type=\"text\" id=\"username\" name=\"username\" placeholder=\"Username\" required autofocus>\n"
|
|
|
+ " </p>\n"
|
|
|
+ " <p>\n"
|
|
|
- + " <label for=\"password\" class=\"sr-only\">Password</label>\n"
|
|
|
- + " <input type=\"password\" id=\"password\" name=\"password\" class=\"form-control\" placeholder=\"Password\" required>\n"
|
|
|
+ + " <label for=\"password\" class=\"screenreader\">Password</label>\n"
|
|
|
+ + " <input type=\"password\" id=\"password\" name=\"password\" placeholder=\"Password\" required>\n"
|
|
|
+ " </p>\n"
|
|
|
+ "<input name=\"" + token.getParameterName() + "\" type=\"hidden\" value=\"" + token.getToken() + "\" />\n"
|
|
|
- + " <button class=\"btn btn-lg btn-primary btn-block\" type=\"submit\">Sign in</button>\n"
|
|
|
+ + " <button type=\"submit\" class=\"primary\">Sign in</button>\n"
|
|
|
+ " </form>\n"
|
|
|
+ "</div>\n"
|
|
|
+ "</body></html>");
|
|
|
@@ -243,30 +354,22 @@ public class DefaultLoginPageConfigurerTests {
|
|
|
CsrfToken token = (CsrfToken) result.getRequest().getAttribute(CsrfToken.class.getName());
|
|
|
assertThat(result.getResponse().getContentAsString()).isEqualTo("<!DOCTYPE html>\n"
|
|
|
+ "<html lang=\"en\">\n"
|
|
|
- + " <head>\n"
|
|
|
- + " <meta charset=\"utf-8\">\n"
|
|
|
- + " <meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\">\n"
|
|
|
- + " <meta name=\"description\" content=\"\">\n"
|
|
|
- + " <meta name=\"author\" content=\"\">\n"
|
|
|
- + " <title>Please sign in</title>\n"
|
|
|
- + " <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" crossorigin=\"anonymous\">\n"
|
|
|
- + " <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" rel=\"stylesheet\" integrity=\"sha384-oOE/3m0LUMPub4kaC09mrdEhIc+e3exm4xOGxAmuFXhBNF4hcg/6MiAXAf5p0P56\" crossorigin=\"anonymous\"/>\n"
|
|
|
- + " </head>\n"
|
|
|
+ + EXPECTED_HTML_HEAD
|
|
|
+ " <body>\n"
|
|
|
- + " <div class=\"container\">\n"
|
|
|
- + " <form class=\"form-signin\" method=\"post\" action=\"/login\">\n"
|
|
|
- + " <h2 class=\"form-signin-heading\">Please sign in</h2>\n"
|
|
|
+ + " <div class=\"content\">\n"
|
|
|
+ + " <form class=\"login-form\" method=\"post\" action=\"/login\">\n"
|
|
|
+ + " <h2>Please sign in</h2>\n"
|
|
|
+ " <p>\n"
|
|
|
- + " <label for=\"username\" class=\"sr-only\">Username</label>\n"
|
|
|
- + " <input type=\"text\" id=\"username\" name=\"username\" class=\"form-control\" placeholder=\"Username\" required autofocus>\n"
|
|
|
+ + " <label for=\"username\" class=\"screenreader\">Username</label>\n"
|
|
|
+ + " <input type=\"text\" id=\"username\" name=\"username\" placeholder=\"Username\" required autofocus>\n"
|
|
|
+ " </p>\n"
|
|
|
+ " <p>\n"
|
|
|
- + " <label for=\"password\" class=\"sr-only\">Password</label>\n"
|
|
|
- + " <input type=\"password\" id=\"password\" name=\"password\" class=\"form-control\" placeholder=\"Password\" required>\n"
|
|
|
+ + " <label for=\"password\" class=\"screenreader\">Password</label>\n"
|
|
|
+ + " <input type=\"password\" id=\"password\" name=\"password\" placeholder=\"Password\" required>\n"
|
|
|
+ " </p>\n"
|
|
|
+ "<p><input type='checkbox' name='remember-me'/> Remember me on this computer.</p>\n"
|
|
|
+ "<input name=\"" + token.getParameterName() + "\" type=\"hidden\" value=\"" + token.getToken() + "\" />\n"
|
|
|
- + " <button class=\"btn btn-lg btn-primary btn-block\" type=\"submit\">Sign in</button>\n"
|
|
|
+ + " <button type=\"submit\" class=\"primary\">Sign in</button>\n"
|
|
|
+ " </form>\n"
|
|
|
+ "</div>\n"
|
|
|
+ "</body></html>");
|
Daniel Garnier-Moiroux