feat: IAM回调添加项目审批人 TencentBlueKing#5228

fitzcao · Sep 24, 2021 · 8c23064 · 8c23064
1 parent 63bdb78
commit 8c23064
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/...lueking/src/main/kotlin/com/tencent/devops/auth/service/BkAuthPermissionProjectService.kt b/...lueking/src/main/kotlin/com/tencent/devops/auth/service/BkAuthPermissionProjectService.kt
@@ -22,7 +22,7 @@ class BkAuthPermissionProjectService : PermissionProjectService {
         return true
     }
 
-    override fun createProjectUser(userId: String, projectCode: String, roleName: String): Boolean {
+    override fun createProjectUser(userId: String, projectCode: String, roleCode: String): Boolean {
         return true
     }
 

diff --git a/...c/main/kotlin/com/tencent/devops/auth/resources/service/ServiceProjectAuthResourceImpl.kt b/...c/main/kotlin/com/tencent/devops/auth/resources/service/ServiceProjectAuthResourceImpl.kt
@@ -91,7 +91,7 @@ class ServiceProjectAuthResourceImpl @Autowired constructor(
             permissionProjectService.createProjectUser(
                 userId = userId,
                 projectCode = projectCode,
-                roleName = role
+                roleCode = role
             )
         )
     }

diff --git a/...ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/AuthGroupService.kt b/...ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/AuthGroupService.kt
@@ -134,6 +134,10 @@ class AuthGroupService @Autowired constructor(
         return groupDao.getGroupByName(dslContext, projectCode, groupName)
     }
 
+    fun getGroupByCode(projectCode: String, groupCode: String): TAuthGroupInfoRecord? {
+        return groupDao.getGroup(dslContext, projectCode, groupCode)
+    }
+
     fun bindRelationId(id: Int, relationId: String): Int {
         return groupDao.updateRelationId(dslContext, id, relationId)
     }

diff --git a/.../biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionProjectService.kt b/.../biz-auth/src/main/kotlin/com/tencent/devops/auth/service/iam/PermissionProjectService.kt
@@ -41,7 +41,7 @@ interface PermissionProjectService {
 
     fun isProjectUser(userId: String, projectCode: String, group: BkAuthGroup?): Boolean
 
-    fun createProjectUser(userId: String, projectCode: String, roleName: String): Boolean
+    fun createProjectUser(userId: String, projectCode: String, roleCode: String): Boolean
 
     fun getProjectRoles(projectCode: String, projectId: String): List<BKAuthProjectRolesResources>
 }
diff --git a/...h/src/main/kotlin/com/tencent/devops/auth/service/iam/impl/AbsPermissionProjectService.kt b/...h/src/main/kotlin/com/tencent/devops/auth/service/iam/impl/AbsPermissionProjectService.kt
@@ -146,14 +146,14 @@ abstract class AbsPermissionProjectService @Autowired constructor(
         return checkProjectUser
     }
 
-    override fun createProjectUser(userId: String, projectCode: String, roleName: String): Boolean {
+    override fun createProjectUser(userId: String, projectCode: String, roleCode: String): Boolean {
         val extProjectId = getProjectId(projectCode)
-        val projectRoles = groupService.getGroupByName(projectCode, roleName)
+        val projectRoles = groupService.getGroupByCode(projectCode, roleCode)
         if (projectRoles == null) {
-            logger.warn("$projectCode | $roleName group not exists")
-            throw ParamBlankException("user group $roleName not exists")
+            logger.warn("$projectCode | $roleCode group not exists")
+            throw ParamBlankException("user group $roleCode not exists")
         }
-        val managerRole = roleName == BkAuthGroup.MANAGER.value
+        val managerRole = roleCode == BkAuthGroup.MANAGER.value
         val members = mutableListOf<RoleMemberDTO>()
         members.add(RoleMemberDTO(type = ManagerScopesEnum.USER, id = userId))
         permissionRoleMemberService.createRoleMember(