diff --git a/apps/studio/pages/authorize.tsx b/apps/studio/pages/authorize.tsx index 49e60d48ac923..70ebd6c5e4750 100644 --- a/apps/studio/pages/authorize.tsx +++ b/apps/studio/pages/authorize.tsx @@ -30,7 +30,7 @@ import { const APIAuthorizationPage: NextPageWithLayout = () => { const router = useRouter() - const { auth_id } = useParams() + const { auth_id, organization_slug } = useParams() const [isApproving, setIsApproving] = useState(false) const [isDeclining, setIsDeclining] = useState(false) const [selectedOrgSlug, setSelectedOrgSlug] = useState() @@ -58,7 +58,11 @@ const APIAuthorizationPage: NextPageWithLayout = () => { useEffect(() => { if (isSuccessOrganizations && organizations.length > 0) { - setSelectedOrgSlug(organizations[0].slug) + if (organization_slug) { + setSelectedOrgSlug(organizations.find(({ slug }) => slug === organization_slug)?.slug) + } else { + setSelectedOrgSlug(organizations[0].slug) + } } // eslint-disable-next-line react-hooks/exhaustive-deps }, [isSuccessOrganizations]) @@ -168,7 +172,9 @@ const APIAuthorizationPage: NextPageWithLayout = () => {