Bugfixes
This commit is contained in:
@@ -9,7 +9,6 @@ import org.springframework.web.server.ResponseStatusException;
|
||||
|
||||
import de.zendric.app.xpensely_server.model.AppUser;
|
||||
import de.zendric.app.xpensely_server.model.AppUserCreateRequest;
|
||||
import de.zendric.app.xpensely_server.model.Exception.UsernameAlreadyExistsException;
|
||||
import de.zendric.app.xpensely_server.security.AuthenticatedUserResolver;
|
||||
import de.zendric.app.xpensely_server.services.UserService;
|
||||
|
||||
@@ -47,15 +46,9 @@ public class AppUserController {
|
||||
|
||||
@PostMapping("/createUser")
|
||||
public ResponseEntity<AppUser> createUser(@RequestBody @Valid AppUserCreateRequest userRequest) {
|
||||
try {
|
||||
AppUser convertedUser = userRequest.convertToAppUser();
|
||||
AppUser nUser = userService.createUser(convertedUser);
|
||||
return new ResponseEntity<>(nUser, HttpStatus.CREATED);
|
||||
} catch (UsernameAlreadyExistsException e) {
|
||||
return new ResponseEntity<>(null, HttpStatus.CONFLICT);
|
||||
} catch (Exception e) {
|
||||
return new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
AppUser convertedUser = userRequest.convertToAppUser();
|
||||
AppUser nUser = userService.createUser(convertedUser);
|
||||
return new ResponseEntity<>(nUser, HttpStatus.CREATED);
|
||||
}
|
||||
|
||||
@DeleteMapping
|
||||
|
||||
@@ -68,6 +68,7 @@ public class ExpenseListController {
|
||||
expenseList.setXpenselyStandardCategories(standardCategories);
|
||||
expenseList.setSharedWith(null);
|
||||
ExpenseList savedItem = expenseListService.createList(expenseList);
|
||||
log.debug("Created expense list '{}' for user {}", savedItem.getName(), authenticatedUser.getId());
|
||||
return new ResponseEntity<>(savedItem, HttpStatus.CREATED);
|
||||
}
|
||||
|
||||
@@ -106,7 +107,7 @@ public class ExpenseListController {
|
||||
AppUser user = authenticatedUserResolver.resolveCurrentUser(authentication);
|
||||
Optional<ExpenseList> expenseListOpt = expenseListService.findById(expenseListId);
|
||||
if (expenseListOpt.isEmpty())
|
||||
return new ResponseEntity<>(null, HttpStatus.NOT_FOUND);
|
||||
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
|
||||
assertMember(user, expenseListOpt.get());
|
||||
AppUser expenseOwner = userService.getUserByName(expenseChangeRequest.getOwnerName());
|
||||
Expense expense = expenseChangeRequest.convertToExpense(expenseOwner.getId(), expenseListOpt.get());
|
||||
|
||||
@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Profile;
|
||||
import org.springframework.security.config.Customizer;
|
||||
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
||||
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
|
||||
import org.springframework.security.oauth2.server.resource.web.BearerTokenAuthenticationFilter;
|
||||
import org.springframework.security.oauth2.server.resource.web.authentication.BearerTokenAuthenticationFilter;
|
||||
import org.springframework.security.web.SecurityFilterChain;
|
||||
|
||||
@Configuration
|
||||
@@ -18,7 +18,7 @@ public class SecurityConfig {
|
||||
http
|
||||
.authorizeHttpRequests(auth -> auth
|
||||
.anyRequest().permitAll())
|
||||
.csrf().disable();
|
||||
.csrf(csrf -> csrf.disable());
|
||||
|
||||
return http.build();
|
||||
}
|
||||
@@ -33,7 +33,7 @@ public class SecurityConfig {
|
||||
.jwt(Customizer.withDefaults()))
|
||||
.oauth2Login(Customizer.withDefaults())
|
||||
.addFilterAfter(new RateLimitFilter(), BearerTokenAuthenticationFilter.class)
|
||||
.csrf().disable();
|
||||
.csrf(csrf -> csrf.disable());
|
||||
|
||||
return http.build();
|
||||
}
|
||||
|
||||
@@ -31,18 +31,10 @@ public class ExpenseListService {
|
||||
this.customCategoryRepository = customCategoryRepository;
|
||||
}
|
||||
|
||||
public List<ExpenseList> getAllLists() {
|
||||
return repository.findAll();
|
||||
}
|
||||
|
||||
public ExpenseList createList(ExpenseList list) {
|
||||
return repository.save(list);
|
||||
}
|
||||
|
||||
public void deleteList(Long id) {
|
||||
repository.deleteById(id);
|
||||
}
|
||||
|
||||
public void deleteById(Long id) {
|
||||
repository.deleteById(id);
|
||||
}
|
||||
@@ -51,10 +43,6 @@ public class ExpenseListService {
|
||||
return repository.findById(id);
|
||||
}
|
||||
|
||||
public Iterable<ExpenseList> findAll() {
|
||||
return repository.findAll();
|
||||
}
|
||||
|
||||
public ExpenseList save(ExpenseList expenseList) {
|
||||
return repository.save(expenseList);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user