Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # build.gradle.kts
This commit is contained in:
commit
546d1f5330
|
@ -33,6 +33,9 @@ steps:
|
||||||
- echo -n "latest" > .tags
|
- echo -n "latest" > .tags
|
||||||
when:
|
when:
|
||||||
branch: develop
|
branch: develop
|
||||||
|
event:
|
||||||
|
exclude:
|
||||||
|
- pull_request
|
||||||
|
|
||||||
- name: set-docker-tags-release
|
- name: set-docker-tags-release
|
||||||
image: *alpine-image
|
image: *alpine-image
|
||||||
|
@ -55,6 +58,9 @@ steps:
|
||||||
repo: *docker-registry-repo
|
repo: *docker-registry-repo
|
||||||
when:
|
when:
|
||||||
branch: develop
|
branch: develop
|
||||||
|
event:
|
||||||
|
exclude:
|
||||||
|
- pull_request
|
||||||
|
|
||||||
- name: containerize-release
|
- name: containerize-release
|
||||||
image: plugins/docker
|
image: plugins/docker
|
||||||
|
|
|
@ -10,7 +10,6 @@ import org.springframework.context.annotation.Profile
|
||||||
import org.springframework.http.MediaType
|
import org.springframework.http.MediaType
|
||||||
import org.springframework.security.access.prepost.PreAuthorize
|
import org.springframework.security.access.prepost.PreAuthorize
|
||||||
import org.springframework.web.bind.annotation.*
|
import org.springframework.web.bind.annotation.*
|
||||||
import java.security.Principal
|
|
||||||
import javax.servlet.http.HttpServletRequest
|
import javax.servlet.http.HttpServletRequest
|
||||||
import javax.servlet.http.HttpServletResponse
|
import javax.servlet.http.HttpServletResponse
|
||||||
import javax.validation.Valid
|
import javax.validation.Valid
|
||||||
|
@ -32,22 +31,6 @@ class UserController(private val userService: UserService) {
|
||||||
fun getById(@PathVariable id: Long) =
|
fun getById(@PathVariable id: Long) =
|
||||||
ok(userService.getByIdForOutput(id))
|
ok(userService.getByIdForOutput(id))
|
||||||
|
|
||||||
@GetMapping("current")
|
|
||||||
@PreAuthorize("isFullyAuthenticated()")
|
|
||||||
fun getCurrent(loggedInUser: Principal?) =
|
|
||||||
if (loggedInUser != null)
|
|
||||||
ok(
|
|
||||||
with(userService) {
|
|
||||||
getById(
|
|
||||||
loggedInUser.name.toLong(),
|
|
||||||
ignoreDefaultGroupUsers = false,
|
|
||||||
ignoreSystemUsers = false
|
|
||||||
).toOutput()
|
|
||||||
}
|
|
||||||
)
|
|
||||||
else
|
|
||||||
forbidden()
|
|
||||||
|
|
||||||
@PostMapping
|
@PostMapping
|
||||||
@PreAuthorizeEditUsers
|
@PreAuthorizeEditUsers
|
||||||
fun save(@Valid @RequestBody user: UserSaveDto) =
|
fun save(@Valid @RequestBody user: UserSaveDto) =
|
||||||
|
@ -134,6 +117,12 @@ class GroupsController(
|
||||||
getRequestDefaultGroup(request).toOutput()
|
getRequestDefaultGroup(request).toOutput()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@GetMapping("currentuser")
|
||||||
|
fun getCurrentGroupUser(request: HttpServletRequest) =
|
||||||
|
ok(with(groupService.getRequestDefaultGroup(request)) {
|
||||||
|
userService.getDefaultGroupUser(this).toOutputDto()
|
||||||
|
})
|
||||||
|
|
||||||
@PostMapping
|
@PostMapping
|
||||||
@PreAuthorizeEditUsers
|
@PreAuthorizeEditUsers
|
||||||
fun save(@Valid @RequestBody group: GroupSaveDto) =
|
fun save(@Valid @RequestBody group: GroupSaveDto) =
|
||||||
|
|
Loading…
Reference in New Issue