Merge branch 'use_partition_ff_fix' into 'master'

Incorporate core-common fix to partition service feature flag implementation

See merge request !303

pom.xml

@@ -31,7 +31,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- <springfox.version>3.0.0</springfox.version> -->
         <openapi.version>1.6.9</openapi.version>
-        <osdu.oscorecommon.version>0.19.0-rc3</osdu.oscorecommon.version>
+        <osdu.oscorecommon.version>0.19.0-rc8</osdu.oscorecommon.version>
         <log4j2.version>2.17.1</log4j2.version>
         <gson.version>2.8.9</gson.version>
         <json-smart.version>2.4.7</json-smart.version>

provider/register-azure/pom.xml

@@ -30,7 +30,7 @@
     <version>0.19.0-SNAPSHOT</version>
     <properties>
         <osdu.corelibazure.version>0.18.0</osdu.corelibazure.version>
-        <osdu.oscorecommon.version>0.19.0-rc3</osdu.oscorecommon.version>
+        <osdu.oscorecommon.version>0.19.0-rc8</osdu.oscorecommon.version>
         <junit-jupiter.version>5.6.0</junit-jupiter.version>
         <mockito-junit-jupiter.version>2.23.0</mockito-junit-jupiter.version>
         <oauth2-oidc-sdk.version>6.5</oauth2-oidc-sdk.version>

provider/register-azure/src/main/java/org/opengroup/osdu/register/provider/azure/util/ServiceAccountJwtClientImpl.java

+package org.opengroup.osdu.register.provider.azure.util;
+
+import org.opengroup.osdu.azure.util.AzureServicePrincipleTokenService;
+import org.opengroup.osdu.core.common.util.IServiceAccountJwtClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.annotation.RequestScope;
+
+@Component
+@RequestScope
+public class ServiceAccountJwtClientImpl implements IServiceAccountJwtClient {
+
+    @Autowired
+    private AzureServicePrincipleTokenService tokenService;
+
+    @Override
+    public String getIdToken(String partitionId){
+        return "Bearer " + this.tokenService.getAuthorizationToken();
+    }
+}

provider/register-azure/src/test/java/org/opengroup/osdu/register/provider/azure/util/ServiceAccountJwtClientImplTest.java

+package org.opengroup.osdu.register.provider.azure.util;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opengroup.osdu.azure.util.AzureServicePrincipleTokenService;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@ExtendWith(MockitoExtension.class)
+public class ServiceAccountJwtClientImplTest {
+
+    @Mock
+    private AzureServicePrincipleTokenService tokenService;
+
+    @InjectMocks
+    private ServiceAccountJwtClientImpl sut;
+
+    @Test
+    public void shouldReturnCustomToken_whenTokenIsRequestedNoPartition() {
+        Mockito.when(tokenService.getAuthorizationToken()).thenReturn("mytoken");
+        assertEquals(sut.getIdToken(""), "Bearer mytoken");
+    }
+
+    @Test
+    public void shouldReturnCustomToken_whenTokenIsRequestedSomePartition() {
+        Mockito.when(tokenService.getAuthorizationToken()).thenReturn("mytoken");
+        assertEquals(sut.getIdToken("partition"), "Bearer mytoken");
+    }
+}

register-core/pom.xml

@@ -106,7 +106,7 @@
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
             <artifactId>os-core-common</artifactId>
-            <version>0.19.0-rc3</version>
+            <version>0.19.0-rc8</version>
         </dependency>
         <dependency>
             <groupId>com.nimbusds</groupId>