Merge branch 'dev' of https://github.com/zhangyd-c/JustAuth into dev

src/main/java/me/zhyd/oauth/config/AuthSource.java

@@ -444,6 +444,31 @@ public enum AuthSource {
         public String userInfo() {
             return "https://api.teambition.com/users/me";
         }
+    },
+
+    /**
+     * 人人网
+     */
+    RENREN {
+        @Override
+        public String authorize() {
+            return "https://graph.renren.com/oauth/authorize";
+        }
+
+        @Override
+        public String accessToken() {
+            return "https://graph.renren.com/oauth/token";
+        }
+
+        @Override
+        public String refresh() {
+            return "https://graph.renren.com/oauth/token";
+        }
+
+        @Override
+        public String userInfo() {
+            return "https://api.renren.com/v2/user/get";
+        }
     };
 
     /**
@@ -485,4 +510,4 @@ public enum AuthSource {
         throw new AuthException(AuthResponseStatus.UNSUPPORTED);
     }
 
-}
\ No newline at end of file
+}

src/main/java/me/zhyd/oauth/model/AuthUserGender.java

@@ -10,7 +10,7 @@ import java.util.Arrays;
  * @since 1.8
  */
 public enum AuthUserGender {
-    MALE(1, "男"), FEMALE(0, "女"), UNKNOW(-1, "未知");
+    MALE(1, "男"), FEMALE(0, "女"), UNKNOWN(-1, "未知");
     private int code;
     private String desc;
 
@@ -21,17 +21,17 @@ public enum AuthUserGender {
 
     public static AuthUserGender getRealGender(String code) {
         if (code == null) {
-            return UNKNOW;
+            return UNKNOWN;
         }
-        String[] males = {"m", "男", "1", "male", "F"};
-        if (Arrays.asList(males).contains(code)) {
+        String[] males = {"m", "男", "1", "male"};
+        if (Arrays.asList(males).contains(code.toLowerCase())) {
             return MALE;
         }
         String[] females = {"f", "女", "0", "female"};
-        if (Arrays.asList(females).contains(code)) {
+        if (Arrays.asList(females).contains(code.toLowerCase())) {
             return FEMALE;
         }
-        return UNKNOW;
+        return UNKNOWN;
     }
 
     public int getCode() {

src/main/java/me/zhyd/oauth/request/AuthCsdnRequest.java

@@ -53,7 +53,7 @@ public class AuthCsdnRequest extends AuthDefaultRequest {
                 .username(object.getString("username"))
                 .remark(object.getString("description"))
                 .blog(object.getString("website"))
-                .gender(AuthUserGender.UNKNOW)
+                .gender(AuthUserGender.UNKNOWN)
                 .token(authToken)
                 .source(AuthSource.CSDN)
                 .build();

src/main/java/me/zhyd/oauth/request/AuthDingTalkRequest.java

@@ -63,7 +63,7 @@ public class AuthDingTalkRequest extends AuthDefaultRequest {
                 .uuid(object.getString("unionid"))
                 .nickname(object.getString("nick"))
                 .username(object.getString("nick"))
-                .gender(AuthUserGender.UNKNOW)
+                .gender(AuthUserGender.UNKNOWN)
                 .source(AuthSource.DINGTALK)
                 .token(token)
                 .build();

src/main/java/me/zhyd/oauth/request/AuthDouyinRequest.java

@@ -49,7 +49,7 @@ public class AuthDouyinRequest extends AuthDefaultRequest {
                 .nickname(userInfoObject.getString("nickname"))
                 .avatar(userInfoObject.getString("avatar"))
                 .remark(userInfoObject.getString("description"))
-                .gender(AuthUserGender.UNKNOW)
+                .gender(AuthUserGender.UNKNOWN)
                 .token(authToken)
                 .source(AuthSource.DOUYIN)
                 .build();

src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java

@@ -55,7 +55,7 @@ public class AuthGiteeRequest extends AuthDefaultRequest {
                 .location(object.getString("address"))
                 .email(object.getString("email"))
                 .remark(object.getString("bio"))
-                .gender(AuthUserGender.UNKNOW)
+                .gender(AuthUserGender.UNKNOWN)
                 .token(authToken)
                 .source(AuthSource.GITEE)
                 .build();

src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java

@@ -58,7 +58,7 @@ public class AuthGithubRequest extends AuthDefaultRequest {
                 .location(object.getString("location"))
                 .email(object.getString("email"))
                 .remark(object.getString("bio"))
-                .gender(AuthUserGender.UNKNOW)
+                .gender(AuthUserGender.UNKNOWN)
                 .token(authToken)
                 .source(AuthSource.GITHUB)
                 .build();

src/main/java/me/zhyd/oauth/request/AuthGoogleRequest.java

@@ -61,7 +61,7 @@ public class AuthGoogleRequest extends AuthDefaultRequest {
                 .nickname(object.getString("name"))
                 .location(object.getString("locale"))
                 .email(object.getString("email"))
-                .gender(AuthUserGender.UNKNOW)
+                .gender(AuthUserGender.UNKNOWN)
                 .token(authToken)
                 .source(AuthSource.GOOGLE)
                 .build();

src/main/java/me/zhyd/oauth/request/AuthLinkedinRequest.java

@@ -81,7 +81,7 @@ public class AuthLinkedinRequest extends AuthDefaultRequest {
                 .avatar(avatar)
                 .email(email)
                 .token(authToken)
-                .gender(AuthUserGender.UNKNOW)
+                .gender(AuthUserGender.UNKNOWN)
                 .source(AuthSource.LINKEDIN)
                 .build();
     }

src/main/java/me/zhyd/oauth/request/AuthMiRequest.java

@@ -78,7 +78,7 @@ public class AuthMiRequest extends AuthDefaultRequest {
                 .nickname(user.getString("miliaoNick"))
                 .avatar(user.getString("miliaoIcon"))
                 .email(user.getString("mail"))
-                .gender(AuthUserGender.UNKNOW)
+                .gender(AuthUserGender.UNKNOWN)
                 .token(authToken)
                 .source(AuthSource.MI)
                 .build();

src/main/java/me/zhyd/oauth/request/AuthMicrosoftRequest.java

@@ -83,7 +83,7 @@ public class AuthMicrosoftRequest extends AuthDefaultRequest {
                 .nickname(object.getString("displayName"))
                 .location(object.getString("officeLocation"))
                 .email(object.getString("mail"))
-                .gender(AuthUserGender.UNKNOW)
+                .gender(AuthUserGender.UNKNOWN)
                 .token(authToken)
                 .source(AuthSource.MICROSOFT)
                 .build();

src/main/java/me/zhyd/oauth/request/AuthRenrenRequest.java

+package me.zhyd.oauth.request;
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.config.AuthConfig;
+import me.zhyd.oauth.exception.AuthException;
+import me.zhyd.oauth.model.AuthCallback;
+import me.zhyd.oauth.model.AuthToken;
+import me.zhyd.oauth.model.AuthUser;
+import me.zhyd.oauth.model.AuthUserGender;
+import me.zhyd.oauth.url.AuthRenrenUrlBuilder;
+import me.zhyd.oauth.url.entity.AuthUserInfoEntity;
+
+import java.util.Objects;
+
+import static me.zhyd.oauth.config.AuthSource.RENREN;
+
+/**
+ * 人人登录
+ *
+ * @author hongwei.peng (pengisgood(at)gmail(dot)com)
+ * @version 1.8.1
+ * @since 1.8.1
+ */
+public class AuthRenrenRequest extends AuthDefaultRequest {
+
+    public AuthRenrenRequest(AuthConfig config) {
+        super(config, RENREN, new AuthRenrenUrlBuilder());
+    }
+
+    @Override
+    protected AuthToken getAccessToken(AuthCallback authCallback) {
+        String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(authCallback.getCode());
+        HttpResponse response = HttpRequest.post(accessTokenUrl).execute();
+        JSONObject accessTokenObject = JSONObject.parseObject(response.body());
+        if (!response.isOk()) {
+            throw new AuthException("Unable to get token from renren using code [" + authCallback.getCode() + "]: " + accessTokenObject);
+        }
+
+        return AuthToken.builder()
+            .accessToken(accessTokenObject.getString("access_token"))
+            .refreshToken(accessTokenObject.getString("refresh_token"))
+            .openId(accessTokenObject.getJSONObject("user").getString("id"))
+            .build();
+    }
+
+    @Override
+    protected AuthUser getUserInfo(AuthToken authToken) {
+        String accessToken = authToken.getAccessToken();
+        HttpResponse response = HttpRequest.get(this.urlBuilder.getUserInfoUrl(AuthUserInfoEntity.builder()
+            .openId(authToken.getOpenId())
+            .accessToken(accessToken)
+            .build())).execute();
+        JSONObject userObj = JSONObject.parseObject(response.body()).getJSONObject("response");
+
+        return AuthUser.builder()
+            .uuid(userObj.getString("id"))
+            .avatar(getAvatarUrl(userObj))
+            .nickname(userObj.getString("name"))
+            .company(getCompany(userObj))
+            .gender(getGender(userObj))
+            .token(authToken)
+            .source(RENREN)
+            .build();
+    }
+
+    private String getAvatarUrl(JSONObject userObj) {
+        JSONArray jsonArray = userObj.getJSONArray("avatar");
+        if (Objects.isNull(jsonArray) || jsonArray.isEmpty()) {
+            return null;
+        }
+        return jsonArray.getJSONObject(0).getString("url");
+    }
+
+    private AuthUserGender getGender(JSONObject userObj) {
+        JSONObject basicInformation = userObj.getJSONObject("basicInformation");
+        if (Objects.isNull(basicInformation)) {
+            return AuthUserGender.UNKNOWN;
+        }
+        return AuthUserGender.getRealGender(basicInformation.getString("sex"));
+    }
+
+    private String getCompany(JSONObject userObj) {
+        JSONArray jsonArray = userObj.getJSONArray("work");
+        if (Objects.isNull(jsonArray) || jsonArray.isEmpty()) {
+            return null;
+        }
+        return jsonArray.getJSONObject(0).getString("name");
+    }
+}

src/main/java/me/zhyd/oauth/request/AuthTaobaoRequest.java

@@ -47,7 +47,7 @@ public class AuthTaobaoRequest extends AuthDefaultRequest {
                 .uuid(accessTokenObject.getString("taobao_user_id"))
                 .username(nick)
                 .nickname(nick)
-                .gender(AuthUserGender.UNKNOW)
+                .gender(AuthUserGender.UNKNOWN)
                 .token(authToken)
                 .source(AuthSource.TAOBAO)
                 .build();

src/main/java/me/zhyd/oauth/request/AuthTeambitionRequest.java

@@ -66,7 +66,7 @@ public class AuthTeambitionRequest extends AuthDefaultRequest {
                 .blog(object.getString("website"))
                 .location(object.getString("location"))
                 .email(object.getString("email"))
-                .gender(AuthUserGender.UNKNOW)
+                .gender(AuthUserGender.UNKNOWN)
                 .token(authToken)
                 .source(AuthSource.TEAMBITION)
                 .build();

src/main/java/me/zhyd/oauth/url/AuthRenrenUrlBuilder.java

+package me.zhyd.oauth.url;
+
+import me.zhyd.oauth.exception.AuthException;
+import me.zhyd.oauth.model.AuthResponseStatus;
+import me.zhyd.oauth.url.entity.AuthUserInfoEntity;
+
+import java.text.MessageFormat;
+
+import static me.zhyd.oauth.config.AuthSource.RENREN;
+
+/**
+ * 人人网相关的URL构建类
+ *
+ * @author hongwei.peng (pengisgood(at)gmail(dot)com)
+ * @version 1.8.1
+ * @since 1.8.1
+ */
+public class AuthRenrenUrlBuilder extends AuthDefaultUrlBuilder {
+
+    private static final String RENREN_ACCESS_TOKEN_PATTERN = "{0}?client_id={1}&client_secret={2}&grant_type=authorization_code&code={3}&redirect_uri={4}";
+    private static final String RENREN_USER_INFO_PATTERN = "{0}?access_token={1}&userId={2}";
+    private static final String RENREN_AUTHORIZE_PATTERN = "{0}?client_id={1}&response_type=code&redirect_uri={2}&state={3}";
+    private static final String RENREN_REFRESH_PATTERN = "{0}?refresh_token={1}&client_id={2}&client_secret={3}&grant_type=refresh_token";
+
+    @Override
+    public String getAccessTokenUrl(String code) {
+        return MessageFormat.format(RENREN_ACCESS_TOKEN_PATTERN, RENREN.accessToken(), config.getClientId(), config.getClientSecret(), code, config.getRedirectUri());
+    }
+
+    @Override
+    public String getUserInfoUrl(AuthUserInfoEntity userInfoEntity) {
+        return MessageFormat.format(RENREN_USER_INFO_PATTERN, RENREN.userInfo(), userInfoEntity.getAccessToken(), userInfoEntity.getOpenId());
+    }
+
+    @Override
+    public String getAuthorizeUrl() {
+        return MessageFormat.format(RENREN_AUTHORIZE_PATTERN, RENREN.authorize(), config.getClientId(), config.getRedirectUri(), this.getRealState(config.getState()));
+    }
+
+    @Override
+    public String getRefreshUrl(String refreshToken) {
+        return MessageFormat.format(RENREN_REFRESH_PATTERN, RENREN.refresh(), refreshToken, config.getClientId(), config.getClientSecret());
+    }
+
+    @Override
+    public String getRevokeUrl(String accessToken) {
+        throw new AuthException(AuthResponseStatus.UNSUPPORTED);
+    }
+}