diff --git a/.github/workflows/deploy-preview.yml b/.github/workflows/deploy-preview.yml index 8904035981c..5dee1089a34 100644 --- a/.github/workflows/deploy-preview.yml +++ b/.github/workflows/deploy-preview.yml @@ -212,6 +212,7 @@ jobs: DATABASE_URL: ${{ env.DATABASE_URL }} DATABASE_URL_UNPOOLED: ${{ env.DATABASE_URL_UNPOOLED }} NEXT_PUBLIC_API_URL: https://${{ env.API_ALIAS }} + NEXT_PUBLIC_WEB_URL: https://${{ env.WEB_ALIAS }} NEXT_PUBLIC_MARKETING_URL: https://${{ env.MARKETING_ALIAS }} NEXT_PUBLIC_DOCS_URL: https://${{ env.DOCS_ALIAS }} CLERK_SECRET_KEY: ${{ secrets.CLERK_SECRET_KEY }} @@ -229,6 +230,7 @@ jobs: --env DATABASE_URL_UNPOOLED=$DATABASE_URL_UNPOOLED \ --env DESKTOP_AUTH_SECRET=$DESKTOP_AUTH_SECRET \ --env NEXT_PUBLIC_API_URL=$NEXT_PUBLIC_API_URL \ + --env NEXT_PUBLIC_WEB_URL=$NEXT_PUBLIC_WEB_URL \ --env NEXT_PUBLIC_MARKETING_URL=$NEXT_PUBLIC_MARKETING_URL \ --env NEXT_PUBLIC_DOCS_URL=$NEXT_PUBLIC_DOCS_URL \ --env NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY=$NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY \ diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index 3955cb22efd..115e3db1935 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -134,6 +134,7 @@ jobs: DATABASE_URL: ${{ secrets.DATABASE_URL }} DATABASE_URL_UNPOOLED: ${{ secrets.DATABASE_URL_UNPOOLED }} NEXT_PUBLIC_API_URL: ${{ secrets.NEXT_PUBLIC_API_URL }} + NEXT_PUBLIC_WEB_URL: ${{ secrets.NEXT_PUBLIC_WEB_URL }} NEXT_PUBLIC_MARKETING_URL: ${{ secrets.NEXT_PUBLIC_MARKETING_URL }} NEXT_PUBLIC_DOCS_URL: ${{ secrets.NEXT_PUBLIC_DOCS_URL }} CLERK_SECRET_KEY: ${{ secrets.CLERK_SECRET_KEY }} @@ -151,6 +152,7 @@ jobs: --env DATABASE_URL_UNPOOLED=$DATABASE_URL_UNPOOLED \ --env DESKTOP_AUTH_SECRET=$DESKTOP_AUTH_SECRET \ --env NEXT_PUBLIC_API_URL=$NEXT_PUBLIC_API_URL \ + --env NEXT_PUBLIC_WEB_URL=$NEXT_PUBLIC_WEB_URL \ --env NEXT_PUBLIC_MARKETING_URL=$NEXT_PUBLIC_MARKETING_URL \ --env NEXT_PUBLIC_DOCS_URL=$NEXT_PUBLIC_DOCS_URL \ --env NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY=$NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY \ diff --git a/apps/web/src/app/auth/desktop/success/components/DesktopAuthSuccess/DesktopAuthSuccess.tsx b/apps/web/src/app/auth/desktop/success/components/DesktopAuthSuccess/DesktopAuthSuccess.tsx new file mode 100644 index 00000000000..8e84163d197 --- /dev/null +++ b/apps/web/src/app/auth/desktop/success/components/DesktopAuthSuccess/DesktopAuthSuccess.tsx @@ -0,0 +1,96 @@ +"use client"; + +import Image from "next/image"; +import Link from "next/link"; +import { useSearchParams } from "next/navigation"; +import { useCallback, useEffect, useState } from "react"; + +const DESKTOP_PROTOCOL = + process.env.NODE_ENV === "development" ? "superset-dev" : "superset"; + +export function DesktopAuthSuccess() { + const searchParams = useSearchParams(); + const accessToken = searchParams.get("accessToken"); + const accessTokenExpiresAt = searchParams.get("accessTokenExpiresAt"); + const refreshToken = searchParams.get("refreshToken"); + const refreshTokenExpiresAt = searchParams.get("refreshTokenExpiresAt"); + const state = searchParams.get("state"); + const error = searchParams.get("error"); + + const [hasAttempted, setHasAttempted] = useState(false); + + const hasAllTokens = + accessToken && + accessTokenExpiresAt && + refreshToken && + refreshTokenExpiresAt && + state; + + const desktopUrl = hasAllTokens + ? `${DESKTOP_PROTOCOL}://auth/callback?accessToken=${encodeURIComponent(accessToken)}&accessTokenExpiresAt=${encodeURIComponent(accessTokenExpiresAt)}&refreshToken=${encodeURIComponent(refreshToken)}&refreshTokenExpiresAt=${encodeURIComponent(refreshTokenExpiresAt)}&state=${encodeURIComponent(state)}` + : null; + + const openDesktopApp = useCallback(() => { + if (!desktopUrl) return; + window.location.href = desktopUrl; + }, [desktopUrl]); + + useEffect(() => { + if (error || !desktopUrl || hasAttempted) return; + setHasAttempted(true); + openDesktopApp(); + }, [error, desktopUrl, hasAttempted, openDesktopApp]); + + if (error) { + return ( +
Authentication failed
+{error}
+Invalid request
++ Missing authentication parameters. Please try again. +
++ Redirecting to the desktop app... +
+Loading...
+Authentication failed
-{error}
-Invalid request
-- Missing authentication parameters. Please try again. -
-- Redirecting to the desktop app... -
-