Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 3, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...epository/src/main/kotlin/com/tencent/devops/repository/service/OauthRepositoryService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class OauthRepositoryService @Autowired constructor(
scmCode = scmCode.value,
scmType = scmCode.convertScmType(),
name = scmCode.scmName,
operator = it.operator ?: "",
operator = it.operator ?: it.userId ?: "",
createTime = it.createTime,
expired = it.expiresIn?.let { expiresIn ->
(it.createTime ?: 0L) + expiresIn * 1000 <= System.currentTimeMillis()
Expand Down
7 changes: 5 additions & 2 deletions ...sitory/src/main/kotlin/com/tencent/devops/repository/service/github/GithubOAuthService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ import org.apache.commons.lang3.RandomStringUtils
import org.slf4j.LoggerFactory
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.stereotype.Service
import java.net.URLDecoder
import java.net.URLEncoder
import javax.ws.rs.core.Response

Expand Down Expand Up @@ -86,8 +87,9 @@ class GithubOAuthService @Autowired constructor(
specRedirectUrl,
redirectUrlTypeEnum?.type
).joinToString(separator = OAUTH_URL_STATE_SEPARATOR)
val encodeState = URLEncoder.encode(state, "UTF-8")
val redirectUrl = "$GITHUB_URL/login/oauth/authorize" +
"?client_id=${gitConfig.githubClientId}&redirect_uri=${gitConfig.githubCallbackUrl}&state=$state"
"?client_id=${gitConfig.githubClientId}&redirect_uri=${gitConfig.githubCallbackUrl}&state=$encodeState"
return GithubOauth(redirectUrl)
}

Expand Down Expand Up @@ -136,10 +138,11 @@ class GithubOAuthService @Autowired constructor(
if (state.isNullOrBlank() || !state.contains(",BK_DEVOPS__")) {
throw OperationException("TGIT call back contain invalid parameter: $state")
}
val sourceState = URLDecoder.decode(state, "UTF-8")
// 回调状态信息
// @see com.tencent.devops.repository.service.github.GithubOAuthService.getGithubOauth
// 格式：{{授权用户Id}},{{蓝盾项目Id}},{{蓝盾代码库Id}},{{回调标识}},{{弹框标识位}},{{重置类型}},{{跳转链接}},{{跳转类型}}
val arrays = state.split(OAUTH_URL_STATE_SEPARATOR)
val arrays = sourceState.split(OAUTH_URL_STATE_SEPARATOR)
val userId = arrays[0]
val projectId = arrays[1]
val repoHashId = if (arrays[2].isNotBlank()) HashUtil.encodeOtherLongId(arrays[2].toLong()) else ""
Expand Down