Merge branch 'Dokploy:canary' into feat/internal-path-routing

apps/api/package.json

@@ -9,25 +9,25 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"dependencies": {
-		"pino": "9.4.0",
-		"pino-pretty": "11.2.2",
-		"@hono/zod-validator": "0.3.0",
-		"zod": "^3.23.4",
-		"react": "18.2.0",
-		"react-dom": "18.2.0",
 		"@dokploy/server": "workspace:*",
 		"@hono/node-server": "^1.12.1",
-		"hono": "^4.5.8",
+		"@hono/zod-validator": "0.3.0",
+		"@nerimity/mimiqueue": "1.2.3",
 		"dotenv": "^16.3.1",
+		"hono": "^4.5.8",
+		"pino": "9.4.0",
+		"pino-pretty": "11.2.2",
+		"react": "18.2.0",
+		"react-dom": "18.2.0",
 		"redis": "4.7.0",
-		"@nerimity/mimiqueue": "1.2.3"
+		"zod": "^3.23.4"
 	},
 	"devDependencies": {
-		"typescript": "^5.4.2",
+		"@types/node": "^20.11.17",
 		"@types/react": "^18.2.37",
 		"@types/react-dom": "^18.2.15",
-		"@types/node": "^20.11.17",
+		"tsx": "^4.7.1",
-		"tsx": "^4.7.1"
+		"typescript": "^5.4.2"
 	},
 	"packageManager": "pnpm@9.5.0"
 }

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.22.7",
+	"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",
@@ -36,8 +37,6 @@
 		"test": "vitest --config __test__/vitest.config.ts"
 	},
 	"dependencies": {
-		"pino": "9.4.0",
-		"pino-pretty": "11.2.2",
 		"@ai-sdk/anthropic": "^1.0.6",
 		"@ai-sdk/azure": "^1.0.15",
 		"@ai-sdk/cohere": "^1.0.6",
@@ -127,6 +126,8 @@
 		"octokit": "3.1.2",
 		"ollama-ai-provider": "^1.1.0",
 		"otpauth": "^9.2.3",
+		"pino": "9.4.0",
+		"pino-pretty": "11.2.2",
 		"postgres": "3.4.4",
 		"public-ip": "6.0.2",
 		"qrcode": "^1.5.3",
@@ -147,13 +148,13 @@
 		"swagger-ui-react": "^5.17.14",
 		"tailwind-merge": "^2.2.0",
 		"tailwindcss-animate": "^1.0.7",
+		"toml": "3.0.0",
 		"undici": "^6.19.2",
 		"use-resize-observer": "9.1.0",
 		"ws": "8.16.0",
 		"xterm-addon-fit": "^0.8.0",
 		"zod": "^3.23.4",
-		"zod-form-data": "^2.0.2",
+		"zod-form-data": "^2.0.2"
-		"toml": "3.0.0"
 	},
 	"devDependencies": {
 		"@types/adm-zip": "^0.5.5",

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

apps/schedules/package.json

@@ -8,26 +8,26 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"dependencies": {
-		"drizzle-orm": "^0.39.1",
-		"ioredis": "5.4.1",
-		"bullmq": "5.4.2",
-		"@hono/zod-validator": "0.3.0",
-		"zod": "^3.23.4",
-		"react": "18.2.0",
-		"react-dom": "18.2.0",
 		"@dokploy/server": "workspace:*",
 		"@hono/node-server": "^1.12.1",
-		"hono": "^4.5.8",
+		"@hono/zod-validator": "0.3.0",
+		"bullmq": "5.4.2",
 		"dotenv": "^16.3.1",
+		"drizzle-orm": "^0.39.1",
+		"hono": "^4.5.8",
+		"ioredis": "5.4.1",
 		"pino": "9.4.0",
-		"pino-pretty": "11.2.2"
+		"pino-pretty": "11.2.2",
+		"react": "18.2.0",
+		"react-dom": "18.2.0",
+		"zod": "^3.23.4"
 	},
 	"devDependencies": {
-		"typescript": "^5.4.2",
+		"@types/node": "^20.11.17",
 		"@types/react": "^18.2.37",
 		"@types/react-dom": "^18.2.15",
-		"@types/node": "^20.11.17",
+		"tsx": "^4.7.1",
-		"tsx": "^4.7.1"
+		"typescript": "^5.4.2"
 	},
 	"packageManager": "pnpm@9.5.0"
 }

package.json

@@ -20,15 +20,15 @@
 		"format-and-lint:fix": "biome check . --write"
 	},
 	"devDependencies": {
-		"dotenv": "16.4.5",
-		"esbuild": "0.20.2",
-		"tsx": "4.16.2",
-		"lint-staged": "^15.2.7",
 		"@biomejs/biome": "1.9.4",
-		"lefthook": "1.8.4",
 		"@commitlint/cli": "^19.3.0",
 		"@commitlint/config-conventional": "^19.2.2",
-		"@types/node": "^18.17.0"
+		"@types/node": "^18.17.0",
+		"dotenv": "16.4.5",
+		"esbuild": "0.20.2",
+		"lefthook": "1.8.4",
+		"lint-staged": "^15.2.7",
+		"tsx": "4.16.2"
 	},
 	"packageManager": "pnpm@9.5.0",
 	"engines": {

packages/server/package.json

@@ -28,9 +28,6 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "pino": "9.4.0",
-    "pino-pretty": "11.2.2",
-    "micromatch": "4.0.8",
     "@ai-sdk/anthropic": "^1.0.6",
     "@ai-sdk/azure": "^1.0.15",
     "@ai-sdk/cohere": "^1.0.6",
@@ -39,27 +36,29 @@
     "@ai-sdk/openai": "^1.0.12",
     "@ai-sdk/openai-compatible": "^0.0.13",
     "@better-auth/utils": "0.2.4",
-    "@oslojs/encoding": "1.1.0",
-    "@oslojs/crypto": "1.0.1",
-    "drizzle-dbml-generator": "0.10.0",
-    "better-auth": "v1.2.8-beta.7",
     "@faker-js/faker": "^8.4.1",
     "@octokit/auth-app": "^6.0.4",
+    "@octokit/rest": "^20.0.2",
+    "@oslojs/crypto": "1.0.1",
+    "@oslojs/encoding": "1.1.0",
     "@react-email/components": "^0.0.21",
     "@trpc/server": "^10.43.6",
     "adm-zip": "^0.5.14",
     "ai": "^4.0.23",
     "bcrypt": "5.1.1",
+    "better-auth": "v1.2.8-beta.7",
     "bl": "6.0.11",
     "boxen": "^7.1.1",
     "date-fns": "3.6.0",
     "dockerode": "4.0.2",
     "dotenv": "16.4.5",
+    "drizzle-dbml-generator": "0.10.0",
     "drizzle-orm": "^0.39.1",
     "drizzle-zod": "0.5.1",
     "hi-base32": "^0.5.1",
     "js-yaml": "4.1.0",
     "lodash": "4.17.21",
+    "micromatch": "4.0.8",
     "nanoid": "3",
     "node-os-utils": "1.3.7",
     "node-pty": "1.0.0",
@@ -68,6 +67,8 @@
     "octokit": "3.1.2",
     "ollama-ai-provider": "^1.1.0",
     "otpauth": "^9.2.3",
+    "pino": "9.4.0",
+    "pino-pretty": "11.2.2",
     "postgres": "3.4.4",
     "public-ip": "6.0.2",
     "qrcode": "^1.5.3",
@@ -75,19 +76,18 @@
     "react-dom": "18.2.0",
     "rotating-file-stream": "3.2.3",
     "slugify": "^1.6.6",
-    "ws": "8.16.0",
-    "zod": "^3.23.4",
     "ssh2": "1.15.0",
-    "@octokit/rest": "^20.0.2",
+    "toml": "3.0.0",
-    "toml": "3.0.0"
+    "ws": "8.16.0",
+    "zod": "^3.23.4"
   },
   "devDependencies": {
-    "@types/micromatch": "4.0.9",
     "@types/adm-zip": "^0.5.5",
     "@types/bcrypt": "5.0.2",
     "@types/dockerode": "3.3.23",
     "@types/js-yaml": "4.0.9",
     "@types/lodash": "4.17.4",
+    "@types/micromatch": "4.0.9",
     "@types/node": "^18.17.0",
     "@types/node-os-utils": "1.3.4",
     "@types/node-schedule": "2.1.6",