Merge pull request #2066 from nikolajjsj/feat/reset-2fa-script

Feat/reset 2fa script

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 || "",

apps/dokploy/drizzle/0094_numerous_carmella_unuscione.sql

@@ -1,12 +1,11 @@
 ALTER TABLE "git_provider" ADD COLUMN "userId" text;--> statement-breakpoint
 
 -- Update existing git providers to be owned by the organization owner
--- We need to get the account.user_id for the organization owner
+-- We can get the owner_id directly from the organization table
 UPDATE "git_provider" 
 SET "userId" = (
-    SELECT a.user_id 
+    SELECT o."owner_id" 
     FROM "organization" o 
-    JOIN "account" a ON o."owner_id" = a.user_id 
     WHERE o.id = "git_provider"."organizationId"
 );--> statement-breakpoint
 

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",

apps/dokploy/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "dokploy",
-	"version": "v0.23.0",
+	"version": "v0.23.2",
 	"private": true,
 	"license": "Apache-2.0",
 	"type": "module",
@@ -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",

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);
+  }
+})();