Skip to content

Commit 0e90ce5

Browse files
KehrlannKehrlann
committed
Render default UIs using lightweight templates
1 parent 36a408f commit 0e90ce5

File tree

9 files changed

+955
-268
lines changed

9 files changed

+955
-268
lines changed

‎config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultLoginPageConfigurerTests.java‎

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,10 @@ public void loginPageThenDefaultLoginPageIsRendered() throws Exception {
226226
+ "<html lang=\"en\">\n"
227227
+ EXPECTED_HTML_HEAD
228228
+ " <body>\n"
229-
+ " <div class=\"content\">\n"
229+
+ " <div class=\"content\">\n"
230230
+ " <form class=\"login-form\" method=\"post\" action=\"/login\">\n"
231231
+ " <h2>Please sign in</h2>\n"
232+
+ " \n"
232233
+ " <p>\n"
233234
+ " <label for=\"username\" class=\"screenreader\">Username</label>\n"
234235
+ " <input type=\"text\" id=\"username\" name=\"username\" placeholder=\"Username\" required autofocus>\n"
@@ -237,11 +238,15 @@ public void loginPageThenDefaultLoginPageIsRendered() throws Exception {
237238
+ " <label for=\"password\" class=\"screenreader\">Password</label>\n"
238239
+ " <input type=\"password\" id=\"password\" name=\"password\" placeholder=\"Password\" required>\n"
239240
+ " </p>\n"
241+
+ "\n"
240242
+ "<input name=\"" + token.getParameterName() + "\" type=\"hidden\" value=\"" + token.getToken() + "\" />\n"
241243
+ " <button type=\"submit\" class=\"primary\">Sign in</button>\n"
242244
+ " </form>\n"
243-
+ "</div>\n"
244-
+ "</body></html>");
245+
+ "\n"
246+
+ "\n"
247+
+ " </div>\n"
248+
+ " </body>\n"
249+
+ "</html>");
245250
});
246251
// @formatter:on
247252
}
@@ -267,21 +272,26 @@ public void loginPageWhenErrorThenDefaultLoginPageWithError() throws Exception {
267272
+ "<html lang=\"en\">\n"
268273
+ EXPECTED_HTML_HEAD
269274
+ " <body>\n"
270-
+ " <div class=\"content\">\n"
275+
+ " <div class=\"content\">\n"
271276
+ " <form class=\"login-form\" method=\"post\" action=\"/login\">\n"
272277
+ " <h2>Please sign in</h2>\n"
273-
+ "<div class=\"alert alert-danger\" role=\"alert\">Bad credentials</div> <p>\n"
278+
+ " <div class=\"alert alert-danger\" role=\"alert\">Bad credentials</div>\n"
279+
+ " <p>\n"
274280
+ " <label for=\"username\" class=\"screenreader\">Username</label>\n"
275281
+ " <input type=\"text\" id=\"username\" name=\"username\" placeholder=\"Username\" required autofocus>\n"
276282
+ " </p>\n" + " <p>\n"
277283
+ " <label for=\"password\" class=\"screenreader\">Password</label>\n"
278284
+ " <input type=\"password\" id=\"password\" name=\"password\" placeholder=\"Password\" required>\n"
279285
+ " </p>\n"
286+
+ "\n"
280287
+ "<input name=\"" + token.getParameterName() + "\" type=\"hidden\" value=\"" + token.getToken() + "\" />\n"
281288
+ " <button type=\"submit\" class=\"primary\">Sign in</button>\n"
282289
+ " </form>\n"
283-
+ "</div>\n"
284-
+ "</body></html>");
290+
+ "\n"
291+
+ "\n"
292+
+ " </div>\n"
293+
+ " </body>\n"
294+
+ "</html>");
285295
});
286296
// @formatter:on
287297
}
@@ -311,22 +321,27 @@ public void loginPageWhenLoggedOutThenDefaultLoginPageWithLogoutMessage() throws
311321
+ "<html lang=\"en\">\n"
312322
+ EXPECTED_HTML_HEAD
313323
+ " <body>\n"
314-
+ " <div class=\"content\">\n"
324+
+ " <div class=\"content\">\n"
315325
+ " <form class=\"login-form\" method=\"post\" action=\"/login\">\n"
316326
+ " <h2>Please sign in</h2>\n"
317-
+ "<div class=\"alert alert-success\" role=\"alert\">You have been signed out</div> <p>\n"
327+
+ " <div class=\"alert alert-success\" role=\"alert\">You have been signed out</div>\n"
328+
+ " <p>\n"
318329
+ " <label for=\"username\" class=\"screenreader\">Username</label>\n"
319330
+ " <input type=\"text\" id=\"username\" name=\"username\" placeholder=\"Username\" required autofocus>\n"
320331
+ " </p>\n"
321332
+ " <p>\n"
322333
+ " <label for=\"password\" class=\"screenreader\">Password</label>\n"
323334
+ " <input type=\"password\" id=\"password\" name=\"password\" placeholder=\"Password\" required>\n"
324335
+ " </p>\n"
336+
+ "\n"
325337
+ "<input name=\"" + token.getParameterName() + "\" type=\"hidden\" value=\"" + token.getToken() + "\" />\n"
326338
+ " <button type=\"submit\" class=\"primary\">Sign in</button>\n"
327339
+ " </form>\n"
328-
+ "</div>\n"
329-
+ "</body></html>");
340+
+ "\n"
341+
+ "\n"
342+
+ " </div>\n"
343+
+ " </body>\n"
344+
+ "</html>");
330345
});
331346
// @formatter:on
332347
}
@@ -356,9 +371,10 @@ public void loginPageWhenRememberConfigureThenDefaultLoginPageWithRememberMeChec
356371
+ "<html lang=\"en\">\n"
357372
+ EXPECTED_HTML_HEAD
358373
+ " <body>\n"
359-
+ " <div class=\"content\">\n"
374+
+ " <div class=\"content\">\n"
360375
+ " <form class=\"login-form\" method=\"post\" action=\"/login\">\n"
361376
+ " <h2>Please sign in</h2>\n"
377+
+ " \n"
362378
+ " <p>\n"
363379
+ " <label for=\"username\" class=\"screenreader\">Username</label>\n"
364380
+ " <input type=\"text\" id=\"username\" name=\"username\" placeholder=\"Username\" required autofocus>\n"
@@ -371,8 +387,11 @@ public void loginPageWhenRememberConfigureThenDefaultLoginPageWithRememberMeChec
371387
+ "<input name=\"" + token.getParameterName() + "\" type=\"hidden\" value=\"" + token.getToken() + "\" />\n"
372388
+ " <button type=\"submit\" class=\"primary\">Sign in</button>\n"
373389
+ " </form>\n"
374-
+ "</div>\n"
375-
+ "</body></html>");
390+
+ "\n"
391+
+ "\n"
392+
+ " </div>\n"
393+
+ " </body>\n"
394+
+ "</html>");
376395
});
377396
// @formatter:on
378397
}

0 commit comments

Comments
 (0)