From 2af420ef778a724c91de04365eae67b20b30afba Mon Sep 17 00:00:00 2001
From: Mauricio Siu <siumauricio@icloud.com>
Date: Sat, 4 Apr 2026 22:36:43 -0600
Subject: [PATCH] Merge branch 'canary' into
 invite-user-with-initial-credentials

Resolve conflicts:
- Integrate credentials-based user provisioning with canary changes
- Use withPermission("member", "create") instead of adminProcedure
- Adopt standardSchemaResolver, inviteMember mutation, and custom roles from canary
- Restrict credentials flow to non-cloud environments
---
 .../components/dashboard/settings/users/add-invitation.tsx      | 2 +-
 packages/server/src/services/user.ts                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/dokploy/components/dashboard/settings/users/add-invitation.tsx b/apps/dokploy/components/dashboard/settings/users/add-invitation.tsx
index 150fcc9e0..314379586 100644
--- a/apps/dokploy/components/dashboard/settings/users/add-invitation.tsx
+++ b/apps/dokploy/components/dashboard/settings/users/add-invitation.tsx
@@ -139,7 +139,7 @@ export const AddInvitation = () => {
 			if (data.mode === "credentials") {
 				await createUserWithCredentials({
 					email: data.email.toLowerCase(),
-					password: data.password,
+					password: data.password!,
 					role: data.role,
 				});
 				toast.success("User created with initial credentials");
diff --git a/packages/server/src/services/user.ts b/packages/server/src/services/user.ts
index 976f676ba..243751705 100644
--- a/packages/server/src/services/user.ts
+++ b/packages/server/src/services/user.ts
@@ -405,7 +405,7 @@ export const createOrganizationUserWithCredentials = async ({
 	organizationId: string;
 	email: string;
 	password: string;
-	role: "member" | "admin";
+	role: string;
 }) => {
 	const normalizedEmail = email.trim().toLowerCase();
 	const now = new Date();