From e6d230c2d8aa1bb3f946629e744c6e0f69c5d465 Mon Sep 17 00:00:00 2001
From: Carlos <28845529+mesacarlos@users.noreply.github.com>
Date: Sat, 21 Aug 2021 13:19:39 +0200
Subject: [PATCH] Update client and modify configManager to autoupdate old
 config files

---
 client/index.html                             | 18 +++---
 .../webconsole/config/ConfigManager.java      | 55 +++++++++++++++----
 2 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/client/index.html b/client/index.html
index d84c5e0..f9c1b95 100644
--- a/client/index.html
+++ b/client/index.html
@@ -264,7 +264,7 @@
 		<!-- Webpage footer -->
 		<footer class="footer mt-auto py-3">
 			<div class="container">
-				<span class="text-muted">WebConsole v2.1 - <a href="https://github.com/mesacarlos/WebConsole">GitHub</a></span>
+				<span class="text-muted">WebConsole v2.2 - <a href="https://github.com/mesacarlos/WebConsole">GitHub</a></span>
 			</div>
 		</footer>
 		
@@ -274,15 +274,15 @@
 		<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
 		
 		<!-- WebConsole JS Objects -->
-		<script src="scripts/object/Setting.js?v=2.1.0"></script>
-		<script src="scripts/object/WSServer.js?v=2.1.0"></script>
+		<script src="scripts/object/Setting.js?v=2.2.0"></script>
+		<script src="scripts/object/WSServer.js?v=2.2.0"></script>
 
 		<!-- WebConsole JS Scripts -->
-		<script src="scripts/WebConsoleLanguage.js?v=2.1.0"></script>
-		<script src="scripts/WebConsoleConnector.js?v=2.1.0"></script>
-		<script src="scripts/WebConsoleManager.js?v=2.1.0"></script>
-		<script src="scripts/WebConsolePersistenceManager.js?v=2.1.0"></script>
-		<script src="scripts/WebConsole.js?v=2.1.0"></script>
-		<script src="scripts/WebConsoleJqueryHandler.js?v=2.1.0"></script>
+		<script src="scripts/WebConsoleLanguage.js?v=2.2.0"></script>
+		<script src="scripts/WebConsoleConnector.js?v=2.2.0"></script>
+		<script src="scripts/WebConsoleManager.js?v=2.2.0"></script>
+		<script src="scripts/WebConsolePersistenceManager.js?v=2.2.0"></script>
+		<script src="scripts/WebConsole.js?v=2.2.0"></script>
+		<script src="scripts/WebConsoleJqueryHandler.js?v=2.2.0"></script>
 	</body>
 </html>
diff --git a/src/es/mesacarlos/webconsole/config/ConfigManager.java b/src/es/mesacarlos/webconsole/config/ConfigManager.java
index c615971..a87eb6f 100644
--- a/src/es/mesacarlos/webconsole/config/ConfigManager.java
+++ b/src/es/mesacarlos/webconsole/config/ConfigManager.java
@@ -42,18 +42,53 @@ public class ConfigManager {
 		// Language config
 		config.addDefault("language", "en");
 		
-		if(config.getConfigurationSection("passwords") == null) {
-			ConfigurationSection passwordsSection = config.createSection("passwords");
-			ConfigurationSection adminPasswordSection = passwordsSection.createSection("admin");
-			ConfigurationSection individualAdminPasswordSection = adminPasswordSection.createSection("user1");
-			individualAdminPasswordSection.addDefault("password", "mySecurePassword");
-			ConfigurationSection commandWhitelist = individualAdminPasswordSection.createSection("commandWhitelist");
-			commandWhitelist.addDefault("enabled", false);
-			commandWhitelist.addDefault("commandWhitelistActsAsBlacklist", false);
-			commandWhitelist.addDefault("whitelist", Arrays.asList("whisper", "gamemode survival"));
-			passwordsSection.createSection("viewer");
+		//Create passwords section if it does not exist
+		ConfigurationSection passwordsSection = config.getConfigurationSection("passwords");
+		if(passwordsSection == null) {
+			passwordsSection = config.createSection("passwords");
 		}
 		
+		//Create passwords.admin section if it does not exist
+		ConfigurationSection adminPasswordSection = passwordsSection.getConfigurationSection("admin");
+		if(adminPasswordSection == null) {
+			adminPasswordSection = passwordsSection.createSection("admin");
+			adminPasswordSection.createSection("user1");
+		}
+		
+		//For each admin user, create the password value and the commandWhitelist section if it does not exist
+		Set<String> adminUsersSections = adminPasswordSection.getKeys(false);
+		for (String adminUserSectionName : adminUsersSections) {
+			ConfigurationSection userSection = adminPasswordSection.getConfigurationSection(adminUserSectionName);
+			if(userSection == null) {
+				//If userSection is null, that means that the config file is prior to v2.2. We need to update the file to v2.2 by replacing the "user:password" value to a new section for each user.
+				String userPasswordFromOldConfig = adminPasswordSection.getString(adminUserSectionName);
+				userSection = adminPasswordSection.createSection(adminUserSectionName);
+				userSection.set("password", userPasswordFromOldConfig);
+			}
+			userSection.addDefault("password", "mySecurePassword");
+			
+			ConfigurationSection commandWhitelist = userSection.getConfigurationSection("commandWhitelist");
+			if(commandWhitelist == null) {
+				commandWhitelist = userSection.createSection("commandWhitelist");
+				commandWhitelist.addDefault("enabled", false);
+				commandWhitelist.addDefault("commandWhitelistActsAsBlacklist", false);
+				commandWhitelist.addDefault("whitelist", Arrays.asList("whisper", "gamemode survival"));
+			}
+		}
+		
+		//Create passwords.viewer section if it does not exist
+		ConfigurationSection viewerPasswordSection = passwordsSection.getConfigurationSection("viewer");
+		if(viewerPasswordSection == null) {
+			viewerPasswordSection = passwordsSection.createSection("viewer");
+		}
+		
+		//For each viewer user, create the password value and the commandWhitelist section if it does not exist
+//		Set<String> viewerUsersSections = viewerPasswordSection.getKeys(false);
+//		for (String viewerUserSectionName : viewerUsersSections) {
+//			ConfigurationSection userSection = viewerPasswordSection.getConfigurationSection(viewerUserSectionName);
+//			userSection.addDefault("password", "mySecurePassword");
+//		}
+		
 		config.options().copyDefaults(true);
 		plugin.saveConfig();
 	}