Replaced Authentication.toUser() by Authentication.username()

### What's done: - a small refactoring It's part of #2336
saveourtool · Jul 20, 2023 · 19f0143 · 19f0143
1 parent 7b67a57
commit 19f0143
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 24 deletions.
diff --git a/...in/kotlin/com/saveourtool/save/gateway/utils/StoringServerAuthenticationSuccessHandler.kt b/...in/kotlin/com/saveourtool/save/gateway/utils/StoringServerAuthenticationSuccessHandler.kt
@@ -53,7 +53,7 @@ class StoringServerAuthenticationSuccessHandler(
 /**
  * @return [User] with data from this [Authentication]
  */
-fun Authentication.toUser(): User = User(
+private fun Authentication.toUser(): User = User(
     userName(),
     null,
     authorities.joinToString(",") { it.authority },

diff --git a/...ntication-service/src/main/kotlin/com/saveourtool/save/authservice/utils/SecurityUtils.kt b/...ntication-service/src/main/kotlin/com/saveourtool/save/authservice/utils/SecurityUtils.kt
@@ -56,25 +56,6 @@ fun Authentication.extractUserNameAndIdentitySource(): Pair<String, String> = th
     identitySource
 }
 
-/**
- * Convert [Authentication] to [User] based on convention in backend.
- * We assume here that all authentications are created by [ConvertingAuthenticationManager],
- * so `principal` is a String, containing identity source.
- *
- * @return [User]
- */
-fun Authentication.toUser(): User {
-    val (identitySource, name) = (principal as String).split(':')
-    return User(
-        name = name,
-        password = null,
-        email = null,
-        role = (this as UsernamePasswordAuthenticationToken).authorities.joinToString(separator = ","),
-        source = identitySource,
-        status = UserStatus.CREATED,
-    )
-}
-
 /**
  * Set role hierarchy for spring security
  *

diff --git a/...src/main/kotlin/com/saveourtool/save/backend/controllers/LnkUserOrganizationController.kt b/...src/main/kotlin/com/saveourtool/save/backend/controllers/LnkUserOrganizationController.kt
@@ -7,8 +7,8 @@
 
 package com.saveourtool.save.backend.controllers
 
-import com.saveourtool.save.authservice.utils.toUser
 import com.saveourtool.save.authservice.utils.userId
+import com.saveourtool.save.authservice.utils.username
 import com.saveourtool.save.backend.security.OrganizationPermissionEvaluator
 import com.saveourtool.save.backend.service.LnkUserOrganizationService
 import com.saveourtool.save.backend.service.OrganizationService
@@ -106,7 +106,7 @@ class LnkUserOrganizationController(
         authentication: Authentication?,
     ): Mono<Role> = authentication?.let {
         getUserAndOrganizationWithPermissions(
-            authentication.toUser().name,
+            authentication.username(),
             organizationName,
             Permission.READ,
             authentication,

diff --git a/...-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/PermissionController.kt b/...-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/PermissionController.kt
@@ -1,6 +1,6 @@
 package com.saveourtool.save.backend.controllers
 
-import com.saveourtool.save.authservice.utils.toUser
+import com.saveourtool.save.authservice.utils.username
 import com.saveourtool.save.backend.security.OrganizationPermissionEvaluator
 import com.saveourtool.save.backend.security.ProjectPermissionEvaluator
 import com.saveourtool.save.backend.service.OrganizationService
@@ -78,7 +78,7 @@ class PermissionController(
         @PathVariable projectName: String,
         @RequestParam(required = false) userName: String?,
         authentication: Authentication,
-    ): Mono<Role> = getUserAndProjectOrNotFound(userName ?: authentication.toUser().name, projectName, organizationName, authentication)
+    ): Mono<Role> = getUserAndProjectOrNotFound(userName ?: authentication.username(), projectName, organizationName, authentication)
         .map { (user, project) ->
             permissionService.getRole(user, project)
                 .also {