diff --git a/app/src/main/java/rife/HelloAuthentication.java b/app/src/main/java/rife/HelloAuthentication.java index c5b52fe2..bb0a8ccf 100644 --- a/app/src/main/java/rife/HelloAuthentication.java +++ b/app/src/main/java/rife/HelloAuthentication.java @@ -17,7 +17,7 @@ public class HelloAuthentication extends Site { class AuthenticatedSection extends Router { Route hello = get("/hello", c -> { var t = c.template("HelloAuthenticated"); - t.setValue("user", config.identityAttribute(c).getLogin()); + t.setValue("user", AuthConfig.identityAttribute(c).getLogin()); c.print(t); }); Route logout = get("/logout", new Logout(config, TemplateFactory.HTML.get("HelloLogout"))); diff --git a/app/src/main/java/rife/HelloGroup.java b/app/src/main/java/rife/HelloGroup.java new file mode 100644 index 00000000..9d5c4b0f --- /dev/null +++ b/app/src/main/java/rife/HelloGroup.java @@ -0,0 +1,23 @@ +/* + * Copyright 2001-2022 Geert Bevin (gbevin[remove] at uwyn dot com) + * Licensed under the Apache License, Version 2.0 (the "License") + */ +package rife; + +import rife.engine.*; + +public class HelloGroup extends Site { + Route hello = get("/hello", c -> c.print("Hello World")); + Router group = group("/group", new Router() { + public void setup() { + before(c -> c.print("before ")); + get("/hello", c -> c.print("hello inside")); + get("/bonjour", c -> c.print("bonjour inside")); + after(c -> c.print(" after")); + } + }); + + public static void main(String[] args) { + new Server().start(new HelloGroup()); + } +} \ No newline at end of file diff --git a/app/src/test/java/rife/HelloTest.java b/app/src/test/java/rife/HelloTest.java index 3938155c..dfd34f3a 100644 --- a/app/src/test/java/rife/HelloTest.java +++ b/app/src/test/java/rife/HelloTest.java @@ -22,6 +22,12 @@ class HelloTest { .follow().getText()); } + @Test void verifyHelloGroup() { + var m = new MockConversation(new HelloGroup()); + assertEquals("before hello inside after", m.doRequest("/group/hello").getText()); + assertEquals("before bonjour inside after", m.doRequest("/group/bonjour").getText()); + } + @Test void verifyHelloTemplate() { var m = new MockConversation(new HelloTemplate()); assertEquals("Hello World", m.doRequest("/link")