From 5d4cbe37eb3cce9846368a0e9fcb026ccff54fec Mon Sep 17 00:00:00 2001 From: Agusti Fernandez Date: Sat, 26 Feb 2022 20:27:52 +0100 Subject: [PATCH] Fixes connectionIntegration undefined bug (#1987) * Fixes connectionIntegration undefined bug * fixes adding NEXT_PUBLIC_BASE_URL to consts and using that Co-authored-by: Agusti Fernandez Pardo --- apps/web/components/integrations/ConnectIntegrations.tsx | 4 ++-- apps/web/lib/config/constants.ts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/web/components/integrations/ConnectIntegrations.tsx b/apps/web/components/integrations/ConnectIntegrations.tsx index 524a4abe..bbf50dd5 100644 --- a/apps/web/components/integrations/ConnectIntegrations.tsx +++ b/apps/web/components/integrations/ConnectIntegrations.tsx @@ -2,7 +2,7 @@ import type { IntegrationOAuthCallbackState } from "pages/api/integrations/types import { useState } from "react"; import { useMutation } from "react-query"; -import { BASE_URL } from "@lib/config/constants"; +import { NEXT_PUBLIC_BASE_URL } from "@lib/config/constants"; import { AddAppleIntegrationModal } from "@lib/integrations/calendar/components/AddAppleIntegration"; import { AddCalDavIntegrationModal } from "@lib/integrations/calendar/components/AddCalDavIntegration"; @@ -18,7 +18,7 @@ export default function ConnectIntegration(props: { const mutation = useMutation(async () => { const state: IntegrationOAuthCallbackState = { - returnTo: BASE_URL + location.pathname + location.search, + returnTo: NEXT_PUBLIC_BASE_URL + location.pathname + location.search, }; const stateStr = encodeURIComponent(JSON.stringify(state)); const searchParams = `?state=${stateStr}`; diff --git a/apps/web/lib/config/constants.ts b/apps/web/lib/config/constants.ts index 96450a7e..b2f1800e 100644 --- a/apps/web/lib/config/constants.ts +++ b/apps/web/lib/config/constants.ts @@ -3,3 +3,4 @@ export const WEBSITE_URL = process.env.NEXT_PUBLIC_APP_URL || "https://cal.com"; export const IS_PRODUCTION = process.env.NODE_ENV === "production"; export const TRIAL_LIMIT_DAYS = 14; export const HOSTED_CAL_FEATURES = process.env.HOSTED_CAL_FEATURES || BASE_URL === "https://app.cal.com"; +export const NEXT_PUBLIC_BASE_URL = process.env.NEXT_PUBLIC_BASE_URL || `https://${process.env.VERCEL_URL}`;