From a8009734a98fe50067a7cfdad13be0a1eca70995 Mon Sep 17 00:00:00 2001
From: Daniel <daniel31x13@gmail.com>
Date: Thu, 3 Aug 2023 17:54:04 -0400
Subject: [PATCH] added docker bind mounts + bug fix

---
 Dockerfile                              |  4 +--
 docker-compose.yml                      | 24 +++++++--------
 lib/api/controllers/users/updateUser.ts | 41 +++++++++++++++++--------
 3 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6613e0d..0a875e5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # playwright doesnt support debian image
 FROM ubuntu:focal
 
-run apt-get update && apt-get install wget xz-utils -y
+RUN apt-get update && apt-get install wget xz-utils -y
 
 RUN mkdir /data
 
@@ -14,7 +14,7 @@ RUN wget https://nodejs.org/dist/v20.5.0/node-v20.5.0-linux-x64.tar.xz -O nodejs
 ENV PATH="$PATH:/opt/nodejs/bin"
 RUN npm install -g yarn
 
-COPY ./package.json ./yarn.lock ./playwright.config.ts .
+COPY ./package.json ./yarn.lock ./playwright.config.ts ./
 
 RUN yarn
 RUN npx playwright install-deps
diff --git a/docker-compose.yml b/docker-compose.yml
index 4d2912c..219d689 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,20 +1,18 @@
 version: "3.5"
 services:
-  linkwarden:
-    env_file: .env
-    environment:
-      - DATABASE_URL=postgresql://postgres:${POSTGRES_PASSWORD}@postgres:5432/postgres
-    restart: always
-    build: .
-    ports:
-      - 3000:3000
-    volumes:
-      - /var/lib/elasticsearch/data
   postgres:
     image: postgres
     env_file: .env
     restart: always
     volumes:
-      - pgdata:/var/lib/postgresql/data
-volumes:
-  pgdata:
+      - ./pgdata:/var/lib/postgresql/data
+  linkwarden:
+    env_file: .env
+    restart: always
+    build: .
+    ports:
+      - 3000:3000
+    volumes:
+      - ./data:/data/data
+    depends_on:
+      - postgres
diff --git a/lib/api/controllers/users/updateUser.ts b/lib/api/controllers/users/updateUser.ts
index 8f4eb0f..1f41fb5 100644
--- a/lib/api/controllers/users/updateUser.ts
+++ b/lib/api/controllers/users/updateUser.ts
@@ -3,7 +3,11 @@ import { AccountSettings } from "@/types/global";
 import bcrypt from "bcrypt";
 import removeFile from "@/lib/api/storage/removeFile";
 import createFile from "@/lib/api/storage/createFile";
-import updateCustomerEmail from "../../updateCustomerEmail";
+import updateCustomerEmail from "@/lib/api/updateCustomerEmail";
+import createFolder from "@/lib/api/storage/createFolder";
+
+const emailEnabled =
+  process.env.EMAIL_FROM && process.env.EMAIL_SERVER ? true : false;
 
 export default async function updateUser(
   user: AccountSettings,
@@ -14,9 +18,14 @@ export default async function updateUser(
     isSubscriber: boolean;
   }
 ) {
-  if (!user.username || !user.email)
+  if (emailEnabled && !user.email)
     return {
-      response: "Username/Email invalid.",
+      response: "Email invalid.",
+      status: 400,
+    };
+  else if (!user.username)
+    return {
+      response: "Username invalid.",
       status: 400,
     };
 
@@ -32,14 +41,18 @@ export default async function updateUser(
   const userIsTaken = await prisma.user.findFirst({
     where: {
       id: { not: sessionUser.id },
-      OR: [
-        {
-          username: user.username.toLowerCase(),
-        },
-        {
-          email: user.email.toLowerCase(),
-        },
-      ],
+      OR: emailEnabled
+        ? [
+            {
+              username: user.username.toLowerCase(),
+            },
+            {
+              email: user.email?.toLowerCase(),
+            },
+          ]
+        : {
+            username: user.username.toLowerCase(),
+          },
     },
   });
 
@@ -58,6 +71,8 @@ export default async function updateUser(
       try {
         const base64Data = profilePic.replace(/^data:image\/jpeg;base64,/, "");
 
+        createFolder({ filePath: `uploads/avatar` });
+
         await createFile({
           filePath: `uploads/avatar/${sessionUser.id}.jpg`,
           data: base64Data,
@@ -102,12 +117,12 @@ export default async function updateUser(
   const STRIPE_SECRET_KEY = process.env.STRIPE_SECRET_KEY;
   const PRICE_ID = process.env.PRICE_ID;
 
-  if (STRIPE_SECRET_KEY && PRICE_ID)
+  if (STRIPE_SECRET_KEY && PRICE_ID && emailEnabled)
     await updateCustomerEmail(
       STRIPE_SECRET_KEY,
       PRICE_ID,
       sessionUser.email,
-      user.email
+      user.email as string
     );
 
   const { password, ...userInfo } = updatedUser;