Merge pull request 'feature/12-user-info-in-jwt' (#20) from feature/12-user-info-in-jwt into develop

Reviewed-on: #20

.drone.yml

@@ -33,6 +33,9 @@ steps:
       - echo -n "latest" > .tags
     when:
       branch: develop
+      event:
+        exclude:
+          - pull_request
 
   - name: set-docker-tags-release
     image: *alpine-image
@@ -55,6 +58,9 @@ steps:
       repo: *docker-registry-repo
     when:
       branch: develop
+      event:
+        exclude:
+          - pull_request
 
   - name: containerize-release
     image: plugins/docker

build.gradle.kts

@@ -37,8 +37,8 @@ dependencies {
     implementation("io.jsonwebtoken:jjwt-jackson:0.11.2")
     implementation("org.apache.poi:poi-ooxml:4.1.0")
     implementation("org.apache.pdfbox:pdfbox:2.0.4")
-    implementation("org.apache.logging.log4j:log4j-api:2.15.0")
-    implementation("org.apache.logging.log4j:log4j-to-slf4j:2.15.0")
+    implementation("org.apache.logging.log4j:log4j-api:2.16.0")
+    implementation("org.apache.logging.log4j:log4j-to-slf4j:2.16.0")
     implementation("dev.fyloz.colorrecipesexplorer:database-manager:5.2.1")
 
     implementation("org.springframework.boot:spring-boot-starter-data-jpa:${springBootVersion}")

src/main/kotlin/dev/fyloz/colorrecipesexplorer/rest/AccountControllers.kt

@@ -9,7 +9,6 @@ import org.springframework.context.annotation.Profile
 import org.springframework.http.MediaType
 import org.springframework.security.access.prepost.PreAuthorize
 import org.springframework.web.bind.annotation.*
-import java.security.Principal
 import javax.servlet.http.HttpServletRequest
 import javax.servlet.http.HttpServletResponse
 import javax.validation.Valid
@@ -31,22 +30,6 @@ class UserController(private val userService: UserService) {
     fun getById(@PathVariable id: Long) =
         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
     @PreAuthorizeEditUsers
     fun save(@Valid @RequestBody user: UserSaveDto) =
@@ -133,6 +116,12 @@ class GroupsController(
             getRequestDefaultGroup(request).toOutput()
         })
 
+    @GetMapping("currentuser")
+    fun getCurrentGroupUser(request: HttpServletRequest) =
+        ok(with(groupService.getRequestDefaultGroup(request)) {
+            userService.getDefaultGroupUser(this).toOutputDto()
+        })
+
     @PostMapping
     @PreAuthorizeEditUsers
     fun save(@Valid @RequestBody group: GroupSaveDto) =