From 2fb7d7af8f3b09a4d4fe22b41adbef93ba9c258c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Gyebrovszki?= <kavics@sensenet.com>
Date: Mon, 20 Nov 2023 02:19:10 +0100
Subject: [PATCH] Delete settings: OAuth and TaskManagement. Add to last patch.

---
 src/ContentRepository/ServicesComponent.cs    | 30 +++++++++++++++++++
 .../import/System/Settings/OAuth.settings     |  4 ---
 .../System/Settings/OAuth.settings.Content    | 14 ---------
 .../System/Settings/TaskManagement.settings   |  5 ----
 .../Settings/TaskManagement.settings.Content  | 14 ---------
 5 files changed, 30 insertions(+), 37 deletions(-)
 delete mode 100644 src/nuget/snadmin/install-services/import/System/Settings/OAuth.settings
 delete mode 100644 src/nuget/snadmin/install-services/import/System/Settings/OAuth.settings.Content
 delete mode 100644 src/nuget/snadmin/install-services/import/System/Settings/TaskManagement.settings
 delete mode 100644 src/nuget/snadmin/install-services/import/System/Settings/TaskManagement.settings.Content

diff --git a/src/ContentRepository/ServicesComponent.cs b/src/ContentRepository/ServicesComponent.cs
index d549d33cd..d1d45936c 100644
--- a/src/ContentRepository/ServicesComponent.cs
+++ b/src/ContentRepository/ServicesComponent.cs
@@ -1956,6 +1956,13 @@ private void Patch_7_7_32(PatchExecutionContext context)
 
             #endregion
 
+            #region Settings changes
+
+            DeleteSettings("OAuth.settings", logger);
+            DeleteSettings("TaskManagement.settings", logger);
+            
+            #endregion
+
             #region CTD changes
 
             try
@@ -2111,5 +2118,28 @@ private static void CreateSettings(string contentName, string value, string desc
 
             logger.LogTrace($"Settings {contentName} was created.");
         }
+
+        private static void DeleteSettings(string settingsName, ILogger logger)
+        {
+            var path = RepositoryPath.Combine(Repository.SettingsFolderPath, settingsName);
+            try
+            {
+                logger.LogTrace($"Deleting {settingsName} ...");
+                var setting = Node.Load<Settings>(path);
+                if (setting != null)
+                {
+                    setting.ForceDeleteAsync(CancellationToken.None).GetAwaiter().GetResult();
+                    logger.LogTrace($"{settingsName} successfully deleted.");
+                }
+                else
+                {
+                    logger.LogTrace($"{settingsName} already deleted.");
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.LogWarning(ex, $"Error deleting {settingsName} settings.");
+            }
+        }
     }
 }
diff --git a/src/nuget/snadmin/install-services/import/System/Settings/OAuth.settings b/src/nuget/snadmin/install-services/import/System/Settings/OAuth.settings
deleted file mode 100644
index a360fbe91..000000000
--- a/src/nuget/snadmin/install-services/import/System/Settings/OAuth.settings
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "UserType": "User",
-  "Domain": "Public"
-}
\ No newline at end of file
diff --git a/src/nuget/snadmin/install-services/import/System/Settings/OAuth.settings.Content b/src/nuget/snadmin/install-services/import/System/Settings/OAuth.settings.Content
deleted file mode 100644
index 705950c37..000000000
--- a/src/nuget/snadmin/install-services/import/System/Settings/OAuth.settings.Content
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ContentMetaData>
-  <ContentType>Settings</ContentType>
-  <ContentName>OAuth.settings</ContentName>
-  <Fields>
-    <Binary attachment="OAuth.settings" />
-    <GlobalOnly>true</GlobalOnly>
-    <Index>20</Index>
-    <Description><![CDATA[When users log in using one of the configured OAuth providers (like Google or Facebook), these settings control the type and place of the newly created users.]]></Description>
-  </Fields>
-  <Permissions>
-    <Clear />
-  </Permissions>
-</ContentMetaData>
\ No newline at end of file
diff --git a/src/nuget/snadmin/install-services/import/System/Settings/TaskManagement.settings b/src/nuget/snadmin/install-services/import/System/Settings/TaskManagement.settings
deleted file mode 100644
index 470ae965e..000000000
--- a/src/nuget/snadmin/install-services/import/System/Settings/TaskManagement.settings
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "TaskManagementUrl": "",
-  "TaskManagementApplicationUrl": "http://localhost",
-  "TaskManagementAppId": "SenseNet"
-}
\ No newline at end of file
diff --git a/src/nuget/snadmin/install-services/import/System/Settings/TaskManagement.settings.Content b/src/nuget/snadmin/install-services/import/System/Settings/TaskManagement.settings.Content
deleted file mode 100644
index 9035204b9..000000000
--- a/src/nuget/snadmin/install-services/import/System/Settings/TaskManagement.settings.Content
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ContentMetaData>
-  <ContentType>Settings</ContentType>
-  <ContentName>TaskManagement.settings</ContentName>
-  <Fields>
-    <Binary attachment="TaskManagement.settings" />
-    <GlobalOnly>true</GlobalOnly>
-    <Index>400</Index>
-    <Description><![CDATA[When the Task Management module is installed, this is the place where you can configure the connection to the central task management service.]]></Description>
-  </Fields>
-  <Permissions>
-    <Clear />
-  </Permissions>
-</ContentMetaData>
\ No newline at end of file