Files
supabase/apps/studio/components/interfaces/ApiAuthorization/ApiAuthorization.Valid.tsx
Danny WhiteandCursor 43c2229f1e fix(studio): align /authorize invalid and edge states with interstitial UI (#46960)
## What kind of change does this PR introduce?

Bug fix / UI polish

## What is the current behavior?

Visiting `/authorize` without an `auth_id` renders a bare `Card` outside
the shared Connect interstitial — no centered layout, no Supabase logo,
inconsistent with every other `/authorize` state (loading, error, form,
approved).

Two edge cases also produce poor UX: a blank flash while
`router.isReady` is false, and a silent empty page when the
authorization query succeeds but returns no requester.

## What is the new behavior?

- **Missing `auth_id`**: `ApiAuthorizationInvalidScreen` now uses
`InterstitialLayout` with `SupabaseLogo`, a user-facing title ("Missing
authorization link"), warning admonition, and "Back to dashboard" —
matching the error screen and CLI missing-params pattern.
- **Router not ready**: `authorize.tsx` shows
`ApiAuthorizationLoadingScreen` instead of `null`.
- **Empty requester**: `ApiAuthorization.Valid.tsx` renders
`ApiAuthorizationErrorScreen` instead of returning `null`.

Tests updated in `ApiAuthorization.test.tsx`; added `authorize.test.tsx`
for router-not-ready loading.

| Before | After |
| --- | --- |
| <img width="524" height="455" alt="Authorize API Access
Supabase-DCB404EC-7D65-4DD1-A6E0-B720DC765DA7"
src="https://github.com/user-attachments/assets/8d2b68fc-e008-4145-aa74-3154a883083c"
/> | <img width="524" height="455" alt="Authorize API Access
Supabase-6B642066-D0BE-4EDC-A186-A0290B4B5634"
src="https://github.com/user-attachments/assets/b04bee93-6b23-411f-8e36-9a0fff8a975d"
/> |

## To test

Please do a visual check on `http://localhost:8082/authorize` (no
`auth_id` or other parameters).

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **Bug Fixes**
* Improved the UI and copy shown when the authorization link is missing.
* Updated behavior to show an explicit error screen when authorization
requester data is unavailable.
* **New Features**
* Added a loading state for the authorization page while router
parameters are initializing.
* **Tests**
* Updated component expectations for the missing authorization and
“unable to load” scenarios.
* Added a page test to verify the loading message when the router is not
ready.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-16 16:19:57 +08:00

234 lines
7.3 KiB
TypeScript

import { zodResolver } from '@hookform/resolvers/zod'
import Head from 'next/head'
import { useEffect, useEffectEvent, useMemo, useState, type ReactNode } from 'react'
import { useForm, type UseFormReturn } from 'react-hook-form'
import { toast } from 'sonner'
import { ApiAuthorizationApprovedScreen } from './ApiAuthorization.Approved'
import { ApiAuthorizationErrorScreen } from './ApiAuthorization.Error'
import { ApiAuthorizationMainView } from './ApiAuthorization.Form'
import { ApiAuthorizationLoadingScreen } from './ApiAuthorization.Loading'
import {
approvalFormSchema,
type ApprovalState,
type IApprovalFormSchema,
} from './ApiAuthorization.Schema'
import { useApiAuthorizationApproveMutation } from '@/data/api-authorization/api-authorization-approve-mutation'
import { useApiAuthorizationDeclineMutation } from '@/data/api-authorization/api-authorization-decline-mutation'
import { useApiAuthorizationQuery } from '@/data/api-authorization/api-authorization-query'
import { useOrganizationsQuery } from '@/data/organizations/organizations-query'
import { buildStudioPageTitle } from '@/lib/page-title'
import type { Organization } from '@/types'
function getMatchingOrganization(
organization_slug: string | undefined,
organizations: Array<Organization> | undefined
): Organization | null {
if (!organization_slug || !organizations) return null
return organizations.find(({ slug }) => slug === organization_slug) ?? null
}
interface PreselectOrganizationSlugParameters {
form: UseFormReturn<IApprovalFormSchema>
organization_slug: string | undefined
organizations: Array<{ slug: string }>
}
function preselectOrganizationSlug({
form,
organization_slug,
organizations,
}: PreselectOrganizationSlugParameters) {
if (organization_slug) {
const preselected = organizations.find(({ slug }) => slug === organization_slug)
if (preselected) form.setValue('selectedOrgSlug', preselected.slug)
} else if (!form.getValues('selectedOrgSlug') && organizations.length === 1) {
form.setValue('selectedOrgSlug', organizations[0].slug)
}
}
function useOrganizationsState(organization_slug: string | undefined, enabled = true) {
const {
data: organizations,
isPending: isLoadingOrganizations,
isError: isErrorOrganizations,
error: organizationsError,
} = useOrganizationsQuery({ enabled })
const organizationsState = useMemo(
function calculateOrganizationsState() {
if (!enabled) {
return { _tag: 'loading' as const }
}
if (isLoadingOrganizations) {
return { _tag: 'loading' as const }
}
if (isErrorOrganizations) {
return { _tag: 'error' as const, error: organizationsError }
}
if (organizations.length === 0) {
return { _tag: 'empty' as const }
}
if (organization_slug) {
const matchingOrganization = getMatchingOrganization(organization_slug, organizations)
if (!matchingOrganization) {
return { _tag: 'not_member' as const }
}
}
return { _tag: 'success' as const, organizations }
},
[
enabled,
isLoadingOrganizations,
isErrorOrganizations,
organizationsError,
organizations,
organization_slug,
]
)
return organizationsState
}
function usePrefillFormOnOrganizationsSuccess(
form: UseFormReturn<IApprovalFormSchema>,
organizationsState: ReturnType<typeof useOrganizationsState>,
organization_slug: string | undefined
) {
const prefillForm = useEffectEvent(() => {
if (organizationsState._tag === 'success') {
preselectOrganizationSlug({
form,
organization_slug,
organizations: organizationsState.organizations,
})
}
})
useEffect(() => {
if (organizationsState._tag === 'success') {
prefillForm()
}
// eslint-disable-next-line react-hooks/exhaustive-deps -- useEffectEvent fn intentionally not a dep (eslint-plugin-react-hooks v5 doesn't recognize stable useEffectEvent yet)
}, [organizationsState._tag])
}
export interface ApiAuthorizationValidScreenProps {
auth_id: string
organization_slug: string | undefined
navigate: (destination: string) => void
}
export function ApiAuthorizationValidScreen({
auth_id,
organization_slug,
navigate,
}: ApiAuthorizationValidScreenProps): ReactNode {
const [approvalState, setApprovalState] = useState<ApprovalState>('indeterminate')
const form = useForm<IApprovalFormSchema>({
resolver: zodResolver(approvalFormSchema),
defaultValues: { selectedOrgSlug: '' },
mode: 'onSubmit',
reValidateMode: 'onBlur',
})
const organizationsState = useOrganizationsState(organization_slug)
usePrefillFormOnOrganizationsSuccess(form, organizationsState, organization_slug)
const {
data: requester,
isPending: isLoading,
isError,
error,
} = useApiAuthorizationQuery({ id: auth_id })
const isApproved = (requester?.approved_at ?? null) !== null
const { mutate: approveRequest } = useApiAuthorizationApproveMutation({
onSuccess: (res) => {
window.location.href = res.url
},
})
const { mutate: declineRequest } = useApiAuthorizationDeclineMutation({
onSuccess: () => {
toast.success('Declined API authorization request')
navigate('/organizations')
},
})
const onApproveRequest = form.handleSubmit((values) => {
if (approvalState !== 'indeterminate') {
return
}
setApprovalState('approving')
approveRequest(
{ id: auth_id, slug: values.selectedOrgSlug },
{ onError: () => setApprovalState('indeterminate') }
)
})
const onDeclineRequest = form.handleSubmit((values) => {
if (approvalState !== 'indeterminate') {
return
}
setApprovalState('declining')
declineRequest(
{ id: auth_id, slug: values.selectedOrgSlug },
{ onError: () => setApprovalState('indeterminate') }
)
})
if (isLoading) {
return <ApiAuthorizationLoadingScreen />
}
if (isError) {
return <ApiAuthorizationErrorScreen error={error} />
}
const effectiveRequester = requester
const effectiveOrganizationsState = organizationsState
const effectiveOrganizationSlug = organization_slug
const effectiveApprovalState = approvalState
const pageTitle = effectiveRequester
? buildStudioPageTitle({ section: `Authorize ${effectiveRequester.name}`, brand: 'Supabase' })
: undefined
if (!effectiveRequester) {
return <ApiAuthorizationErrorScreen error={undefined} />
}
if (isApproved) {
const approvedOrganization =
effectiveOrganizationsState._tag === 'success'
? effectiveOrganizationsState.organizations.find(
(org) => org.slug === effectiveRequester.approved_organization_slug
)
: undefined
return (
<>
<Head>{pageTitle && <title>{pageTitle}</title>}</Head>
<ApiAuthorizationApprovedScreen
requester={effectiveRequester}
organization={approvedOrganization}
/>
</>
)
}
return (
<>
<Head>{pageTitle && <title>{pageTitle}</title>}</Head>
<ApiAuthorizationMainView
approvalState={effectiveApprovalState}
form={form}
requester={effectiveRequester}
requestedOrganizationSlug={effectiveOrganizationSlug}
organizations={effectiveOrganizationsState}
onApprove={onApproveRequest}
onDecline={onDeclineRequest}
/>
</>
)
}