diff --git a/pom.xml b/pom.xml index a7126a7..561c151 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,11 @@ jjwt-impl ${jwt.version} + + io.jsonwebtoken + jjwt-jackson + ${jwt.version} + org.bouncycastle bcpkix-jdk18on diff --git a/src/main/java/me/zhyd/oauth/request/AuthAppleRequest.java b/src/main/java/me/zhyd/oauth/request/AuthAppleRequest.java index d15cbe2..20b41da 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthAppleRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthAppleRequest.java @@ -51,7 +51,7 @@ public class AuthAppleRequest extends AuthDefaultRequest { @Override protected AuthToken getAccessToken(AuthCallback authCallback) { - if (authCallback.getError() != null) { + if (!StringUtils.isEmpty(authCallback.getError())) { throw new AuthException(authCallback.getError()); } this.config.setClientSecret(this.getToken()); @@ -67,7 +67,7 @@ public class AuthAppleRequest extends AuthDefaultRequest { .idToken(accessTokenObject.getString("id_token")); if (!StringUtils.isEmpty(authCallback.getUser())) { try { - AppleUserInfo userInfo = JSONObject.parseObject(response, AppleUserInfo.class); + AppleUserInfo userInfo = JSONObject.parseObject(authCallback.getUser(), AppleUserInfo.class); builder.username(userInfo.getName().getFirstName() + " " + userInfo.getName().getLastName()); } catch (Exception ignored) { }