From 89fc9903e5f684d78e7953cf1e6769a5aa78f9b5 Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Fri, 22 Mar 2019 18:03:26 +0800 Subject: [PATCH] =?UTF-8?q?:hankey:=20=E5=8E=BB=E6=8E=89=E9=9D=9E=E5=BC=BA?= =?UTF-8?q?=E5=88=B6=E7=9A=84=E4=BE=9D=E8=B5=96=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 ------ .../me/zhyd/oauth/request/AuthRequest.java | 12 ----------- .../zhyd/oauth/request/AuthWeiboRequest.java | 2 -- .../zhyd/oauth/request/BaseAuthRequest.java | 8 -------- .../java/me/zhyd/oauth/utils/IpUtils.java | 3 --- .../java/me/zhyd/oauth/AuthRequestTest.java | 20 ++++--------------- 6 files changed, 4 insertions(+), 47 deletions(-) diff --git a/pom.xml b/pom.xml index 2651865..898ff41 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,6 @@ 4.1.21 1.18.4 4.11 - 2.5 1.2.44 1.28.0 @@ -65,11 +64,6 @@ ${junit-version} test - - javax.servlet - servlet-api - ${servlet-api-version} - com.alibaba fastjson diff --git a/src/main/java/me/zhyd/oauth/request/AuthRequest.java b/src/main/java/me/zhyd/oauth/request/AuthRequest.java index 6f3b6fc..b74d0df 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthRequest.java @@ -3,9 +3,6 @@ package me.zhyd.oauth.request; import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.AuthResponse; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - /** * @author yadong.zhang (yadong.zhang0415(a)gmail.com) * @version 1.0 @@ -15,15 +12,6 @@ import java.io.IOException; */ public interface AuthRequest { - /** - * 自动跳转到认证页面 - * - * @param response response - */ - default void authorize(HttpServletResponse response) throws IOException { - throw new AuthException(ResponseStatus.NOT_IMPLEMENTED); - } - /** * 返回认证url，可自行跳转页面 */ diff --git a/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java index 7ef35d7..d58f258 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java @@ -13,8 +13,6 @@ import me.zhyd.oauth.utils.IpUtils; import me.zhyd.oauth.utils.StringUtils; import me.zhyd.oauth.utils.UrlBuilder; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; /** * @author yadong.zhang (yadong.zhang0415(a)gmail.com) diff --git a/src/main/java/me/zhyd/oauth/request/BaseAuthRequest.java b/src/main/java/me/zhyd/oauth/request/BaseAuthRequest.java index a0d73c6..b138e03 100644 --- a/src/main/java/me/zhyd/oauth/request/BaseAuthRequest.java +++ b/src/main/java/me/zhyd/oauth/request/BaseAuthRequest.java @@ -9,9 +9,6 @@ import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.utils.AuthConfigChecker; import me.zhyd.oauth.utils.UrlBuilder; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - /** * @author yadong.zhang (yadong.zhang0415(a)gmail.com) * @version 1.0 @@ -43,11 +40,6 @@ public abstract class BaseAuthRequest implements AuthRequest { .build(); } - @Override - public void authorize(HttpServletResponse response) throws IOException { - response.sendRedirect(this.authorize()); - } - @Override public String authorize() { String authorizeUrl = null; diff --git a/src/main/java/me/zhyd/oauth/utils/IpUtils.java b/src/main/java/me/zhyd/oauth/utils/IpUtils.java index eeec62c..48475ea 100644 --- a/src/main/java/me/zhyd/oauth/utils/IpUtils.java +++ b/src/main/java/me/zhyd/oauth/utils/IpUtils.java @@ -1,8 +1,5 @@ package me.zhyd.oauth.utils; -import lombok.extern.slf4j.Slf4j; - -import javax.servlet.http.HttpServletRequest; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/src/test/java/me/zhyd/oauth/AuthRequestTest.java b/src/test/java/me/zhyd/oauth/AuthRequestTest.java index 11ac2c6..29a4af3 100644 --- a/src/test/java/me/zhyd/oauth/AuthRequestTest.java +++ b/src/test/java/me/zhyd/oauth/AuthRequestTest.java @@ -4,7 +4,7 @@ import me.zhyd.oauth.config.AuthConfig; import me.zhyd.oauth.request.*; import org.junit.Test; -import javax.servlet.http.HttpServletResponse; +import java.io.IOException; /** * @author yadong.zhang (yadong.zhang0415(a)gmail.com) @@ -16,15 +16,12 @@ import javax.servlet.http.HttpServletResponse; public class AuthRequestTest { @Test - public void giteeTest() { - HttpServletResponse response = null; + public void giteeTest() throws IOException { AuthRequest authRequest = new AuthGiteeRequest(AuthConfig.builder() .clientId("clientId") .clientSecret("clientSecret") .redirectUri("redirectUri") .build()); - // 自动跳转到授权页面 - authRequest.authorize(response); // 返回授权页面，可自行调整 authRequest.authorize(); // 授权登录后会返回一个code，用这个code进行登录 @@ -32,15 +29,12 @@ public class AuthRequestTest { } @Test - public void githubTest() { - HttpServletResponse response = null; + public void githubTest() throws IOException { AuthRequest authRequest = new AuthGithubRequest(AuthConfig.builder() .clientId("clientId") .clientSecret("clientSecret") .redirectUri("redirectUri") .build()); - // 自动跳转到授权页面 - authRequest.authorize(response); // 返回授权页面，可自行调整 authRequest.authorize(); // 授权登录后会返回一个code，用这个code进行登录 @@ -48,15 +42,12 @@ public class AuthRequestTest { } @Test - public void weiboTest() { - HttpServletResponse response = null; + public void weiboTest() throws IOException { AuthRequest authRequest = new AuthWeiboRequest(AuthConfig.builder() .clientId("clientId") .clientSecret("clientSecret") .redirectUri("redirectUri") .build()); - // 自动跳转到授权页面 - authRequest.authorize(response); // 返回授权页面，可自行调整 authRequest.authorize(); // 授权登录后会返回一个code，用这个code进行登录 @@ -65,14 +56,11 @@ public class AuthRequestTest { @Test public void dingdingTest() { - HttpServletResponse response = null; AuthRequest authRequest = new AuthDingTalkRequest(AuthConfig.builder() .clientId("dingoa2q6o3fomfk6vdqzy") .clientSecret("d5w75-R-yNtQsq_Ya_r50gOsKOy9WlmrlUOJkUJXKvsQp7NDPRHsj0epJriiN3yO") .redirectUri("http://61.149.7.121:8443/oauth/dingtalk/callback") .build()); - // 自动跳转到授权页面 -// authRequest.authorize(response); // 返回授权页面，可自行调整 String url = authRequest.authorize(); System.out.println(url); -- GitLab