admin/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2025-12-06 17:08:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复OpenID Connect metadata 元数据接口接口返回json格式不正确

Browse Source
This commit is contained in:
janeluo 2024-03-17 20:58:32 +08:00
parent 522c581320
commit dc65768b9b
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OpenidConfigurationEndpoint.java
View File

@ -17,30 +17,23 @@
package org.dromara.maxkey.authz.oauth2.provider.wellknown.endpoint; 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 com.alibaba.cloud.commons.lang.StringUtils;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; 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文档模块") @Tag(name = "2-1-OAuth v2.0 API文档模块")
@Controller @Controller
@ -55,7 +48,7 @@ public class OpenidConfigurationEndpoint extends AbstractEndpoint {
produces = "application/json", produces = "application/json",
method={RequestMethod.POST, RequestMethod.GET}) method={RequestMethod.POST, RequestMethod.GET})
@ResponseBody @ResponseBody
public String configuration( public OpenidConfiguration configuration(
HttpServletRequest request, HttpServletRequest request,
HttpServletResponse response, HttpServletResponse response,
@RequestParam(value = "client_id", required = false) String client_id) { @RequestParam(value = "client_id", required = false) String client_id) {
@ -69,7 +62,7 @@ public class OpenidConfigurationEndpoint extends AbstractEndpoint {
produces = "application/json", produces = "application/json",
method={RequestMethod.POST, RequestMethod.GET}) method={RequestMethod.POST, RequestMethod.GET})
@ResponseBody @ResponseBody
public String configurationMetadata( public OpenidConfiguration configurationMetadata(
HttpServletRequest request, HttpServletRequest request,
HttpServletResponse response, HttpServletResponse response,
@PathVariable("instId") String instId, @PathVariable("instId") String instId,
@ -262,7 +255,8 @@ public class OpenidConfigurationEndpoint extends AbstractEndpoint {
openidConfig.setClaims_supported(claims_supported); openidConfig.setClaims_supported(claims_supported);
} }
return JsonPretty.getInstance().format(openidConfig,true);
return openidConfig;
} }
} }