Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

fix: Don't use the custom domain when resolving OpenID config (#46637)

Ivan Vasilov714f0ad8e9dd
diff --git a/apps/studio/components/interfaces/Auth/OAuthApps/OAuthServerSettingsForm.tsx b/apps/studio/components/interfaces/Auth/OAuthApps/OAuthServerSettingsForm.tsx
index 1be26ad534a..44ba297c29a 100644
--- a/apps/studio/components/interfaces/Auth/OAuthApps/OAuthServerSettingsForm.tsx
+++ b/apps/studio/components/interfaces/Auth/OAuthApps/OAuthServerSettingsForm.tsx
@@ -1,7 +1,6 @@
import { zodResolver } from '@hookform/resolvers/zod'
import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
-import dynamic from 'next/dynamic'
import Link from 'next/link'
import { useEffect, useState } from 'react'
import { useForm } from 'react-hook-form'
@@ -17,13 +16,14 @@ import {
Input,
Switch,
} from 'ui'
-import { PageSection, PageSectionContent } from 'ui-patterns'
import { Admonition } from 'ui-patterns/admonition'
import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
+import { PageSection, PageSectionContent } from 'ui-patterns/PageSection'
import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
import * as z from 'zod'
+import { OAuthEndpointsTable } from './OAuthEndpointsTable'
import { InlineLink } from '@/components/ui/InlineLink'
import NoPermission from '@/components/ui/NoPermission'
import { useAuthConfigQuery } from '@/data/auth/auth-config-query'
@@ -32,10 +32,6 @@ import { useOAuthServerAppsQuery } from '@/data/oauth-server-apps/oauth-server-a
import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
import { DOCS_URL } from '@/lib/constants'
-const OAuthEndpointsTable = dynamic(() =>
- import('./OAuthEndpointsTable').then((mod) => ({ default: mod.OAuthEndpointsTable }))
-)
-
const configUrlSchema = z.object({
id: z.string(),
name: z.string(),
diff --git a/apps/studio/data/oauth-server-apps/oauth-openid-configuration-query.ts b/apps/studio/data/oauth-server-apps/oauth-openid-configuration-query.ts
index 71c6a8295d8..3de62ba7d68 100644
--- a/apps/studio/data/oauth-server-apps/oauth-openid-configuration-query.ts
+++ b/apps/studio/data/oauth-server-apps/oauth-openid-configuration-query.ts
@@ -31,13 +31,13 @@ export type OpenIDConfiguration = {
}
export async function getOpenIDConfiguration({
- clientEndpoint,
+ endpoint,
}: {
- clientEndpoint: string | undefined
+ endpoint: string | undefined
}): Promise<OpenIDConfiguration> {
- if (!clientEndpoint) throw new Error('Client endpoint is required')
+ if (!endpoint) throw new Error('Client endpoint is required')
- const response = await fetch(`${clientEndpoint}/auth/v1/.well-known/openid-configuration`)
+ const response = await fetch(`${endpoint}/auth/v1/.well-known/openid-configuration`)
if (!response.ok) {
handleError({ message: `Failed to fetch OpenID configuration: ${response.statusText}` })
@@ -56,7 +56,7 @@ export const useOpenIDConfigurationQuery = <TData = OpenIDConfigurationData>(
...options
}: UseCustomQueryOptions<OpenIDConfigurationData, OpenIDConfigurationError, TData> = {}
) => {
- const { data: clientEndpoint, isPending: isEndpointLoading } = useProjectApiUrl({
+ const { hostEndpoint, isPending: isEndpointLoading } = useProjectApiUrl({
projectRef,
})
@@ -70,13 +70,13 @@ export const useOpenIDConfigurationQuery = <TData = OpenIDConfigurationData>(
const isQueryEnabled =
enabled &&
typeof projectRef !== 'undefined' &&
- !!clientEndpoint &&
+ !!hostEndpoint &&
isSuccessConfig &&
isOAuthServerEnabled
const query = useQuery<OpenIDConfigurationData, OpenIDConfigurationError, TData>({
queryKey: oauthServerAppKeys.openidConfiguration(projectRef),
- queryFn: () => getOpenIDConfiguration({ clientEndpoint }),
+ queryFn: () => getOpenIDConfiguration({ endpoint: hostEndpoint }),
enabled: isQueryEnabled,
...options,
})