Merge branch 'multi-role' into dev

2026-08-07 13:08:03 +02:00 · 2026-03-29 13:55:23 -07:00
parent 8a6960d9c3 2828dee94c
commit 9808a48da0
126 changed files with 5337 additions and 2014 deletions
@@ -129,12 +129,13 @@ export default function ResourceAuthenticationPage() {
            orgId: org.org.orgId
        })
    );
-    const { data: orgIdps = [], isLoading: isLoadingOrgIdps } = useQuery(
-        orgQueries.identityProviders({
+    const { data: orgIdps = [], isLoading: isLoadingOrgIdps } = useQuery({
+        ...orgQueries.identityProviders({
            orgId: org.org.orgId,
            useOrgOnlyIdp: env.app.identityProviderMode === "org"
-        })
-    );
+        }),
+        enabled: isPaidUser(tierMatrix.orgOidc)
+    });

    const pageLoading =
        isLoadingOrgRoles ||