diff --git a/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java b/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java index c75c15b8b334a7456d4c0764fb8c9b1e55d4f381..2675d97215ee761186146cba3112b6d1f2c49fa3 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java @@ -71,13 +71,13 @@ public class AuthBaiduRequest extends AuthDefaultRequest { } @Override - public AuthResponse revoke(AuthToken authToken) { + public AuthResponse revoke(AuthToken authToken) { String response = doGetRevoke(authToken); JSONObject object = JSONObject.parseObject(response); this.checkResponse(object); // 返回1表示取消授权成功,否则失败 AuthResponseStatus status = object.getIntValue("result") == 1 ? AuthResponseStatus.SUCCESS : AuthResponseStatus.FAILURE; - return AuthResponse.builder().code(status.getCode()).msg(status.getMsg()).build(); + return AuthResponse.builder().code(status.getCode()).msg(status.getMsg()).build(); } @Override diff --git a/src/main/java/me/zhyd/oauth/request/AuthLineRequest.java b/src/main/java/me/zhyd/oauth/request/AuthLineRequest.java index 722d201c7e0f4bb2c5cabc83c2ede86de41ef64c..f632341c2d9f44dcc6de840623bb95cd581ad59f 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthLineRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthLineRequest.java @@ -75,7 +75,7 @@ public class AuthLineRequest extends AuthDefaultRequest { } @Override - public AuthResponse revoke(AuthToken authToken) { + public AuthResponse revoke(AuthToken authToken) { Map params = new HashMap<>(5); params.put("access_token", authToken.getAccessToken()); params.put("client_id", config.getClientId()); @@ -84,7 +84,7 @@ public class AuthLineRequest extends AuthDefaultRequest { JSONObject object = JSONObject.parseObject(userInfo); // 返回1表示取消授权成功,否则失败 AuthResponseStatus status = object.getBooleanValue("revoked") ? AuthResponseStatus.SUCCESS : AuthResponseStatus.FAILURE; - return AuthResponse.builder().code(status.getCode()).msg(status.getMsg()).build(); + return AuthResponse.builder().code(status.getCode()).msg(status.getMsg()).build(); } @Override diff --git a/src/main/java/me/zhyd/oauth/request/AuthOktaRequest.java b/src/main/java/me/zhyd/oauth/request/AuthOktaRequest.java index 150ed60e61c7b865e290c8219a483fb341f076d0..03d4d444ab446735e4a21f56f79bad048172e2c8 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthOktaRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthOktaRequest.java @@ -100,7 +100,7 @@ public class AuthOktaRequest extends AuthDefaultRequest { } @Override - public AuthResponse revoke(AuthToken authToken) { + public AuthResponse revoke(AuthToken authToken) { Map params = new HashMap<>(4); params.put("token", authToken.getAccessToken()); params.put("token_type_hint", "access_token"); @@ -109,7 +109,7 @@ public class AuthOktaRequest extends AuthDefaultRequest { .add("Authorization", "Basic " + Base64Utils.encode(config.getClientId().concat(":").concat(config.getClientSecret()))); new HttpUtils(config.getHttpConfig()).post(revokeUrl(authToken), params, header, false); AuthResponseStatus status = AuthResponseStatus.SUCCESS; - return AuthResponse.builder().code(status.getCode()).msg(status.getMsg()).build(); + return AuthResponse.builder().code(status.getCode()).msg(status.getMsg()).build(); } private void checkResponse(JSONObject object) { diff --git a/src/main/java/me/zhyd/oauth/request/AuthRequest.java b/src/main/java/me/zhyd/oauth/request/AuthRequest.java index e849bbb2a42725b908295d91ed742e9df71a4a06..53c41b49cd1d9fdb01c43d09450eb6f0ef6deee9 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthRequest.java @@ -79,7 +79,7 @@ public interface AuthRequest { * @param authToken 登录成功后返回的Token信息 * @return AuthResponse */ - default AuthResponse revoke(AuthToken authToken) { + default AuthResponse revoke(AuthToken authToken) { throw new AuthException(AuthResponseStatus.NOT_IMPLEMENTED); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthSlackRequest.java b/src/main/java/me/zhyd/oauth/request/AuthSlackRequest.java index 95c46491ee6f990a897815f40bba4dcce816a34e..c6b4a27bb962d4068c19dffee7c038ebd5195031 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthSlackRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthSlackRequest.java @@ -75,7 +75,7 @@ public class AuthSlackRequest extends AuthDefaultRequest { } @Override - public AuthResponse revoke(AuthToken authToken) { + public AuthResponse revoke(AuthToken authToken) { HttpHeader header = new HttpHeader() .add("Content-Type", "application/x-www-form-urlencoded") .add("Authorization", "Bearer ".concat(authToken.getAccessToken())); @@ -85,7 +85,7 @@ public class AuthSlackRequest extends AuthDefaultRequest { this.checkResponse(object); // 返回1表示取消授权成功,否则失败 AuthResponseStatus status = object.getBooleanValue("revoked") ? AuthResponseStatus.SUCCESS : AuthResponseStatus.FAILURE; - return AuthResponse.builder().code(status.getCode()).msg(status.getMsg()).build(); + return AuthResponse.builder().code(status.getCode()).msg(status.getMsg()).build(); } /** diff --git a/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java index 509e1aac847cde71cb9c49198245d34f09d57961..85bfb31c5caf025fbb1622c150fcd87c7f16d6fd 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java @@ -100,17 +100,17 @@ public class AuthWeiboRequest extends AuthDefaultRequest { } @Override - public AuthResponse revoke(AuthToken authToken) { + public AuthResponse revoke(AuthToken authToken) { String response = doGetRevoke(authToken); JSONObject object = JSONObject.parseObject(response); if (object.containsKey("error")) { - return AuthResponse.builder() + return AuthResponse.builder() .code(AuthResponseStatus.FAILURE.getCode()) .msg(object.getString("error")) .build(); } // 返回 result = true 表示取消授权成功,否则失败 AuthResponseStatus status = object.getBooleanValue("result") ? AuthResponseStatus.SUCCESS : AuthResponseStatus.FAILURE; - return AuthResponse.builder().code(status.getCode()).msg(status.getMsg()).build(); + return AuthResponse.builder().code(status.getCode()).msg(status.getMsg()).build(); } } diff --git a/src/test/java/me/zhyd/oauth/request/AuthExtendRequest.java b/src/test/java/me/zhyd/oauth/request/AuthExtendRequest.java index 6bccad726a522ae88f0df8d351395aa016cb4bc2..c7d88c8ab7a320256d59dc7b6b9a43acf9a5bd89 100644 --- a/src/test/java/me/zhyd/oauth/request/AuthExtendRequest.java +++ b/src/test/java/me/zhyd/oauth/request/AuthExtendRequest.java @@ -73,8 +73,8 @@ public class AuthExtendRequest extends AuthDefaultRequest { * @return AuthResponse */ @Override - public AuthResponse revoke(AuthToken authToken) { - return AuthResponse.builder() + public AuthResponse revoke(AuthToken authToken) { + return AuthResponse.builder() .code(AuthResponseStatus.SUCCESS.getCode()) .msg(AuthResponseStatus.SUCCESS.getMsg()) .build(); diff --git a/src/test/java/me/zhyd/oauth/request/AuthExtendRequestTest.java b/src/test/java/me/zhyd/oauth/request/AuthExtendRequestTest.java index c961cf16d2ba29b8cd49e8b367dc8c19613e0cf2..92da71227deee183c5af45e30675c45f3dba1790 100644 --- a/src/test/java/me/zhyd/oauth/request/AuthExtendRequestTest.java +++ b/src/test/java/me/zhyd/oauth/request/AuthExtendRequestTest.java @@ -61,7 +61,7 @@ public class AuthExtendRequestTest { .redirectUri("http://redirectUri") .build()); - AuthResponse response = request.revoke(AuthToken.builder().build()); + AuthResponse response = request.revoke(AuthToken.builder().build()); Assert.assertNotNull(response); System.out.println(JSON.toJSONString(response)); }