mirror of
https://github.com/andwati/dokploy.git
synced 2026-11-20 11:08:46 +00:00
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
This commit is contained in:
@@ -139,7 +139,7 @@ export const AddInvitation = () => {
|
|||||||
if (data.mode === "credentials") {
|
if (data.mode === "credentials") {
|
||||||
await createUserWithCredentials({
|
await createUserWithCredentials({
|
||||||
email: data.email.toLowerCase(),
|
email: data.email.toLowerCase(),
|
||||||
password: data.password,
|
password: data.password!,
|
||||||
role: data.role,
|
role: data.role,
|
||||||
});
|
});
|
||||||
toast.success("User created with initial credentials");
|
toast.success("User created with initial credentials");
|
||||||
|
|||||||
@@ -405,7 +405,7 @@ export const createOrganizationUserWithCredentials = async ({
|
|||||||
organizationId: string;
|
organizationId: string;
|
||||||
email: string;
|
email: string;
|
||||||
password: string;
|
password: string;
|
||||||
role: "member" | "admin";
|
role: string;
|
||||||
}) => {
|
}) => {
|
||||||
const normalizedEmail = email.trim().toLowerCase();
|
const normalizedEmail = email.trim().toLowerCase();
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
|
|||||||
Reference in New Issue
Block a user