From dc65768b9b8cdac9b87ada1eea60cfb904b23c5b Mon Sep 17 00:00:00 2001 From: janeluo Date: Sun, 17 Mar 2024 20:58:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DOpenID=20Connect=20metadata?= =?UTF-8?q?=20=E5=85=83=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9Ejson=E6=A0=BC=E5=BC=8F=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../endpoint/OpenidConfigurationEndpoint.java | 40 ++++++++----------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OpenidConfigurationEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OpenidConfigurationEndpoint.java index c1d449599..f4e2cc326 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OpenidConfigurationEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OpenidConfigurationEndpoint.java @@ -17,30 +17,23 @@ package org.dromara.maxkey.authz.oauth2.provider.wellknown.endpoint; -import java.util.HashSet; -import java.util.Set; - -import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; -import org.dromara.maxkey.authz.oauth2.provider.endpoint.AbstractEndpoint; -import org.dromara.maxkey.authz.oauth2.provider.wellknown.OpenidConfiguration; -import org.dromara.maxkey.entity.apps.oauth2.provider.ClientDetails; -import org.dromara.maxkey.pretty.impl.JsonPretty; -import org.dromara.maxkey.web.WebContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - import com.alibaba.cloud.commons.lang.StringUtils; - import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; +import org.dromara.maxkey.authz.oauth2.provider.endpoint.AbstractEndpoint; +import org.dromara.maxkey.authz.oauth2.provider.wellknown.OpenidConfiguration; +import org.dromara.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.dromara.maxkey.web.WebContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.HashSet; +import java.util.Set; @Tag(name = "2-1-OAuth v2.0 API文档模块") @Controller @@ -55,7 +48,7 @@ public class OpenidConfigurationEndpoint extends AbstractEndpoint { produces = "application/json", method={RequestMethod.POST, RequestMethod.GET}) @ResponseBody - public String configuration( + public OpenidConfiguration configuration( HttpServletRequest request, HttpServletResponse response, @RequestParam(value = "client_id", required = false) String client_id) { @@ -69,7 +62,7 @@ public class OpenidConfigurationEndpoint extends AbstractEndpoint { produces = "application/json", method={RequestMethod.POST, RequestMethod.GET}) @ResponseBody - public String configurationMetadata( + public OpenidConfiguration configurationMetadata( HttpServletRequest request, HttpServletResponse response, @PathVariable("instId") String instId, @@ -262,7 +255,8 @@ public class OpenidConfigurationEndpoint extends AbstractEndpoint { openidConfig.setClaims_supported(claims_supported); } - - return JsonPretty.getInstance().format(openidConfig,true); + + + return openidConfig; } }