From 988d3cd293003372c7357d3c59b13cc76f198ba0 Mon Sep 17 00:00:00 2001
From: G-XD <GXD0606@gmail.com>
Date: Fri, 19 Jan 2024 11:49:35 +0800
Subject: [PATCH] fix: fix user info

---
 pom.xml                                                   | 5 +++++
 src/main/java/me/zhyd/oauth/request/AuthAppleRequest.java | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a7126a7..561c151 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,11 @@
       <artifactId>jjwt-impl</artifactId>
       <version>${jwt.version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.jsonwebtoken</groupId>
+      <artifactId>jjwt-jackson</artifactId>
+      <version>${jwt.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk18on</artifactId>
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) {
             }