diff --git a/pom.xml b/pom.xml
index 265186506ffd944083b28a3655882ad76d1923c6..898ff41a0d5836b5f1465e1a1f87ae4d096cd999 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 6f3b6fce24f4bf8b9d95ac680a200062855961df..b74d0df151c25f01d6233ea3930a604912f224c5 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 7ef35d7b35ed4d34f8f5e807223951fd762e6fa7..d58f2585785bb440f92e180390972555ae0ceeba 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 a0d73c657096ceda10b9a3692350e5c325459f85..b138e038bc6ab46f870a46eb67e65dac1e5bf7b6 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 eeec62c579607d1beb25efc8bfcf9650ea24c055..48475eaa9dad97913f51103138c7e6a5d16e7e72 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 11ac2c6ee2054313d74fd9eacbc377c31b4730b4..29a4af314790dfb4b4a2debf239867168bab4e25 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);