From 4c987b901155c5ef3101a7745690f6e5dab78566 Mon Sep 17 00:00:00 2001
From: Alok Joshi <AJoshi19@slb.com>
Date: Tue, 31 Jan 2023 13:25:39 -0600
Subject: [PATCH] use_partition_ff_fix

---
 pom.xml                                       |  2 +-
 provider/register-azure/pom.xml               |  2 +-
 .../util/ServiceAccountJwtClientImpl.java     | 20 +++++++++++
 .../util/ServiceAccountJwtClientImplTest.java | 33 +++++++++++++++++++
 register-core/pom.xml                         |  2 +-
 5 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 provider/register-azure/src/main/java/org/opengroup/osdu/register/provider/azure/util/ServiceAccountJwtClientImpl.java
 create mode 100644 provider/register-azure/src/test/java/org/opengroup/osdu/register/provider/azure/util/ServiceAccountJwtClientImplTest.java

diff --git a/pom.xml b/pom.xml
index 1c7fd25d7..cc4a45fd2 100644
--- a/pom.xml
+++ b/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>
diff --git a/provider/register-azure/pom.xml b/provider/register-azure/pom.xml
index 09d6d49b1..01a99942f 100644
--- a/provider/register-azure/pom.xml
+++ b/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>
diff --git a/provider/register-azure/src/main/java/org/opengroup/osdu/register/provider/azure/util/ServiceAccountJwtClientImpl.java b/provider/register-azure/src/main/java/org/opengroup/osdu/register/provider/azure/util/ServiceAccountJwtClientImpl.java
new file mode 100644
index 000000000..631c71ecf
--- /dev/null
+++ b/provider/register-azure/src/main/java/org/opengroup/osdu/register/provider/azure/util/ServiceAccountJwtClientImpl.java
@@ -0,0 +1,20 @@
+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();
+    }
+}
diff --git a/provider/register-azure/src/test/java/org/opengroup/osdu/register/provider/azure/util/ServiceAccountJwtClientImplTest.java b/provider/register-azure/src/test/java/org/opengroup/osdu/register/provider/azure/util/ServiceAccountJwtClientImplTest.java
new file mode 100644
index 000000000..fc70eb62d
--- /dev/null
+++ b/provider/register-azure/src/test/java/org/opengroup/osdu/register/provider/azure/util/ServiceAccountJwtClientImplTest.java
@@ -0,0 +1,33 @@
+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");
+    }
+}
diff --git a/register-core/pom.xml b/register-core/pom.xml
index 5dd9fec7f..cfa69c2b0 100644
--- a/register-core/pom.xml
+++ b/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>
-- 
GitLab