修复 Wework::getUserById 方法重复json_decode问题 (#204)

* 修复 Wework::getUserById 方法重复json_decode问题 * 兼容 WeWork 非企业成员授权
overtrue · Nov 27, 2020 · ed6bb2d · ed6bb2d
1 parent a57a825
commit ed6bb2d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Providers/WeWork.php b/src/Providers/WeWork.php
@@ -141,8 +141,10 @@ protected function getUserId(string $token, string $code): array
 
         $response = \json_decode($response->getBody(), true) ?? [];
 
-        if (($response['errcode'] ?? 1) > 0 || empty($response['UserId'])) {
+        if (($response['errcode'] ?? 1) > 0 || (empty($response['UserId']) && empty($response['OpenId']))) {
             throw new AuthorizeFailedException('Failed to get user openid:' . $response['errmsg'] ?? 'Unknown.', $response);
+        } else if (empty($response['UserId'])) {
+            $this->detailed = false;
         }
 
         return $response;
@@ -173,7 +175,7 @@ protected function getUserById(string $userId): array
             throw new AuthorizeFailedException('Failed to get user:' . $response['errmsg'] ?? 'Unknown.', $response);
         }
 
-        return \json_decode($response->getBody(), true) ?? [];
+        return $response;
     }
 
     /**