Implemented generic token handling

src/main/frontend/components/administration/MessageManagement.tsx

@@ -3,14 +3,14 @@ import withConfigPage from "Frontend/components/administration/withConfigPage";
 import ConfigFormField from "Frontend/components/administration/ConfigFormField";
 import Section from "Frontend/components/general/Section";
 import {Button, Card, Tooltip, useDisclosure} from "@nextui-org/react";
-import {MessageTemplateEndpoint, NotificationEndpoint} from "Frontend/generated/endpoints";
+import {MessageEndpoint, MessageTemplateEndpoint} from "Frontend/generated/endpoints";
 import {toast} from "sonner";
 import {PaperPlaneRight, Pencil} from "@phosphor-icons/react";
-import MessageTemplateDto from "Frontend/generated/de/grimsi/gameyfin/notifications/templates/MessageTemplateDto";
-import SendTestNotificationModal from "Frontend/components/administration/notifications/SendTestNotificationModal";
-import EditTemplateModal from "Frontend/components/administration/notifications/EditTemplateModel";
+import MessageTemplateDto from "Frontend/generated/de/grimsi/gameyfin/messages/templates/MessageTemplateDto";
+import SendTestNotificationModal from "Frontend/components/administration/messages/SendTestNotificationModal";
+import EditTemplateModal from "Frontend/components/administration/messages/EditTemplateModel";
 
-function NotificationManagementLayout({getConfig, getConfigs, formik}: any) {
+function MessageManagementLayout({getConfig, getConfigs, formik}: any) {
 
     const editorModal = useDisclosure();
     const testNotificationModal = useDisclosure();
@@ -25,13 +25,13 @@ function NotificationManagementLayout({getConfig, getConfigs, formik}: any) {
 
     async function verifyCredentials(provider: string) {
         const credentials: Record<string, any> = {
-            host: formik.values.notifications.providers.email.host,
-            port: formik.values.notifications.providers.email.port,
-            username: formik.values.notifications.providers.email.username,
-            password: formik.values.notifications.providers.email.password
+            host: formik.values.messages.providers.email.host,
+            port: formik.values.messages.providers.email.port,
+            username: formik.values.messages.providers.email.username,
+            password: formik.values.messages.providers.email.password
         }
 
-        const areCredentialsValid = await NotificationEndpoint.verifyCredentials(provider, credentials);
+        const areCredentialsValid = await MessageEndpoint.verifyCredentials(provider, credentials);
 
         if (areCredentialsValid) {
             toast.success("Credentials are valid")
@@ -57,22 +57,22 @@ function NotificationManagementLayout({getConfig, getConfigs, formik}: any) {
                     <div className="flex flex-row gap-8">
                         <div className="flex flex-col flex-1">
                             <Section title="E-Mail"/>
-                            <ConfigFormField configElement={getConfig("notifications.providers.email.enabled")}/>
-                            <ConfigFormField configElement={getConfig("notifications.providers.email.host")}
-                                             isDisabled={!formik.values.notifications.providers.email.enabled}/>
-                            <ConfigFormField configElement={getConfig("notifications.providers.email.port")}
-                                             isDisabled={!formik.values.notifications.providers.email.enabled}/>
-                            <ConfigFormField configElement={getConfig("notifications.providers.email.username")}
-                                             isDisabled={!formik.values.notifications.providers.email.enabled}/>
-                            <ConfigFormField configElement={getConfig("notifications.providers.email.password")}
+                            <ConfigFormField configElement={getConfig("messages.providers.email.enabled")}/>
+                            <ConfigFormField configElement={getConfig("messages.providers.email.host")}
+                                             isDisabled={!formik.values.messages.providers.email.enabled}/>
+                            <ConfigFormField configElement={getConfig("messages.providers.email.port")}
+                                             isDisabled={!formik.values.messages.providers.email.enabled}/>
+                            <ConfigFormField configElement={getConfig("messages.providers.email.username")}
+                                             isDisabled={!formik.values.messages.providers.email.enabled}/>
+                            <ConfigFormField configElement={getConfig("messages.providers.email.password")}
                                              type="password"
-                                             isDisabled={!formik.values.notifications.providers.email.enabled}/>
+                                             isDisabled={!formik.values.messages.providers.email.enabled}/>
                             <Button onPress={() => verifyCredentials("email")}
                                     isDisabled={!(
-                                        formik.values.notifications.providers.email.enabled &&
-                                        formik.values.notifications.providers.email.host &&
-                                        formik.values.notifications.providers.email.port &&
-                                        formik.values.notifications.providers.email.username)}>Test</Button>
+                                        formik.values.messages.providers.email.enabled &&
+                                        formik.values.messages.providers.email.host &&
+                                        formik.values.messages.providers.email.port &&
+                                        formik.values.messages.providers.email.username)}>Test</Button>
                         </div>
                         <div className="flex flex-col flex-1">
                             <Section title="Message Templates"/>
@@ -119,4 +119,4 @@ function NotificationManagementLayout({getConfig, getConfigs, formik}: any) {
     );
 }
 
-export const NotificationManagement = withConfigPage(NotificationManagementLayout, "Notifications", "notifications");
+export const MessageManagement = withConfigPage(MessageManagementLayout, "Messages", "messages");

src/main/frontend/components/administration/messages/EditTemplateModel.tsx

@@ -12,8 +12,8 @@ import {
 } from "@nextui-org/react";
 import {toast} from "sonner";
 import {MessageTemplateEndpoint} from "Frontend/generated/endpoints";
-import MessageTemplateDto from "Frontend/generated/de/grimsi/gameyfin/notifications/templates/MessageTemplateDto";
-import TemplateType from "Frontend/generated/de/grimsi/gameyfin/notifications/templates/TemplateType";
+import MessageTemplateDto from "Frontend/generated/de/grimsi/gameyfin/messages/templates/MessageTemplateDto";
+import TemplateType from "Frontend/generated/de/grimsi/gameyfin/messages/templates/TemplateType";
 
 interface EditTemplateModalProps {
     isOpen: boolean;
@@ -41,6 +41,12 @@ export default function EditTemplateModal({isOpen, onOpenChange, selectedTemplat
         await MessageTemplateEndpoint.save(template.key, TemplateType.MJML, templateContent);
     }
 
+    function templateContainsAllRequiredPlaceholders(): boolean {
+        if (!selectedTemplate || !selectedTemplate.availablePlaceholders) return false;
+        return selectedTemplate.availablePlaceholders
+            .every((p) => templateContent.includes(`{${p}}`))
+    }
+
     return (
         <Modal isOpen={isOpen} onOpenChange={onOpenChange} size="5xl">
             <ModalContent>
@@ -98,15 +104,17 @@ export default function EditTemplateModal({isOpen, onOpenChange, selectedTemplat
                         </ModalBody>
                         <ModalFooter>
                             <Button color="danger" variant="light" onPress={onClose}>
-                                Close
+                                Cancel
                             </Button>
-                            <Button color="primary" onPress={async () => {
-                                if (selectedTemplate) {
-                                    await saveTemplate(selectedTemplate);
-                                    toast.success("Template saved");
-                                    onClose();
-                                }
-                            }}>
+                            <Button color="primary"
+                                    isDisabled={!templateContainsAllRequiredPlaceholders()}
+                                    onPress={async () => {
+                                        if (selectedTemplate) {
+                                            await saveTemplate(selectedTemplate);
+                                            toast.success("Template saved");
+                                            onClose();
+                                        }
+                                    }}>
                                 Save
                             </Button>
                         </ModalFooter>

src/main/frontend/components/administration/messages/SendTestNotificationModal.tsx

@@ -3,9 +3,9 @@ import {Form, Formik} from "formik";
 import {Button, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@nextui-org/react";
 import {toast} from "sonner";
 import Input from "Frontend/components/general/Input";
-import {NotificationEndpoint} from "Frontend/generated/endpoints";
+import {MessageEndpoint} from "Frontend/generated/endpoints";
 import * as Yup from "yup";
-import MessageTemplateDto from "Frontend/generated/de/grimsi/gameyfin/notifications/templates/MessageTemplateDto";
+import MessageTemplateDto from "Frontend/generated/de/grimsi/gameyfin/messages/templates/MessageTemplateDto";
 
 interface SendTestNotificationModalProps {
     isOpen: boolean;
@@ -35,7 +35,7 @@ export default function SendTestNotificationModal({
                         <Formik
                             initialValues={{}}
                             onSubmit={async (values) => {
-                                await NotificationEndpoint.sendTestNotification(selectedTemplate?.key, values);
+                                await MessageEndpoint.sendTestNotification(selectedTemplate?.key, values);
                                 toast.success("Test notification to you has been sent");
                                 onClose();
                             }}