AS-3064: Adapt the /import/bpu endpoint to work with Custom Connector.

Author: hwang-vividsolutions

.github/workflows/build-package.yml

@@ -56,7 +56,7 @@ jobs:
           export NODE_OPTIONS="--max-old-space-size=4096"
           export RELEASE_URL=${{ vars.RELEASE_URL }}
           export SNAPSHOT_URL=${{ vars.SNAPSHOT_URL }}
-          mvn --settings=settings.xml --batch-mode --update-snapshots -f ${{ inputs.MICROSERVICE_NAME }}/pom.xml -Drepo.login=${{ secrets.IDIR_AS_EMAIL }} -Drepo.password=${{ secrets.IDIR_PASSWORD }}  -DopenshiftRepo.login=${{ secrets.OPENSHIFT_ACCOUNT }} -DopenshiftRepo.password=${{ secrets.OPENSHIFT_PASSWORD }} -Dtenant.id=${{ secrets.TENANT_ID }} -Dclient.id=${{ secrets.CLIENT_ID }} deploy
+          mvn --settings=settings.xml --batch-mode --update-snapshots -f ${{ inputs.MICROSERVICE_NAME }}/pom.xml -Drepo.login=${{ secrets.IDIR_AS_EMAIL }} -Drepo.password=${{ secrets.IDIR_PASSWORD }}  -DopenshiftRepo.login=${{ secrets.OPENSHIFT_ACCOUNT }} -DopenshiftRepo.password=${{ secrets.OPENSHIFT_PASSWORD }} -Dclient.id=${{ secrets.CLIENT_ID }} deploy
 
       - name: Cache local Maven repository
         uses: actions/cache@v4

farms-api/farms-api-rest-endpoints/pom.xml

@@ -63,6 +63,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-log4j2</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.azure.spring</groupId>
+            <artifactId>spring-cloud-azure-starter-active-directory</artifactId>
+            <version>4.20.0</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>

farms-api/farms-api-rest-endpoints/src/main/java/ca/bc/gov/farms/api/rest/v1/endpoints/ImportEndpoints.java

@@ -1,24 +1,20 @@
 package ca.bc.gov.farms.api.rest.v1.endpoints;
 
-import java.io.InputStream;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
-import org.glassfish.jersey.media.multipart.FormDataParam;
-
 @Path("/import")
 public interface ImportEndpoints {
 
     @POST
-    @Path("/bpu")
-    @Consumes(MediaType.MULTIPART_FORM_DATA)
+    @Path("/bpu/{fileName}")
+    @Consumes(MediaType.TEXT_PLAIN)
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-    Response importBPU(@FormDataParam("file") InputStream fileInputStream,
-            @FormDataParam("file") FormDataContentDisposition fileDetail) throws Exception;
+    Response importBPU(@PathParam("fileName") String fileName,
+            String fileContent) throws Exception;
 }

farms-api/farms-api-rest-endpoints/src/main/java/ca/bc/gov/farms/api/rest/v1/endpoints/impl/ImportEndpointsImpl.java

@@ -1,13 +1,10 @@
 package ca.bc.gov.farms.api.rest.v1.endpoints.impl;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 
 import javax.ws.rs.core.Response;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,24 +26,21 @@ public class ImportEndpointsImpl extends BaseEndpointsImpl implements ImportEndp
     private ImportBPUService importBPUService;
 
     @Override
-    public Response importBPU(InputStream fileInputStream, FormDataContentDisposition fileDetail) throws Exception {
+    public Response importBPU(String fileName, String fileContent) throws Exception {
         logger.debug("<importBPU");
 
         Response response = null;
 
         logRequest();
 
         try {
-            byte[] fileContent = readBytes(fileInputStream);
-            String fileName = fileDetail.getFileName();
-
             // Call the service layer to handle the import
             ImportVersionDto importVersionDto = importService.createImportVersion(
                     ImportClassCodes.BPU, ImportStateCodes.SCHEDULED_FOR_STAGING, ImportClassCodes.BPU_DESCRIPTION,
-                    fileName, fileContent, "UserId");
+                    fileName, fileContent.getBytes(), "UserId");
 
             Long importVersionId = importVersionDto.getImportVersionId();
-            InputStream inputStream = new ByteArrayInputStream(fileContent);
+            InputStream inputStream = new ByteArrayInputStream(fileContent.getBytes());
             String userId = "UserId";
             importBPUService.importCSV(importVersionId, inputStream, userId);
 
@@ -63,15 +57,4 @@ public Response importBPU(InputStream fileInputStream, FormDataContentDispositio
         return response;
     }
 
-    private byte[] readBytes(InputStream inputStream) throws IOException {
-        try (ByteArrayOutputStream buffer = new ByteArrayOutputStream()) {
-            int nRead;
-            byte[] data = new byte[4096];
-            while ((nRead = inputStream.read(data, 0, data.length)) != -1) {
-                buffer.write(data, 0, nRead);
-            }
-            return buffer.toByteArray();
-        }
-    }
-
 }

farms-api/farms-api-rest-endpoints/src/main/resources/application.properties

@@ -1,3 +1,7 @@
 spring.application.name=farms-api-rest-endpoints
-spring.security.oauth2.resourceserver.jwt.issuer-uri=https://sts.windows.net/@tenant.id@/
-spring.security.oauth2.resourceserver.jwt.audiences=api://@client.id@
+#spring.security.oauth2.resourceserver.jwt.issuer-uri=https://sts.windows.net/@tenant.id@/
+#spring.security.oauth2.resourceserver.jwt.audiences=api://@client.id@,https://apihub.azure.com
+
+spring.cloud.azure.active-directory.enabled=true
+spring.cloud.azure.active-directory.credential.client-id=@client.id@
+spring.cloud.azure.active-directory.app-id-uri=api://@client.id@