From d5e161eaef94fc3847d7620a750a370a2ea77a46 Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Tue, 6 Aug 2019 07:41:35 +0800 Subject: [PATCH] =?UTF-8?q?:memo:=20=E9=9B=86=E6=88=90=E5=8D=8E=E4=B8=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/me/zhyd/oauth/request/AuthHuaweiRequest.java | 6 +++--- src/test/java/me/zhyd/oauth/sdk/ThirdPartSdkTest.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/me/zhyd/oauth/request/AuthHuaweiRequest.java b/src/main/java/me/zhyd/oauth/request/AuthHuaweiRequest.java index ce30135..be33552 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthHuaweiRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthHuaweiRequest.java @@ -186,10 +186,10 @@ public class AuthHuaweiRequest extends AuthDefaultRequest { * @param object 接口返回的结果 */ private void checkResponse(JSONObject object) { + if (object.containsKey("NSP_STATUS")) { + throw new AuthException(object.getString("error")); + } if (object.containsKey("error")) { - if (!object.containsKey("sub_error") && !object.containsKey("error_description")) { - throw new AuthException(object.getString("error")); - } throw new AuthException(object.getString("sub_error") + ":" + object.getString("error_description")); } } diff --git a/src/test/java/me/zhyd/oauth/sdk/ThirdPartSdkTest.java b/src/test/java/me/zhyd/oauth/sdk/ThirdPartSdkTest.java index 30d1d71..9c89ed1 100644 --- a/src/test/java/me/zhyd/oauth/sdk/ThirdPartSdkTest.java +++ b/src/test/java/me/zhyd/oauth/sdk/ThirdPartSdkTest.java @@ -14,12 +14,12 @@ public class ThirdPartSdkTest { @Test public void huawei() { - String code = "CF1IE8WDUI7HR0cTOcl59SHBmIo0EGugnY99HTnLjH0BiCu5+maSDDejA7V2FJntFGfdTXY/jD68WZAVW2cMZoXrHW0LHVQ+uYqb498PkdI453sejJcaSIS6bBCZJBNzrYKGk4PYWc5OS/yuPorSSNRlXXhjN9selraIOF+TBMb7wzXDho7FVz/Es2rInRfttnr3AEaIvkg="; + String code = "CF1IvwdXw18r6LTfoRSgs+LrdP/DuO1VJJmAD0up2grQrSs3gcuyrt1O+jjWp7/TFiBy9IlPepNs/PUggcLe8cgjesqj1+DGXXojJsjEqsokFCCU0eJVt1F02zLDWH1+bq40HSlljXDaTvCBNrqWJJnIZhRetoV9pocrWPLZpYrx/h0iaC9T0GjMRVEXC//LnTAlTjg7"; HttpResponse response = HttpRequest.post("https://oauth-login.cloud.huawei.com/oauth2/v2/token") .form("grant_type", "authorization_code") .form("code", code) - .form("client_id", "100994535") - .form("client_secret", "22aea400bef603fef26d15a79c806eb477b35de0a529758f2a3b1bda32bfb80d") + .form("client_id", "100xxxxx") + .form("client_secret", "22aea400bef603xxxxxbfb80d") .form("redirect_uri", "http://localhost:8443/huawei/login") .execute(); System.out.println(response.body()); -- GitLab