Skip to content

Commit 2af420e

Browse files
committed
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
1 parent 87c7305 commit 2af420e

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

apps/dokploy/components/dashboard/settings/users/add-invitation.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ export const AddInvitation = () => {
139139
if (data.mode === "credentials") {
140140
await createUserWithCredentials({
141141
email: data.email.toLowerCase(),
142-
password: data.password,
142+
password: data.password!,
143143
role: data.role,
144144
});
145145
toast.success("User created with initial credentials");

packages/server/src/services/user.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ export const createOrganizationUserWithCredentials = async ({
405405
organizationId: string;
406406
email: string;
407407
password: string;
408-
role: "member" | "admin";
408+
role: string;
409409
}) => {
410410
const normalizedEmail = email.trim().toLowerCase();
411411
const now = new Date();

0 commit comments

Comments
 (0)