From 57a93f63f0c31a929944c6439b97dc453f42ece7 Mon Sep 17 00:00:00 2001
From: David Fowler <davidfowl@gmail.com>
Date: Tue, 2 May 2023 21:15:43 -0700
Subject: [PATCH] More customization

---
 .../Services.Common/CommonExtensions.cs       | 51 ++++++++++++++-----
 1 file changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/Services/Services.Common/CommonExtensions.cs b/src/Services/Services.Common/CommonExtensions.cs
index 7048af39f..bc623801e 100644
--- a/src/Services/Services.Common/CommonExtensions.cs
+++ b/src/Services/Services.Common/CommonExtensions.cs
@@ -82,6 +82,18 @@ public static class CommonExtensions
         app.UseSwagger();
         app.UseSwaggerUI(setup =>
         {
+            /// {
+            ///   "OpenApi": {
+            ///     "Endpoint: {
+            ///         "Name": 
+            ///     },
+            ///     "Auth": {
+            ///         "ClientId": ..,
+            ///         "AppName": ..
+            ///     }
+            ///   }
+            /// }
+
             var pathBase = configuration["PATH_BASE"];
             var openApiSection = configuration.GetRequiredSection("OpenApi");
             var authSection = openApiSection.GetRequiredSection("Auth");
@@ -104,31 +116,42 @@ public static class CommonExtensions
 
             /// {
             ///   "OpenApi": {
-            ///     "Endpoint: {
-            ///         "Name": 
-            ///     },
             ///     "Document": {
             ///         "Title": ..
             ///         "Version": ..
             ///         "Description": ..
-            ///     },
-            ///     "Auth": {
-            ///         "ClientId": ..,
-            ///         "AppName": ..
             ///     }
             ///   }
             /// }
+            var document = openApi.GetRequiredSection("Document");
 
-            var version = openApi.GetRequiredValue("Version") ?? "v1";
+            var version = document.GetRequiredValue("Version") ?? "v1";
 
             options.SwaggerDoc(version, new OpenApiInfo
             {
-                Title = openApi.GetRequiredValue("Title"),
+                Title = document.GetRequiredValue("Title"),
                 Version = version,
-                Description = openApi.GetRequiredValue("Description")
+                Description = document.GetRequiredValue("Description")
             });
 
-            var identityUrlExternal = configuration.GetRequiredValue("IdentityUrlExternal");
+            var identitySection = configuration.GetSection("Identity");
+
+            if (identitySection is null)
+            {
+                // No identity section, so no authentication open api definition
+                return;
+            }
+
+            // {
+            //   "Identity": {
+            //     "ExternalUrl": "http://identity",
+            //     "Scopes": {
+            //         "basket": "Basket API"
+            //      }
+            //    }
+            // }
+
+            var identityUrlExternal = identitySection.GetRequiredValue("ExternalUrl");
             var scopes = openApi.GetRequiredSection("Scopes").AsEnumerable().ToDictionary(p => p.Key, p => p.Value);
 
             options.AddSecurityDefinition("oauth2", new OpenApiSecurityScheme
@@ -140,7 +163,7 @@ public static class CommonExtensions
                     {
                         AuthorizationUrl = new Uri($"{identityUrlExternal}/connect/authorize"),
                         TokenUrl = new Uri($"{identityUrlExternal}/connect/token"),
-                        Scopes = openApi.GetRequiredSection("Scopes").AsEnumerable().ToDictionary(p => p.Key, p => p.Value),
+                        Scopes = scopes,
                     }
                 }
             });
@@ -258,7 +281,7 @@ public static class CommonExtensions
         // {
         //   "EventBus": {
         //     "ProviderName": "ServiceBus | RabbitMQ",
-        //     "ConnectionString": "Endpoint=sb://eshop-eventbus.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=..."
+        //     "ConnectionString": "..."
         //   }
         // }
 
@@ -293,7 +316,7 @@ public static class CommonExtensions
         // {
         //   "EventBus": {
         //     "ProviderName": "ServiceBus",
-        //     "ConnectionString": "Endpoint=sb://eshop-eventbus.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=..."
+        //     "ConnectionString": "..."
         //     "SubscriptionClientName": "eshop_event_bus"
         //   }
         // }