From a5a375eaf04fec91483e9e10a79ac3342a00dc83 Mon Sep 17 00:00:00 2001
From: Hugo-Ho <52446959+Hugo-Ho@users.noreply.github.com>
Date: Fri, 15 Dec 2023 17:50:59 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20#3186=20=E3=80=90=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E3=80=91=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E8=BA=AB=E4=BB=BD=E5=92=8C?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E4=BA=8C=E6=AC=A1=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E4=BF=A1=E6=81=AF=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/cp/api/WxCpOAuth2Service.java      | 35 +++++++++++++++++++
 .../cp/api/impl/WxCpOAuth2ServiceImpl.java    | 24 +++++++++++++
 .../WxCpSecondVerificatioInformation.java     | 27 ++++++++++++++
 .../weixin/cp/constant/WxCpApiPathConsts.java |  8 +++++
 4 files changed, 94 insertions(+)
 create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/workbench/WxCpSecondVerificatioInformation.java

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpOAuth2Service.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpOAuth2Service.java
index a2c47437b..bb0f30ba8 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpOAuth2Service.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpOAuth2Service.java
@@ -3,6 +3,7 @@ package me.chanjar.weixin.cp.api;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.cp.bean.WxCpOauth2UserInfo;
 import me.chanjar.weixin.cp.bean.WxCpUserDetail;
+import me.chanjar.weixin.cp.bean.workbench.WxCpSecondVerificatioInformation;
 
 /**
  * <pre>
@@ -116,4 +117,38 @@ public interface WxCpOAuth2Service {
    * @throws WxErrorException 异常
    */
   WxCpUserDetail getUserDetail(String userTicket) throws WxErrorException;
+
+  /**
+   * <pre>
+   * 获取用户登录身份
+   * https://qyapi.weixin.qq.com/cgi-bin/auth/getuserinfo?access_token=ACCESS_TOKEN&code=CODE
+   * 该接口可使用用户登录成功颁发的code来获取成员信息，适用于自建应用与代开发应用
+   *
+   * 注意: 旧的/user/getuserinfo 接口的url已变更为auth/getuserinfo，不过旧接口依旧可以使用，建议是关注新接口即可
+   *
+   * 适用范围：身份验证中网页授权开发和企业微信Web登录的获取用户登录身份
+   * </pre>
+   *
+   * @param code 通过成员授权获取到的code，最大为512字节。每次成员授权带上的code将不一样，code只能使用一次，5分钟未被使用自动过期。
+   * @return WxCpOauth2UserInfo user info
+   * @throws WxErrorException 异常
+   * @see #getUserInfo(Integer, String) #getUserInfo(Integer, String)
+   */
+  WxCpOauth2UserInfo getAuthUserInfo(String code) throws WxErrorException;
+
+  /**
+   * 获取用户二次验证信息
+   *
+   * https://qyapi.weixin.qq.com/cgi-bin/auth/get_tfa_info?access_token=ACCESS_TOKEN
+   *
+   * @author Hugo
+   * @date 2023/12/14 10:29
+   * @param code 用户进入二次验证页面时，企业微信颁发的code,每次成员授权带上的code将不一样，code只能使用一次，5分钟未被使用自动过期
+   * @return me.chanjar.weixin.cp.bean.workbench.WxCpSecondVerificatioInformation 二次验证授权码，开发者可以调用通过二次验证接口，解锁企业微信终端.tfa_code有效期五分钟，且只能使用一次。
+   *
+   * 权限说明：仅『通讯录同步』或者自建应用可调用，如用自建应用调用，用户需要在二次验证范围和应用可见范围内。
+   *
+   * 并发限制：20
+   */
+  WxCpSecondVerificatioInformation get_tfa_info(String code) throws WxErrorException;
 }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpOAuth2ServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpOAuth2ServiceImpl.java
index f5bd61ba9..35094aaf4 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpOAuth2ServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpOAuth2ServiceImpl.java
@@ -10,6 +10,7 @@ import me.chanjar.weixin.cp.api.WxCpOAuth2Service;
 import me.chanjar.weixin.cp.api.WxCpService;
 import me.chanjar.weixin.cp.bean.WxCpOauth2UserInfo;
 import me.chanjar.weixin.cp.bean.WxCpUserDetail;
+import me.chanjar.weixin.cp.bean.workbench.WxCpSecondVerificatioInformation;
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
 import static me.chanjar.weixin.common.api.WxConsts.OAuth2Scope.*;
@@ -106,4 +107,27 @@ public class WxCpOAuth2ServiceImpl implements WxCpOAuth2Service {
       param.toString());
     return WxCpGsonBuilder.create().fromJson(responseText, WxCpUserDetail.class);
   }
+
+  @Override
+  public WxCpOauth2UserInfo getAuthUserInfo(String code) throws WxErrorException {
+    String responseText =
+      this.mainService.get(String.format(this.mainService.getWxCpConfigStorage().getApiUrl(GET_USER_AUTH_INFO), code), null);
+    JsonObject jo = GsonParser.parse(responseText);
+
+    return WxCpOauth2UserInfo.builder()
+      .userId(GsonHelper.getString(jo, "UserId"))
+      .openId(GsonHelper.getString(jo, "OpenId"))
+      .userTicket(GsonHelper.getString(jo, "user_ticket"))
+      .externalUserId(GsonHelper.getString(jo, "external_userid"))
+      .build();
+  }
+
+  @Override
+  public WxCpSecondVerificatioInformation get_tfa_info(String code) throws WxErrorException {
+    JsonObject param = new JsonObject();
+    param.addProperty("code", code);
+    String responseText = this.mainService.post(this.mainService.getWxCpConfigStorage().getApiUrl(GET_TFA_INFO),
+      param.toString());
+    return WxCpGsonBuilder.create().fromJson(responseText, WxCpSecondVerificatioInformation.class);
+  }
 }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/workbench/WxCpSecondVerificatioInformation.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/workbench/WxCpSecondVerificatioInformation.java
new file mode 100644
index 000000000..71cf57e8d
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/workbench/WxCpSecondVerificatioInformation.java
@@ -0,0 +1,27 @@
+package me.chanjar.weixin.cp.bean.workbench;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * @author Hugo
+ * <pre>
+ *  获取用户二次验证信息的结果类
+ * </pre>
+ * <p>
+ * 文档1：https://developer.work.weixin.qq.com/document/path/99499
+ */
+@Data
+@Accessors(chain = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class WxCpSecondVerificatioInformation {
+  private static final long serialVersionUID = -4301564507150486556L;
+
+  private String userId;
+  private String tfa_code;
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
index 18c3ac6d2..e3560149b 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
@@ -148,6 +148,14 @@ public interface WxCpApiPathConsts {
      * The constant URL_OAUTH2_AUTHORIZE.
      */
     String URL_OAUTH2_AUTHORIZE = "https://open.weixin.qq.com/connect/oauth2/authorize";
+    /**
+     * The constant GET_USER_INFO without agentId.
+     */
+    String GET_USER_AUTH_INFO = "/cgi-bin/auth/getuserinfo?code=%s";
+    /**
+     * The constant GET_TFA_INFO.
+     */
+    String GET_TFA_INFO = "/cgi-bin/auth/get_tfa_info";
   }
 
   /**