feat：用户个人视角权限管理优化 #11138

TencentBlueKing · Dec 19, 2024 · 34887b5 · 34887b5
1 parent 14a83b4
commit 34887b5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/...pi-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthAuthorizationResource.kt b/...pi-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthAuthorizationResource.kt
@@ -29,7 +29,9 @@
 package com.tencent.devops.auth.api.user
 
 import com.tencent.devops.auth.pojo.enum.OperateChannel
+import com.tencent.devops.auth.pojo.vo.AuthProjectVO
 import com.tencent.devops.auth.pojo.vo.ResourceTypeInfoVo
+import com.tencent.devops.common.api.auth.AUTH_HEADER_DEVOPS_USER_ID
 import com.tencent.devops.common.api.auth.AUTH_HEADER_USER_ID
 import com.tencent.devops.common.api.auth.AUTH_HEADER_USER_ID_DEFAULT_VALUE
 import com.tencent.devops.common.api.model.SQLPage
@@ -142,4 +144,13 @@ interface UserAuthAuthorizationResource {
         @Parameter(description = "资源授权交接条件实体", required = true)
         condition: ResetAllResourceAuthorizationReq
     ): Result<List<ResourceTypeInfoVo>>
+
+    @GET
+    @Path("/listUserProjectsWithAuthorization")
+    @Operation(summary = "获取用户授权相关的项目")
+    fun listUserProjectsWithAuthorization(
+        @HeaderParam(AUTH_HEADER_DEVOPS_USER_ID)
+        @Parameter(description = "用户ID", required = true)
+        userId: String
+    ): Result<List<AuthProjectVO>>
 }
diff --git a/...uth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthResourceResource.kt b/...uth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthResourceResource.kt
@@ -215,13 +215,4 @@ interface UserAuthResourceResource {
         @PathParam("resourceCode")
         resourceCode: String
     ): Result<AuthResourceInfo>
-
-    @GET
-    @Path("/listUserProjectsWithAuthorization")
-    @Operation(summary = "获取用户授权相关的项目")
-    fun listUserProjectsWithAuthorization(
-        @HeaderParam(AUTH_HEADER_DEVOPS_USER_ID)
-        @Parameter(description = "用户ID", required = true)
-        userId: String
-    ): Result<List<AuthProjectVO>>
 }
diff --git a/...c/main/kotlin/com/tencent/devops/auth/resources/user/UserAuthAuthorizationResourceImpl.kt b/...c/main/kotlin/com/tencent/devops/auth/resources/user/UserAuthAuthorizationResourceImpl.kt
@@ -2,6 +2,7 @@ package com.tencent.devops.auth.resources.user
 
 import com.tencent.devops.auth.api.user.UserAuthAuthorizationResource
 import com.tencent.devops.auth.pojo.enum.OperateChannel
+import com.tencent.devops.auth.pojo.vo.AuthProjectVO
 import com.tencent.devops.auth.pojo.vo.ResourceTypeInfoVo
 import com.tencent.devops.auth.service.PermissionAuthorizationService
 import com.tencent.devops.auth.service.iam.PermissionResourceValidateService
@@ -103,4 +104,8 @@ class UserAuthAuthorizationResourceImpl(
             )
         )
     }
+
+    override fun listUserProjectsWithAuthorization(userId: String): Result<List<AuthProjectVO>> {
+        return Result(permissionAuthorizationService.listUserProjectsWithAuthorization(userId))
+    }
 }
diff --git a/...th/src/main/kotlin/com/tencent/devops/auth/resources/user/UserAuthResourceResourceImpl.kt b/...th/src/main/kotlin/com/tencent/devops/auth/resources/user/UserAuthResourceResourceImpl.kt
@@ -47,8 +47,7 @@ import org.springframework.beans.factory.annotation.Autowired
 class UserAuthResourceResourceImpl @Autowired constructor(
     private val permissionResourceService: PermissionResourceService,
     private val permissionResourceValidateService: PermissionResourceValidateService,
-    private val permissionResourceGroupService: PermissionResourceGroupService,
-    private val permissionAuthorizationService: PermissionAuthorizationService
+    private val permissionResourceGroupService: PermissionResourceGroupService
 ) : UserAuthResourceResource {
     override fun hasManagerPermission(
         userId: String,
@@ -189,8 +188,4 @@ class UserAuthResourceResourceImpl @Autowired constructor(
             )
         )
     }
-
-    override fun listUserProjectsWithAuthorization(userId: String): Result<List<AuthProjectVO>> {
-        return Result(permissionAuthorizationService.listUserProjectsWithAuthorization(userId))
-    }
 }