From 0de14e6c81f0f18f7d747cfc178372b1485211f6 Mon Sep 17 00:00:00 2001 From: xuyuxiang Date: Mon, 22 Sep 2025 22:35:25 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E4=B8=89=E6=96=B9=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/AuthThirdIamCommonSource.java | 6 ++++++ .../third/request/AuthThirdIamRequest.java | 18 ++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/third/request/AuthThirdIamCommonSource.java b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/third/request/AuthThirdIamCommonSource.java index 70f6b907..2c997c82 100644 --- a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/third/request/AuthThirdIamCommonSource.java +++ b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/third/request/AuthThirdIamCommonSource.java @@ -42,4 +42,10 @@ public record AuthThirdIamCommonSource(String authorizeUrl, String accessTokenUr public Class getTargetClass() { return AuthThirdIamRequest.class; } + + + @Override + public String toString() { + return "COMMON_THIRD"; + } } diff --git a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/third/request/AuthThirdIamRequest.java b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/third/request/AuthThirdIamRequest.java index ac55bac6..c571b65d 100644 --- a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/third/request/AuthThirdIamRequest.java +++ b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/third/request/AuthThirdIamRequest.java @@ -56,7 +56,13 @@ public class AuthThirdIamRequest extends AuthDefaultRequest { String response = this.doPostAuthorizationCode(authCallback.getCode()); com.alibaba.fastjson.JSONObject accessTokenObject = com.alibaba.fastjson.JSONObject.parseObject(response); this.checkResponse(accessTokenObject); - return AuthToken.builder().accessToken(accessTokenObject.getString("access_token")).refreshToken(accessTokenObject.getString("refresh_token")).scope(accessTokenObject.getString("scope")).tokenType(accessTokenObject.getString("token_type")).expireIn(accessTokenObject.getIntValue("expires_in")).build(); + return AuthToken.builder() + .accessToken(accessTokenObject.getString("access_token")) + .refreshToken(accessTokenObject.getString("refresh_token")) + .scope(accessTokenObject.getString("scope")) + .tokenType(accessTokenObject.getString("token_type")) + .expireIn(accessTokenObject.getIntValue("expires_in")) + .build(); } @Override @@ -64,7 +70,15 @@ public class AuthThirdIamRequest extends AuthDefaultRequest { String userInfo = this.doGetUserInfo(authToken); com.alibaba.fastjson.JSONObject userInfoObject = com.alibaba.fastjson.JSONObject.parseObject(userInfo); this.checkResponse(userInfoObject); - return AuthUser.builder().rawUserInfo(userInfoObject).uuid(userInfoObject.getString("sub")).nickname(userInfoObject.getString("name")).username(userInfoObject.getString("account")).avatar(userInfoObject.getString("picture")).email(userInfoObject.getString("email")).gender(AuthUserGender.UNKNOWN).token(authToken).source(this.source.toString()).build(); + return AuthUser.builder().rawUserInfo(userInfoObject) + .uuid(userInfoObject.getString("sub")) + .nickname(userInfoObject.getString("name")) + .username(userInfoObject.getString("account")) + .avatar(userInfoObject.getString("picture")) + .email(userInfoObject.getString("email")) + .gender(AuthUserGender.UNKNOWN) + .token(authToken) + .source(this.source.toString()).build(); } private void checkResponse(JSONObject object) {