fix: further typos

packages/server/src/services/deployment.ts

@@ -177,7 +177,7 @@ export const createDeployment = async (
 				status: "error",
 				logPath: "",
 				description: deployment.description || "",
-				errorMessage: `An error have occured: ${error instanceof Error ? error.message : error}`,
+				errorMessage: `An error have occurred: ${error instanceof Error ? error.message : error}`,
 				startedAt: new Date().toISOString(),
 				finishedAt: new Date().toISOString(),
 			})
@@ -257,7 +257,7 @@ export const createDeploymentPreview = async (
 				status: "error",
 				logPath: "",
 				description: deployment.description || "",
-				errorMessage: `An error have occured: ${error instanceof Error ? error.message : error}`,
+				errorMessage: `An error have occurred: ${error instanceof Error ? error.message : error}`,
 				startedAt: new Date().toISOString(),
 				finishedAt: new Date().toISOString(),
 			})
@@ -334,7 +334,7 @@ echo "Initializing deployment\n" >> ${logFilePath};
 				status: "error",
 				logPath: "",
 				description: deployment.description || "",
-				errorMessage: `An error have occured: ${error instanceof Error ? error.message : error}`,
+				errorMessage: `An error have occurred: ${error instanceof Error ? error.message : error}`,
 				startedAt: new Date().toISOString(),
 				finishedAt: new Date().toISOString(),
 			})
@@ -418,7 +418,7 @@ echo "Initializing backup\n" >> ${logFilePath};
 				status: "error",
 				logPath: "",
 				description: deployment.description || "",
-				errorMessage: `An error have occured: ${error instanceof Error ? error.message : error}`,
+				errorMessage: `An error have occurred: ${error instanceof Error ? error.message : error}`,
 				startedAt: new Date().toISOString(),
 				finishedAt: new Date().toISOString(),
 			})
@@ -493,7 +493,7 @@ export const createDeploymentSchedule = async (
 				status: "error",
 				logPath: "",
 				description: deployment.description || "",
-				errorMessage: `An error have occured: ${error instanceof Error ? error.message : error}`,
+				errorMessage: `An error have occurred: ${error instanceof Error ? error.message : error}`,
 				startedAt: new Date().toISOString(),
 				finishedAt: new Date().toISOString(),
 			})
@@ -578,7 +578,7 @@ export const createDeploymentVolumeBackup = async (
 				status: "error",
 				logPath: "",
 				description: deployment.description || "",
-				errorMessage: `An error have occured: ${error instanceof Error ? error.message : error}`,
+				errorMessage: `An error have occurred: ${error instanceof Error ? error.message : error}`,
 				startedAt: new Date().toISOString(),
 				finishedAt: new Date().toISOString(),
 			})

packages/server/src/services/destination.ts

@@ -9,7 +9,7 @@ import type { z } from "zod";
 
 export type Destination = typeof destinations.$inferSelect;
 
-export const createDestintation = async (
+export const createDestination = async (
 	input: z.infer<typeof apiCreateDestination>,
 	organizationId: string,
 ) => {

packages/server/src/services/settings.ts

@@ -383,12 +383,12 @@ export const readPorts = async (
 	const seenPorts = new Set<string>();
 	for (const key in parsedResult) {
 		if (Object.hasOwn(parsedResult, key)) {
-			const containerPortMapppings = parsedResult[key];
+			const containerPortMappings = parsedResult[key];
 			const protocol = key.split("/")[1];
 			const targetPort = Number.parseInt(key.split("/")[0] ?? "0", 10);
 
 			// Take only the first mapping to avoid duplicates (IPv4 and IPv6)
-			const firstMapping = containerPortMapppings[0];
+			const firstMapping = containerPortMappings[0];
 			if (firstMapping) {
 				const publishedPort = Number.parseInt(firstMapping.HostPort, 10);
 				const portKey = `${targetPort}-${publishedPort}-${protocol}`;

packages/server/src/services/user.ts

@@ -7,452 +7,452 @@ import { auth } from "../lib/auth";
 export type User = typeof user.$inferSelect;
 
 export const addNewProject = async (
-	userId: string,
-	projectId: string,
-	organizationId: string,
+  userId: string,
+  projectId: string,
+  organizationId: string,
 ) => {
-	const userR = await findMemberById(userId, organizationId);
+  const userR = await findMemberById(userId, organizationId);
 
-	await db
-		.update(member)
-		.set({
-			accessedProjects: [...userR.accessedProjects, projectId],
-		})
-		.where(
-			and(eq(member.id, userR.id), eq(member.organizationId, organizationId)),
-		);
+  await db
+    .update(member)
+    .set({
+      accessedProjects: [...userR.accessedProjects, projectId],
+    })
+    .where(
+      and(eq(member.id, userR.id), eq(member.organizationId, organizationId)),
+    );
 };
 
 export const addNewEnvironment = async (
-	userId: string,
-	environmentId: string,
-	organizationId: string,
+  userId: string,
+  environmentId: string,
+  organizationId: string,
 ) => {
-	const userR = await findMemberById(userId, organizationId);
+  const userR = await findMemberById(userId, organizationId);
 
-	await db
-		.update(member)
-		.set({
-			accessedEnvironments: [...userR.accessedEnvironments, environmentId],
-		})
-		.where(
-			and(eq(member.id, userR.id), eq(member.organizationId, organizationId)),
-		);
+  await db
+    .update(member)
+    .set({
+      accessedEnvironments: [...userR.accessedEnvironments, environmentId],
+    })
+    .where(
+      and(eq(member.id, userR.id), eq(member.organizationId, organizationId)),
+    );
 };
 
 export const addNewService = async (
-	userId: string,
-	serviceId: string,
-	organizationId: string,
+  userId: string,
+  serviceId: string,
+  organizationId: string,
 ) => {
-	const userR = await findMemberById(userId, organizationId);
-	await db
-		.update(member)
-		.set({
-			accessedServices: [...userR.accessedServices, serviceId],
-		})
-		.where(
-			and(eq(member.id, userR.id), eq(member.organizationId, organizationId)),
-		);
+  const userR = await findMemberById(userId, organizationId);
+  await db
+    .update(member)
+    .set({
+      accessedServices: [...userR.accessedServices, serviceId],
+    })
+    .where(
+      and(eq(member.id, userR.id), eq(member.organizationId, organizationId)),
+    );
 };
 
 export const canPerformCreationService = async (
-	userId: string,
-	projectId: string,
-	organizationId: string,
+  userId: string,
+  projectId: string,
+  organizationId: string,
 ) => {
-	const { accessedProjects, canCreateServices } = await findMemberById(
-		userId,
-		organizationId,
-	);
-	const haveAccessToProject = accessedProjects.includes(projectId);
+  const { accessedProjects, canCreateServices } = await findMemberById(
+    userId,
+    organizationId,
+  );
+  const haveAccessToProject = accessedProjects.includes(projectId);
 
-	if (canCreateServices && haveAccessToProject) {
-		return true;
-	}
+  if (canCreateServices && haveAccessToProject) {
+    return true;
+  }
 
-	return false;
+  return false;
 };
 
 export const canPerformAccessService = async (
-	userId: string,
-	serviceId: string,
-	organizationId: string,
+  userId: string,
+  serviceId: string,
+  organizationId: string,
 ) => {
-	const { accessedServices } = await findMemberById(userId, organizationId);
-	const haveAccessToService = accessedServices.includes(serviceId);
+  const { accessedServices } = await findMemberById(userId, organizationId);
+  const haveAccessToService = accessedServices.includes(serviceId);
 
-	if (haveAccessToService) {
-		return true;
-	}
+  if (haveAccessToService) {
+    return true;
+  }
 
-	return false;
+  return false;
 };
 
-export const canPeformDeleteService = async (
-	userId: string,
-	serviceId: string,
-	organizationId: string,
+export const canPerformDeleteService = async (
+  userId: string,
+  serviceId: string,
+  organizationId: string,
 ) => {
-	const { accessedServices, canDeleteServices } = await findMemberById(
-		userId,
-		organizationId,
-	);
-	const haveAccessToService = accessedServices.includes(serviceId);
+  const { accessedServices, canDeleteServices } = await findMemberById(
+    userId,
+    organizationId,
+  );
+  const haveAccessToService = accessedServices.includes(serviceId);
 
-	if (canDeleteServices && haveAccessToService) {
-		return true;
-	}
+  if (canDeleteServices && haveAccessToService) {
+    return true;
+  }
 
-	return false;
+  return false;
 };
 
 export const canPerformCreationProject = async (
-	userId: string,
-	organizationId: string,
+  userId: string,
+  organizationId: string,
 ) => {
-	const { canCreateProjects } = await findMemberById(userId, organizationId);
+  const { canCreateProjects } = await findMemberById(userId, organizationId);
 
-	if (canCreateProjects) {
-		return true;
-	}
+  if (canCreateProjects) {
+    return true;
+  }
 
-	return false;
+  return false;
 };
 
 export const canPerformDeleteProject = async (
-	userId: string,
-	organizationId: string,
+  userId: string,
+  organizationId: string,
 ) => {
-	const { canDeleteProjects } = await findMemberById(userId, organizationId);
+  const { canDeleteProjects } = await findMemberById(userId, organizationId);
 
-	if (canDeleteProjects) {
-		return true;
-	}
+  if (canDeleteProjects) {
+    return true;
+  }
 
-	return false;
+  return false;
 };
 
 export const canPerformAccessProject = async (
-	userId: string,
-	projectId: string,
-	organizationId: string,
+  userId: string,
+  projectId: string,
+  organizationId: string,
 ) => {
-	const { accessedProjects } = await findMemberById(userId, organizationId);
+  const { accessedProjects } = await findMemberById(userId, organizationId);
 
-	const haveAccessToProject = accessedProjects.includes(projectId);
+  const haveAccessToProject = accessedProjects.includes(projectId);
 
-	if (haveAccessToProject) {
-		return true;
-	}
-	return false;
+  if (haveAccessToProject) {
+    return true;
+  }
+  return false;
 };
 
 export const canPerformAccessEnvironment = async (
-	userId: string,
-	environmentId: string,
-	organizationId: string,
+  userId: string,
+  environmentId: string,
+  organizationId: string,
 ) => {
-	const { accessedEnvironments } = await findMemberById(userId, organizationId);
-	const haveAccessToEnvironment = accessedEnvironments.includes(environmentId);
+  const { accessedEnvironments } = await findMemberById(userId, organizationId);
+  const haveAccessToEnvironment = accessedEnvironments.includes(environmentId);
 
-	if (haveAccessToEnvironment) {
-		return true;
-	}
+  if (haveAccessToEnvironment) {
+    return true;
+  }
 
-	return false;
+  return false;
 };
 
 export const canPerformDeleteEnvironment = async (
-	userId: string,
-	projectId: string,
-	organizationId: string,
+  userId: string,
+  projectId: string,
+  organizationId: string,
 ) => {
-	const { accessedProjects, canDeleteEnvironments } = await findMemberById(
-		userId,
-		organizationId,
-	);
-	const haveAccessToProject = accessedProjects.includes(projectId);
+  const { accessedProjects, canDeleteEnvironments } = await findMemberById(
+    userId,
+    organizationId,
+  );
+  const haveAccessToProject = accessedProjects.includes(projectId);
 
-	if (canDeleteEnvironments && haveAccessToProject) {
-		return true;
-	}
+  if (canDeleteEnvironments && haveAccessToProject) {
+    return true;
+  }
 
-	return false;
+  return false;
 };
 
 export const canAccessToTraefikFiles = async (
-	userId: string,
-	organizationId: string,
+  userId: string,
+  organizationId: string,
 ) => {
-	const { canAccessToTraefikFiles } = await findMemberById(
-		userId,
-		organizationId,
-	);
-	return canAccessToTraefikFiles;
+  const { canAccessToTraefikFiles } = await findMemberById(
+    userId,
+    organizationId,
+  );
+  return canAccessToTraefikFiles;
 };
 
 export const checkServiceAccess = async (
-	userId: string,
-	serviceId: string,
-	organizationId: string,
-	action = "access" as "access" | "create" | "delete",
+  userId: string,
+  serviceId: string,
+  organizationId: string,
+  action = "access" as "access" | "create" | "delete",
 ) => {
-	let hasPermission = false;
-	switch (action) {
-		case "create":
-			hasPermission = await canPerformCreationService(
-				userId,
-				serviceId,
-				organizationId,
-			);
-			break;
-		case "access":
-			hasPermission = await canPerformAccessService(
-				userId,
-				serviceId,
-				organizationId,
-			);
-			break;
-		case "delete":
-			hasPermission = await canPeformDeleteService(
-				userId,
-				serviceId,
-				organizationId,
-			);
-			break;
-		default:
-			hasPermission = false;
-	}
-	if (!hasPermission) {
-		throw new TRPCError({
-			code: "UNAUTHORIZED",
-			message: "Permission denied",
-		});
-	}
+  let hasPermission = false;
+  switch (action) {
+    case "create":
+      hasPermission = await canPerformCreationService(
+        userId,
+        serviceId,
+        organizationId,
+      );
+      break;
+    case "access":
+      hasPermission = await canPerformAccessService(
+        userId,
+        serviceId,
+        organizationId,
+      );
+      break;
+    case "delete":
+      hasPermission = await canPerformDeleteService(
+        userId,
+        serviceId,
+        organizationId,
+      );
+      break;
+    default:
+      hasPermission = false;
+  }
+  if (!hasPermission) {
+    throw new TRPCError({
+      code: "UNAUTHORIZED",
+      message: "Permission denied",
+    });
+  }
 };
 
 export const checkEnvironmentAccess = async (
-	userId: string,
-	environmentId: string,
-	organizationId: string,
-	action = "access" as const,
+  userId: string,
+  environmentId: string,
+  organizationId: string,
+  action = "access" as const,
 ) => {
-	let hasPermission = false;
-	switch (action) {
-		case "access":
-			hasPermission = await canPerformAccessEnvironment(
-				userId,
-				environmentId,
-				organizationId,
-			);
-			break;
-		default:
-			hasPermission = false;
-	}
-	if (!hasPermission) {
-		throw new TRPCError({
-			code: "UNAUTHORIZED",
-			message: "Permission denied",
-		});
-	}
+  let hasPermission = false;
+  switch (action) {
+    case "access":
+      hasPermission = await canPerformAccessEnvironment(
+        userId,
+        environmentId,
+        organizationId,
+      );
+      break;
+    default:
+      hasPermission = false;
+  }
+  if (!hasPermission) {
+    throw new TRPCError({
+      code: "UNAUTHORIZED",
+      message: "Permission denied",
+    });
+  }
 };
 
 export const checkEnvironmentDeletionPermission = async (
-	userId: string,
-	projectId: string,
-	organizationId: string,
+  userId: string,
+  projectId: string,
+  organizationId: string,
 ) => {
-	const member = await findMemberById(userId, organizationId);
+  const member = await findMemberById(userId, organizationId);
 
-	if (!member) {
-		throw new TRPCError({
-			code: "UNAUTHORIZED",
-			message: "User not found in organization",
-		});
-	}
+  if (!member) {
+    throw new TRPCError({
+      code: "UNAUTHORIZED",
+      message: "User not found in organization",
+    });
+  }
 
-	if (member.role === "owner" || member.role === "admin") {
-		return true;
-	}
+  if (member.role === "owner" || member.role === "admin") {
+    return true;
+  }
 
-	if (!member.canDeleteEnvironments) {
-		throw new TRPCError({
-			code: "UNAUTHORIZED",
-			message: "You don't have permission to delete environments",
-		});
-	}
+  if (!member.canDeleteEnvironments) {
+    throw new TRPCError({
+      code: "UNAUTHORIZED",
+      message: "You don't have permission to delete environments",
+    });
+  }
 
-	const hasProjectAccess = member.accessedProjects.includes(projectId);
-	if (!hasProjectAccess) {
-		throw new TRPCError({
-			code: "UNAUTHORIZED",
-			message: "You don't have access to this project",
-		});
-	}
+  const hasProjectAccess = member.accessedProjects.includes(projectId);
+  if (!hasProjectAccess) {
+    throw new TRPCError({
+      code: "UNAUTHORIZED",
+      message: "You don't have access to this project",
+    });
+  }
 
-	return true;
+  return true;
 };
 
 export const checkProjectAccess = async (
-	authId: string,
-	action: "create" | "delete" | "access",
-	organizationId: string,
-	projectId?: string,
+  authId: string,
+  action: "create" | "delete" | "access",
+  organizationId: string,
+  projectId?: string,
 ) => {
-	let hasPermission = false;
-	switch (action) {
-		case "access":
-			hasPermission = await canPerformAccessProject(
-				authId,
-				projectId as string,
-				organizationId,
-			);
-			break;
-		case "create":
-			hasPermission = await canPerformCreationProject(authId, organizationId);
-			break;
-		case "delete":
-			hasPermission = await canPerformDeleteProject(authId, organizationId);
-			break;
-		default:
-			hasPermission = false;
-	}
-	if (!hasPermission) {
-		throw new TRPCError({
-			code: "UNAUTHORIZED",
-			message: "Permission denied",
-		});
-	}
+  let hasPermission = false;
+  switch (action) {
+    case "access":
+      hasPermission = await canPerformAccessProject(
+        authId,
+        projectId as string,
+        organizationId,
+      );
+      break;
+    case "create":
+      hasPermission = await canPerformCreationProject(authId, organizationId);
+      break;
+    case "delete":
+      hasPermission = await canPerformDeleteProject(authId, organizationId);
+      break;
+    default:
+      hasPermission = false;
+  }
+  if (!hasPermission) {
+    throw new TRPCError({
+      code: "UNAUTHORIZED",
+      message: "Permission denied",
+    });
+  }
 };
 
 export const checkEnvironmentCreationPermission = async (
-	userId: string,
-	projectId: string,
-	organizationId: string,
+  userId: string,
+  projectId: string,
+  organizationId: string,
 ) => {
-	// Get user's member record
-	const member = await findMemberById(userId, organizationId);
+  // Get user's member record
+  const member = await findMemberById(userId, organizationId);
 
-	if (!member) {
-		throw new TRPCError({
-			code: "UNAUTHORIZED",
-			message: "User not found in organization",
-		});
-	}
+  if (!member) {
+    throw new TRPCError({
+      code: "UNAUTHORIZED",
+      message: "User not found in organization",
+    });
+  }
 
-	// Owners and admins can always create environments
-	if (member.role === "owner" || member.role === "admin") {
-		return true;
-	}
+  // Owners and admins can always create environments
+  if (member.role === "owner" || member.role === "admin") {
+    return true;
+  }
 
-	// Check if user has canCreateEnvironments permission
-	if (!member.canCreateEnvironments) {
-		throw new TRPCError({
-			code: "UNAUTHORIZED",
-			message: "You don't have permission to create environments",
-		});
-	}
+  // Check if user has canCreateEnvironments permission
+  if (!member.canCreateEnvironments) {
+    throw new TRPCError({
+      code: "UNAUTHORIZED",
+      message: "You don't have permission to create environments",
+    });
+  }
 
-	// Check if user has access to the project
-	const hasProjectAccess = member.accessedProjects.includes(projectId);
-	if (!hasProjectAccess) {
-		throw new TRPCError({
-			code: "UNAUTHORIZED",
-			message: "You don't have access to this project",
-		});
-	}
+  // Check if user has access to the project
+  const hasProjectAccess = member.accessedProjects.includes(projectId);
+  if (!hasProjectAccess) {
+    throw new TRPCError({
+      code: "UNAUTHORIZED",
+      message: "You don't have access to this project",
+    });
+  }
 
-	return true;
+  return true;
 };
 
 export const findMemberById = async (
-	userId: string,
-	organizationId: string,
+  userId: string,
+  organizationId: string,
 ) => {
-	const result = await db.query.member.findFirst({
-		where: and(
-			eq(member.userId, userId),
-			eq(member.organizationId, organizationId),
-		),
-		with: {
-			user: true,
-		},
-	});
+  const result = await db.query.member.findFirst({
+    where: and(
+      eq(member.userId, userId),
+      eq(member.organizationId, organizationId),
+    ),
+    with: {
+      user: true,
+    },
+  });
 
-	if (!result) {
-		throw new TRPCError({
-			code: "UNAUTHORIZED",
-			message: "Permission denied",
-		});
-	}
-	return result;
+  if (!result) {
+    throw new TRPCError({
+      code: "UNAUTHORIZED",
+      message: "Permission denied",
+    });
+  }
+  return result;
 };
 
 export const updateUser = async (userId: string, userData: Partial<User>) => {
-	// Validate email if it's being updated
-	if (userData.email !== undefined) {
-		if (!userData.email || userData.email.trim() === "") {
-			throw new Error("Email is required and cannot be empty");
-		}
+  // Validate email if it's being updated
+  if (userData.email !== undefined) {
+    if (!userData.email || userData.email.trim() === "") {
+      throw new Error("Email is required and cannot be empty");
+    }
 
-		// Basic email format validation
-		const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-		if (!emailRegex.test(userData.email)) {
-			throw new Error("Please enter a valid email address");
-		}
-	}
+    // Basic email format validation
+    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+    if (!emailRegex.test(userData.email)) {
+      throw new Error("Please enter a valid email address");
+    }
+  }
 
-	const userResult = await db
-		.update(user)
-		.set({
-			...userData,
-		})
-		.where(eq(user.id, userId))
-		.returning()
-		.then((res) => res[0]);
+  const userResult = await db
+    .update(user)
+    .set({
+      ...userData,
+    })
+    .where(eq(user.id, userId))
+    .returning()
+    .then((res) => res[0]);
 
-	return userResult;
+  return userResult;
 };
 
 export const createApiKey = async (
-	userId: string,
-	input: {
-		name: string;
-		prefix?: string;
-		expiresIn?: number;
-		metadata: {
-			organizationId: string;
-		};
-		rateLimitEnabled?: boolean;
-		rateLimitTimeWindow?: number;
-		rateLimitMax?: number;
-		remaining?: number;
-		refillAmount?: number;
-		refillInterval?: number;
-	},
+  userId: string,
+  input: {
+    name: string;
+    prefix?: string;
+    expiresIn?: number;
+    metadata: {
+      organizationId: string;
+    };
+    rateLimitEnabled?: boolean;
+    rateLimitTimeWindow?: number;
+    rateLimitMax?: number;
+    remaining?: number;
+    refillAmount?: number;
+    refillInterval?: number;
+  },
 ) => {
-	const result = await auth.createApiKey({
-		body: {
-			name: input.name,
-			expiresIn: input.expiresIn,
-			prefix: input.prefix,
-			rateLimitEnabled: input.rateLimitEnabled,
-			rateLimitTimeWindow: input.rateLimitTimeWindow,
-			rateLimitMax: input.rateLimitMax,
-			remaining: input.remaining,
-			refillAmount: input.refillAmount,
-			refillInterval: input.refillInterval,
-			userId,
-		},
-	});
+  const result = await auth.createApiKey({
+    body: {
+      name: input.name,
+      expiresIn: input.expiresIn,
+      prefix: input.prefix,
+      rateLimitEnabled: input.rateLimitEnabled,
+      rateLimitTimeWindow: input.rateLimitTimeWindow,
+      rateLimitMax: input.rateLimitMax,
+      remaining: input.remaining,
+      refillAmount: input.refillAmount,
+      refillInterval: input.refillInterval,
+      userId,
+    },
+  });
 
-	if (input.metadata) {
-		await db
-			.update(apikey)
-			.set({ metadata: JSON.stringify(input.metadata) })
-			.where(eq(apikey.id, result.id));
-	}
+  if (input.metadata) {
+    await db
+      .update(apikey)
+      .set({ metadata: JSON.stringify(input.metadata) })
+      .where(eq(apikey.id, result.id));
+  }
 
-	return result;
+  return result;
 };