ci: add missing env var

feat: get current user id from token
bcgov · Feb 8, 2024 · 9486a8f · 9486a8f
1 parent 744a815
commit 9486a8f
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 2 deletions.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -49,6 +49,7 @@ jobs:
             file: backend/openshift.deploy.yml
             parameters:
               -p RESULTS_ENV_OPENSEARCH=test
+              -p AWS_COGNITO_ISSUER_URI=https://cognito-idp.${{ vars.AWS_REGION }}.amazonaws.com/${{ vars.VITE_USER_POOLS_ID }}
           - name: frontend
             file: frontend/openshift.deploy.yml
             parameters:
@@ -124,6 +125,7 @@ jobs:
             file: backend/openshift.deploy.yml
             parameters:
               -p RESULTS_ENV_OPENSEARCH=production
+              -p AWS_COGNITO_ISSUER_URI=https://cognito-idp.${{ vars.AWS_REGION }}.amazonaws.com/${{ vars.VITE_USER_POOLS_ID }}
           - name: frontend
             file: frontend/openshift.deploy.yml
             parameters:

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
@@ -104,6 +104,7 @@ jobs:
             parameters:
               -p MIN_REPLICAS=1
               -p MAX_REPLICAS=2
+              -p AWS_COGNITO_ISSUER_URI=https://cognito-idp.${{ vars.AWS_REGION }}.amazonaws.com/${{ vars.VITE_USER_POOLS_ID }}
           - name: frontend
             file: frontend/openshift.deploy.yml
             parameters:

diff --git a/backend/openshift.deploy.yml b/backend/openshift.deploy.yml
@@ -60,6 +60,9 @@ parameters:
   - name: ORACLEDB_KEYSTORE
     description: Keystore location path
     value: /app/jssecacerts
+  - name: AWS_COGNITO_ISSUER_URI
+    description: AWS Cognito JWT Server URI
+    required: true
 objects:
   - apiVersion: v1
     kind: ImageStream
@@ -129,6 +132,8 @@ objects:
                   value: ${DATABASE_PORT}
                 - name: SERVICE_NAME
                   value: ${SERVICE_NAME}
+                - name: AWS_COGNITO_ISSUER_URI
+                  value: ${AWS_COGNITO_ISSUER_URI}
                 - name: DATABASE_USER
                   valueFrom:
                     secretKeyRef:

diff --git a/backend/src/main/java/ca/bc/gov/restapi/results/service/OpeningService.java b/backend/src/main/java/ca/bc/gov/restapi/results/service/OpeningService.java
@@ -6,6 +6,7 @@
 import ca.bc.gov.restapi.results.entity.CutBlockOpenAdminEntity;
 import ca.bc.gov.restapi.results.entity.OpeningEntity;
 import ca.bc.gov.restapi.results.repository.OpeningRepository;
+import ca.bc.gov.restapi.results.security.LoggedUserService;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.ArrayList;
@@ -27,6 +28,8 @@ public class OpeningService {
 
   private final CutBlockOpenAdminService cutBlockOpenAdminService;
 
+  private final LoggedUserService loggedUserService;
+
   /**
    * Gets all recent openings for the Home Screen.
    *
@@ -38,7 +41,7 @@ public PaginatedResult<RecentOpeningDto> getRecentOpenings(PaginationParameters
         pagination.page(),
         pagination.pageSize());
 
-    String entryUserId = "idir-here";
+    String entryUserId = loggedUserService.getLoggedUserId();
 
     // Openings
     Pageable pageable = PageRequest.of(pagination.page(), pagination.pageSize());

diff --git a/backend/src/test/java/ca/bc/gov/restapi/results/service/OpeningServiceTest.java b/backend/src/test/java/ca/bc/gov/restapi/results/service/OpeningServiceTest.java
@@ -9,6 +9,7 @@
 import ca.bc.gov.restapi.results.entity.CutBlockOpenAdminEntity;
 import ca.bc.gov.restapi.results.entity.OpeningEntity;
 import ca.bc.gov.restapi.results.repository.OpeningRepository;
+import ca.bc.gov.restapi.results.security.LoggedUserService;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
@@ -30,11 +31,14 @@ class OpeningServiceTest {
 
   @Mock CutBlockOpenAdminService cutBlockOpenAdminService;
 
+  @Mock LoggedUserService loggedUserService;
+
   private OpeningService openingService;
 
   @BeforeEach
   void setup() {
-    openingService = new OpeningService(openingRepository, cutBlockOpenAdminService);
+    openingService =
+        new OpeningService(openingRepository, cutBlockOpenAdminService, loggedUserService);
   }
 
   @Test

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -57,6 +57,7 @@ services:
       SERVICE_NAME: dbq01.nrs.bcgov
       ORACLEDB_KEYSTORE: /app/jssecacerts
       ORACLEDB_SECRET: changeit
+      AWS_COGNITO_ISSUER_URI: https://cognito-idp.ca-central-1.amazonaws.com/ca-central-1_t2HSZBHur
     <<: *backend
 
   backend-native: