Settings are now checked at proper stage

Checking for valid settings should be done before executing logic, to allow for different configurations Signed-off-by: Brend Smits <brend.smits@philips.com>
philips-software · Nov 26, 2021 · cbab270 · cbab270
1 parent db15da5
commit cbab270
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/Action/Domain/MediumNewPost.cs b/Action/Domain/MediumNewPost.cs
@@ -13,5 +13,7 @@ public class Post
         [JsonPropertyName("content")] public string Content { get; set; }
 
         [JsonPropertyName("contentFormat")] public string ContentFormat { get; set; }
+        [JsonPropertyName("canonicalUrl")] public string CanonicalUrl { get; set; }
+        [JsonPropertyName("license")] public string License { get; set; }
     }
 }
diff --git a/Action/Services/ConfigureService.cs b/Action/Services/ConfigureService.cs
@@ -18,6 +18,8 @@ public ConfigureService(string[] args)
 
         /// <summary>
         ///     Configure the application with correct settings.
+        /// First Set environment variables
+        /// Command line arguments will then override environment variables
         /// </summary>
         private void ConfigureApplication(string[] args)
         {
@@ -49,13 +51,6 @@ private void ConfigureApplication(string[] args)
             };
             Program.Client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
             Program.Client.DefaultRequestHeaders.Add("Authorization", $"Bearer {Program.Settings.IntegrationToken}");
-
-            CheckForValidSettings();
-
-            // Ensure lower case, API is case sensitive sadly
-            Program.Settings.License = Program.Settings.License?.ToLower();
-            Program.Settings.PublishStatus = Program.Settings.PublishStatus?.ToLower();
-            Program.Settings.ContentFormat = Program.Settings.ContentFormat?.ToLower();
         }
 
         /// <summary>
@@ -97,7 +92,7 @@ public void OverrideSettings(Settings settingsToReplace)
         /// <summary>
         ///     Checks if settings are filled in correctly.
         /// </summary>
-        private void CheckForValidSettings()
+        public void CheckForValidSettings()
         {
             if (string.IsNullOrEmpty(Program.Settings.IntegrationToken))
                 throw new ArgumentNullException(nameof(Program.Settings.IntegrationToken),

diff --git a/Action/Services/MediumService.cs b/Action/Services/MediumService.cs
@@ -32,6 +32,13 @@ public async Task SubmitNewContentAsync()
                 await ParseFrontmatter(Program.Settings.Content);
             }
 
+            _configureService.CheckForValidSettings();
+
+            // Ensure lower case, API is case sensitive sadly
+            Program.Settings.License = Program.Settings.License?.ToLower();
+            Program.Settings.PublishStatus = Program.Settings.PublishStatus?.ToLower();
+            Program.Settings.ContentFormat = Program.Settings.ContentFormat?.ToLower();
+
             MediumCreatedPost post = await CreateNewPostUnderPublicationAsync(pub.Id);
             SetWorkflowOutputs(post);
         }
@@ -132,7 +139,9 @@ public async Task<MediumCreatedPost> CreateNewPostUnderPublicationAsync(string p
                 ContentFormat = Program.Settings.ContentFormat,
                 PublishStatus = Program.Settings.PublishStatus,
                 Tags = Program.Settings.Tags as string[],
-                Title = Program.Settings.Title
+                Title = Program.Settings.Title,
+                CanonicalUrl = Program.Settings.CanonicalUrl,
+                License = Program.Settings.License
             };
             HttpResponseMessage response = await Program.Client.PostAsync($"publications/{publicationId}/posts",
                     new StringContent(JsonSerializer.Serialize(post), Encoding.UTF8, "application/json"))