src/main/java/djmil/cashcard/CashCardController.java

@@ -13,8 +13,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.util.UriComponentsBuilder;
 
-import java.security.Principal;
-
 import java.net.URI;
 import java.util.List;
 import java.util.Optional;
@@ -30,12 +28,8 @@ public class CashCardController {
     }
 
     @GetMapping("/{requestedId}")
-    public ResponseEntity<CashCard> findById(@PathVariable Long requestedId, Principal principal) {
+    public ResponseEntity<CashCard> findById(@PathVariable Long requestedId) {
-        CashCard cashCard = cashCardRepository.findByIdAndOwner(
+        Optional<CashCard> cashCardOptional = cashCardRepository.findById(requestedId);
-	            requestedId, 
-	            principal.getName()
-        );
-        Optional<CashCard> cashCardOptional = Optional.ofNullable(cashCard);
 
         if (cashCardOptional.isPresent()) {
             return ResponseEntity.ok(cashCardOptional.get());
@@ -50,9 +44,8 @@ public class CashCardController {
     // }
 
     @GetMapping
-    public ResponseEntity<List<CashCard>> findAll(Pageable pageable, Principal principal) {
+    public ResponseEntity<List<CashCard>> findAll(Pageable pageable) {
-        Page<CashCard> page = cashCardRepository.findByOwner(
+        Page<CashCard> page = cashCardRepository.findAll(
-                principal.getName(),
                 PageRequest.of(
                         pageable.getPageNumber(),
                         pageable.getPageSize(),
@@ -63,15 +56,13 @@ public class CashCardController {
     }
 
     @PostMapping
-    private ResponseEntity<Void> createCashCard(@RequestBody CashCard newCashCardRequest, UriComponentsBuilder ucb, Principal principal) {
+    private ResponseEntity<Void> createCashCard(@RequestBody CashCard newCashCardRequest, UriComponentsBuilder ucb) {
-        CashCard cashCardWithOwner = new CashCard(null, newCashCardRequest.amount(), principal.getName());
+        CashCard savedCashCard = cashCardRepository.save(newCashCardRequest); // CRUD - Create
-        CashCard savedCashCard = cashCardRepository.save(cashCardWithOwner); // CRUD - Create
 
         URI locationOfNewCashCard = ucb
                 .path("cashcards/{id}")
                 .buildAndExpand(savedCashCard.id())
                 .toUri();
-
         return ResponseEntity.created(locationOfNewCashCard).build();
     }
 }

src/main/java/djmil/cashcard/CashCardRepository.java

@@ -2,15 +2,10 @@ package djmil.cashcard;
 
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
 
 public interface 
     CashCardRepository 
 extends 
     CrudRepository<CashCard, Long>, 
-    PagingAndSortingRepository<CashCard, Long>     
+    PagingAndSortingRepository<CashCard, Long> {
-{
-    CashCard findByIdAndOwner(Long id, String owner);
-	Page<CashCard> findByOwner(String owner, PageRequest amount);
 }

src/main/java/djmil/cashcard/SecurityConfig.java

@@ -18,8 +18,7 @@ public class SecurityConfig {
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         http.authorizeHttpRequests()
             .requestMatchers("/cashcards/**")
-            //.authenticated()
+            .authenticated()
-            .hasRole("CARD-OWNER") // <<-- enable RBAC
             .and()
             .csrf().disable()
             .httpBasic();
@@ -35,19 +34,11 @@ public class SecurityConfig {
     @Bean
     public UserDetailsService testOnlyUsers(PasswordEncoder passwordEncoder) {
         User.UserBuilder users = User.builder();
-	
         UserDetails sarah = users
             .username("sarah1")
             .password(passwordEncoder.encode("abc123"))
-            .roles("CARD-OWNER") // new role
+            .roles() // No roles for now
             .build();
-        
+    return new InMemoryUserDetailsManager(sarah);
-        UserDetails hankOwnsNoCards = users
-            .username("hank-owns-no-cards")
-            .password(passwordEncoder.encode("qrs456"))
-            .roles("NON-OWNER") // new role
-            .build();
-        
-        return new InMemoryUserDetailsManager(sarah, hankOwnsNoCards);
     }
 }

src/test/java/djmil/cashcard/CashcardApplicationTests.java

@@ -59,13 +59,14 @@ class CashcardApplicationTests {
 	@Test
 	@DirtiesContext
 	void shouldCreateANewCashCard() {
-		CashCard newCashCard = new CashCard(null, 250.00, null);
+		CashCard newCashCard = new CashCard(null, 250.00, "sarah1");
 		ResponseEntity<Void> createResponse = restTemplate
 			.withBasicAuth("sarah1", "abc123")
 			.postForEntity("/cashcards", newCashCard, Void.class );
 
 		assertThat(createResponse.getStatusCode()).isEqualTo(HttpStatus.CREATED);
 
+
 		// Validate created CashCard
 		URI locationOfNewCashCard = createResponse.getHeaders().getLocation();
    		ResponseEntity<String> getResponse = restTemplate
@@ -153,20 +154,4 @@ class CashcardApplicationTests {
 			.getForEntity("/cashcards/99", String.class);
 		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED);
 	}
-
-	@Test
-	void shouldRejectUsersWhoAreNotCardOwners() {
-		ResponseEntity<String> response = restTemplate
-		.withBasicAuth("hank-owns-no-cards", "qrs456")
-		.getForEntity("/cashcards/99", String.class);
-		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN);
-	}
-
-	@Test
-	void shouldNotAllowAccessToCashCardsTheyDoNotOwn() {
-		ResponseEntity<String> response = restTemplate
-		.withBasicAuth("sarah1", "abc123")
-		.getForEntity("/cashcards/102", String.class); // <<-- kumar2's data
-		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
-	}
 }

src/test/resources/data.sql

@@ -1,4 +1,3 @@
 INSERT INTO CASH_CARD(ID, AMOUNT, OWNER) VALUES (99, 123.45, 'sarah1');
 INSERT INTO CASH_CARD(ID, AMOUNT, OWNER) VALUES (100, 1.00, 'sarah1');
 INSERT INTO CASH_CARD(ID, AMOUNT, OWNER) VALUES (101, 150.00, 'sarah1');
-INSERT INTO CASH_CARD(ID, AMOUNT, OWNER) VALUES (102, 200.00, 'kumar2');