-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- remove old authentication controller - add two new authentication controllers
- Loading branch information
Showing
3 changed files
with
75 additions
and
53 deletions.
There are no files selected for viewing
53 changes: 0 additions & 53 deletions
53
src/main/java/cz/cvut/kbss/analysis/controller/AuthController.java
This file was deleted.
Oops, something went wrong.
45 changes: 45 additions & 0 deletions
45
src/main/java/cz/cvut/kbss/analysis/controller/OidcUserController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
package cz.cvut.kbss.analysis.controller; | ||
|
||
import cz.cvut.kbss.analysis.exception.EntityNotFoundException; | ||
import cz.cvut.kbss.analysis.model.User; | ||
import cz.cvut.kbss.analysis.security.SecurityConstants; | ||
import cz.cvut.kbss.analysis.service.UserRepositoryService; | ||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; | ||
import org.springframework.http.MediaType; | ||
import org.springframework.security.access.prepost.PreAuthorize; | ||
import org.springframework.web.bind.annotation.GetMapping; | ||
import org.springframework.web.bind.annotation.PathVariable; | ||
import org.springframework.web.bind.annotation.RequestMapping; | ||
import org.springframework.web.bind.annotation.RestController; | ||
|
||
/** | ||
* API for getting basic user info. | ||
* <p> | ||
* Enabled when OIDC security is used. | ||
*/ | ||
@ConditionalOnProperty(prefix = "security", name = "provider", havingValue = "oidc") | ||
@RestController | ||
@RequestMapping("/users") | ||
public class OidcUserController { | ||
|
||
private final UserRepositoryService userService; | ||
|
||
public OidcUserController(UserRepositoryService userService) { | ||
this.userService = userService; | ||
} | ||
|
||
@PreAuthorize("hasRole('" + SecurityConstants.ROLE_USER + "')") | ||
@GetMapping(value = "/current", produces = MediaType.APPLICATION_JSON_VALUE) | ||
public User getCurrent() { | ||
return userService.getCurrentUser(); | ||
} | ||
|
||
@PreAuthorize("hasRole('" + SecurityConstants.ROLE_ADMIN + "') or #username == authentication.name or " + | ||
"hasRole('" + SecurityConstants.ROLE_USER + "')") | ||
@GetMapping(value = "/{username}", produces = MediaType.APPLICATION_JSON_VALUE) | ||
public User getByUsername(@PathVariable("username") String username) { | ||
return userService.findByUsername(username).orElseThrow(() -> | ||
EntityNotFoundException.create("User", username)); | ||
} | ||
|
||
} |
30 changes: 30 additions & 0 deletions
30
src/main/java/cz/cvut/kbss/analysis/controller/UserController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
package cz.cvut.kbss.analysis.controller; | ||
|
||
|
||
import cz.cvut.kbss.analysis.model.User; | ||
import cz.cvut.kbss.analysis.security.SecurityConstants; | ||
import cz.cvut.kbss.analysis.service.UserRepositoryService; | ||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; | ||
import org.springframework.http.MediaType; | ||
import org.springframework.security.access.prepost.PreAuthorize; | ||
import org.springframework.web.bind.annotation.GetMapping; | ||
import org.springframework.web.bind.annotation.RequestMapping; | ||
import org.springframework.web.bind.annotation.RestController; | ||
|
||
@ConditionalOnProperty(prefix = "security", name = "provider", havingValue = "internal", matchIfMissing = true) | ||
@RestController | ||
@RequestMapping("/users") | ||
public class UserController { | ||
private final UserRepositoryService userService; | ||
|
||
public UserController(UserRepositoryService userService) { | ||
this.userService = userService; | ||
} | ||
|
||
@PreAuthorize("hasRole('" + SecurityConstants.ROLE_USER + "')") | ||
@GetMapping(value = "/current", produces = MediaType.APPLICATION_JSON_VALUE) | ||
public User getCurrent() { | ||
return userService.getCurrentUser(); | ||
} | ||
|
||
} |