Fix 修复 三方授权 钉钉回调地址未进行url编码问题 由全局编码改为单独编码 避免其他三方调用重复编码

SERVER/VberAdminPlusV3/vber-common/vber-common-social/src/main/java/com/vber/common/social/ding/AuthDingTalkV2Request.java

@@ -0,0 +1,110 @@
+package com.vber.common.social.ding;
+
+import com.alibaba.fastjson.JSONObject;
+import com.xkcoding.http.support.HttpHeader;
+import me.zhyd.oauth.cache.AuthStateCache;
+import me.zhyd.oauth.config.AuthConfig;
+import me.zhyd.oauth.config.AuthDefaultSource;
+import me.zhyd.oauth.enums.scope.AuthDingTalkScope;
+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.request.AuthDefaultRequest;
+import me.zhyd.oauth.utils.AuthScopeUtils;
+import me.zhyd.oauth.utils.GlobalAuthUtils;
+import me.zhyd.oauth.utils.HttpUtils;
+import me.zhyd.oauth.utils.UrlBuilder;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 新版钉钉二维码登录
+ *
+ * @author yadong.zhang (yadong.zhang0415(a)gmail.com)
+ * @since 1.16.7
+ */
+public class AuthDingTalkV2Request extends AuthDefaultRequest {
+
+    public AuthDingTalkV2Request(AuthConfig config) {
+        super(config, AuthDefaultSource.DINGTALK_V2);
+    }
+
+    public AuthDingTalkV2Request(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthDefaultSource.DINGTALK_V2, authStateCache);
+    }
+
+    @Override
+    public String authorize(String state) {
+        return UrlBuilder.fromBaseUrl(source.authorize())
+                .queryParam("response_type", "code")
+                .queryParam("client_id", config.getClientId())
+                .queryParam("scope", this.getScopes(",", true, AuthScopeUtils.getDefaultScopes(AuthDingTalkScope.values())))
+                .queryParam("redirect_uri", GlobalAuthUtils.urlEncode(config.getRedirectUri()))
+                .queryParam("prompt", "consent")
+                .queryParam("org_type", config.getDingTalkOrgType())
+                .queryParam("corpId", config.getDingTalkCorpId())
+                .queryParam("exclusiveLogin", config.isDingTalkExclusiveLogin())
+                .queryParam("exclusiveCorpId", config.getDingTalkExclusiveCorpId())
+                .queryParam("state", getRealState(state))
+                .build();
+    }
+
+    @Override
+    public AuthToken getAccessToken(AuthCallback authCallback) {
+        Map<String, String> params = new HashMap<>();
+        params.put("grantType", "authorization_code");
+        params.put("clientId", config.getClientId());
+        params.put("clientSecret", config.getClientSecret());
+        params.put("code", authCallback.getCode());
+        String response = new HttpUtils(config.getHttpConfig()).post(this.source.accessToken(), JSONObject.toJSONString(params)).getBody();
+        JSONObject accessTokenObject = JSONObject.parseObject(response);
+        if (!accessTokenObject.containsKey("accessToken")) {
+            throw new AuthException(JSONObject.toJSONString(response), source);
+        }
+        return AuthToken.builder()
+                .accessToken(accessTokenObject.getString("accessToken"))
+                .refreshToken(accessTokenObject.getString("refreshToken"))
+                .expireIn(accessTokenObject.getIntValue("expireIn"))
+                .corpId(accessTokenObject.getString("corpId"))
+                .build();
+    }
+
+    @Override
+    public AuthUser getUserInfo(AuthToken authToken) {
+        HttpHeader header = new HttpHeader();
+        header.add("x-acs-dingtalk-access-token", authToken.getAccessToken());
+
+        String response = new HttpUtils(config.getHttpConfig()).get(this.source.userInfo(), null, header, false).getBody();
+        JSONObject object = JSONObject.parseObject(response);
+
+        authToken.setOpenId(object.getString("openId"));
+        authToken.setUnionId(object.getString("unionId"));
+        return AuthUser.builder()
+                .rawUserInfo(object)
+                .uuid(object.getString("unionId"))
+                .username(object.getString("nick"))
+                .nickname(object.getString("nick"))
+                .avatar(object.getString("avatarUrl"))
+                .snapshotUser(object.getBooleanValue("visitor"))
+                .token(authToken)
+                .source(source.toString())
+                .build();
+    }
+
+    /**
+     * 返回获取accessToken的url
+     *
+     * @param code 授权码
+     * @return 返回获取accessToken的url
+     */
+    protected String accessTokenUrl(String code) {
+        return UrlBuilder.fromBaseUrl(source.accessToken())
+                .queryParam("code", code)
+                .queryParam("clientId", config.getClientId())
+                .queryParam("clientSecret", config.getClientSecret())
+                .queryParam("grantType", "authorization_code")
+                .build();
+    }
+}

SERVER/VberAdminPlusV3/vber-common/vber-common-social/src/main/java/com/vber/common/social/utils/SocialUtils.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.vber.common.core.utils.SpringUtils;
 import com.vber.common.social.config.properties.SocialLoginConfigProperties;
 import com.vber.common.social.config.properties.SocialProperties;
+import com.vber.common.social.ding.AuthDingTalkV2Request;
 import com.vber.common.social.gitea.AuthGiteaRequest;
 import com.vber.common.social.maxkey.AuthMaxKeyRequest;
 import me.zhyd.oauth.config.AuthConfig;
@@ -13,6 +14,7 @@ import me.zhyd.oauth.model.AuthResponse;
 import me.zhyd.oauth.model.AuthUser;
 import me.zhyd.oauth.request.*;
 
+
 /**
  * 认证授权工具类
  *

SERVER/VberAdminPlusV3/vber-common/vber-common-social/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java → SERVER/VberAdminPlusV3/vber-common/vber-common-social/src/main/java/com/vber/common/social/wechat/AbstractAuthWeChatEnterpriseRequest.java

@@ -1,4 +1,4 @@
-package me.zhyd.oauth.request;
+package com.vber.common.social.wechat;
 
 import com.alibaba.fastjson.JSONObject;
 import me.zhyd.oauth.cache.AuthStateCache;
@@ -10,6 +10,7 @@ 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.request.AuthDefaultRequest;
 import me.zhyd.oauth.utils.HttpUtils;
 import me.zhyd.oauth.utils.StringUtils;
 import me.zhyd.oauth.utils.UrlBuilder;