diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java index d666b3d2c..773130f7b 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeCredentialEndpoint.java @@ -49,6 +49,7 @@ public class AuthorizeCredentialEndpoint extends AuthorizeBaseEndpoint{ modelAndView.addObject("setpassword", true); modelAndView.addObject("uid", WebContext.getUserInfo().getId()); modelAndView.addObject("appId", appId); + modelAndView.addObject("appName",getApp(appId).getName()); modelAndView.addObject("redirect_uri", redirect_uri); return modelAndView; } diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java index 08ce99fd1..cfe09466d 100644 --- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java @@ -73,7 +73,7 @@ public class FormBasedAuthorizeEndpoint extends AuthorizeBaseEndpoint{ _logger.debug("Accounts "+appUser); if(appUser == null){ - return generateInitCredentialModelAndView(id,"/authorize/formbased/"+id); + return generateInitCredentialModelAndView(id,"/authz/formbased/"+id); }else{ formBasedDetails.setAppUser(appUser); diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/authorize/init_sso_credential.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/authorize/init_sso_credential.ftl index d097ff283..e5eb66c2f 100644 --- a/maxkey-web-maxkey/src/main/resources/templates/views/authorize/init_sso_credential.ftl +++ b/maxkey-web-maxkey/src/main/resources/templates/views/authorize/init_sso_credential.ftl @@ -2,19 +2,24 @@ <#include "authorize_common.ftl"> - SSO Credential Init + <#include "../layout/common.cssjs.ftl"> + Single Sign-On Credential Initialize -
- + +
- - + + + + + + - - + + @@ -29,7 +34,7 @@ - +
<@locale code="userinfo.appaccouts.relatedUsername" /><@locale code="account.appName" />${appName}
<@locale code="account.relatedUsername" />
<@locale code="userinfo.appaccouts.relatedPassword" /><@locale code="account.relatedPassword" />
uid
"/>"/>