Merge branch 'master' into spring-security-5.1

Author: mraible

src/main/java/com/okta/developer/jugtours/model/Group.java

@@ -25,7 +25,7 @@ public class Group {
     private String stateOrProvince;
     private String country;
     private String postalCode;
-    @ManyToOne(cascade=CascadeType.ALL)
+    @ManyToOne(cascade=CascadeType.PERSIST)
     private User user;
 
     @OneToMany(fetch = FetchType.EAGER, cascade=CascadeType.ALL)

src/main/java/com/okta/developer/jugtours/model/GroupRepository.java

@@ -6,5 +6,5 @@
 
 public interface GroupRepository extends JpaRepository<Group, Long> {
     Group findByName(String name);
-    List<Group> findAllByUserName(String name);
+    List<Group> findAllByUserId(String id);
 }

src/main/java/com/okta/developer/jugtours/model/UserRepository.java

@@ -0,0 +1,6 @@
+package com.okta.developer.jugtours.model;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface UserRepository extends JpaRepository<User, String> {
+}

src/main/java/com/okta/developer/jugtours/web/GroupController.java

@@ -3,12 +3,13 @@
 import com.okta.developer.jugtours.model.Group;
 import com.okta.developer.jugtours.model.GroupRepository;
 import com.okta.developer.jugtours.model.User;
+import com.okta.developer.jugtours.model.UserRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.oauth2.provider.OAuth2Authentication;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -24,48 +25,54 @@
 class GroupController {
 
     private final Logger log = LoggerFactory.getLogger(GroupController.class);
-    private GroupRepository repository;
+    private GroupRepository groupRepository;
+    private UserRepository userRepository;
 
-	public GroupController(GroupRepository repository) {
-		this.repository = repository;
+	public GroupController(GroupRepository groupRepository, UserRepository userRepository) {
+		this.groupRepository = groupRepository;
+		this.userRepository = userRepository;
 	}
 
 	@GetMapping("/groups")
 	Collection<Group> groups(Principal principal) {
-		return repository.findAllByUserName(principal.getName());
+		return groupRepository.findAllByUserId(principal.getName());
 	}
 
     @GetMapping("/group/{id}")
     ResponseEntity<?> getGroup(@PathVariable Long id) {
-        Optional<Group> group = repository.findById(id);
+        Optional<Group> group = groupRepository.findById(id);
         return group.map(response -> ResponseEntity.ok().body(response))
                 .orElse(new ResponseEntity<>(HttpStatus.NOT_FOUND));
     }
 
 	@PostMapping("/group")
-    ResponseEntity<Group> createGroup(@Valid @RequestBody Group group, Principal principal) throws URISyntaxException {
+    ResponseEntity<Group> createGroup(@Valid @RequestBody Group group,
+                                      @AuthenticationPrincipal OAuth2User principal) throws URISyntaxException {
         log.info("Request to create group: {}", group);
-        OAuth2Authentication authentication = (OAuth2Authentication) principal;
-        Map<String, Object> details = (Map<String, Object>) authentication.getUserAuthentication().getDetails();
-        User user = new User(details.get("sub").toString(),
-                details.get("name").toString(), details.get("email").toString());
-        group.setUser(user);
-        Group result = repository.save(group);
+        Map<String, Object> details = principal.getAttributes();
+        String userId = details.get("sub").toString();
+
+        // check to see if user already exists
+        Optional<User> user = userRepository.findById(userId);
+        group.setUser(user.orElse(new User(userId,
+                        details.get("name").toString(), details.get("email").toString())));
+
+        Group result = groupRepository.save(group);
         return ResponseEntity.created(new URI("/api/group/" + result.getId()))
                 .body(result);
     }
 
     @PutMapping("/group")
     ResponseEntity<Group> updateGroup(@Valid @RequestBody Group group) {
         log.info("Request to update group: {}", group);
-        Group result = repository.save(group);
+        Group result = groupRepository.save(group);
         return ResponseEntity.ok().body(result);
     }
 
     @DeleteMapping("/group/{id}")
     public ResponseEntity<?> deleteGroup(@PathVariable Long id) {
         log.info("Request to delete group: {}", id);
-        repository.deleteById(id);
+        groupRepository.deleteById(id);
         return ResponseEntity.ok().build();
     }
 }