This commit is contained in:
MaxKey
2021-03-27 08:37:02 +08:00
parent 97b3a9c08e
commit 63411e2dc5
6 changed files with 10 additions and 12 deletions

View File

@@ -24,8 +24,6 @@ package org.maxkey.constants;
*/
public final class ConstantsProtocols {
public static final String DESKTOP = "Desktop";
public static final String BASIC = "Basic";
public static final String EXTEND_API = "Extend_API";

View File

@@ -41,14 +41,14 @@ import io.swagger.annotations.ApiOperation;
* @author Crystal.Sea
*
*/
@Api(tags = "认证地址文档模块")
@Api(tags = "认证地址文档模块")
@Controller
public class AuthorizeEndpoint extends AuthorizeBaseEndpoint{
@Autowired
AppsCasDetailsService casDetailsService;
//all single sign on url
@ApiOperation(value = "认证地址接口", notes = "参数应用ID分发到不同应用的认证地址",httpMethod="GET")
@ApiOperation(value = "认证地址接口", notes = "参数应用ID分发到不同应用的认证地址",httpMethod="GET")
@RequestMapping("/authz/{id}")
public ModelAndView authorize(
HttpServletRequest request,
@@ -75,9 +75,7 @@ public class AuthorizeEndpoint extends AuthorizeBaseEndpoint{
modelAndView=WebContext.forward("/authz/cas/"+id);
}else if (application.getProtocol().equalsIgnoreCase(ConstantsProtocols.JWT)){
modelAndView=WebContext.forward("/authz/jwt/"+id);
}else if (application.getProtocol().equalsIgnoreCase(ConstantsProtocols.DESKTOP)){
modelAndView=WebContext.forward("/authz/desktop/"+id);
}else if (application.getProtocol().equalsIgnoreCase(ConstantsProtocols.BASIC)){
}else if (application.getProtocol().equalsIgnoreCase(ConstantsProtocols.BASIC)){
modelAndView=WebContext.redirect(application.getLoginUrl());
}

View File

@@ -156,6 +156,7 @@ public class CasAuthorizeEndpoint extends CasBaseAuthorizeEndpoint{
* @param casService
* @return
*/
@ApiOperation(value = "CAS注销接口", notes = "CAS注销接口",httpMethod="GET")
@RequestMapping("/authz/cas/logout")
public ModelAndView logout(
HttpServletRequest request,

View File

@@ -64,7 +64,7 @@ public class JwtAuthorizeEndpoint extends AuthorizeBaseEndpoint{
@Autowired
ApplicationConfig applicationConfig;
@ApiOperation(value = "JWT<EFBFBD><EFBFBD>֤<EFBFBD><EFBFBD>ַ<EFBFBD>ӿ<EFBFBD>", notes = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD><EFBFBD>ID",httpMethod="GET")
@ApiOperation(value = "JWT应用ID认证接口", notes = "应用ID",httpMethod="GET")
@RequestMapping("/authz/jwt/{id}")
public ModelAndView authorize(
HttpServletRequest request,

View File

@@ -82,7 +82,7 @@ public class BaseAppContorller {
protected void encodeSharedPassword(Apps application){
if(application.getCredential()!=Apps.CREDENTIALS.SHARED){
if(application.getProtocol().equals(ConstantsProtocols.DESKTOP)||application.getProtocol().equals(ConstantsProtocols.FORMBASED)){
if(application.getProtocol().equals(ConstantsProtocols.FORMBASED)){
if(StringUtils.isNotEmpty(application.getSharedPassword())){
application.setSharedPassword(ReciprocalUtils.encode(application.getSharedPassword()));
}
@@ -92,7 +92,7 @@ public class BaseAppContorller {
protected void decoderSharedPassword(Apps application){
if(application.getCredential()!=Apps.CREDENTIALS.SHARED){
if(application.getProtocol().equals(ConstantsProtocols.DESKTOP)||application.getProtocol().equals(ConstantsProtocols.FORMBASED)){
if(application.getProtocol().equals(ConstantsProtocols.FORMBASED)){
if(StringUtils.isNotEmpty(application.getSharedPassword())){
application.setSharedPassword(ReciprocalUtils.decoder(application.getSharedPassword()));
}

View File

@@ -191,8 +191,9 @@ public class AppListController {
UserInfo userInfo = WebContext.getUserInfo();
if (credential == Apps.CREDENTIALS.USER_DEFINED) {
appUsers = appUsersService.load(new Accounts(userInfo.getId(), appId));
if (protocol.equalsIgnoreCase(ConstantsProtocols.DESKTOP) || protocol.equalsIgnoreCase(ConstantsProtocols.FORMBASED)
|| protocol.equalsIgnoreCase(ConstantsProtocols.BASIC) || protocol.equalsIgnoreCase(ConstantsProtocols.EXTEND_API)) {
if (protocol.equalsIgnoreCase(ConstantsProtocols.FORMBASED)
|| protocol.equalsIgnoreCase(ConstantsProtocols.BASIC)
|| protocol.equalsIgnoreCase(ConstantsProtocols.EXTEND_API)) {
modelAndView.addObject("username", true);
modelAndView.addObject("password", true);