From f76a8c61db3b94905b3ab529db3a8093295a6197 Mon Sep 17 00:00:00 2001
From: David Fowler <davidfowl@gmail.com>
Date: Sun, 7 May 2023 01:22:52 -0700
Subject: [PATCH] Make default URLs work

---
 .../aggregator/Properties/launchSettings.json     |  6 +-----
 .../Web.Bff.Shopping/aggregator/appsettings.json  | 15 ++++++++++++++-
 .../aggregator/appsettings.localhost.json         | 11 -----------
 .../Identity.API/Properties/launchSettings.json   |  1 -
 .../Identity/Identity.API/appsettings.json        |  6 +++++-
 5 files changed, 20 insertions(+), 19 deletions(-)
 delete mode 100644 src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.localhost.json

diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Properties/launchSettings.json b/src/ApiGateways/Web.Bff.Shopping/aggregator/Properties/launchSettings.json
index 0e4ac481a..4525154b7 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Properties/launchSettings.json
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Properties/launchSettings.json
@@ -3,12 +3,8 @@
     "Web.Shopping.HttpAggregator": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:61632/",
+      "applicationUrl": "http://localhost:5229/",
       "environmentVariables": {
-        "CatalogUrlHC": "http://localhost:5222/hc",
-        "OrderingUrlHC": "http://localhost:5224/hc",
-        "BasketUrlHC": "http://localhost:5221/hc",
-        "IdentityUrlHC": "http://localhost:5223/hc",
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     }
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.json b/src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.json
index f55fc195a..cd51126df 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.json
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.json
@@ -26,5 +26,18 @@
     "Scopes": {
       "webshoppingagg": "Shopping Aggregator for Web Clients"
     }
-  }
+  },
+  "Urls": {
+    "Basket": "http://localhost:5221",
+    "Catalog": "http://localhost:5222",
+    "Orders": "http://localhost:5224",
+    "Identity": "http://localhost:5223",
+    "GrpcBasket": "http://localhost:6221",
+    "GrpcCatalog": "http://localhost:6222",
+    "GrpcOrdering": "http://localhost:6224"
+  },
+  "CatalogUrlHC": "http://localhost:5222/hc",
+  "OrderingUrlHC": "http://localhost:5224/hc",
+  "BasketUrlHC": "http://localhost:5221/hc",
+  "IdentityUrlHC": "http://localhost:5223/hc"
 }
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.localhost.json b/src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.localhost.json
deleted file mode 100644
index 055bcfc7f..000000000
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.localhost.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "urls": {
-    "basket": "http://localhost:55103",
-    "catalog": "http://localhost:55101",
-    "orders": "http://localhost:55102",
-    "identity": "http://localhost:55105",
-    "grpcBasket": "http://localhost:5580",
-    "grpcCatalog": "http://localhost:81",
-    "grpcOrdering": "http://localhost:5581"
-  }
-}
diff --git a/src/Services/Identity/Identity.API/Properties/launchSettings.json b/src/Services/Identity/Identity.API/Properties/launchSettings.json
index 9b6496bd6..485a5f313 100644
--- a/src/Services/Identity/Identity.API/Properties/launchSettings.json
+++ b/src/Services/Identity/Identity.API/Properties/launchSettings.json
@@ -5,7 +5,6 @@
       "launchBrowser": true,
       "applicationUrl": "http://localhost:5223",
       "environmentVariables": {
-        "BasketApiClient": "http://localhost:5221",
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     }
diff --git a/src/Services/Identity/Identity.API/appsettings.json b/src/Services/Identity/Identity.API/appsettings.json
index 48e4ff569..99f585c38 100644
--- a/src/Services/Identity/Identity.API/appsettings.json
+++ b/src/Services/Identity/Identity.API/appsettings.json
@@ -14,5 +14,9 @@
     "InstrumentationKey": ""
   },
   "TokenLifetimeMinutes": 120,
-  "PermanentTokenLifetimeDays": 365
+  "PermanentTokenLifetimeDays": 365,
+  "BasketApiClient": "http://localhost:5221",
+  "OrderingApiClient": "http://localhost:5224",
+  "WebShoppingAggClient": "http://localhost:5229",
+  "WebhooksApiClient": "http://localhost:5227"
 }