fix: hide and disallow email recipients if disabled

stonith404 · Nov 11, 2022 · 34db3ae · 34db3ae
1 parent 32ad43a
commit 34db3ae
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 28 deletions.
diff --git a/backend/src/email/email.service.ts b/backend/src/email/email.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from "@nestjs/common";
+import { Injectable, InternalServerErrorException } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
 import { User } from "@prisma/client";
 import * as nodemailer from "nodemailer";
@@ -19,6 +19,9 @@ export class EmailService {
   });
 
   async sendMail(recipientEmail: string, shareId: string, creator: User) {
+    if (this.config.get("EMAIL_RECIPIENTS_ENABLED") == "false")
+      throw new InternalServerErrorException("Email service disabled");
+
     const shareUrl = `${this.config.get("APP_URL")}/share/${shareId}`;
     const creatorIdentifier =
       creator.firstName && creator.lastName

diff --git a/frontend/.env.example b/frontend/.env.example
@@ -1,4 +1,5 @@
 SHOW_HOME_PAGE=true
 ALLOW_REGISTRATION=true
 MAX_FILE_SIZE=1000000000
-ALLOW_UNAUTHENTICATED_SHARES=false
+ALLOW_UNAUTHENTICATED_SHARES=false
+EMAIL_RECIPIENTS_ENABLED=false
diff --git a/frontend/next.config.js b/frontend/next.config.js
@@ -5,7 +5,8 @@ const nextConfig = {
     ALLOW_REGISTRATION: process.env.ALLOW_REGISTRATION,
     SHOW_HOME_PAGE: process.env.SHOW_HOME_PAGE,
     MAX_FILE_SIZE: process.env.MAX_FILE_SIZE,
-    ALLOW_UNAUTHENTICATED_SHARES: process.env.ALLOW_UNAUTHENTICATED_SHARES
+    ALLOW_UNAUTHENTICATED_SHARES: process.env.ALLOW_UNAUTHENTICATED_SHARES,
+    EMAIL_RECIPIENTS_ENABLED: process.env.EMAIL_RECIPIENTS_ENABLED
   }
 }
 

diff --git a/frontend/src/components/upload/modals/showCreateUploadModal.tsx b/frontend/src/components/upload/modals/showCreateUploadModal.tsx
@@ -225,31 +225,36 @@ const CreateUploadModalBody = ({
             {ExpirationPreview({ form })}
           </Text>
           <Accordion>
-            <Accordion.Item value="recipients" sx={{ borderBottom: "none" }}>
-              <Accordion.Control>Email recipients</Accordion.Control>
-              <Accordion.Panel>
-                <MultiSelect
-                  data={form.values.recipients}
-                  placeholder="Enter email recipients"
-                  searchable
-                  {...form.getInputProps("recipients")}
-                  creatable
-                  getCreateLabel={(query) => `+ ${query}`}
-                  onCreate={(query) => {
-                    if (!query.match(/^\S+@\S+\.\S+$/)) {
-                      form.setFieldError("recipients", "Invalid email address");
-                    } else {
-                      form.setFieldError("recipients", null);
-                      form.setFieldValue("recipients", [
-                        ...form.values.recipients,
-                        query,
-                      ]);
-                      return query;
-                    }
-                  }}
-                />
-              </Accordion.Panel>
-            </Accordion.Item>
+            {publicRuntimeConfig.EMAIL_RECIPIENTS_ENABLED == "true" && (
+              <Accordion.Item value="recipients" sx={{ borderBottom: "none" }}>
+                <Accordion.Control>Email recipients</Accordion.Control>
+                <Accordion.Panel>
+                  <MultiSelect
+                    data={form.values.recipients}
+                    placeholder="Enter email recipients"
+                    searchable
+                    {...form.getInputProps("recipients")}
+                    creatable
+                    getCreateLabel={(query) => `+ ${query}`}
+                    onCreate={(query) => {
+                      if (!query.match(/^\S+@\S+\.\S+$/)) {
+                        form.setFieldError(
+                          "recipients",
+                          "Invalid email address"
+                        );
+                      } else {
+                        form.setFieldError("recipients", null);
+                        form.setFieldValue("recipients", [
+                          ...form.values.recipients,
+                          query,
+                        ]);
+                        return query;
+                      }
+                    }}
+                  />
+                </Accordion.Panel>
+              </Accordion.Item>
+            )}
             <Accordion.Item value="security" sx={{ borderBottom: "none" }}>
               <Accordion.Control>Security options</Accordion.Control>
               <Accordion.Panel>