feat：支持管理我的 OAUTH TencentBlueKing#10995

hejieehe · Sep 27, 2024 · c3fe4cb · c3fe4cb
1 parent 8925be2
commit c3fe4cb
Show file tree

Hide file tree

Showing 7 changed files with 90 additions and 12 deletions.
diff --git a/.../core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserOauthResource.kt b/.../core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserOauthResource.kt
@@ -111,6 +111,9 @@ interface UserOauthResource {
         userId: String,
         @Parameter(description = "授权类型", required = true)
         @QueryParam("oauthType")
-        oauthType: OauthType
+        oauthType: OauthType,
+        @Parameter(description = "回调链接(授权完以后的链接地址)", required = true)
+        @QueryParam("redirectUrl")
+        redirectUrl: String
     ): Result<OauthResetUrl>
 }
diff --git a/.../auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/UserOauthResourceImpl.kt b/.../auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/UserOauthResourceImpl.kt
@@ -16,7 +16,12 @@ class UserOauthResourceImpl @Autowired constructor(
     val userOauthService: UserOauthService
 ) : UserOauthResource {
     override fun list(userId: String, projectId: String): Result<List<UserOauthInfo>> {
-        return Result(userOauthService.list(userId = userId, projectId = projectId))
+        return Result(
+            userOauthService.list(
+                userId = userId,
+                projectId = projectId
+            )
+        )
     }
 
     override fun relRepo(
@@ -42,13 +47,25 @@ class UserOauthResourceImpl @Autowired constructor(
         projectId: String,
         oauthType: OauthType
     ): Result<Boolean> {
-        userOauthService.delete(userId = userId,projectId = projectId, oauthType = oauthType)
+        userOauthService.delete(
+            userId = userId,
+            projectId = projectId,
+            oauthType = oauthType
+        )
         return Result(true)
     }
 
-    override fun reOauth(userId: String, oauthType: OauthType): Result<OauthResetUrl> {
+    override fun reOauth(
+        userId: String,
+        oauthType: OauthType,
+        redirectUrl: String
+    ): Result<OauthResetUrl> {
         return Result(
-            userOauthService.reOauth(userId = userId, oauthType = oauthType)
+            userOauthService.reOauth(
+                userId = userId,
+                oauthType = oauthType,
+                redirectUrl = redirectUrl
+            )
         )
     }
 }
diff --git a/...ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/UserOauthService.kt b/...ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/UserOauthService.kt
@@ -56,8 +56,15 @@ class UserOauthService @Autowired constructor(
         )
     }
 
-    fun reOauth(userId: String, oauthType: OauthType): OauthResetUrl {
-        return getService(oauthType).reOauth(userId)
+    fun reOauth(
+        userId: String,
+        oauthType: OauthType,
+        redirectUrl: String
+    ): OauthResetUrl {
+        return getService(oauthType).reOauth(
+            userId = userId,
+            redirectUrl = redirectUrl
+        )
     }
 
     private fun getService(oauthType: OauthType): OauthService {
@@ -66,4 +73,4 @@ class UserOauthService @Autowired constructor(
             OauthType.GITHUB -> repoGithubOauthService
         }
     }
-}
+}
diff --git a/...biz-auth/src/main/kotlin/com/tencent/devops/auth/service/self/AbstractRepoOauthService.kt b/...biz-auth/src/main/kotlin/com/tencent/devops/auth/service/self/AbstractRepoOauthService.kt
@@ -2,6 +2,7 @@ package com.tencent.devops.auth.service.self
 
 import com.tencent.devops.auth.constant.AuthMessageCode
 import com.tencent.devops.auth.pojo.OauthRelResource
+import com.tencent.devops.auth.pojo.OauthResetUrl
 import com.tencent.devops.auth.pojo.enum.OauthType
 import com.tencent.devops.common.api.enums.ScmType
 import com.tencent.devops.common.api.exception.ErrorCodeException
@@ -53,6 +54,15 @@ abstract class AbstractRepoOauthService(
         )
     }
 
+    override fun reOauth(userId: String, redirectUrl: String): OauthResetUrl {
+        val reOauthUrl = client.get(ServiceOauthResource::class).reOauthUrl(
+            userId = userId,
+            scmType = convertOauthType(),
+            redirectUrl = redirectUrl
+        ).data ?: ""
+        return OauthResetUrl(reOauthUrl)
+    }
+
     private fun convertOauthType(): ScmType {
         return when (oauthType) {
             OauthType.GIT -> ScmType.CODE_GIT
@@ -67,4 +77,4 @@ abstract class AbstractRepoOauthService(
             scmType = convertOauthType()
         ).data ?: 0
     }
-}
+}
diff --git a/...i/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/self/OauthService.kt b/...i/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/self/OauthService.kt
@@ -27,5 +27,5 @@ interface OauthService {
     /**
      * 重置授权
      */
-    fun reOauth(userId: String): OauthResetUrl
-}
+    fun reOauth(userId: String, redirectUrl: String): OauthResetUrl
+}
diff --git a/.../api-repository/src/main/kotlin/com/tencent/devops/repository/api/ServiceOauthResource.kt b/.../api-repository/src/main/kotlin/com/tencent/devops/repository/api/ServiceOauthResource.kt
@@ -137,4 +137,19 @@ interface ServiceOauthResource {
         @QueryParam("scmType")
         scmType: ScmType
     ): Result<Boolean>
+
+    @Operation(summary = "获取重置授权链接")
+    @GET
+    @Path("/reOauthUrl")
+    fun reOauthUrl(
+        @Parameter(description = "用户ID", required = true, example = AUTH_HEADER_USER_ID_DEFAULT_VALUE)
+        @HeaderParam(AUTH_HEADER_USER_ID)
+        userId: String,
+        @Parameter(description = "回调链接(授权完以后的链接地址)", required = true)
+        @QueryParam("redirectUrl")
+        redirectUrl: String,
+        @Parameter(description = "代码库类型", required = true)
+        @QueryParam("scmType")
+        scmType: ScmType
+    ): Result<String>
 }
diff --git a/...itory/src/main/kotlin/com/tencent/devops/repository/resources/ServiceOauthResourceImpl.kt b/...itory/src/main/kotlin/com/tencent/devops/repository/resources/ServiceOauthResourceImpl.kt
@@ -35,7 +35,6 @@ import com.tencent.devops.repository.pojo.AuthorizeResult
 import com.tencent.devops.repository.pojo.enums.RedirectUrlTypeEnum
 import com.tencent.devops.repository.pojo.oauth.GitOauthCallback
 import com.tencent.devops.repository.pojo.oauth.GitToken
-import com.tencent.devops.repository.pojo.oauth.RepositoryOauthInfo
 import com.tencent.devops.repository.service.github.GithubOAuthService
 import com.tencent.devops.repository.service.scm.IGitOauthService
 import com.tencent.devops.repository.service.tgit.TGitOAuthService
@@ -113,6 +112,33 @@ class ServiceOauthResourceImpl @Autowired constructor(
         return Result(true)
     }
 
+    override fun reOauthUrl(userId: String, redirectUrl: String, scmType: ScmType): Result<String> {
+        val url = when (scmType) {
+            ScmType.CODE_GIT -> {
+                gitOauthService.getOauthUrl(
+                    userId = userId,
+                    redirectUrl = redirectUrl
+                )
+            }
+
+            ScmType.GITHUB -> {
+                githubOAuthService.getGithubOauth(
+                    userId = userId,
+                    projectId = "",
+                    redirectUrlTypeEnum = RedirectUrlTypeEnum.SPEC,
+                    specRedirectUrl = redirectUrl,
+                    repoHashId = null
+                ).redirectUrl
+            }
+
+            else -> {
+                logger.warn("cannot reset oauth, not support scm type $scmType")
+                ""
+            }
+        }
+        return Result(url)
+    }
+
     companion object {
         private val logger = LoggerFactory.getLogger(ServiceOauthResourceImpl::class.java)
     }