From fa16cfec2afce4ac3d77ddcf23fb693f8a5dd42b Mon Sep 17 00:00:00 2001
From: nikolajjsj <10490273+nikolajjsj@users.noreply.github.com>
Date: Sun, 22 Jun 2025 15:10:57 +0200
Subject: [PATCH 1/5] feat(scripts): add script to reset 2fa for admin

Similar style to existing reset-password script
---
 apps/dokploy/reset-2fa.ts | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 apps/dokploy/reset-2fa.ts

diff --git a/apps/dokploy/reset-2fa.ts b/apps/dokploy/reset-2fa.ts
new file mode 100644
index 000000000..573f31d7f
--- /dev/null
+++ b/apps/dokploy/reset-2fa.ts
@@ -0,0 +1,27 @@
+import { findAdmin } from "@dokploy/server";
+import { db } from "@dokploy/server/db";
+import { users_temp } from "@dokploy/server/db/schema";
+import { eq } from "drizzle-orm";
+
+(async () => {
+  try {
+    const result = await findAdmin();
+
+    const update = await db
+      .update(users_temp)
+      .set({
+        twoFactorEnabled: false,
+      })
+      .where(eq(users_temp.id, result.userId));
+
+    if (update) {
+      console.log("2FA reset successful");
+    } else {
+      console.log("Password reset failed");
+    }
+
+    process.exit(0);
+  } catch (error) {
+    console.log("Error resetting 2FA", error);
+  }
+})();

From db8a4e6edf94186fda1df70675945b03caab5e16 Mon Sep 17 00:00:00 2001
From: nikolajjsj <10490273+nikolajjsj@users.noreply.github.com>
Date: Sun, 22 Jun 2025 15:11:12 +0200
Subject: [PATCH 2/5] feat(scripts): add command to run reset-2fa script

---
 apps/dokploy/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json
index fbb833fc6..84180c8c2 100644
--- a/apps/dokploy/package.json
+++ b/apps/dokploy/package.json
@@ -11,6 +11,7 @@
 		"build-next": "next build",
 		"setup": "tsx -r dotenv/config setup.ts && sleep 5 && pnpm run migration:run",
 		"reset-password": "node -r dotenv/config dist/reset-password.mjs",
+		"reset-2fa": "node -r dotenv/config dist/reset-2fa.mjs",
 		"dev": "tsx -r dotenv/config ./server/server.ts  --project tsconfig.server.json ",
 		"dev-turbopack": "TURBOPACK=1 tsx -r dotenv/config ./server/server.ts  --project tsconfig.server.json",
 		"studio": "drizzle-kit studio --config ./server/db/drizzle.config.ts",

From f7fd77f7e9fd06a8d2d7ac6984d92253ef369107 Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sun, 22 Jun 2025 08:31:46 -0600
Subject: [PATCH 3/5] fix: simplify useEffect condition in ShowEnvironment
 component

---
 .../components/dashboard/application/environment/show.tsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/dokploy/components/dashboard/application/environment/show.tsx b/apps/dokploy/components/dashboard/application/environment/show.tsx
index 35ddc51b8..6f504959c 100644
--- a/apps/dokploy/components/dashboard/application/environment/show.tsx
+++ b/apps/dokploy/components/dashboard/application/environment/show.tsx
@@ -49,7 +49,7 @@ export const ShowEnvironment = ({ applicationId }: Props) => {
 		currentBuildArgs !== (data?.buildArgs || "");
 
 	useEffect(() => {
-		if (data && !hasChanges) {
+		if (data) {
 			form.reset({
 				env: data.env || "",
 				buildArgs: data.buildArgs || "",

From b74d3995ee2f662c6d3c27a134e4c6b283514d63 Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sun, 22 Jun 2025 08:32:20 -0600
Subject: [PATCH 4/5] chore: update version in package.json to v0.23.2

---
 apps/dokploy/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json
index fbb833fc6..03ecb5728 100644
--- a/apps/dokploy/package.json
+++ b/apps/dokploy/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "dokploy",
-	"version": "v0.23.1",
+	"version": "v0.23.2",
 	"private": true,
 	"license": "Apache-2.0",
 	"type": "module",

From fca537ee400e9939e4383866dcf68da66d485e0f Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sun, 22 Jun 2025 08:40:13 -0600
Subject: [PATCH 5/5] feat(esbuild): add entry point for reset-2fa script

---
 apps/dokploy/esbuild.config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/dokploy/esbuild.config.ts b/apps/dokploy/esbuild.config.ts
index 9e6469ca3..91854d943 100644
--- a/apps/dokploy/esbuild.config.ts
+++ b/apps/dokploy/esbuild.config.ts
@@ -21,6 +21,7 @@ try {
 			entryPoints: {
 				server: "server/server.ts",
 				"reset-password": "reset-password.ts",
+				"reset-2fa": "reset-2fa.ts",
 			},
 			bundle: true,
 			platform: "node",