From c11539cccbb96c311ca65a8a3733f6bb6324285b Mon Sep 17 00:00:00 2001 From: mposolda Date: Mon, 14 Sep 2015 10:46:05 +0200 Subject: [PATCH] docs and javadoc fixes --- docbook/reference/en/en-US/modules/auth-spi.xml | 4 ++-- .../adapters/authentication/ClientCredentialsProvider.java | 2 +- .../adapters/authentication/JWTClientCredentialsProvider.java | 2 +- .../authenticators/client/JWTClientAuthenticator.java | 2 +- .../org/keycloak/protocol/oidc/OIDCWellKnownProvider.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docbook/reference/en/en-US/modules/auth-spi.xml b/docbook/reference/en/en-US/modules/auth-spi.xml index ff7f061c46..10cb89db71 100755 --- a/docbook/reference/en/en-US/modules/auth-spi.xml +++ b/docbook/reference/en/en-US/modules/auth-spi.xml @@ -898,7 +898,7 @@ public class SecretQuestionRequiredActionFactory implements RequiredActionFactor } ]]> - where the mysecret needs to be replaced with the real value of client secret. You can obtain it from client admin console. + where the mysecret needs to be replaced with the real value of client secret. You can obtain it from admin console from client configuration. @@ -906,7 +906,7 @@ public class SecretQuestionRequiredActionFactory implements RequiredActionFactor Authentication with signed JWT - This is based on the JWT Bearer Token Profiles for OAuth 2.0 specification. + This is based on the JWT Bearer Token Profiles for OAuth 2.0 specification. The client/adapter generates the JWT and signs it with his private key. The Keycloak then verifies the signed JWT with the client's public key and authenticates client based on it. diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/authentication/ClientCredentialsProvider.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/authentication/ClientCredentialsProvider.java index 80a0c4dc01..2c6a92dc95 100644 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/authentication/ClientCredentialsProvider.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/authentication/ClientCredentialsProvider.java @@ -14,7 +14,7 @@ import org.keycloak.adapters.KeycloakDeployment; * * You must specify a file * META-INF/services/org.keycloak.adapters.authentication.ClientCredentialsProvider in the WAR that this class is contained in (or in the JAR that is attached to the WEB-INF/lib or as jboss module - * if you want to share the implementation among more WARs). This file must have the fully qualified class name of all your ClientAuthenticatorFactory classes + * if you want to share the implementation among more WARs). * * NOTE: The SPI is not finished and method signatures are still subject to change in future versions (for example to support * authentication with client certificate) diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/authentication/JWTClientCredentialsProvider.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/authentication/JWTClientCredentialsProvider.java index d68c7cb8e7..1c8907e21c 100644 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/authentication/JWTClientCredentialsProvider.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/authentication/JWTClientCredentialsProvider.java @@ -13,7 +13,7 @@ import org.keycloak.util.Time; /** * Client authentication based on JWT signed by client private key . - * See specs for more details. + * See specs for more details. * * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientAuthenticator.java index 0c308abec3..96f81cbc28 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientAuthenticator.java @@ -27,7 +27,7 @@ import org.keycloak.services.Urls; /** * Client authentication based on JWT signed by client private key . - * See specs for more details. + * See specs for more details. * * This is server side, which verifies JWT from client_assertion parameter, where the assertion was created on adapter side by * org.keycloak.adapters.authentication.JWTClientCredentialsProvider diff --git a/services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProvider.java b/services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProvider.java index afd2a8a1c8..714c0d1da9 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProvider.java @@ -20,7 +20,7 @@ public class OIDCWellKnownProvider implements WellKnownProvider { public static final List DEFAULT_ID_TOKEN_SIGNING_ALG_VALUES_SUPPORTED = list("RS256"); - public static final List DEFAULT_GRANT_TYPES_SUPPORTED = list(OAuth2Constants.AUTHORIZATION_CODE, OAuth2Constants.REFRESH_TOKEN, OAuth2Constants.PASSWORD); + public static final List DEFAULT_GRANT_TYPES_SUPPORTED = list(OAuth2Constants.AUTHORIZATION_CODE, OAuth2Constants.REFRESH_TOKEN, OAuth2Constants.PASSWORD, OAuth2Constants.CLIENT_CREDENTIALS); public static final List DEFAULT_RESPONSE_TYPES_SUPPORTED = list(OAuth2Constants.CODE);