Merge remote-tracking branch 'remotes/origin/master' into features/ti…

…maqt/jasper-71
bcgov · Nov 21, 2024 · f763fcf · f763fcf
2 parents 5e57cec + 7c6710a
commit f763fcf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/api/Infrastructure/ServiceCollectionExtensions.cs b/api/Infrastructure/ServiceCollectionExtensions.cs
@@ -43,9 +43,6 @@ public static IServiceCollection AddMapster(this IServiceCollection services, Ac
 
         public static IServiceCollection AddHttpClientsAndScvServices(this IServiceCollection services, IConfiguration configuration)
         {
-            var apigwKey = configuration.GetNonEmptyValue("AWS_API_GATEWAY_API_KEY");
-            var authorizerKey = configuration.GetNonEmptyValue("AuthorizerKey");
-
             services.AddTransient<TimingHandler>();
             services.AddHttpClient<FileServicesClient>(client =>
             {
@@ -66,12 +63,10 @@ public static IServiceCollection AddHttpClientsAndScvServices(this IServiceColle
 
             services.AddHttpClient<LocationServicesClient>(client =>
             {
-                // client.DefaultRequestHeaders.Authorization = new BasicAuthenticationHeaderValue(
-                //     configuration.GetNonEmptyValue("LocationServicesClient:Username"),
-                //     configuration.GetNonEmptyValue("LocationServicesClient:Password"));
+                client.DefaultRequestHeaders.Authorization = new BasicAuthenticationHeaderValue(
+                    configuration.GetNonEmptyValue("LocationServicesClient:Username"),
+                    configuration.GetNonEmptyValue("LocationServicesClient:Password"));
                 client.BaseAddress = new Uri(configuration.GetNonEmptyValue("LocationServicesClient:Url").EnsureEndingForwardSlash());
-                client.DefaultRequestHeaders.Add(X_APIGW_KEY_HEADER, apigwKey);
-                client.DefaultRequestHeaders.Add(X_ORIGIN_VERIFY_HEADER, authorizerKey);
             }).AddHttpMessageHandler<TimingHandler>();
 
             services.AddHttpClient<UserServiceClient>(client =>

diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
@@ -1,6 +1,5 @@
 version: "3.4"
 services:
-
   web:
     image: "${COMPOSE_PROJECT_NAME}-web"
     environment:
@@ -67,8 +66,9 @@ services:
       - SplunkCollectorUrl=${SplunkCollectorUrl}
       - SplunkCollectorId=${SplunkCollectorId}
       - SplunkToken=${SplunkToken}
-      - AWS_API_GATEWAY_URL=${AWS_API_GATEWAY_URL}
-      - AWS_API_GATEWAY_API_KEY=${AWS_API_GATEWAY_API_KEY}
+      # - AWS_API_GATEWAY_URL=${AWS_API_GATEWAY_URL}
+      # - AWS_API_GATEWAY_API_KEY=${AWS_API_GATEWAY_API_KEY}
+      # - AuthorizerKey=${AuthorizerKey}
     ports:
       - 5000:5000
     volumes: