Deal with some edge cases

AuroraLS3 · AuroraLS3 · commit 9850627d8986 · 2025-08-10T14:54:43.000+03:00
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/auth/WebPermission.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/auth/WebPermission.java
@@ -130,7 +130,7 @@ public enum WebPermission implements Supplier<String>, Lang {
 
     MANAGE_GROUPS("Allows modifying group permissions & Access to /manage/groups page"),
     MANAGE_USERS("Allows modifying what users belong to what group"),
-    MANAGE_THEMES("Allows editing and saving themes via theme-editor");
+    MANAGE_THEMES("Allows saving or deleting themes via theme-editor for everyone");
 
     private final String description;
     private final boolean deprecated;
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/datatransfer/ThemeDto.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/datatransfer/ThemeDto.java
@@ -24,11 +24,20 @@
  */
 public class ThemeDto {
 
+    private String name;
     private Map<String, String> colors;
     private Map<String, String> nightColors;
     private Map<String, Object> useCases;
     private Map<String, Object> nightModeUseCases;
 
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public Map<String, String> getColors() {
         return colors;
     }
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/ResponseFactory.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/ResponseFactory.java
@@ -35,7 +35,6 @@
 import com.djrapitops.plan.settings.config.PlanConfig;
 import com.djrapitops.plan.settings.locale.Locale;
 import com.djrapitops.plan.settings.locale.lang.ErrorPageLang;
-import com.djrapitops.plan.settings.theme.Theme;
 import com.djrapitops.plan.storage.database.DBSystem;
 import com.djrapitops.plan.storage.database.Database;
 import com.djrapitops.plan.storage.database.queries.containers.ContainerFetchQueries;
@@ -75,7 +74,6 @@ public class ResponseFactory {
     private final PageFactory pageFactory;
     private final Locale locale;
     private final DBSystem dbSystem;
-    private final Theme theme;
     private final Lazy<Addresses> addresses;
     private final Lazy<BundleAddressCorrection> bundleAddressCorrection;
     private final Formatter<Long> httpLastModifiedFormatter;
@@ -88,7 +86,6 @@ public ResponseFactory(
             Locale locale,
             DBSystem dbSystem,
             Formatters formatters,
-            Theme theme,
             Lazy<Addresses> addresses,
             Lazy<BundleAddressCorrection> bundleAddressCorrection
     ) {
@@ -97,7 +94,6 @@ public ResponseFactory(
         this.pageFactory = pageFactory;
         this.locale = locale;
         this.dbSystem = dbSystem;
-        this.theme = theme;
         this.addresses = addresses;
 
         httpLastModifiedFormatter = formatters.httpLastModifiedLong();
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/theme/SaveThemeJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/theme/SaveThemeJSONResolver.java
@@ -112,16 +112,21 @@ private Response getResponse(@Untrusted String themeName, Request request) {
         if (!themeFilePattern.matcher(themeName).matches()) {
             throw new BadRequestException("'theme' parameter was invalid");
         }
+        if (themeName.length() > 100) {
+            throw new BadRequestException("'theme' name was too long");
+        }
 
         @Untrusted byte[] requestBody = request.getRequestBody();
         try {
             @Untrusted ThemeDto result = gson.fromJson(new String(requestBody, StandardCharsets.UTF_8), ThemeDto.class);
             if (result == null
+                    || result.getName() == null || result.getName().isEmpty()
+                    || !themeFilePattern.matcher(result.getName()).matches()
                     || result.getColors() == null || result.getColors().isEmpty()
                     || result.getNightColors() == null || result.getNightColors().isEmpty()
                     || result.getUseCases() == null || result.getUseCases().isEmpty()
                     || result.getNightModeUseCases() == null || result.getNightModeUseCases().isEmpty()) {
-                throw new BadRequestException("Body needs to be a vaild theme file");
+                throw new BadRequestException("Body needs to be a valid theme file");
             }
 
             List<String> issues = new ArrayList<>();
@@ -135,12 +140,14 @@ private Response getResponse(@Untrusted String themeName, Request request) {
 
             java.nio.file.Path themeDirectory = files.getThemeDirectory();
             java.nio.file.Path themeFile = themeDirectory.resolve(themeName + ".json");
-            if (!themeFile.startsWith(themeFile)) {
+            if (!themeFile.startsWith(themeDirectory)) {
                 throw new BadRequestException("'theme' parameter was invalid");
             }
 
             Files.write(themeFile, gson.toJson(result).getBytes(StandardCharsets.UTF_8), PlanFiles.replaceIfExists());
 
+            request.getQuery().get("originalName")
+                    .ifPresent(originalName -> deleteOriginal(themeName, originalName, themeDirectory));
             return responseFactory.successResponse();
         } catch (JsonSyntaxException e) {
             throw new BadRequestException("Request body was invalid json");
@@ -149,6 +156,32 @@ private Response getResponse(@Untrusted String themeName, Request request) {
         }
     }
 
+    private void deleteOriginal(@Untrusted String themeName, @Untrusted String originalName, java.nio.file.Path themeDirectory) {
+        if (originalName.equals(themeName)) return; // Theme was not renamed.
+
+        // All these checks are against trying to delete other themes than the one they're editing.
+        if (!themeFilePattern.matcher(originalName).matches()) {
+            throw new BadRequestException("'originalTheme' parameter was invalid, theme could have been renamed by another user");
+        }
+        java.nio.file.Path originalThemeFile = themeDirectory.resolve(originalName + ".json");
+        if (!originalThemeFile.startsWith(themeDirectory)) {
+            throw new BadRequestException("'originalTheme' parameter was invalid, theme could have been renamed by another user");
+        }
+        if (!Files.exists(originalThemeFile)) {
+            throw new BadRequestException("'originalTheme' parameter was invalid, theme could have been renamed by another user");
+        }
+        try {
+            ThemeDto original = gson.fromJson(Files.readString(originalThemeFile), ThemeDto.class);
+            if (!original.getName().equals(originalName)) {
+                throw new BadRequestException("'originalTheme' parameter was invalid, doesn't match original file");
+            }
+
+            Files.delete(originalThemeFile);
+        } catch (JsonSyntaxException | IOException e) {
+            throw new BadRequestException("'originalTheme' parameter was invalid, could not parse or delete original file. Delete manually.");
+        }
+    }
+
     private void validateUseCases(String prefix, Map<String, Object> useCases, List<String> issues) {
         for (Map.Entry<String, Object> entry : useCases.entrySet()) {
             String prefixedKey = prefix + entry.getKey();
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/settings/locale/lang/HtmlLang.java b/Plan/common/src/main/java/com/djrapitops/plan/settings/locale/lang/HtmlLang.java
@@ -460,8 +460,7 @@ public enum HtmlLang implements Lang {
     THEME_EDITOR_MISSING("html.label.themeEditor.missing", "Missing color"),
     THEME_EDITOR_REMOVE_OVERRIDE("html.label.themeEditor.removeOverride", "Remove night mode override"),
     THEME_EDITOR_NAME("html.label.themeEditor.themeName", "Theme name"),
-    THEME_EDITOR_INVALID_NAME("html.label.themeEditor.invalidName", "Name should be alphanumerical. Max 100 characters."),
-    THEME_EDITOR_EXISTING_NAME("html.label.themeEditor.existingName", "Name should be unique."),
+    THEME_EDITOR_INVALID_NAME("html.label.themeEditor.invalidName", "Name should be alphanumerical and must be unique. Max 100 characters."),
     THEME_EDITOR_DEFAULT_NAME("html.label.themeEditor.defaultThemeNameFeedback", "Default theme can not be renamed. You can create a new theme based on Default instead."),
     THEME_EDITOR_UNSAVED_CHANGES("html.label.themeEditor.unsavedChanges", "There are unsaved changes - do you still want to leave the page?"),
     THEME_EDITOR_SHOW_HISTORY("html.label.themeEditor.showHistory", "Show history"),
@@ -474,12 +473,14 @@ public enum HtmlLang implements Lang {
     THEME_EDITOR_UPLOAD_THEME("html.label.themeEditor.uploadTheme", "or Upload a previously downloaded theme:"),
 
     THEME_EDITOR_DELETE_THEMES("html.label.themeEditor.deleteThemes", "Delete themes"),
+    THEME_EDITOR_CANNOT_DELETE_BUILT_IN("html.label.themeEditor.canNotDeleteBuiltIn", "Note that you can not delete built-in themes, only the modifications you have made to them."),
     THEME_EDITOR_THEME_TO_DELETE("html.label.themeEditor.themeToDelete", "Theme to delete"),
-    THEME_EDITOR_DOWNLOAD_BEFORE_DELETE("html.label.themeEditor.downloadThemeBeforeDeleting", "Would you like to download the theme before deleting it?"),
-    THEME_EDITOR_CONFIRM_DELETE("html.label.themeEditor.confirmDelete", "I confirm that I want to delete theme called {{theme}} and that this is an irreversible action."),
+    THEME_EDITOR_DOWNLOAD_BEFORE_DELETE("html.label.themeEditor.downloadThemeBeforeDeleting", "Would you like to download the theme '{{theme}}' before deleting it?"),
+    THEME_EDITOR_CONFIRM_DELETE("html.label.themeEditor.confirmDelete", "I confirm that I want to delete theme called '{{theme}}' and that this is an irreversible action."),
     THEME_EDITOR_DELETE_THEME("html.label.themeEditor.deleteTheme", "Delete theme"),
     THEME_EDITOR_DELETE_LOCAL("html.label.themeEditor.deleteLocalTheme", "Delete theme (Only the locally stored one)"),
     THEME_EDITOR_NO_PERMISSION_TO_DELETE("html.label.themeEditor.noPermissionToDelete", "You don't have access rights for deleting non-local themes. You may need to delete them from the plugin folder."),
+    THEME_EDITOR_FAILED_CLONE("html.label.themeEditor.failedToClone", "Failed to clone the original theme {{error}}"),
 
     THEME_EDITOR_CHANGE_RENAME_COLOR("html.label.themeEditor.changes.renameColor", "Renamed {{previous}} to {{name}}, set color to {{color}}"),
     THEME_EDITOR_CHANGE_SET_COLOR("html.label.themeEditor.changes.setColor", "Set {{name}} color to {{color}}"),
diff --git a/Plan/common/src/main/resources/assets/plan/themes/default.json b/Plan/common/src/main/resources/assets/plan/themes/default.json
@@ -1,4 +1,5 @@
 {
+  "name": "default",
   "colors": {
     "black": "#555555",
     "white": "#ffffff",
diff --git a/Plan/common/src/main/resources/assets/plan/themes/high-contrast.json b/Plan/common/src/main/resources/assets/plan/themes/high-contrast.json
@@ -1,4 +1,5 @@
 {
+  "name": "high-contrast",
   "colors": {
     "black": "#000",
     "white": "#ffffff",
diff --git a/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/AccessControlTest.java b/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/AccessControlTest.java
@@ -168,7 +168,11 @@ static Stream<Arguments> testCases() {
                 Arguments.of("/v1/gameAllowlistBounces?server=" + TestConstants.SERVER_UUID_STRING, WebPermission.PAGE_SERVER_ALLOWLIST_BOUNCE, 200, 403),
                 Arguments.of("/v1/theme?theme=default", WebPermission.ACCESS, 200, 200),
                 Arguments.of("/v1/saveTheme?theme=default", WebPermission.MANAGE_THEMES, 405, 403),
-                Arguments.of("/v1/deleteTheme?theme=default", WebPermission.MANAGE_THEMES, 405, 403)
+                Arguments.of("/v1/deleteTheme?theme=default", WebPermission.MANAGE_THEMES, 405, 403),
+                Arguments.of("/theme-editor", WebPermission.ACCESS_THEME_EDITOR, 200, 403),
+                Arguments.of("/theme-editor/new", WebPermission.ACCESS_THEME_EDITOR, 200, 403),
+                Arguments.of("/theme-editor/delete", WebPermission.ACCESS_THEME_EDITOR, 200, 403),
+                Arguments.of("/theme-editor/default", WebPermission.ACCESS_THEME_EDITOR, 200, 403)
         );
     }
 
diff --git a/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/AccessControlVisibilityTest.java b/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/AccessControlVisibilityTest.java
@@ -201,7 +201,9 @@ static Stream<Arguments> pageLevelVisibleCases() {
                 Arguments.arguments(WebPermission.ACCESS_QUERY, "query-button", "query"),
                 Arguments.arguments(WebPermission.ACCESS_PLAYERS, "players-table", "players"),
                 Arguments.arguments(WebPermission.ACCESS_ERRORS, "content", "errors"),
-                Arguments.arguments(WebPermission.ACCESS_THEME_EDITOR, "theme-editor", "theme-editor/default")
+                Arguments.arguments(WebPermission.ACCESS_THEME_EDITOR, "theme-editor", "theme-editor/default"),
+                Arguments.arguments(WebPermission.ACCESS_THEME_EDITOR, "theme-editor", "theme-editor/new"),
+                Arguments.arguments(WebPermission.ACCESS_THEME_EDITOR, "theme-editor", "theme-editor/delete")
 //                Arguments.arguments(WebPermission.ACCESS_DOCS, "swagger-ui", "docs")
         );
     }
diff --git a/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/resolver/json/theme/SaveThemeJSONResolverTest.java b/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/resolver/json/theme/SaveThemeJSONResolverTest.java
@@ -63,6 +63,7 @@ void setUp(PlanFiles files) {
 
     @Test
     void defaultThemeIsDeemedValid(PlanFiles files) throws IOException {
+        when(request.getMethod()).thenReturn("POST");
         when(request.getQuery()).thenReturn(new URIQuery(Map.of("theme", "default")));
         when(request.getRequestBody()).thenReturn(TestResources.getJarResourceAsBytes("/assets/plan/themes/default.json"));
         lenient().when(responseFactory.badRequest(any(), any())).thenReturn(mock(Response.class));
diff --git a/Plan/react/dashboard/src/components/theme/DownloadButton.jsx b/Plan/react/dashboard/src/components/theme/DownloadButton.jsx
@@ -5,7 +5,7 @@ import ActionButton from "../input/ActionButton.jsx";
 import {useTranslation} from "react-i18next";
 import {useThemeEditContext} from "../../hooks/context/themeEditContextHook.jsx";
 
-const DownloadButton = ({className}) => {
+const DownloadButton = ({className, disabled}) => {
     const {t} = useTranslation();
 
     const {
@@ -14,6 +14,7 @@ const DownloadButton = ({className}) => {
 
     const download = () => {
         const dataStr = "data:text/json;charset=utf-8," + encodeURIComponent(JSON.stringify({
+            name,
             colors: currentColors,
             nightColors: currentNightColors,
             useCases: currentUseCases,
@@ -28,7 +29,7 @@ const DownloadButton = ({className}) => {
     }
 
     return (
-        <ActionButton className={className} onClick={download}>
+        <ActionButton className={className} onClick={download} disabled={disabled}>
             <FontAwesomeIcon icon={faDownload}/> {t('html.modal.version.download')}
         </ActionButton>
     )
diff --git a/Plan/react/dashboard/src/hooks/context/themeContextHook.jsx b/Plan/react/dashboard/src/hooks/context/themeContextHook.jsx
@@ -1,6 +1,10 @@
-import {createContext, useCallback, useContext, useEffect, useMemo, useState} from "react";
+import React, {createContext, useCallback, useContext, useEffect, useMemo, useState} from "react";
 import {useTheme} from "../themeHook.jsx";
 import {fetchTheme} from "../../service/metadataService.js";
+import {FontAwesomeIcon as Fa} from "@fortawesome/react-fontawesome";
+import {faExclamationTriangle} from "@fortawesome/free-solid-svg-icons";
+import {useAlertPopupContext} from "./alertPopupContext.jsx";
+import {Trans} from "react-i18next";
 
 const ThemeStorageContext = createContext({});
 
@@ -11,13 +15,16 @@ export const getLocallyStoredThemes = () => {
 export const ThemeStorageContextProvider = ({children}) => {
     const theme = useTheme();
     const {currentTheme, color} = theme;
+    const {addAlert} = useAlertPopupContext();
     const [loaded, setLoaded] = useState(false);
     const [currentColors, setCurrentColors] = useState({});
     const [currentNightColors, setCurrentNightColors] = useState({});
     const [currentUseCases, setCurrentUseCases] = useState({});
     const [currentNightModeUseCases, setCurrentNightModeUseCases] = useState({});
+    const [error, setError] = useState(null);
 
     const loadTheme = useCallback(async (name) => {
+        setError(null);
         let theme;
         if (getLocallyStoredThemes().includes(name)) {
             const found = window.localStorage.getItem(`locally-stored-theme-${name}`);
@@ -28,6 +35,7 @@ export const ThemeStorageContextProvider = ({children}) => {
             const response = await fetchTheme(name);
             if (response.error) {
                 console.error(response.error);
+                setError(response.error);
                 return;
             }
             theme = response.data;
@@ -39,13 +47,16 @@ export const ThemeStorageContextProvider = ({children}) => {
         setLoaded(true);
     }, []);
 
-    const saveUploadedThemeLocally = (name, themeJson) => {
+    const saveUploadedThemeLocally = (name, themeJson, originalName) => {
         const locallyStoredThemes = getLocallyStoredThemes();
         window.localStorage.setItem(`locally-stored-theme-${name}`, JSON.stringify(themeJson));
         if (!locallyStoredThemes.includes(name)) {
             locallyStoredThemes.push(name);
         }
         window.localStorage.setItem(`locally-stored-themes`, JSON.stringify(locallyStoredThemes));
+        if (name !== originalName) {
+            deleteThemeLocally(originalName);
+        }
     }
 
     const deleteThemeLocally = (name) => {
@@ -62,10 +73,20 @@ export const ThemeStorageContextProvider = ({children}) => {
         const response = await fetchTheme(themeToClone);
         if (response.error) {
             console.error(response.error);
-            return; // TODO alert context
+            addAlert({
+                timeout: 15000,
+                color: "error",
+                content: <>
+                    <Fa icon={faExclamationTriangle}/>
+                    {" "}
+                    <Trans i18nKey={"html.label.themeEditor.failedToClone"} values={{error: error?.message}}/>
+                </>
+            });
+            return false;
         }
         const theme = response.data;
         saveUploadedThemeLocally(nameAs, theme);
+        return true;
     }
 
     const reloadTheme = () => {
@@ -84,7 +105,7 @@ export const ThemeStorageContextProvider = ({children}) => {
             : currentUseCases?.themeColorOptions) || [];
         const colorExistsAsOption = themeOptions.includes(color);
         return {
-            loaded,
+            loaded, error,
             name: currentTheme,
             color: colorExistsAsOption ? color : undefined,
             currentColors,
@@ -95,7 +116,7 @@ export const ThemeStorageContextProvider = ({children}) => {
             usedUseCases: theme.nightModeEnabled ? currentUseCases : {...currentUseCases, ...currentNightModeUseCases},
             cloneThemeLocally, saveUploadedThemeLocally, deleteThemeLocally, reloadTheme
         }
-    }, [name, color, currentColors, currentNightColors, currentUseCases, currentNightModeUseCases, loaded, theme.nightModeEnabled]);
+    }, [name, color, currentColors, currentNightColors, currentUseCases, currentNightModeUseCases, loaded, error, theme.nightModeEnabled]);
     return (<ThemeStorageContext.Provider value={sharedState}>
             {children}
         </ThemeStorageContext.Provider>
diff --git a/Plan/react/dashboard/src/hooks/context/themeEditContextHook.jsx b/Plan/react/dashboard/src/hooks/context/themeEditContextHook.jsx
diff --git a/Plan/react/dashboard/src/service/metadataService.js b/Plan/react/dashboard/src/service/metadataService.js
diff --git a/Plan/react/dashboard/src/views/layout/ThemeEditorPage.jsx b/Plan/react/dashboard/src/views/layout/ThemeEditorPage.jsx
diff --git a/Plan/react/dashboard/src/views/theme/AddThemeView.jsx b/Plan/react/dashboard/src/views/theme/AddThemeView.jsx
diff --git a/Plan/react/dashboard/src/views/theme/DeleteThemesView.jsx b/Plan/react/dashboard/src/views/theme/DeleteThemesView.jsx
diff --git a/Plan/react/dashboard/src/views/theme/ThemeEditorView.jsx b/Plan/react/dashboard/src/views/theme/ThemeEditorView.jsx

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "name": "default",`
`2`	`3`	`"colors": {`
`3`	`4`	`"black": "#555555",`
`4`	`5`	`"white": "#ffffff",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "name": "high-contrast",`
`2`	`3`	`"colors": {`
`3`	`4`	`"black": "#000",`
`4`	`5`	`"white": "#ffffff",`