From e601038c0f35113996e20607fc19ab6a815dd28c Mon Sep 17 00:00:00 2001
From: miloschwartz <mschwartz10612@gmail.com>
Date: Wed, 8 Oct 2025 17:49:30 -0700
Subject: [PATCH] fix role extraction in idp form

---
 .../settings/(private)/idp/[idpId]/general/page.tsx | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/app/[orgId]/settings/(private)/idp/[idpId]/general/page.tsx b/src/app/[orgId]/settings/(private)/idp/[idpId]/general/page.tsx
index 59f7aa85..d4bfdcd0 100644
--- a/src/app/[orgId]/settings/(private)/idp/[idpId]/general/page.tsx
+++ b/src/app/[orgId]/settings/(private)/idp/[idpId]/general/page.tsx
@@ -144,7 +144,7 @@ export default function GeneralPage() {
     };
 
     const form = useForm<GeneralFormValues>({
-        resolver: zodResolver(getFormSchema()) as any, // is this right? 
+        resolver: zodResolver(getFormSchema()) as any, // is this right?
         defaultValues: {
             name: "",
             clientId: "",
@@ -236,17 +236,11 @@ export default function GeneralPage() {
                     let tenantId = "";
                     if (idpVariant === "azure" && data.idpOidcConfig?.authUrl) {
                         // Azure URL format: https://login.microsoftonline.com/{tenant-id}/oauth2/v2.0/authorize
-                        console.log(
-                            "Azure authUrl:",
-                            data.idpOidcConfig.authUrl
-                        );
                         const tenantMatch = data.idpOidcConfig.authUrl.match(
                             /login\.microsoftonline\.com\/([^\/]+)\/oauth2/
                         );
-                        console.log("Tenant match:", tenantMatch);
                         if (tenantMatch) {
                             tenantId = tenantMatch[1];
-                            console.log("Extracted tenantId:", tenantId);
                         }
                     }
 
@@ -262,8 +256,6 @@ export default function GeneralPage() {
                             : matchingRoleId || null
                     };
 
-                    console.log(formData);
-
                     // Add variant-specific fields
                     if (idpVariant === "oidc") {
                         formData.authUrl = data.idpOidcConfig.authUrl;
@@ -276,7 +268,6 @@ export default function GeneralPage() {
                         formData.scopes = data.idpOidcConfig.scopes;
                     } else if (idpVariant === "azure") {
                         formData.tenantId = tenantId;
-                        console.log("Setting tenantId in formData:", tenantId);
                     }
 
                     form.reset(formData);
@@ -284,7 +275,7 @@ export default function GeneralPage() {
                     // Set the role mapping mode based on the data
                     // Default to "expression" unless it's a simple roleId or basic '{role name}' pattern
                     setRoleMappingMode(
-                        isRoleId || isRoleName ? "role" : "expression"
+                        matchingRoleId && isRoleName ? "role" : "expression"
                     );
                 }
             } catch (e) {