Fix filtering on SAML provider (supabase#29636)

Author: joshenlim

apps/studio/components/interfaces/Auth/AuthProvidersFormValidation.tsx

@@ -1383,7 +1383,7 @@ const PROVIDER_SAML = {
  $schema: JSON_SCHEMA_VERSION,
  type: 'object',
  title: 'SAML 2.0',
- link: 'https://supabase.com/docs/guides/auth/enterprise-sso',
+ link: 'https://supabase.com/docs/guides/auth/enterprise-sso/auth-sso-saml',
  properties: {
  SAML_ENABLED: {
  title: 'Enable SAML 2.0 Single Sign-on',

apps/studio/data/auth/users-count-query.ts

@@ -41,9 +41,17 @@ const getUsersCountSQl = ({
  }
 
  if (providers && providers.length > 0) {
- conditions.push(
- `(raw_app_meta_data->>'providers')::jsonb ?| array[${providers.map((p) => `'${p}'`).join(', ')}]`
- )
+ // [Joshen] This is arguarbly not fully optimized, but at the same time not commonly used
+ // JFYI in case we do eventually run into performance issues here when filtering for SAML provider
+ if (providers.includes('saml 2.0')) {
+ conditions.push(
+ `(select jsonb_agg(case when value ~ '^sso' then 'sso' else value end) from jsonb_array_elements_text((raw_app_meta_data ->> 'providers')::jsonb)) ?| array[${providers.map((p) => (p === 'saml 2.0' ? `'sso'` : `'${p}'`)).join(', ')}]`.trim()
+ )
+ } else {
+ conditions.push(
+ `(raw_app_meta_data->>'providers')::jsonb ?| array[${providers.map((p) => `'${p}'`).join(', ')}]`
+ )
+ }
  }
 
  const combinedConditions = conditions.map((x) => `(${x})`).join(' and ')

apps/studio/data/auth/users-infinite-query.ts

@@ -56,9 +56,17 @@ const getUsersSQL = ({
  }
 
  if (providers && providers.length > 0) {
- conditions.push(
- `(raw_app_meta_data->>'providers')::jsonb ?| array[${providers.map((p) => `'${p}'`).join(', ')}]`
- )
+ // [Joshen] This is arguarbly not fully optimized, but at the same time not commonly used
+ // JFYI in case we do eventually run into performance issues here when filtering for SAML provider
+ if (providers.includes('saml 2.0')) {
+ conditions.push(
+ `(select jsonb_agg(case when value ~ '^sso' then 'sso' else value end) from jsonb_array_elements_text((raw_app_meta_data ->> 'providers')::jsonb)) ?| array[${providers.map((p) => (p === 'saml 2.0' ? `'sso'` : `'${p}'`)).join(', ')}]`.trim()
+ )
+ } else {
+ conditions.push(
+ `(raw_app_meta_data->>'providers')::jsonb ?| array[${providers.map((p) => `'${p}'`).join(', ')}]`
+ )
+ }
  }
 
  const combinedConditions = conditions.map((x) => `(${x})`).join(' and ')