admin/JustAuth
1
0
Fork 0
mirror of https://gitee.com/yadong.zhang/JustAuth.git synced 2025-12-07 17:28:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

🔀 合并 Gitee PR !15

Browse Source
This commit is contained in:
yadong.zhang 2020-06-07 16:30:28 +08:00
parent e4985c63f3
commit c34e226a54
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/me/zhyd/oauth/request/AuthRenrenRequest.java
View File

@ -2,7 +2,7 @@ package me.zhyd.oauth.request;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import me.zhyd.oauth.utils.HttpUtils; import com.xkcoding.http.util.UrlUtil;
import me.zhyd.oauth.cache.AuthStateCache; import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.config.AuthConfig; import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.enums.AuthUserGender;
@ -11,10 +11,9 @@ import me.zhyd.oauth.model.AuthCallback;
import me.zhyd.oauth.model.AuthResponse; import me.zhyd.oauth.model.AuthResponse;
import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthToken;
import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUser;
import me.zhyd.oauth.utils.HttpUtils;
import me.zhyd.oauth.utils.UrlBuilder; import me.zhyd.oauth.utils.UrlBuilder;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.Objects; import java.util.Objects;
import static me.zhyd.oauth.config.AuthDefaultSource.RENREN; import static me.zhyd.oauth.config.AuthDefaultSource.RENREN;
@ -72,17 +71,13 @@ public class AuthRenrenRequest extends AuthDefaultRequest {
throw new AuthException("Failed to get token from Renren: " + jsonObject); throw new AuthException("Failed to get token from Renren: " + jsonObject);
} }
try { return AuthToken.builder()
return AuthToken.builder() .tokenType(jsonObject.getString("token_type"))
.tokenType(jsonObject.getString("token_type")) .expireIn(jsonObject.getIntValue("expires_in"))
.expireIn(jsonObject.getIntValue("expires_in")) .accessToken(UrlUtil.urlEncode(jsonObject.getString("access_token")))
.accessToken(URLEncoder.encode(jsonObject.getString("access_token"), "UTF-8")) .refreshToken(UrlUtil.urlEncode(jsonObject.getString("refresh_token")))
.refreshToken(URLEncoder.encode(jsonObject.getString("refresh_token"), "UTF-8")) .openId(jsonObject.getJSONObject("user").getString("id"))
.openId(jsonObject.getJSONObject("user").getString("id")) .build();
.build();
} catch (UnsupportedEncodingException e) {
throw new AuthException("Failed to encode token" + e.getMessage());
}
} }
private String getAvatarUrl(JSONObject userObj) { private String getAvatarUrl(JSONObject userObj) {