fix: test script for checking changes

opengovsg · Jul 29, 2023 · 41a79c4 · 41a79c4
1 parent 6a16fe1
commit 41a79c4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/.platform/hooks/postdeploy/01_fetch_ssm_parameters.sh b/.platform/hooks/postdeploy/01_fetch_ssm_parameters.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 
 ENV_TYPE=$(/opt/elasticbeanstalk/bin/get-config environment -k SSM_PREFIX)
-ENV_VARS=("SGID_CLIENT_ID" "SGID_CLIENT_SECRET" "SGID_PRIVATE_KEY") # Add any additional env vars to this array
+# ENV_VARS=("SGID_CLIENT_ID" "SGID_CLIENT_SECRET" "SGID_PRIVATE_KEY") # Add any additional env vars to this array
+
+ENV_VARS=("SGID_CLIENT_ID")
 
 echo "Set AWS region"
 aws configure set default.region ap-southeast-1
@@ -10,6 +12,7 @@ for ENV_VAR in "${ENV_VARS[@]}"; do
   echo "Running for this ${ENV_TYPE}"
   echo "Fetching ${ENV_VAR} from SSM"
   VALUE=$(aws ssm get-parameter --name "${ENV_TYPE}_${ENV_VAR}" --with-decryption --query "Parameter.Value" --output text)
+  echo "These are the values ${ENV_VAR}=${VALUE}"
   echo "${ENV_VAR}=${VALUE}" >> /opt/elasticbeanstalk/deployment/env
   echo "Saved ${ENV_VAR}"
 done
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -28,11 +28,7 @@ services:
       - REDIS_SAFE_BROWSING_URI=redis://redis:6379/4
       - SESSION_SECRET=thiscouldbeanything
       - GA_TRACKING_ID=UA-139330318-1
-      - SGID_PRIVATE_KEY=
-
       - SGID_API_HOSTNAME=https://api.id.gov.sg
-      - SGID_CLIENT_ID=
-      - SGID_CLIENT_SECRET=
 
       - OG_URL=https://go.gov.sg
       - VALID_EMAIL_GLOB_EXPRESSION=*.gov.sg

diff --git a/src/server/services/sgid.ts b/src/server/services/sgid.ts
@@ -23,7 +23,11 @@ class SgidService {
     redirectUri,
     hostname,
   }: SgidServiceOption) {
-    console.log('This is the client ID', clientId, redirectUri)
+    console.log(
+      'This is the client ID',
+      process.env.SGID_CLIENT_ID,
+      process.env.SGID_API_HOSTNAME,
+    )
     try {
       this.sgidClient = new SgidClient({
         clientId,
@@ -93,9 +97,9 @@ class SgidService {
 
 // Initialised the sgidService object with the different environments
 export const SgidAuthService = new SgidService({
-  clientId: process.env.SGID_CLIENT_ID as string,
-  clientSecret: process.env.SGID_CLIENT_SECRET as string,
-  privateKey: process.env.SGID_PRIVATE_KEY as string,
+  clientId: process.env.SGID_CLIENT_ID || '',
+  clientSecret: process.env.SGID_CLIENT_SECRET || '',
+  privateKey: process.env.SGID_PRIVATE_KEY || '',
   redirectUri: `${process.env.OG_URL}/api/sgidLogin/authenticate`,
-  hostname: process.env.SGID_API_HOSTNAME as string,
+  hostname: process.env.SGID_API_HOSTNAME || '',
 })