From 9586213dd129aaf895b455d9c52e9ef9c58f7c96 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 10 May 2022 18:21:05 +0200
Subject: [PATCH] fix: WP custom db

---
 src/lib/database/services.ts                         | 11 ++++++++++-
 src/routes/services/[id]/_Services/_Wordpress.svelte | 12 ++++++------
 src/routes/services/[id]/wordpress/index.json.ts     | 10 ++++++----
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/lib/database/services.ts b/src/lib/database/services.ts
index a1fb7f2de..d2a7bb899 100644
--- a/src/lib/database/services.ts
+++ b/src/lib/database/services.ts
@@ -418,20 +418,27 @@ export async function updateWordpress({
 	fqdn,
 	name,
 	exposePort,
+	ownMysql,
 	mysqlDatabase,
 	extraConfig,
 	mysqlHost,
-	mysqlPort
+	mysqlPort,
+	mysqlUser,
+	mysqlPassword
 }: {
 	id: string;
 	fqdn: string;
 	name: string;
 	exposePort?: number;
+	ownMysql: boolean;
 	mysqlDatabase: string;
 	extraConfig: string;
 	mysqlHost?: string;
 	mysqlPort?: number;
+	mysqlUser?: string;
+	mysqlPassword?: string;
 }): Promise<Service> {
+	mysqlPassword = encrypt(mysqlPassword);
 	return await prisma.service.update({
 		where: { id },
 		data: {
@@ -443,6 +450,8 @@ export async function updateWordpress({
 					mysqlDatabase,
 					extraConfig,
 					mysqlHost,
+					mysqlUser,
+					mysqlPassword,
 					mysqlPort
 				}
 			}
diff --git a/src/routes/services/[id]/_Services/_Wordpress.svelte b/src/routes/services/[id]/_Services/_Wordpress.svelte
index 7dd62c946..13b222fc5 100644
--- a/src/routes/services/[id]/_Services/_Wordpress.svelte
+++ b/src/routes/services/[id]/_Services/_Wordpress.svelte
@@ -175,8 +175,8 @@ define('SUBDOMAIN_INSTALL', false);`
 			id="mysqlRootUser"
 			placeholder="MySQL {$t('forms.root_user')}"
 			value={service.wordpress.mysqlRootUser}
-			readonly={isRunning || !service.wordpress.ownMysq}
-			disabled={isRunning || !service.wordpress.ownMysq}
+			readonly={isRunning || !service.wordpress.ownMysql}
+			disabled={isRunning || !service.wordpress.ownMysql}
 		/>
 	</div>
 	<div class="grid grid-cols-2 items-center px-10">
@@ -184,8 +184,8 @@ define('SUBDOMAIN_INSTALL', false);`
 		<CopyPasswordField
 			id="mysqlRootUserPassword"
 			isPasswordField
-			readonly={isRunning || !service.wordpress.ownMysq}
-			disabled={isRunning || !service.wordpress.ownMysq}
+			readonly={isRunning || !service.wordpress.ownMysql}
+			disabled={isRunning || !service.wordpress.ownMysql}
 			name="mysqlRootUserPassword"
 			value={service.wordpress.mysqlRootUserPassword}
 		/>
@@ -196,7 +196,7 @@ define('SUBDOMAIN_INSTALL', false);`
 	<input
 		name="mysqlUser"
 		id="mysqlUser"
-		value={service.wordpress.mysqlUser}
+		bind:value={service.wordpress.mysqlUser}
 		readonly={isRunning || !service.wordpress.ownMysql}
 		disabled={isRunning || !service.wordpress.ownMysql}
 	/>
@@ -209,6 +209,6 @@ define('SUBDOMAIN_INSTALL', false);`
 		readonly={isRunning || !service.wordpress.ownMysql}
 		disabled={isRunning || !service.wordpress.ownMysql}
 		name="mysqlPassword"
-		value={service.wordpress.mysqlPassword}
+		bind:value={service.wordpress.mysqlPassword}
 	/>
 </div>
diff --git a/src/routes/services/[id]/wordpress/index.json.ts b/src/routes/services/[id]/wordpress/index.json.ts
index a35270009..b10bfeefc 100644
--- a/src/routes/services/[id]/wordpress/index.json.ts
+++ b/src/routes/services/[id]/wordpress/index.json.ts
@@ -12,23 +12,25 @@ export const post: RequestHandler = async (event) => {
 		name,
 		fqdn,
 		exposePort,
-		wordpress: { extraConfig, mysqlDatabase, mysqlHost, mysqlPort }
+		ownMysql,
+		wordpress: { extraConfig, mysqlDatabase, mysqlHost, mysqlPort, mysqlUser, mysqlPassword }
 	} = await event.request.json();
-
 	if (fqdn) fqdn = fqdn.toLowerCase();
 	if (exposePort) exposePort = Number(exposePort);
 	if (mysqlPort) mysqlPort = Number(mysqlPort);
-
 	try {
 		await db.updateWordpress({
 			id,
 			fqdn,
 			name,
 			extraConfig,
+			ownMysql,
 			mysqlDatabase,
 			exposePort,
 			mysqlHost,
-			mysqlPort
+			mysqlPort,
+			mysqlUser,
+			mysqlPassword
 		});
 		return { status: 201 };
 	} catch (error) {