Merge pull request #186 from bcgov/yj

chore: app base url
bcgov · Apr 18, 2024 · f7d16b2 · f7d16b2
2 parents d7bcacf + a59e281
commit f7d16b2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/helm/main/values-dev.yaml b/helm/main/values-dev.yaml
@@ -6,7 +6,7 @@ global:
     'Logging__LogLevel__StrDss.Common.StrDssLogger': 'Information'
     'ASPNETCORE_ENVIRONMENT': 'Development'
     'ENV_NAME': 'dev'
-    'AppBaseUrl': 'https://dev-strdata.apps.silver.devops.gov.bc.ca'
+    'APP_BASE_URL': 'https://dev.strdata.gov.bc.ca'
     'SSO_CLIENT': 'str-dss-5303'
     'SSO_HOST': 'https://dev.loginproxy.gov.bc.ca/auth'
     'SSO_REALM': 'standard'

diff --git a/helm/main/values-prod.yaml b/helm/main/values-prod.yaml
@@ -6,7 +6,7 @@ global:
     'Logging__LogLevel__StrDss.Common.StrDssLogger': 'Information'
     'ASPNETCORE_ENVIRONMENT': 'Production'
     'ENV_NAME': 'prod'
-    'AppBaseUrl': 'https://prod-strdata.apps.silver.devops.gov.bc.ca'
+    'APP_BASE_URL': 'https://strdata.gov.bc.ca'
     'SSO_CLIENT': 'str-dss-5303'
     'SSO_HOST': 'https://loginproxy.gov.bc.ca/auth'
     'SSO_REALM': 'standard'

diff --git a/helm/main/values-test.yaml b/helm/main/values-test.yaml
@@ -6,7 +6,7 @@ global:
     'Logging__LogLevel__StrDss.Common.StrDssLogger': 'Information'
     'ASPNETCORE_ENVIRONMENT': 'Test'
     'ENV_NAME': 'test'
-    'AppBaseUrl': 'https://test-strdata.apps.silver.devops.gov.bc.ca'
+    'APP_BASE_URL': 'https://test.strdata.gov.bc.ca'
     'SSO_CLIENT': 'str-dss-5303'
     'SSO_HOST': 'https://dev.loginproxy.gov.bc.ca/auth'
     'SSO_REALM': 'standard'

diff --git a/helm/main/values-uat.yaml b/helm/main/values-uat.yaml
@@ -6,7 +6,7 @@ global:
     'Logging__LogLevel__StrDss.Common.StrDssLogger': 'Information'
     'ASPNETCORE_ENVIRONMENT': 'Staging'
     'ENV_NAME': 'uat'
-    'AppBaseUrl': 'https://uat-strdata.apps.silver.devops.gov.bc.ca'
+    'APP_BASE_URL': 'https://uat.strdata.gov.bc.ca'
     'SSO_CLIENT': 'str-dss-5303'
     'SSO_HOST': 'https://dev.loginproxy.gov.bc.ca/auth'
     'SSO_REALM': 'standard'

diff --git a/server/StrDss.Service/ServiceBase.cs b/server/StrDss.Service/ServiceBase.cs
@@ -28,8 +28,7 @@ public ServiceBase(ICurrentUser currentUser, IFieldValidatorService validator, I
 
         protected string GetHostUrl()
         {
-            var request = _httpContextAccessor?.HttpContext?.Request;
-            return $"{request?.Scheme}://{request?.Host}";
+            return Environment.GetEnvironmentVariable("APP_BASE_URL") ?? "";
         }
     }
 }