filipizydorczyk/backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Works

Browse Source
This commit is contained in:
Filip Izydorczyk
2020-09-30 19:15:32 +02:00
parent b503ebcbcc
commit fa74965504
8 changed files with 131 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
restservice/src/main/java/com/plannaplan/controllers/CommisionController.java
View File

@ -5,7 +5,6 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Optional;
import com.plannaplan.App;
import com.plannaplan.entities.Assignment;
@ -15,22 +14,18 @@ import com.plannaplan.entities.User;
import com.plannaplan.services.AssignmentService;
import com.plannaplan.services.CommisionService;
import com.plannaplan.services.GroupService;
import com.plannaplan.services.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.security.authentication.AnonymousAuthenticationToken;
@RestController
@CrossOrigin
@RequestMapping("/api/" + App.API_VERSION + "/commisions")
public class CommisionController {
public class CommisionController extends TokenBasedController {
@Autowired
private CommisionService commisionService;
@ -41,9 +36,6 @@ public class CommisionController {
@Autowired
private AssignmentService assignmentService;
@Autowired
private UserService userService;
public CommisionController() {
}
@ -70,14 +62,4 @@ public class CommisionController {
return new ResponseEntity<>(result, HttpStatus.OK);
}
private Optional<User> getCurrentUser() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (!(authentication instanceof AnonymousAuthenticationToken)) {
return Optional.of(this.userService.getUserByEmail(authentication.getName()));
} else {
return Optional.empty();
}
}
}