From 11707e6903a27aacf82140ca62f5e08044e060af Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Sun, 26 Feb 2023 17:54:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?:fire:=20=E5=BE=AE=E4=BF=A1=E5=85=AC?= =?UTF-8?q?=E4=BC=97=E5=B9=B3=E5=8F=B0=E6=94=AF=E6=8C=81=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=BF=AB=E7=85=A7=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/me/zhyd/oauth/model/AuthToken.java | 6 ++++++ src/main/java/me/zhyd/oauth/model/AuthUser.java | 7 +++++++ .../java/me/zhyd/oauth/request/AuthWeChatMpRequest.java | 2 ++ 3 files changed, 15 insertions(+) diff --git a/src/main/java/me/zhyd/oauth/model/AuthToken.java b/src/main/java/me/zhyd/oauth/model/AuthToken.java index e729b1d..eb4c42b 100644 --- a/src/main/java/me/zhyd/oauth/model/AuthToken.java +++ b/src/main/java/me/zhyd/oauth/model/AuthToken.java @@ -44,6 +44,12 @@ public class AuthToken implements Serializable { * @since 1.10.0 */ private String code; + /** + * 微信公众号 - 网页授权的登录时可用 + * + * 微信针对网页授权登录，增加了一个快照页的逻辑，快照页获取到的微信用户的 uid oid 和头像昵称都是虚拟的信息 + */ + private boolean snapshotUser; /** * Twitter附带属性 diff --git a/src/main/java/me/zhyd/oauth/model/AuthUser.java b/src/main/java/me/zhyd/oauth/model/AuthUser.java index 530e73a..ab88b52 100644 --- a/src/main/java/me/zhyd/oauth/model/AuthUser.java +++ b/src/main/java/me/zhyd/oauth/model/AuthUser.java @@ -72,4 +72,11 @@ public class AuthUser implements Serializable { */ private JSONObject rawUserInfo; + /** + * 微信公众号 - 网页授权的登录时可用 + * + * 微信针对网页授权登录，增加了一个快照页的逻辑，快照页获取到的微信用户的 uid oid 和头像昵称都是虚拟的信息 + */ + private boolean snapshotUser; + } diff --git a/src/main/java/me/zhyd/oauth/request/AuthWeChatMpRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWeChatMpRequest.java index 94fcba8..5ee1374 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthWeChatMpRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthWeChatMpRequest.java @@ -65,6 +65,7 @@ public class AuthWeChatMpRequest extends AuthDefaultRequest { .avatar(object.getString("headimgurl")) .location(location) .uuid(openId) + .snapshotUser(authToken.isSnapshotUser()) .gender(AuthUserGender.getWechatRealGender(object.getString("sex"))) .token(authToken) .source(source.toString()) @@ -108,6 +109,7 @@ public class AuthWeChatMpRequest extends AuthDefaultRequest { .expireIn(accessTokenObject.getIntValue("expires_in")) .openId(accessTokenObject.getString("openid")) .scope(accessTokenObject.getString("scope")) + .snapshotUser(accessTokenObject.getIntValue("is_snapshotuser") == 1) .build(); } From 765127e8471afabfc431012b19a53f2f7dde962e Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Sun, 26 Feb 2023 18:09:08 +0800 Subject: [PATCH 2/5] =?UTF-8?q?:memo:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOGS.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOGS.md b/CHANGELOGS.md index da583bb..fd5ca29 100644 --- a/CHANGELOGS.md +++ b/CHANGELOGS.md @@ -1,3 +1,14 @@ +## 1.16.6 + +### 2023/02/26 + +- 企业微信网页登录--获取用户敏感信。 [Github #155](https://github.com/justauth/JustAuth/pull/155) +- 添加飞书单元测试。 [Github #159](https://github.com/justauth/JustAuth/pull/159) +- 升级fastjson版本到1.2.83，1.2.83版本之前存在代码执行漏洞风险 ，CVE-2022-25845。[Gitee PR #31](https://gitee.com/yadong.zhang/JustAuth/pulls/31) +- 添加微软中国(世纪华联)第三方登录，新增微软方式登录的redirectUri校验。[Gitee PR #33](https://gitee.com/yadong.zhang/JustAuth/pulls/33) +- 微信公众平台支持返回快照标识（快照标识为 true 时，标识当前获取到的微信用户信息都是虚拟的） + + ## 1.16.5 ### 2021/10/18 From d1f820514fc72fddb19e35b60a3b7eea605f954d Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Sun, 6 Aug 2023 17:57:47 +0800 Subject: [PATCH 3/5] :arrow_up: 1.16.6 --- CHANGELOGS.md | 3 ++- bin/version.txt | 2 +- pom.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOGS.md b/CHANGELOGS.md index 2168501..ac7af01 100644 --- a/CHANGELOGS.md +++ b/CHANGELOGS.md @@ -1,12 +1,13 @@ ## 1.16.6 -### 2023/02/26 +### 2023/08/06 - 企业微信网页登录--获取用户敏感信。 [Github #155](https://github.com/justauth/JustAuth/pull/155) - 添加飞书单元测试。 [Github #159](https://github.com/justauth/JustAuth/pull/159) - 升级fastjson版本到1.2.83，1.2.83版本之前存在代码执行漏洞风险 ，CVE-2022-25845。[Gitee PR #31](https://gitee.com/yadong.zhang/JustAuth/pulls/31) - 添加微软中国(世纪华联)第三方登录，新增微软方式登录的redirectUri校验。[Gitee PR #33](https://gitee.com/yadong.zhang/JustAuth/pulls/33) - 微信公众平台支持返回快照标识（快照标识为 true 时，标识当前获取到的微信用户信息都是虚拟的） +- 新增爱发电平台 [Gitee #35](https://gitee.com/yadong.zhang/JustAuth/pulls/35) ## 1.16.5 diff --git a/bin/version.txt b/bin/version.txt index a232073..de646d2 100644 --- a/bin/version.txt +++ b/bin/version.txt @@ -1 +1 @@ -1.16.4 +1.16.6 diff --git a/pom.xml b/pom.xml index e4ab741..19c962c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ me.zhyd.oauth JustAuth - 1.16.5 + 1.16.6 JustAuth https://gitee.com/yadong.zhang/JustAuth From 7167a74af2cccc25e51ea6ad74739a0c7bac29ab Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Sun, 6 Aug 2023 18:14:04 +0800 Subject: [PATCH 4/5] =?UTF-8?q?:hankey:=20=E8=B0=83=E6=95=B4=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/me/zhyd/oauth/model/AuthUserTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/me/zhyd/oauth/model/AuthUserTest.java b/src/test/java/me/zhyd/oauth/model/AuthUserTest.java index 4b0f445..5b5623b 100644 --- a/src/test/java/me/zhyd/oauth/model/AuthUserTest.java +++ b/src/test/java/me/zhyd/oauth/model/AuthUserTest.java @@ -16,7 +16,7 @@ public class AuthUserTest { .nickname("test") .build(); String json = JSON.toJSONString(user); - Assert.assertEquals(json, "{\"nickname\":\"test\"}"); + Assert.assertEquals(json, "{\"nickname\":\"test\",\"snapshotUser\":false}"); } From 924f0f552b70d3f4bc9449cfe9e278c47d1aa206 Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Sun, 6 Aug 2023 18:14:42 +0800 Subject: [PATCH 5/5] =?UTF-8?q?:fire:=20=E6=9B=B4=E6=96=B0=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/pull-dev.sh | 2 +- bin/push-dev.sh | 2 +- bin/push.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/pull-dev.sh b/bin/pull-dev.sh index 93437a7..1ef2d61 100644 --- a/bin/pull-dev.sh +++ b/bin/pull-dev.sh @@ -1 +1 @@ -git pull origin dev && git pull github dev && git pull cc dev +git pull origin dev && git pull github dev diff --git a/bin/push-dev.sh b/bin/push-dev.sh index f6284d9..182a18b 100644 --- a/bin/push-dev.sh +++ b/bin/push-dev.sh @@ -1 +1 @@ -git push origin dev && git push github dev && git push cc dev +git push origin dev && git push github dev diff --git a/bin/push.sh b/bin/push.sh index e6239fe..44b75e7 100644 --- a/bin/push.sh +++ b/bin/push.sh @@ -1 +1 @@ -git push origin master && git push github master && git push cc master +git push origin master && git push github master