update docs and labs

andifalk · Jun 4, 2019 · f3493b8 · f3493b8
1 parent b11f0c7
commit f3493b8
Show file tree

Hide file tree

Showing 33 changed files with 984 additions and 678 deletions.
diff --git a/docs/api-doc.html b/docs/api-doc.html
diff --git a/docs/workshop-tutorial.html b/docs/workshop-tutorial.html
diff --git a/docs/workshop-tutorial.pdf b/docs/workshop-tutorial.pdf
diff --git a/...library-server/src/test/java/com/example/library/server/api/BookApiDocumentationTest.java b/...library-server/src/test/java/com/example/library/server/api/BookApiDocumentationTest.java
@@ -63,6 +63,7 @@ void setUp(RestDocumentationContextProvider restDocumentation) {
     this.webTestClient =
         WebTestClient.bindToApplicationContext(applicationContext)
             .configureClient()
+            .baseUrl("http://localhost:9091")
             .filter(
                 documentationConfiguration(restDocumentation)
                     .operationPreprocessors()

diff --git a/...library-server/src/test/java/com/example/library/server/api/UserApiDocumentationTest.java b/...library-server/src/test/java/com/example/library/server/api/UserApiDocumentationTest.java
@@ -71,7 +71,8 @@ void setUp(RestDocumentationContextProvider restDocumentation) {
     this.webTestClient =
         WebTestClient.bindToApplicationContext(applicationContext)
             .configureClient()
-            .filter(
+                .baseUrl("http://localhost:9091")
+                .filter(
                 documentationConfiguration(restDocumentation)
                     .operationPreprocessors()
                     .withRequestDefaults(prettyPrint())

diff --git a/...library-server/src/test/java/com/example/library/server/api/BookApiDocumentationTest.java b/...library-server/src/test/java/com/example/library/server/api/BookApiDocumentationTest.java
@@ -60,6 +60,7 @@ void setUp(RestDocumentationContextProvider restDocumentation) {
     this.webTestClient =
         WebTestClient.bindToApplicationContext(applicationContext)
             .configureClient()
+            .baseUrl("http://localhost:9091")
             .filter(
                 documentationConfiguration(restDocumentation)
                     .operationPreprocessors()

diff --git a/...library-server/src/test/java/com/example/library/server/api/UserApiDocumentationTest.java b/...library-server/src/test/java/com/example/library/server/api/UserApiDocumentationTest.java
@@ -68,7 +68,8 @@ void setUp(RestDocumentationContextProvider restDocumentation) {
     this.webTestClient =
         WebTestClient.bindToApplicationContext(applicationContext)
             .configureClient()
-            .filter(
+                .baseUrl("http://localhost:9091")
+                .filter(
                 documentationConfiguration(restDocumentation)
                     .operationPreprocessors()
                     .withRequestDefaults(prettyPrint())

diff --git a/...library-server/src/test/java/com/example/library/server/api/BookApiDocumentationTest.java b/...library-server/src/test/java/com/example/library/server/api/BookApiDocumentationTest.java
@@ -63,6 +63,7 @@ void setUp(RestDocumentationContextProvider restDocumentation) {
     this.webTestClient =
         WebTestClient.bindToApplicationContext(applicationContext)
             .configureClient()
+            .baseUrl("http://localhost:9091")
             .filter(
                 documentationConfiguration(restDocumentation)
                     .operationPreprocessors()

diff --git a/...library-server/src/test/java/com/example/library/server/api/UserApiDocumentationTest.java b/...library-server/src/test/java/com/example/library/server/api/UserApiDocumentationTest.java
@@ -71,7 +71,8 @@ void setUp(RestDocumentationContextProvider restDocumentation) {
     this.webTestClient =
         WebTestClient.bindToApplicationContext(applicationContext)
             .configureClient()
-            .filter(
+                .baseUrl("http://localhost:9091")
+                .filter(
                 documentationConfiguration(restDocumentation)
                     .operationPreprocessors()
                     .withRequestDefaults(prettyPrint())

diff --git a/...library-server/src/test/java/com/example/library/server/api/BookApiDocumentationTest.java b/...library-server/src/test/java/com/example/library/server/api/BookApiDocumentationTest.java
@@ -63,6 +63,7 @@ void setUp(RestDocumentationContextProvider restDocumentation) {
     this.webTestClient =
         WebTestClient.bindToApplicationContext(applicationContext)
             .configureClient()
+            .baseUrl("http://localhost:9091")
             .filter(
                 documentationConfiguration(restDocumentation)
                     .operationPreprocessors()

diff --git a/...library-server/src/test/java/com/example/library/server/api/UserApiDocumentationTest.java b/...library-server/src/test/java/com/example/library/server/api/UserApiDocumentationTest.java
@@ -71,7 +71,8 @@ void setUp(RestDocumentationContextProvider restDocumentation) {
     this.webTestClient =
         WebTestClient.bindToApplicationContext(applicationContext)
             .configureClient()
-            .filter(
+                .baseUrl("http://localhost:9091")
+                .filter(
                 documentationConfiguration(restDocumentation)
                     .operationPreprocessors()
                     .withRequestDefaults(prettyPrint())

diff --git a/...library-server/src/test/java/com/example/library/server/api/BookApiDocumentationTest.java b/...library-server/src/test/java/com/example/library/server/api/BookApiDocumentationTest.java
@@ -40,7 +40,6 @@
 import static org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation.document;
 import static org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation.documentationConfiguration;
 import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.csrf;
-import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.springSecurity;
 
 @ExtendWith({RestDocumentationExtension.class, SpringExtension.class})
 @WebFluxTest
@@ -63,8 +62,8 @@ class BookApiDocumentationTest {
   void setUp(RestDocumentationContextProvider restDocumentation) {
     this.webTestClient =
         WebTestClient.bindToApplicationContext(applicationContext)
-            .apply(springSecurity())
             .configureClient()
+            .baseUrl("http://localhost:9091")
             .filter(
                 documentationConfiguration(restDocumentation)
                     .operationPreprocessors()

diff --git a/...library-server/src/test/java/com/example/library/server/api/UserApiDocumentationTest.java b/...library-server/src/test/java/com/example/library/server/api/UserApiDocumentationTest.java
@@ -71,7 +71,8 @@ void setUp(RestDocumentationContextProvider restDocumentation) {
     this.webTestClient =
         WebTestClient.bindToApplicationContext(applicationContext)
             .configureClient()
-            .filter(
+                .baseUrl("http://localhost:9091")
+                .filter(
                 documentationConfiguration(restDocumentation)
                     .operationPreprocessors()
                     .withRequestDefaults(prettyPrint())

diff --git a/...esource-server/src/test/java/com/example/library/server/api/BookApiDocumentationTest.java b/...esource-server/src/test/java/com/example/library/server/api/BookApiDocumentationTest.java
@@ -65,6 +65,7 @@ void setUp(RestDocumentationContextProvider restDocumentation) {
         WebTestClient.bindToApplicationContext(applicationContext)
             .apply(springSecurity())
             .configureClient()
+            .baseUrl("http://localhost:9091")
             .filter(
                 documentationConfiguration(restDocumentation)
                     .operationPreprocessors()

diff --git a/...esource-server/src/test/java/com/example/library/server/api/UserApiDocumentationTest.java b/...esource-server/src/test/java/com/example/library/server/api/UserApiDocumentationTest.java
@@ -71,7 +71,8 @@ void setUp(RestDocumentationContextProvider restDocumentation) {
     this.webTestClient =
         WebTestClient.bindToApplicationContext(applicationContext)
             .configureClient()
-            .filter(
+                .baseUrl("http://localhost:9091")
+                .filter(
                 documentationConfiguration(restDocumentation)
                     .operationPreprocessors()
                     .withRequestDefaults(prettyPrint())

diff --git a/...esource-server/src/test/java/com/example/library/server/api/BookApiDocumentationTest.java b/...esource-server/src/test/java/com/example/library/server/api/BookApiDocumentationTest.java
@@ -65,6 +65,7 @@ void setUp(RestDocumentationContextProvider restDocumentation) {
         WebTestClient.bindToApplicationContext(applicationContext)
             .apply(springSecurity())
             .configureClient()
+            .baseUrl("http://localhost:9091")
             .filter(
                 documentationConfiguration(restDocumentation)
                     .operationPreprocessors()

diff --git a/...esource-server/src/test/java/com/example/library/server/api/UserApiDocumentationTest.java b/...esource-server/src/test/java/com/example/library/server/api/UserApiDocumentationTest.java
@@ -71,7 +71,8 @@ void setUp(RestDocumentationContextProvider restDocumentation) {
     this.webTestClient =
         WebTestClient.bindToApplicationContext(applicationContext)
             .configureClient()
-            .filter(
+                .baseUrl("http://localhost:9091")
+                .filter(
                 documentationConfiguration(restDocumentation)
                     .operationPreprocessors()
                     .withRequestDefaults(prettyPrint())

diff --git a/lab-6/complete-oidc-client/src/main/java/com/example/oidc/client/api/UserController.java b/lab-6/complete-oidc-client/src/main/java/com/example/oidc/client/api/UserController.java
@@ -17,8 +17,6 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import static org.springframework.security.oauth2.client.web.reactive.function.client.ServerOAuth2AuthorizedClientExchangeFilterFunction.clientRegistrationId;
-
 @Controller
 @RequestMapping("/users")
 public class UserController {
@@ -44,7 +42,6 @@ Flux<UserResource> allUsers() {
     return webClient
         .get()
         .uri(libraryServer + "/users")
-        .attributes(clientRegistrationId("keycloak"))
         .retrieve()
         .onStatus(
             httpStatus -> HttpStatus.FORBIDDEN.value() == httpStatus.value(),

diff --git a/lab-6/initial-oidc-client/src/main/resources/templates/index.html b/lab-6/initial-oidc-client/src/main/resources/templates/index.html
@@ -26,8 +26,8 @@ <h1>Library Client</h1>
     <hr>
 
     <div class="jumbotron">
-        <a class="btn btn-primary" href="#" role="button" th:href="@{/createbook}"
-           th:unless="${isCurator}">Create Book</a>
+        <a class="btn btn-primary" href="#" role="button" th:unless="${isCurator}"
+           th:href="@{/createbook}">Create Book</a>
     </div>
 
     <table class="table table-striped">
@@ -47,11 +47,10 @@ <h1>Library Client</h1>
             <td th:text="${bookResource.description}">descr</td>
             <td th:text="${bookResource.isbn}">isbn</td>
             <td><a class="btn btn-primary" href="#" role="button"
-                   th:href="@{'/return?identifier=' + ${bookResource.id}}"
-                   th:unless="${!bookResource.borrowed}">Return</a><a class="btn btn-primary" href="#"
-                                                                      role="button"
-                                                                      th:href="@{'/borrow?identifier=' + ${bookResource.id}}"
-                                                                      th:unless="${bookResource.borrowed}">Borrow</a>
+                   th:href="@{'/return?identifier=' + ${bookResource.id}}" th:unless="${!bookResource.borrowed}">Return</a><a class="btn btn-primary" href="#"
+                                                                               role="button"
+                                                                               th:href="@{'/borrow?identifier=' + ${bookResource.id}}"
+                                                                               th:unless="${bookResource.borrowed}">Borrow</a>
             </td>
         </tr>
         </tbody>