diff --git a/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java index dcedd69fa..3730ce452 100644 --- a/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java @@ -38,6 +38,7 @@ import org.maxkey.crypto.jose.keystore.JWKSetKeyStore; import org.maxkey.entity.apps.Apps; import org.maxkey.entity.apps.AppsJwtDetails; import org.maxkey.persistence.service.AppsJwtDetailsService; +import org.maxkey.pretty.PrettyFactory; import org.maxkey.util.Instance; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; @@ -154,8 +155,10 @@ public class JwtAuthorizeEndpoint extends AuthorizeBaseEndpoint{ jwkSetString = jwkSetString + "," +jwtDetails.getAlgorithmKey(); } } + JWKSetKeyStore jwkSetKeyStore = new JWKSetKeyStore("{\"keys\": [" + jwkSetString + "]}"); - return jwkSetKeyStore.getJwkSet().toPublicJWKSet().toString(); + return PrettyFactory.getJsonPretty().format( + jwkSetKeyStore.getJwkSet().toPublicJWKSet().toString()); } } diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java index b1530569e..9485778d9 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java @@ -46,6 +46,7 @@ import org.maxkey.crypto.jose.keystore.JWKSetKeyStore; import org.maxkey.util.HttpEncoder; import org.maxkey.entity.apps.Apps; import org.maxkey.entity.apps.oauth2.provider.ClientDetails; +import org.maxkey.pretty.PrettyFactory; import org.maxkey.web.WebConstants; import org.maxkey.web.WebContext; import org.slf4j.Logger; @@ -309,7 +310,8 @@ public class AuthorizationEndpoint extends AbstractEndpoint { } JWKSetKeyStore jwkSetKeyStore = new JWKSetKeyStore("{\"keys\": [" + jwkSetString + "]}"); - return jwkSetKeyStore.getJwkSet().toPublicJWKSet().toString(); + return PrettyFactory.getJsonPretty().format( + jwkSetKeyStore.getJwkSet().toPublicJWKSet().toString()); } // We need explicit approval from the user. diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java index 631875b4a..aac74a75e 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java @@ -36,7 +36,6 @@ import org.maxkey.authz.oauth2.provider.ClientDetailsService; import org.maxkey.authz.oauth2.provider.OAuth2Authentication; import org.maxkey.authz.oauth2.provider.token.DefaultTokenServices; import org.maxkey.constants.ContentType; -import org.maxkey.crypto.jose.keystore.JWKSetKeyStore; import org.maxkey.crypto.jwt.encryption.service.impl.DefaultJwtEncryptionAndDecryptionService; import org.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService; import org.maxkey.entity.UserInfo; @@ -56,9 +55,7 @@ import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; -import com.nimbusds.jose.EncryptionMethod; import com.nimbusds.jose.JOSEException; -import com.nimbusds.jose.JWEAlgorithm; import com.nimbusds.jose.JWEHeader; import com.nimbusds.jose.JWEObject; import com.nimbusds.jose.JWSAlgorithm; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsList.ftl index 6f54ef910..7f6a5bd3f 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsList.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsList.ftl @@ -96,14 +96,14 @@