Merge branch 'canary' of github.com:ChristoferMendes/dokploy into feature/add-custom-webhook-notification-provider

packages/server/src/db/schema/account.ts

@@ -94,6 +94,7 @@ export const member = pgTable("member", {
 	role: text("role").notNull().$type<"owner" | "member" | "admin">(),
 	createdAt: timestamp("created_at").notNull(),
 	teamId: text("team_id"),
+	isDefault: boolean("is_default").notNull().default(false),
 	// Permissions
 	canCreateProjects: boolean("canCreateProjects").notNull().default(false),
 	canAccessToSSHKeys: boolean("canAccessToSSHKeys").notNull().default(false),

packages/server/src/lib/auth.ts

@@ -165,6 +165,7 @@ const { handler, api } = betterAuth({
 								organizationId: organization?.id || "",
 								role: "owner",
 								createdAt: new Date(),
+								isDefault: true, // Mark first organization as default
 							});
 						});
 					}
@@ -174,9 +175,14 @@ const { handler, api } = betterAuth({
 		session: {
 			create: {
 				before: async (session) => {
+					// Find the default organization for this user
+					// Priority: 1) isDefault=true, 2) most recently created
 					const member = await db.query.member.findFirst({
 						where: eq(schema.member.userId, session.userId),
-						orderBy: desc(schema.member.createdAt),
+						orderBy: [
+							desc(schema.member.isDefault),
+							desc(schema.member.createdAt),
+						],
 						with: {
 							organization: true,
 						},

packages/server/src/services/cdn.ts

@@ -616,6 +616,7 @@ const ARVANCLOUD_IP_RANGES = [
 	"37.32.18.0/27",
 	"37.32.19.0/27",
 	"185.215.232.0/22",
+	"178.131.120.48/28",
 ];
 
 const CDN_PROVIDERS: CDNProvider[] = [

packages/server/src/templates/index.ts

@@ -37,7 +37,16 @@ export const generateRandomDomain = ({
 	const hash = randomBytes(3).toString("hex");
 	const slugIp = serverIp.replaceAll(".", "-").replaceAll(":", "-");
 
-	return `${projectName}-${hash}${slugIp === "" ? "" : `-${slugIp}`}.traefik.me`;
+	// Domain labels have a max length of 63 characters
+	// Reserve space for: hash (6) + separators (1-2) + ip section + dot + traefik.me (10)
+	// Approx: 6 + 2 + (variable ip length) + 11 = ~19-30 chars for other parts
+	const maxProjectNameLength = 40;
+	const truncatedProjectName =
+		projectName.length > maxProjectNameLength
+			? projectName.substring(0, maxProjectNameLength)
+			: projectName;
+
+	return `${truncatedProjectName}-${hash}${slugIp === "" ? "" : `-${slugIp}`}.traefik.me`;
 };
 
 export const generateHash = (length = 8): string => {