Merge branch 'master' into spring-security-5.1

Author: mraible

app/src/GroupList.js

@@ -76,7 +76,7 @@ class GroupList extends Component {
           <div className="float-right">
             <Button color="success" tag={Link} to="/groups/new">Add Group</Button>
           </div>
-          <h3>Java User Groups</h3>
+          <h3>My JUG Tour</h3>
           <Table className="mt-4">
             <thead>
             <tr>

pom.xml

@@ -72,6 +72,11 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-rest-core</artifactId>
+            <version>3.0.8.RELEASE</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -1,10 +1,11 @@
 package com.okta.developer.jugtours.model;
 
-import lombok.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.util.Set;
 
 @Data
@@ -24,6 +25,8 @@ public class Group {
     private String stateOrProvince;
     private String country;
     private String postalCode;
+    @ManyToOne(cascade=CascadeType.ALL)
+    private User user;
 
     @OneToMany(fetch = FetchType.EAGER, cascade=CascadeType.ALL)
     private Set<Event> events;

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

@@ -2,6 +2,9 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface GroupRepository extends JpaRepository<Group, Long> {
     Group findByName(String name);
+    List<Group> findAllByUserName(String name);
 }

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

@@ -5,7 +5,6 @@
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
 @Data
@@ -15,8 +14,7 @@
 public class User {
 
     @Id
-    @GeneratedValue
-    private Long id;
+    private String id;
     private String name;
     private String email;
 }

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

@@ -2,16 +2,21 @@
 
 import com.okta.developer.jugtours.model.Group;
 import com.okta.developer.jugtours.model.GroupRepository;
+import com.okta.developer.jugtours.model.User;
 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.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.security.Principal;
 import java.util.Collection;
+import java.util.Map;
 import java.util.Optional;
 
 @RestController
@@ -26,8 +31,8 @@ public GroupController(GroupRepository repository) {
 	}
 
 	@GetMapping("/groups")
-	Collection<Group> groups() {
-		return repository.findAll();
+	Collection<Group> groups(Principal principal) {
+		return repository.findAllByUserName(principal.getName());
 	}
 
     @GetMapping("/group/{id}")
@@ -38,8 +43,13 @@ ResponseEntity<?> getGroup(@PathVariable Long id) {
     }
 
 	@PostMapping("/group")
-    ResponseEntity<Group> createGroup(@Valid @RequestBody Group group) throws URISyntaxException {
+    ResponseEntity<Group> createGroup(@Valid @RequestBody Group group, Principal 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);
         return ResponseEntity.created(new URI("/api/group/" + result.getId()))
                 .body(result);