Merge pull request #125 from companieshouse/fix-users-api-to-use-acco…

…unturl

fix users api call to use account endpoint

pom.xml

@@ -24,7 +24,7 @@
         <jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
         <encryption-java-library.version>2.0.3</encryption-java-library.version>
         <rest-service-common-library-version>2.0.2</rest-service-common-library-version>
-        <private-api-sdk-java.version>4.0.162</private-api-sdk-java.version>
+        <private-api-sdk-java.version>4.0.163</private-api-sdk-java.version>
         <api-sdk-manager-java-library.version>3.0.5</api-sdk-manager-java-library.version>
         <api-security-java-version>2.0.4</api-security-java-version>
         <org.mapstruct.version>1.6.0.Beta2</org.mapstruct.version>

src/main/java/uk/gov/companieshouse/accounts/association/utils/ApiClientUtil.java

@@ -1,16 +1,20 @@
 package uk.gov.companieshouse.accounts.association.utils;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import uk.gov.companieshouse.api.InternalApiClient;
+import uk.gov.companieshouse.api.http.ApiKeyHttpClient;
 import uk.gov.companieshouse.sdk.manager.ApiSdkManager;
 
 
 @Component
 public class ApiClientUtil {
 
+    @Value("${chs.internal.api.key}")
+    private String internalApiKey;
 
     public InternalApiClient getInternalApiClient(final String internalApiUrl) {
-        final var internalApiClient = ApiSdkManager.getInternalSDK();
+        final var internalApiClient = new InternalApiClient(new ApiKeyHttpClient(internalApiKey));
         internalApiClient.setInternalBasePath(internalApiUrl);
         return internalApiClient;
     }

src/main/resources/application.properties

@@ -22,4 +22,4 @@ kafka.broker.addr=${KAFKA_BROKER_ADDR}
 kafka.config.acks=${KAFKA_CONFIG_ACKS}
 kafka.config.retries=${KAFKA_CONFIG_RETRIES}
 kafka.config.isRoundRobin=${KAFKA_CONFIG_IS_ROUND_ROBIN}
-CHS_INTERNAL_API_KEY=${ACCOUNTS_USER_INTERNAL_API_KEY}
+chs.internal.api.key=${ACCOUNTS_USER_INTERNAL_API_KEY}

src/test/java/uk/gov/companieshouse/accounts/association/integration/AssociationsListForCompanyControllerTest.java

@@ -26,6 +26,7 @@
 import uk.gov.companieshouse.accounts.association.repositories.AssociationsRepository;
 import uk.gov.companieshouse.accounts.association.rest.AccountsUserEndpoint;
 import uk.gov.companieshouse.accounts.association.rest.CompanyProfileEndpoint;
+import uk.gov.companieshouse.accounts.association.utils.ApiClientUtil;
 import uk.gov.companieshouse.accounts.association.utils.StaticPropertyUtil;
 import uk.gov.companieshouse.api.InternalApiClient;
 import uk.gov.companieshouse.api.accounts.associations.model.Association.ApprovalRouteEnum;
@@ -74,7 +75,7 @@ class AssociationsListForCompanyControllerTest {
     ApiClientService apiClientService;
 
     @MockBean
-    InternalApiClient internalApiClient;
+    ApiClientUtil internalApiClient;
 
     @MockBean
     CompanyProfileEndpoint companyProfileEndpoint;

src/test/java/uk/gov/companieshouse/accounts/association/integration/AssociationsServiceTest.java

@@ -27,6 +27,7 @@
 import uk.gov.companieshouse.accounts.association.models.InvitationDao;
 import uk.gov.companieshouse.accounts.association.repositories.AssociationsRepository;
 import uk.gov.companieshouse.accounts.association.service.AssociationsService;
+import uk.gov.companieshouse.accounts.association.utils.ApiClientUtil;
 import uk.gov.companieshouse.accounts.association.utils.StaticPropertyUtil;
 import uk.gov.companieshouse.api.InternalApiClient;
 import uk.gov.companieshouse.api.accounts.associations.model.Association.ApprovalRouteEnum;
@@ -68,7 +69,7 @@ public class AssociationsServiceTest {
     ApiClientService apiClientService;
 
     @MockBean
-    InternalApiClient internalApiClient;
+    ApiClientUtil internalApiClient;
 
     @MockBean
     EmailProducer emailProducer;

src/test/java/uk/gov/companieshouse/accounts/association/integration/UserCompanyAssociationsTest.java

@@ -39,6 +39,7 @@
 import uk.gov.companieshouse.accounts.association.rest.AccountsUserEndpoint;
 import uk.gov.companieshouse.accounts.association.rest.CompanyProfileEndpoint;
 import uk.gov.companieshouse.accounts.association.service.EmailService;
+import uk.gov.companieshouse.accounts.association.utils.ApiClientUtil;
 import uk.gov.companieshouse.accounts.association.utils.StaticPropertyUtil;
 import uk.gov.companieshouse.api.InternalApiClient;
 import uk.gov.companieshouse.api.accounts.associations.model.Association;
@@ -106,7 +107,7 @@ public class UserCompanyAssociationsTest {
     ApiClientService apiClientService;
 
     @MockBean
-    InternalApiClient internalApiClient;
+    ApiClientUtil internalApiClient;
 
     @MockBean
     CompanyProfileEndpoint companyProfileEndpoint;