feat: custom email message

stonith404 · Dec 15, 2022 · 0616a68 · 0616a68
1 parent bfb47ba
commit 0616a68
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 10 deletions.
diff --git a/backend/prisma/seed/config.seed.ts b/backend/prisma/seed/config.seed.ts
@@ -60,6 +60,12 @@ const configVariables: Prisma.ConfigCreateInput[] = [
     value: "false",
     secret: false,
   },
+  {
+    key: "EMAIL_MESSAGE",
+    description: "Message which gets sent to the recipients. {creator} and {shareUrl} will be replaced with the creator's name and the share URL.",
+    type: "text",
+    value: "Hey!\n{creator} shared some files with you. View or download the files with this link: {shareUrl}\nShared securely with Pingvin Share 🐧",
+  },
   {
     key: "SMTP_HOST",
     description: "Host of the SMTP server",

diff --git a/backend/src/config/config.service.ts b/backend/src/config/config.service.ts
@@ -23,7 +23,8 @@ export class ConfigService {
 
     if (configVariable.type == "number") return parseInt(configVariable.value);
     if (configVariable.type == "boolean") return configVariable.value == "true";
-    if (configVariable.type == "string") return configVariable.value;
+    if (configVariable.type == "string" || configVariable.type == "text")
+      return configVariable.value;
   }
 
   async listForAdmin() {
@@ -46,10 +47,15 @@ export class ConfigService {
     if (!configVariable || configVariable.locked)
       throw new NotFoundException("Config variable not found");
 
-    if (typeof value != configVariable.type)
+    if (
+      typeof value != configVariable.type &&
+      typeof value == "string" &&
+      configVariable.type != "text"
+    ) {
       throw new BadRequestException(
         `Config variable must be of type ${configVariable.type}`
       );
+    }
 
     const updatedVariable = await this.prisma.config.update({
       where: { key },

diff --git a/backend/src/email/email.service.ts b/backend/src/email/email.service.ts
@@ -28,7 +28,11 @@ export class EmailService {
       from: `"Pingvin Share" <${this.config.get("SMTP_EMAIL")}>`,
       to: recipientEmail,
       subject: "Files shared with you",
-      text: `Hey!\n${creator.username} shared some files with you. View or dowload the files with this link: ${shareUrl}\nShared securely with Pingvin Share 🐧`,
+      text: this.config
+        .get("EMAIL_MESSAGE")
+        .replaceAll("\\n", "\n")
+        .replaceAll("{creator}", creator.username)
+        .replaceAll("{shareUrl}", shareUrl),
     });
   }
 }
diff --git a/frontend/src/components/admin/AdminConfigTable.tsx b/frontend/src/components/admin/AdminConfigTable.tsx
@@ -73,9 +73,18 @@ const AdminConfigTable = () => {
                     </Text>
                   </td>
                   <td>
-                    {configVariable.obscured
-                      ? "•".repeat(configVariable.value.length)
-                      : configVariable.value}
+                    <Text
+                      style={{
+                        whiteSpace: "nowrap",
+                        overflow: "hidden",
+                        textOverflow: "ellipsis",
+                        maxWidth: "40ch",
+                      }}
+                    >
+                      {configVariable.obscured
+                        ? "•".repeat(configVariable.value.length)
+                        : configVariable.value}
+                    </Text>
                   </td>
                   <td>
                     <Group position="right">

diff --git a/frontend/src/components/admin/showUpdateConfigVariableModal.tsx b/frontend/src/components/admin/showUpdateConfigVariableModal.tsx
@@ -7,6 +7,7 @@ import {
   Space,
   Stack,
   Text,
+  Textarea,
   TextInput,
   Title,
 } from "@mantine/core";
@@ -45,6 +46,7 @@ const Body = ({
   const form = useForm({
     initialValues: {
       stringValue: configVariable.value,
+      textValue: configVariable.value,
       numberValue: parseInt(configVariable.value),
       booleanValue: configVariable.value,
     },
@@ -56,12 +58,16 @@ const Body = ({
       </Text>
       {configVariable.type == "string" &&
         (configVariable.obscured ? (
-          <PasswordInput label="Value" {...form.getInputProps("stringValue")} />
+          <PasswordInput {...form.getInputProps("stringValue")} />
         ) : (
-          <TextInput label="Value" {...form.getInputProps("stringValue")} />
+          <TextInput {...form.getInputProps("stringValue")} />
         ))}
+
+      {configVariable.type == "text" && (
+        <Textarea autosize {...form.getInputProps("textValue")} />
+      )}
       {configVariable.type == "number" && (
-        <NumberInput label="Value" {...form.getInputProps("numberValue")} />
+        <NumberInput {...form.getInputProps("numberValue")} />
       )}
       {configVariable.type == "boolean" && (
         <Select
@@ -78,6 +84,8 @@ const Body = ({
           const value =
             configVariable.type == "string"
               ? form.values.stringValue
+              : configVariable.type == "text"
+              ? form.values.textValue
               : configVariable.type == "number"
               ? form.values.numberValue
               : form.values.booleanValue == "true";

diff --git a/frontend/src/services/config.service.ts b/frontend/src/services/config.service.ts
@@ -27,7 +27,7 @@ const get = (key: string, configVariables: Config[]): any => {
 
   if (configVariable.type == "number") return parseInt(configVariable.value);
   if (configVariable.type == "boolean") return configVariable.value == "true";
-  if (configVariable.type == "string") return configVariable.value;
+  if (configVariable.type == "string" || configVariable.type == "text") return configVariable.value;
 };
 
 const finishSetup = async (): Promise<AdminConfig[]> => {