From 43b679fb40929c01014c6981a0b67588894ce18c Mon Sep 17 00:00:00 2001
From: "yadong.zhang" <yadong.zhang0415@gmail.com>
Date: Thu, 6 May 2021 20:20:03 +0800
Subject: [PATCH] :rotating_light: Modify method return value

---
 .../jap/ids/endpoint/AuthorizationEndpoint.java        | 10 +++++-----
 .../com/fujieid/jap/ids/endpoint/LoginEndpoint.java    |  4 ++--
 .../com/fujieid/jap/ids/endpoint/LogoutEndpoint.java   |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jap-ids/src/main/java/com/fujieid/jap/ids/endpoint/AuthorizationEndpoint.java b/jap-ids/src/main/java/com/fujieid/jap/ids/endpoint/AuthorizationEndpoint.java
index b0b9d79..b2d256a 100644
--- a/jap-ids/src/main/java/com/fujieid/jap/ids/endpoint/AuthorizationEndpoint.java
+++ b/jap-ids/src/main/java/com/fujieid/jap/ids/endpoint/AuthorizationEndpoint.java
@@ -58,7 +58,7 @@ public class AuthorizationEndpoint extends AbstractEndpoint {
      * @return Callback url or authorization url
      * @throws IOException IOException
      */
-    public IdsResponse<String, Object> authorize(HttpServletRequest request) throws IOException {
+    public IdsResponse<String, String> authorize(HttpServletRequest request) throws IOException {
         IdsRequestParam param = IdsRequestParamProvider.parseRequest(request);
 
         ClientDetail clientDetail = JapIds.getContext().getClientDetailService().getByClientId(param.getClientId());
@@ -71,10 +71,10 @@ public class AuthorizationEndpoint extends AbstractEndpoint {
         if (JapIds.isAuthenticated(request)) {
             UserInfo userInfo = JapIds.getUserInfo(request);
             String url = generateResponseUrl(param, param.getResponseType(), clientDetail, userInfo);
-            return new IdsResponse<String, Object>().data(url);
+            return new IdsResponse<String, String>().data(url);
         }
 
-        return new IdsResponse<String, Object>()
+        return new IdsResponse<String, String>()
             .data(OauthUtil.createAuthorizeUrl(JapIds.getIdsConfig().getLoginPageUrl(), param));
     }
 
@@ -84,7 +84,7 @@ public class AuthorizationEndpoint extends AbstractEndpoint {
      * @param request current request
      * @return Return the callback url (with parameters such as code)
      */
-    public IdsResponse<String, Object> agree(HttpServletRequest request) {
+    public IdsResponse<String, String> agree(HttpServletRequest request) {
         IdsRequestParam param = IdsRequestParamProvider.parseRequest(request);
 
         // The scope checked by the user may be inconsistent with the scope passed in the current request
@@ -107,7 +107,7 @@ public class AuthorizationEndpoint extends AbstractEndpoint {
         String responseType = param.getResponseType();
         UserInfo userInfo = JapIds.getUserInfo(request);
         String url = generateResponseUrl(param, responseType, clientDetail, userInfo);
-        return new IdsResponse<String, Object>().data(url);
+        return new IdsResponse<String, String>().data(url);
     }
 
     /**
diff --git a/jap-ids/src/main/java/com/fujieid/jap/ids/endpoint/LoginEndpoint.java b/jap-ids/src/main/java/com/fujieid/jap/ids/endpoint/LoginEndpoint.java
index be46e86..29be6c1 100644
--- a/jap-ids/src/main/java/com/fujieid/jap/ids/endpoint/LoginEndpoint.java
+++ b/jap-ids/src/main/java/com/fujieid/jap/ids/endpoint/LoginEndpoint.java
@@ -98,7 +98,7 @@ public class LoginEndpoint extends AbstractEndpoint {
      * @param request current request
      * @return Confirm authorization page
      */
-    public IdsResponse<String, Object> signin(HttpServletRequest request) {
+    public IdsResponse<String, String> signin(HttpServletRequest request) {
         IdsConfig idsConfig = JapIds.getIdsConfig();
         String username = request.getParameter(idsConfig.getUsernameField());
         String password = request.getParameter(idsConfig.getPasswordField());
@@ -124,7 +124,7 @@ public class LoginEndpoint extends AbstractEndpoint {
             redirectUri = JapIds.getIdsConfig().getConfirmPageUrl();
         }
 
-        return new IdsResponse<String, Object>()
+        return new IdsResponse<String, String>()
             .data(ObjectUtils.appendIfNotEndWith(redirectUri, "?") + request.getQueryString());
     }
 }
diff --git a/jap-ids/src/main/java/com/fujieid/jap/ids/endpoint/LogoutEndpoint.java b/jap-ids/src/main/java/com/fujieid/jap/ids/endpoint/LogoutEndpoint.java
index 81d1be4..7e7eebc 100644
--- a/jap-ids/src/main/java/com/fujieid/jap/ids/endpoint/LogoutEndpoint.java
+++ b/jap-ids/src/main/java/com/fujieid/jap/ids/endpoint/LogoutEndpoint.java
@@ -29,10 +29,10 @@ import javax.servlet.http.HttpServletRequest;
  */
 public class LogoutEndpoint extends AbstractEndpoint {
 
-    public IdsResponse<String, Object> logout(HttpServletRequest request) {
+    public IdsResponse<String, String> logout(HttpServletRequest request) {
         JapIds.removeUserInfo(request);
         request.getSession().invalidate();
-        return new IdsResponse<String, Object>()
+        return new IdsResponse<String, String>()
             .data(JapIds.getIdsConfig().getLogoutRedirectUrl());
     }
 }
-- 
GitLab