Polish code for ch9

Author: gregturn

8/part3/chat/src/main/java/com/greglturnquist/learningspringboot/chat/WebSocketConfig.java

@@ -43,6 +43,7 @@ HandlerMapping webSocketMapping(CommentService commentService,
 		urlMap.put("/app/chatMessage.new", inboundChatService);
 		urlMap.put("/topic/chatMessage.new", outboundChatService);
 
+		// tag::cors[]
 		Map<String, CorsConfiguration> corsConfigurationMap =
 			new HashMap<>();
 		CorsConfiguration corsConfiguration = new CorsConfiguration();
@@ -53,6 +54,7 @@ HandlerMapping webSocketMapping(CommentService commentService,
 			"/app/chatMessage.new", corsConfiguration);
 		corsConfigurationMap.put(
 			"/topic/chatMessage.new", corsConfiguration);
+		// end::cors[]
 
 		SimpleUrlHandlerMapping mapping = new SimpleUrlHandlerMapping();
 		mapping.setOrder(10);

9/part1/chat/build.gradle

@@ -2,6 +2,7 @@ buildscript {
 	ext {
 		springBootVersion = '2.0.0.M3'
 		springCloudVersion = 'Finchley.BUILD-SNAPSHOT'
+		springCloudStreamVersion = 'Elmhurst.M1'
 	}
 	repositories {
 		mavenCentral()
@@ -28,11 +29,13 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 repositories {
+	mavenLocal()
 	mavenCentral()
 	maven { url "https://repo.spring.io/snapshot" }
 	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
 	maven { url "https://dl.bintray.com/rabbitmq/maven-milestones/" }
+	mavenLocal()
 }
 
 jar {
@@ -45,12 +48,11 @@ configurations {
 	all*.exclude group: 'org.springframework', module: 'spring-webmvc'
 }
 
-//ext['spring.version'] = '5.0.0.BUILD-SNAPSHOT'
-//ext['spring-security.version'] = '5.0.0.BUILD-SNAPSHOT'
 ext['spring-session.version'] = '2.0.0.BUILD-SNAPSHOT'
 
 dependencies {
 	compile('org.springframework.boot:spring-boot-starter-webflux')
+	compile('org.synchronoss.cloud:nio-multipart-parser:1.1.0')
 	compile('org.springframework.boot:spring-boot-starter-actuator')
 	compile("org.springframework.boot:spring-boot-starter-thymeleaf")
 	compile('org.springframework.boot:spring-boot-devtools')
@@ -73,7 +75,6 @@ dependencies {
 	// end::zuul[]
 
 	// tag::thymeleaf-security[]
-	compile('org.thymeleaf.extras:thymeleaf-extras-springsecurity4:2.1.3.RELEASE')
 	// end::thymeleaf-security[]
 
 	testCompile('org.springframework.boot:spring-boot-starter-test')
@@ -82,5 +83,6 @@ dependencies {
 dependencyManagement {
 	imports {
 		mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
+		mavenBom "org.springframework.cloud:spring-cloud-stream-dependencies:${springCloudStreamVersion}"
 	}
 }

…ot/chat/UserParsingHandshakeHandler.java …oot/chat/AuthorizedWebSocketHandler.java9/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/UserParsingHandshakeHandler.java renamed to 9/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/AuthorizedWebSocketHandler.java 9/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/UserParsingHandshakeHandler.java renamed to 9/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/AuthorizedWebSocketHandler.java

@@ -15,48 +15,34 @@
  */
 package com.greglturnquist.learningspringboot.chat;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Stream;
+import java.security.Principal;
 
 import reactor.core.publisher.Mono;
-
+import org.springframework.security.core.Authentication;
 import org.springframework.web.reactive.socket.WebSocketHandler;
 import org.springframework.web.reactive.socket.WebSocketSession;
 
 /**
  * @author Greg Turnquist
  */
 // tag::code[]
-abstract class UserParsingHandshakeHandler
+abstract class AuthorizedWebSocketHandler
 				implements WebSocketHandler {
 
-	private final Map<String, String> userMap;
-
-	UserParsingHandshakeHandler() {
-		this.userMap = new HashMap<>();
-	}
-
 	@Override
 	public final Mono<Void> handle(WebSocketSession session) {
-
-		this.userMap.put(session.getId(),
-				Stream.of(session.getHandshakeInfo().getUri()
-							.getQuery().split("&"))
-					.map(s -> s.split("="))
-					.filter(strings -> strings[0].equals("user"))
-					.findFirst()
-					.map(strings -> strings[1])
-					.orElse(""));
-
-		return handleInternal(session);
+		return session.getHandshakeInfo().getPrincipal()
+			.filter(this::isAuthorized)
+			.then(doHandle(session));
 	}
 
-	abstract protected Mono<Void> handleInternal(
-							WebSocketSession session);
-
-	String getUser(String id) {
-		return userMap.get(id);
+	private boolean isAuthorized(Principal principal) {
+		Authentication authentication = (Authentication) principal;
+		return authentication.isAuthenticated() &&
+			authentication.getAuthorities().contains("ROLE_USER");
 	}
+	
+	abstract protected Mono<Void> doHandle(
+							WebSocketSession session);
 }
 // end::code[]

9/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/CommentService.java

@@ -20,11 +20,9 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.FluxSink;
 import reactor.core.publisher.Mono;
-
 import org.springframework.cloud.stream.annotation.EnableBinding;
 import org.springframework.cloud.stream.annotation.StreamListener;
 import org.springframework.stereotype.Service;
-import org.springframework.web.reactive.socket.WebSocketHandler;
 import org.springframework.web.reactive.socket.WebSocketSession;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -36,7 +34,7 @@
 // tag::code[]
 @Service
 @EnableBinding(ChatServiceStreams.class)
-public class CommentService implements WebSocketHandler {
+public class CommentService extends AuthorizedWebSocketHandler {
 
 	private final static Logger log =
 		LoggerFactory.getLogger(CommentService.class);
@@ -64,7 +62,7 @@ public void broadcast(Comment comment) {
 	}
 
 	@Override
-	public Mono<Void> handle(WebSocketSession session) {
+	public Mono<Void> doHandle(WebSocketSession session) {
 		return session.send(this.flux
 			.map(comment -> {
 				try {
@@ -78,6 +76,5 @@ public Mono<Void> handle(WebSocketSession session) {
 			.log("wrap-as-websocket-message"))
 			.log("publish-to-websocket");
 	}
-
 }
 // end::code[]

9/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/GatewayConfig.java

@@ -31,29 +31,33 @@
 @Configuration
 public class GatewayConfig {
 
-	private static final Logger log = LoggerFactory.getLogger(GatewayConfig.class);
-
-	@Bean
-	SaveSessionWebFilterFactory saveSessionWebFilterFactory() {
-		return new SaveSessionWebFilterFactory();
-	}
+	private static final Logger log =
+		LoggerFactory.getLogger(GatewayConfig.class);
 
 	/**
 	 * Force the current WebSession to get saved
 	 */
-	static class SaveSessionWebFilterFactory implements WebFilterFactory {
+	static class SaveSessionWebFilterFactory
+								implements WebFilterFactory {
 		@Override
 		public WebFilter apply(Tuple args) {
 			return (exchange, chain) -> exchange.getSession()
 				.map(webSession -> {
 					log.debug("Session id: " + webSession.getId());
-					webSession.getAttributes().entrySet().forEach(entry ->
-						log.debug(entry.getKey() + " => " + entry.getValue()));
+					webSession.getAttributes().entrySet()
+						.forEach(entry ->
+						log.debug(entry.getKey() + " => " +
+											entry.getValue()));
 					return webSession;
 				})
 				.map(WebSession::save)
 				.then(chain.filter(exchange));
 		}
 	}
+
+	@Bean
+	SaveSessionWebFilterFactory saveSessionWebFilterFactory() {
+		return new SaveSessionWebFilterFactory();
+	}
 }
 // end::code[]

9/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/HomeController.java

@@ -15,7 +15,10 @@
  */
 package com.greglturnquist.learningspringboot.chat;
 
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 
 /**
@@ -24,9 +27,12 @@
 @Controller
 public class HomeController {
 
+	// tag::code[]
 	@GetMapping("/")
-	public String index() {
+	public String index(@AuthenticationPrincipal Authentication auth, Model model) {
+		model.addAttribute("authentication", auth);
 		return "index";
 	}
+	// end::code[]
 
 }

9/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/InboundChatService.java

@@ -16,7 +16,6 @@
 package com.greglturnquist.learningspringboot.chat;
 
 import reactor.core.publisher.Mono;
-
 import org.springframework.cloud.stream.annotation.EnableBinding;
 import org.springframework.messaging.support.MessageBuilder;
 import org.springframework.stereotype.Service;
@@ -29,7 +28,7 @@
 // tag::code[]
 @Service
 @EnableBinding(ChatServiceStreams.class)
-public class InboundChatService extends UserParsingHandshakeHandler {
+public class InboundChatService extends AuthorizedWebSocketHandler {
 
 	private final ChatServiceStreams chatServiceStreams;
 
@@ -38,30 +37,28 @@ public InboundChatService(ChatServiceStreams chatServiceStreams){
 	}
 
 	@Override
-	protected Mono<Void> handleInternal(WebSocketSession session) {
-		return session
-			.receive()
-			.log(getUser(session.getId())
+	protected Mono<Void> doHandle(WebSocketSession session) {
+		//end::code[]
+		return session.receive()
+			.log(session.getId()
 				+ "-inbound-incoming-chat-message")
 			.map(WebSocketMessage::getPayloadAsText)
-			.log(getUser(session.getId())
+			.log(session.getId()
 				+ "-inbound-convert-to-text")
-			.flatMap(message ->
-				broadcast(message, getUser(session.getId())))
-			.log(getUser(session.getId())
+			.flatMap(message -> broadcast(message, session))
+			.log(session.getId()
 				+ "-inbound-broadcast-to-broker")
 			.then();
 	}
 
-	public Mono<?> broadcast(String message, String user) {
-		return Mono.fromRunnable(() -> {
-			chatServiceStreams.clientToBroker().send(
+	Mono<?> broadcast(String message, WebSocketSession user) {
+		return user.getHandshakeInfo().getPrincipal()
+			.map(principal -> chatServiceStreams.clientToBroker().send(
 				MessageBuilder
 					.withPayload(message)
-					.setHeader(ChatServiceStreams.USER_HEADER, user)
-					.build());
-		});
+					.setHeader(ChatServiceStreams.USER_HEADER,
+						principal.getName())
+					.build()));
 	}
 
 }
-// end::code[]

9/part1/chat/src/main/java/com/greglturnquist/learningspringboot/chat/InitUsers.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.greglturnquist.learningspringboot.chat;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.mongodb.core.MongoOperations;
+
+/**
+ * @author Greg Turnquist
+ */
+// tag::code[]
+@Configuration
+public class InitUsers {
+
+	@Bean
+	CommandLineRunner initializeUsers(MongoOperations operations) {
+		return args -> {
+			operations.dropCollection(User.class);
+
+			operations.insert(
+				new User(
+					null,
+					"greg", "turnquist",
+					new String[]{"ROLE_USER", "ROLE_ADMIN"}));
+			operations.insert(
+				new User(
+					null,
+					"phil", "webb",
+					new String[]{"ROLE_USER"}));
+
+			operations.findAll(User.class).forEach(user -> {
+				System.out.println("Loaded " + user);
+			});
+		};
+	}
+}
+// end::code[]