This is an automated email from the ASF dual-hosted git repository. liubao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-fence.git
commit b3e7c1ecf93cf5d608f014bc702b4a7aceccbb6c Author: liubao <[email protected]> AuthorDate: Fri Jul 5 19:34:43 2019 +0800 [SCB-1350]minor fix --- .../servicecomb/authentication/server/GithubTokenGranter.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/GithubTokenGranter.java b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/GithubTokenGranter.java index 4c372e6..2840840 100644 --- a/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/GithubTokenGranter.java +++ b/api/authentication-server/endpoint/src/main/java/org/apache/servicecomb/authentication/server/GithubTokenGranter.java @@ -92,11 +92,15 @@ public class GithubTokenGranter implements ThirdPartyTokenGranter { LOGGER.error("Call github error. ", e); } + if (response == null || StringUtils.isEmpty(response.getAccess_token())) { + return null; + } + if (StringUtils.isEmpty(login)) { login = "anonymous"; } try { - UserDetails userDetails = userDetailsService.loadUserByUsername("github:" + login); + UserDetails userDetails = userDetailsService.loadUserByUsername(name() + ":" + login); OpenIDToken openIDToken = openIDTokenStore.createToken(userDetails); openIDToken.addAdditionalInformation(AuthenticationServerConstants.TOKEN_ADDTIONAL_INFORMATION_GITHUB_TOKEN,
