support multi role on create user and invites

2026-03-31 06:56:39 +00:00 · 2026-03-29 12:11:22 -07:00
parent ee6fb34906
commit 2828dee94c
16 changed files with 629 additions and 416 deletions
--- a/server/routers/idp/validateOidcCallback.ts
+++ b/server/routers/idp/validateOidcCallback.ts
@@ -623,9 +623,7 @@ export async function validateOidcCallback(

                if (orgsToAdd.length > 0) {
                    for (const org of orgsToAdd) {
-                        const [initialRoleId, ...additionalRoleIds] =
-                            org.roleIds;
-                        if (!initialRoleId) {
+                        if (org.roleIds.length === 0) {
                            continue;
                        }

@@ -641,17 +639,9 @@ export async function validateOidcCallback(
                                    userId: userId!,
                                    autoProvisioned: true,
                                },
-                                initialRoleId,
+                                org.roleIds,
                                trx
                            );
-
-                            for (const roleId of additionalRoleIds) {
-                                await trx.insert(userOrgRoles).values({
-                                    userId: userId!,
-                                    orgId: org.orgId,
-                                    roleId
-                                });
-                            }
                        }
                    }
                }