Merge branch 'bugfix/GONRG-1211-Update_core_common_version' into 'integration-master'

GONRG-1211 Update core common version with url normalization fix

Closes GONRG-1211

See merge request go3-nrg/platform/security-and-compliance/legal!33

legal-core/src/main/java/org/opengroup/osdu/legal/di/EntitlementsClientFactory.java

@@ -17,6 +17,8 @@ package org.opengroup.osdu.legal.di;
 import org.opengroup.osdu.core.common.entitlements.EntitlementsAPIConfig;
 import org.opengroup.osdu.core.common.entitlements.EntitlementsFactory;
 import org.opengroup.osdu.core.common.entitlements.IEntitlementsFactory;
+import org.opengroup.osdu.core.common.http.json.HttpResponseBodyMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 import org.springframework.context.annotation.Lazy;
@@ -32,6 +34,9 @@ public class EntitlementsClientFactory extends AbstractFactoryBean<IEntitlements
 	@Value("${AUTHORIZE_API_KEY:}")
 	public String AUTHORIZE_API_KEY;
 
+	@Autowired
+	private HttpResponseBodyMapper bodyMapper;
+
 	@Override
 	protected IEntitlementsFactory createInstance() throws Exception {
 
@@ -40,7 +45,8 @@ public class EntitlementsClientFactory extends AbstractFactoryBean<IEntitlements
 						.builder()
 						.rootUrl(AUTHORIZE_API)
 						.apiKey(AUTHORIZE_API_KEY)
-						.build());
+						.build(),
+				bodyMapper);
 	}
 
 	@Override

pom.xml

@@ -9,7 +9,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <docker.image.prefix>opendes</docker.image.prefix>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <os-core-common.version>0.3.6</os-core-common.version>
+        <os-core-common.version>0.3.21</os-core-common.version>
     </properties>
 
     <licenses>

provider/legal-gcp/src/main/java/org/opengroup/osdu/legal/countries/CloudStorageCredential.java

@@ -16,6 +16,9 @@ import com.google.auth.oauth2.GoogleCredentials;
 import com.google.common.net.HttpHeaders;
 import com.google.gson.JsonObject;
 
+import com.google.gson.JsonParser;
+import java.util.Objects;
+import org.apache.commons.lang3.StringUtils;
 import org.opengroup.osdu.core.common.http.HttpClient;
 import org.opengroup.osdu.core.common.http.HttpRequest;
 import org.opengroup.osdu.core.common.http.HttpResponse;
@@ -41,6 +44,7 @@ public class CloudStorageCredential extends GoogleCredentials {
 
     private final transient TenantInfo tenant;
     private final transient HttpClient httpClient;
+    static final transient JsonParser parser = new JsonParser();
 
     public CloudStorageCredential(TenantInfo tenant) {
         this.tenant = tenant;
@@ -79,9 +83,9 @@ public class CloudStorageCredential extends GoogleCredentials {
                         "assertion", signedJwt))
                 .build();
         HttpResponse response = this.httpClient.send(request);
-        JsonObject jsonResult = response.getAsJsonObject();
+        JsonObject jsonResult = StringUtils.isBlank(response.getBody()) ? null : parser.parse(response.getBody()).getAsJsonObject();
 
-        if (!response.isSuccessCode() || !jsonResult.has("access_token")) {
+        if (!response.isSuccessCode() || Objects.isNull(jsonResult) ||!jsonResult.has("access_token")) {
             throw new CompletionException("Error retrieving refresh token from Google. " + response.getBody(),
                     response.getException());
         }