diff --git a/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/AuthParameterProviderFactory.java b/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/AuthParameterProviderFactory.java index d6b9202f77..891557791b 100644 --- a/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/AuthParameterProviderFactory.java +++ b/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/AuthParameterProviderFactory.java @@ -4,8 +4,6 @@ import org.alfresco.utility.data.AisToken; import org.alfresco.utility.data.auth.DataAIS; import org.alfresco.utility.model.UserModel; import org.apache.chemistry.opencmis.commons.SessionParameter; -import org.keycloak.authorization.client.util.HttpResponseException; -import org.keycloak.representations.AccessTokenResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -86,9 +84,9 @@ public class AuthParameterProviderFactory parameters.put(SessionParameter.OAUTH_REFRESH_TOKEN, aisToken.getRefreshToken()); parameters.put(SessionParameter.OAUTH_EXPIRATION_TIMESTAMP, String.valueOf(System.currentTimeMillis() + (aisToken.getExpiresIn() * 1000))); // getExpiresIn is in seconds - parameters.put(SessionParameter.OAUTH_TOKEN_ENDPOINT, cmisProperties.aisProperty().getAdapterConfig().getAuthServerUrl() + parameters.put(SessionParameter.OAUTH_TOKEN_ENDPOINT, cmisProperties.aisProperty().getAuthServerUrl() + "/realms/alfresco/protocol/openid-connect/token"); - parameters.put(SessionParameter.OAUTH_CLIENT_ID, cmisProperties.aisProperty().getAdapterConfig().getResource()); + parameters.put(SessionParameter.OAUTH_CLIENT_ID, cmisProperties.aisProperty().getResource()); return parameters; } @@ -110,10 +108,10 @@ public class AuthParameterProviderFactory // Attempt to get an access token for userModel from AIS aisToken = dataAIS.perform().getAccessToken(userModel); } - catch (HttpResponseException e) + catch (AssertionError e) { // Trying to authenticate with invalid user credentials so return an invalid access token - if (e.getStatusCode() == 401) + if (e.getMessage().contains("invalid_grant")) { STEP(String.format("%s Invalid user credentials were provided %s:%s. Using invalid token for reqest.", STEP_PREFIX, userModel.getUsername(), userModel.getPassword())); diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestAisAuthentication.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestAisAuthentication.java index 5fe12f930f..2c33eda6ad 100644 --- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestAisAuthentication.java +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestAisAuthentication.java @@ -30,7 +30,6 @@ import static org.alfresco.utility.report.log.Step.STEP; import org.alfresco.utility.data.AisToken; import org.alfresco.utility.data.auth.DataAIS; import org.alfresco.utility.model.UserModel; -import org.keycloak.authorization.client.util.HttpResponseException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -86,12 +85,11 @@ public class RestAisAuthentication // Attempt to get an access token for userModel from AIS aisToken = dataAIS.perform().getAccessToken(userModel); } - catch (HttpResponseException e) + catch (AssertionError e) { // Trying to authenticate with invalid user credentials or disabled // user so return an invalid access token - String httpResponse = new String(e.getBytes()); - if (e.getStatusCode() == 401 || httpResponse.contains(USER_DISABLED_MSG)) + if (e.getMessage().contains("invalid_grant")) { STEP(String.format("%s User disabled or invalid user credentials were provided %s:%s. Using invalid token for request.", STEP_PREFIX, userModel.getUsername(), userModel.getPassword())); diff --git a/pom.xml b/pom.xml index 3878140982..0abeb08b4b 100644 --- a/pom.xml +++ b/pom.xml @@ -123,7 +123,7 @@ 8.0.30 8 2.7.4 - 3.0.61 + 4.0.0 5.2.0 1.11 1.7