From 0fa6a556d06643a3658fdc36c98de3b1a1161486 Mon Sep 17 00:00:00 2001
From: zachery with an e <45150570+zweatshirt@users.noreply.github.com>
Date: Sun, 17 May 2026 14:28:27 -0500
Subject: [PATCH] Remove all references to SITE_URL environment variable since
 it isn't strictly needed

---
 .github/workflows/ci.yml                      |  1 -
 .github/workflows/preview.yml                 |  1 -
 __tests__/util/globalSetup.ts                 |  1 -
 next.config.ts                                |  7 ++--
 pages/_document.page.tsx                      |  2 +-
 .../Items/ProfileMenu/ProfileMenu.test.tsx    |  9 ++---
 .../TopBar/Items/ProfileMenu/ProfileMenu.tsx  |  2 +-
 .../Google/GoogleAccordion.test.tsx           |  8 +++--
 .../Mailchimp/MailchimpAccordion.test.tsx     |  4 ++-
 .../OrganizationAccordion.test.tsx            |  4 ++-
 .../PrayerlettersAccordion.test.tsx           |  8 +++--
 .../Settings/integrations/useOauthUrl.ts      |  2 +-
 .../Tool/MergeContacts/MergeContacts.test.tsx | 35 +++++++++++++++++++
 .../MergeContacts/StickyConfirmButtons.tsx    |  2 +-
 .../Tool/TntConnect/TntConnect.test.tsx       |  8 +++++
 src/components/Tool/TntConnect/TntConnect.tsx |  2 +-
 src/lib/apollo/link.ts                        |  2 +-
 17 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9cbca661da..649f36c4d0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,6 @@ env:
   # we don't want to let the PR be merged yet. If the "Staging API" label is added to the PR, we
   # run codegen against the staging API instead of the production API and block the PR from merging.
   API_URL: ${{ contains(github.event.pull_request.labels.*.name, 'Staging API') && 'https://api.stage.mpdx.org/graphql' || 'https://api.mpdx.org/graphql' }}
-  SITE_URL: http://stage.mpdx.org
 
 jobs:
   test:
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index e34fc7546f..3c14a5bc65 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -32,4 +32,3 @@ jobs:
           AmplifyAppId: ${{ secrets.AMPLIFY_APP_ID }}
           AWS_REGION: 'us-east-1'
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          EnvironmentVariables: 'SITE_URL=https://${{ github.head_ref }}.${{ secrets.AMPLIFY_APP_ID }}.amplifyapp.com'
diff --git a/__tests__/util/globalSetup.ts b/__tests__/util/globalSetup.ts
index 060f090f52..3a5a50e37a 100644
--- a/__tests__/util/globalSetup.ts
+++ b/__tests__/util/globalSetup.ts
@@ -1,7 +1,6 @@
 const globalSetup = (): void => {
   process.env.TZ = 'UTC';
   process.env.JWT_SECRET = 'test-environment-key';
-  process.env.SITE_URL = 'https://mpdx.org';
   process.env.APP_NAME = 'MPDX';
 };
 
diff --git a/next.config.ts b/next.config.ts
index deb2e7b307..0d4d0ab657 100644
--- a/next.config.ts
+++ b/next.config.ts
@@ -23,9 +23,6 @@ if (prod && !process.env.JWT_SECRET) {
   throw new Error('JWT_SECRET environment variable is not set');
 }
 
-const siteUrl =
-  process.env.PREVIEW_URL ?? process.env.SITE_URL ?? 'http://localhost:3000';
-
 const withBundleAnalyzer = bundleAnalyzer({
   enabled: process.env.ANALYZE === 'true',
 });
@@ -38,14 +35,14 @@ const config: NextConfig = {
     REST_API_URL:
       process.env.REST_API_URL ?? 'https://api.stage.mpdx.org/api/v2/',
     OAUTH_URL: process.env.OAUTH_URL ?? 'https://auth.stage.mpdx.org',
-    SITE_URL: siteUrl,
     CLIENT_ID: process.env.CLIENT_ID ?? '4027334344069527005',
     CLIENT_SECRET: process.env.CLIENT_SECRET,
     AUTH_PROVIDER: process.env.AUTH_PROVIDER ?? 'OKTA',
     OKTA_CLIENT_ID: process.env.OKTA_CLIENT_ID ?? '0oa1n0gjoy3j5Ycdg0h8',
     OKTA_CLIENT_SECRET: process.env.OKTA_CLIENT_SECRET,
     OKTA_ISSUER: process.env.OKTA_ISSUER ?? 'https://signon.okta.com',
-    OKTA_SIGNOUT_REDIRECT_URL: process.env.OKTA_SIGNOUT_REDIRECT_URL ?? siteUrl,
+    OKTA_SIGNOUT_REDIRECT_URL:
+      process.env.OKTA_SIGNOUT_REDIRECT_URL ?? 'http://localhost:3000',
     API_OAUTH_CLIENT_ID:
       process.env.API_OAUTH_CLIENT_ID ??
       '3nxoth_gyetHdpjKp2WYkND1PUQlvYcjXQHW9ZdDxq4',
diff --git a/pages/_document.page.tsx b/pages/_document.page.tsx
index c3557a7700..0e086b278f 100644
--- a/pages/_document.page.tsx
+++ b/pages/_document.page.tsx
@@ -42,7 +42,7 @@ class MyDocument extends Document {
           {process.env.HELPJUICE_ORIGIN && (
             <script
               dangerouslySetInnerHTML={{
-                __html: `window.helpjuice_account_url = '${process.env.SITE_URL}/api/helpjuice';
+                __html: `window.helpjuice_account_url = window.location.origin + '/api/helpjuice';
 window.helpjuice_contact_us_url = '${process.env.HELPJUICE_ORIGIN}/contact-us';
 window.helpjuiceSwiftyConfig = { widgetPosition: 'bottomRight' };
 window.helpjuiceSwiftyUrlMap = {};`,
diff --git a/src/components/Layouts/Primary/TopBar/Items/ProfileMenu/ProfileMenu.test.tsx b/src/components/Layouts/Primary/TopBar/Items/ProfileMenu/ProfileMenu.test.tsx
index 56e0f9cd60..9885d738f7 100644
--- a/src/components/Layouts/Primary/TopBar/Items/ProfileMenu/ProfileMenu.test.tsx
+++ b/src/components/Layouts/Primary/TopBar/Items/ProfileMenu/ProfileMenu.test.tsx
@@ -223,11 +223,8 @@ describe('ProfileMenu', () => {
 describe('ProfileMenu while Impersonating', () => {
   fetchMock.enableMocks();
   window = Object.create(window);
-  const url = 'https://mpdx.org';
   Object.defineProperty(window, 'location', {
-    value: {
-      href: url,
-    },
+    value: {},
     writable: true,
   });
 
@@ -275,9 +272,7 @@ describe('ProfileMenu while Impersonating', () => {
     );
 
     await waitFor(() =>
-      expect(window.location.href).toEqual(
-        `${process.env.SITE_URL}/api/stop-impersonating`,
-      ),
+      expect(window.location.href).toEqual('/api/stop-impersonating'),
     );
   });
 });
diff --git a/src/components/Layouts/Primary/TopBar/Items/ProfileMenu/ProfileMenu.tsx b/src/components/Layouts/Primary/TopBar/Items/ProfileMenu/ProfileMenu.tsx
index 8eec31c413..c7658801c8 100644
--- a/src/components/Layouts/Primary/TopBar/Items/ProfileMenu/ProfileMenu.tsx
+++ b/src/components/Layouts/Primary/TopBar/Items/ProfileMenu/ProfileMenu.tsx
@@ -169,7 +169,7 @@ const ProfileMenu = (): ReactElement => {
       },
     );
     window.localStorage.clear();
-    window.location.href = `${process.env.SITE_URL || window.location.origin}/api/stop-impersonating`;
+    window.location.href = '/api/stop-impersonating';
   };
 
   const handleAccountListClick = (
diff --git a/src/components/Settings/integrations/Google/GoogleAccordion.test.tsx b/src/components/Settings/integrations/Google/GoogleAccordion.test.tsx
index f6daf7f917..c1dae72632 100644
--- a/src/components/Settings/integrations/Google/GoogleAccordion.test.tsx
+++ b/src/components/Settings/integrations/Google/GoogleAccordion.test.tsx
@@ -125,7 +125,9 @@ describe('GoogleAccordion', () => {
 
       expect(getByText(/continue/i)).toHaveAttribute(
         'href',
-        `https://auth.mpdx.org/auth/user/google?account_list_id=account-list-1&redirect_to=https%3A%2F%2Fmpdx.org%2FaccountLists%2Faccount-list-1%2Fsettings%2Fintegrations%3FselectedTab%3Dgoogle&access_token=apiToken`,
+        `https://auth.mpdx.org/auth/user/google?account_list_id=account-list-1&redirect_to=${encodeURIComponent(
+          `${window.location.origin}/accountLists/account-list-1/settings/integrations?selectedTab=google`,
+        )}&access_token=apiToken`,
       );
     });
   });
@@ -224,7 +226,9 @@ describe('GoogleAccordion', () => {
 
         expect(getByText(/continue/i)).toHaveAttribute(
           'href',
-          `https://auth.mpdx.org/auth/user/google?account_list_id=account-list-1&redirect_to=https%3A%2F%2Fmpdx.org%2FaccountLists%2Faccount-list-1%2Fsettings%2Fintegrations%3FselectedTab%3Dgoogle&access_token=apiToken`,
+          `https://auth.mpdx.org/auth/user/google?account_list_id=account-list-1&redirect_to=${encodeURIComponent(
+            `${window.location.origin}/accountLists/account-list-1/settings/integrations?selectedTab=google`,
+          )}&access_token=apiToken`,
         );
       });
     });
diff --git a/src/components/Settings/integrations/Mailchimp/MailchimpAccordion.test.tsx b/src/components/Settings/integrations/Mailchimp/MailchimpAccordion.test.tsx
index 02c6928348..f04f687361 100644
--- a/src/components/Settings/integrations/Mailchimp/MailchimpAccordion.test.tsx
+++ b/src/components/Settings/integrations/Mailchimp/MailchimpAccordion.test.tsx
@@ -139,7 +139,9 @@ describe('MailchimpAccount', () => {
 
       expect(getByText('Connect Mailchimp')).toHaveAttribute(
         'href',
-        `https://auth.mpdx.org/auth/user/mailchimp?account_list_id=account-list-1&redirect_to=https%3A%2F%2Fmpdx.org%2FaccountLists%2Faccount-list-1%2Fsettings%2Fintegrations%3FselectedTab%3Dmailchimp&access_token=apiToken`,
+        `https://auth.mpdx.org/auth/user/mailchimp?account_list_id=account-list-1&redirect_to=${encodeURIComponent(
+          `${window.location.origin}/accountLists/account-list-1/settings/integrations?selectedTab=mailchimp`,
+        )}&access_token=apiToken`,
       );
     });
   });
diff --git a/src/components/Settings/integrations/Organization/OrganizationAccordion.test.tsx b/src/components/Settings/integrations/Organization/OrganizationAccordion.test.tsx
index 23c6c4dc9f..928f171e4e 100644
--- a/src/components/Settings/integrations/Organization/OrganizationAccordion.test.tsx
+++ b/src/components/Settings/integrations/Organization/OrganizationAccordion.test.tsx
@@ -333,7 +333,9 @@ describe('OrganizationAccordion', () => {
       });
 
       expect(window.location.assign).toHaveBeenCalledWith(
-        'https://auth.mpdx.org/auth/user/donorhub?account_list_id=account-list-1&redirect_to=https%3A%2F%2Fmpdx.org%2FaccountLists%2Faccount-list-1%2Fsettings%2Fintegrations%3FselectedTab%3Dorganization&access_token=apiToken&organization_id=organizationId',
+        `https://auth.mpdx.org/auth/user/donorhub?account_list_id=account-list-1&redirect_to=${encodeURIComponent(
+          `${window.location.origin}/accountLists/account-list-1/settings/integrations?selectedTab=organization`,
+        )}&access_token=apiToken&organization_id=organizationId`,
       );
     });
 
diff --git a/src/components/Settings/integrations/Prayerletters/PrayerlettersAccordion.test.tsx b/src/components/Settings/integrations/Prayerletters/PrayerlettersAccordion.test.tsx
index ddfa7b7016..a203247d4d 100644
--- a/src/components/Settings/integrations/Prayerletters/PrayerlettersAccordion.test.tsx
+++ b/src/components/Settings/integrations/Prayerletters/PrayerlettersAccordion.test.tsx
@@ -111,7 +111,9 @@ describe('PrayerlettersAccount', () => {
 
       expect(getByText('Connect prayerletters.com Account')).toHaveAttribute(
         'href',
-        `https://auth.mpdx.org/auth/user/prayer_letters?account_list_id=account-list-1&redirect_to=https%3A%2F%2Fmpdx.org%2FaccountLists%2Faccount-list-1%2Fsettings%2Fintegrations%3FselectedTab%3Dprayerletters.com&access_token=apiToken`,
+        `https://auth.mpdx.org/auth/user/prayer_letters?account_list_id=account-list-1&redirect_to=${encodeURIComponent(
+          `${window.location.origin}/accountLists/account-list-1/settings/integrations?selectedTab=prayerletters.com`,
+        )}&access_token=apiToken`,
       );
     });
   });
@@ -153,7 +155,9 @@ describe('PrayerlettersAccount', () => {
 
       expect(getByText('Refresh prayerletters.com Account')).toHaveAttribute(
         'href',
-        `https://auth.mpdx.org/auth/user/prayer_letters?account_list_id=account-list-1&redirect_to=https%3A%2F%2Fmpdx.org%2FaccountLists%2Faccount-list-1%2Fsettings%2Fintegrations%3FselectedTab%3Dprayerletters.com&access_token=apiToken`,
+        `https://auth.mpdx.org/auth/user/prayer_letters?account_list_id=account-list-1&redirect_to=${encodeURIComponent(
+          `${window.location.origin}/accountLists/account-list-1/settings/integrations?selectedTab=prayerletters.com`,
+        )}&access_token=apiToken`,
       );
 
       userEvent.click(
diff --git a/src/components/Settings/integrations/useOauthUrl.ts b/src/components/Settings/integrations/useOauthUrl.ts
index 981f390547..949f3425e7 100644
--- a/src/components/Settings/integrations/useOauthUrl.ts
+++ b/src/components/Settings/integrations/useOauthUrl.ts
@@ -7,7 +7,7 @@ export const useOauthUrl = () => {
   const accountListId = useAccountListId();
 
   const getRedirectUrl = (accordion: IntegrationAccordion) => {
-    const domain = process.env.SITE_URL || window.location.origin;
+    const domain = window.location.origin;
     return encodeURIComponent(
       `${domain}/accountLists/${accountListId}/settings/integrations?selectedTab=${accordion}`,
     );
diff --git a/src/components/Tool/MergeContacts/MergeContacts.test.tsx b/src/components/Tool/MergeContacts/MergeContacts.test.tsx
index 371994a01a..237b4fb891 100644
--- a/src/components/Tool/MergeContacts/MergeContacts.test.tsx
+++ b/src/components/Tool/MergeContacts/MergeContacts.test.tsx
@@ -260,4 +260,39 @@ describe('Tools - MergeContacts', () => {
       `/accountLists/${accountListId}/tools/merge/contacts/contact-2`,
     );
   });
+
+  it('should redirect to tools after Confirm and Leave', async () => {
+    Object.defineProperty(window, 'location', {
+      value: {},
+      writable: true,
+    });
+
+    const { queryAllByTestId, getByRole } = render(
+      <SnackbarProvider>
+        <MergeContactsWrapper
+          mocks={{
+            GetContactDuplicates:
+              getContactDuplicatesMocks.GetContactDuplicates,
+            MassActionsMerge: () => {
+              return { mergeContacts: ['contact-2'] };
+            },
+          }}
+        />
+      </SnackbarProvider>,
+    );
+
+    await waitFor(() =>
+      expect(queryAllByTestId('MergeContactPair')).toHaveLength(2),
+    );
+    userEvent.click(queryAllByTestId('ignoreButton')[0]);
+    userEvent.click(queryAllByTestId('ignoreButton')[1]);
+
+    userEvent.click(getByRole('button', { name: 'Confirm and Leave' }));
+
+    await waitFor(() =>
+      expect(window.location.href).toEqual(
+        `/accountLists/${accountListId}/tools`,
+      ),
+    );
+  });
 });
diff --git a/src/components/Tool/MergeContacts/StickyConfirmButtons.tsx b/src/components/Tool/MergeContacts/StickyConfirmButtons.tsx
index b107322102..f760aeda88 100644
--- a/src/components/Tool/MergeContacts/StickyConfirmButtons.tsx
+++ b/src/components/Tool/MergeContacts/StickyConfirmButtons.tsx
@@ -29,7 +29,7 @@ export const StickyConfirmButtons: React.FC<StickyConfirmButtonsProps> = ({
   const handleConfirmAndLeave = async () => {
     await confirmAction();
     setActions({});
-    window.location.href = `${process.env.SITE_URL}/accountLists/${accountListId}/tools`;
+    window.location.href = `/accountLists/${accountListId}/tools`;
   };
   return (
     <StickyButtonHeaderBox>
diff --git a/src/components/Tool/TntConnect/TntConnect.test.tsx b/src/components/Tool/TntConnect/TntConnect.test.tsx
index 08eaedf95d..2cefd8e3b9 100644
--- a/src/components/Tool/TntConnect/TntConnect.test.tsx
+++ b/src/components/Tool/TntConnect/TntConnect.test.tsx
@@ -48,6 +48,11 @@ describe('TntConnect Import', () => {
   });
 
   it('should handle uploading a file', async () => {
+    Object.defineProperty(window, 'location', {
+      value: {},
+      writable: true,
+    });
+
     const {
       getByRole,
       queryByText,
@@ -88,6 +93,9 @@ describe('TntConnect Import', () => {
     await waitFor(() =>
       expect(queryByText('Good Work!')).not.toBeInTheDocument(),
     );
+    expect(window.location.href).toEqual(
+      `/accountLists/${accountListId}/tools`,
+    );
 
     await waitFor(() =>
       expect(uploadTnt).toHaveBeenCalledWith(
diff --git a/src/components/Tool/TntConnect/TntConnect.tsx b/src/components/Tool/TntConnect/TntConnect.tsx
index 449b06efd0..a82036ca9c 100644
--- a/src/components/Tool/TntConnect/TntConnect.tsx
+++ b/src/components/Tool/TntConnect/TntConnect.tsx
@@ -115,7 +115,7 @@ const TntConnect: React.FC<Props> = ({ accountListId }: Props) => {
 
   const handleCloseModal = () => {
     setShowModal(false);
-    window.location.href = `${process.env.SITE_URL}/accountLists/${accountListId}/tools`;
+    window.location.href = `/accountLists/${accountListId}/tools`;
     setLoading(true);
   };
 
diff --git a/src/lib/apollo/link.ts b/src/lib/apollo/link.ts
index 3e19474c0a..f86f6ec88d 100644
--- a/src/lib/apollo/link.ts
+++ b/src/lib/apollo/link.ts
@@ -23,7 +23,7 @@ const batchNativeHttpLink = new BatchHttpLink({
 });
 
 const restProxyHttpLink = new BatchHttpLink({
-  uri: `${process.env.SITE_URL}/api/graphql-rest`,
+  uri: `/api/graphql-rest`,
   batchMax: 25,
   batchDebounce: true,
   batchInterval: 20,