fix(frontend): use only one server URL env var

distributeaid · Sep 9, 2021 · 896157b · 896157b
1 parent 1ffb1e2
commit 896157b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/frontend/.env.development b/frontend/.env.development
@@ -1,5 +1,2 @@
 # The URL where the server runs
-REACT_APP_SERVER_URL="http://localhost:3000"
-
-# The URL where the Apollo server runs
-REACT_APP_GRAPHQL_URL="http://localhost:3000/graphql"
+REACT_APP_SERVER_URL="http://localhost:3000"
diff --git a/frontend/src/apolloClient.ts b/frontend/src/apolloClient.ts
@@ -21,7 +21,7 @@ const mergeByReplacement: { merge: FieldMergeFunction } = {
 
 export const apolloClient = new ApolloClient({
   link: new HttpLink({
-    uri: process.env.REACT_APP_GRAPHQL_URL,
+    uri: `${process.env.REACT_APP_SERVER_URL?.replace(/\/$/, '')}/graphql`,
     credentials: 'include',
   }),
   cache: new InMemoryCache({

diff --git a/frontend/src/components/UserProfileContext.tsx b/frontend/src/components/UserProfileContext.tsx
@@ -1,6 +1,6 @@
 import { createContext, FunctionComponent, useEffect, useState } from 'react'
 
-const SERVER_URL = process.env.REACT_APP_SERVER_URL
+const SERVER_URL = process.env.REACT_APP_SERVER_URL?.replace(/\/$/, '')
 
 export interface UserProfile {
   id: number

diff --git a/frontend/src/hooks/useAuth.tsx b/frontend/src/hooks/useAuth.tsx
@@ -24,7 +24,7 @@ export const AuthContext = createContext<AuthInfo>({
 
 export const useAuth = () => useContext(AuthContext)
 
-const SERVER_URL = process.env.REACT_APP_SERVER_URL
+const SERVER_URL = process.env.REACT_APP_SERVER_URL?.replace(/\/$/, '')
 
 const headers = {
   'content-type': 'application/json; charset=utf-8',

diff --git a/frontend/src/pages/shipments/DownloadCSVMenu.tsx b/frontend/src/pages/shipments/DownloadCSVMenu.tsx
@@ -12,7 +12,7 @@ interface Props {
   shipment: ShipmentQuery['shipment']
 }
 
-const SERVER_URL = process.env.REACT_APP_SERVER_URL
+const SERVER_URL = process.env.REACT_APP_SERVER_URL?.replace(/\/$/, '')
 
 const DownloadCSVMenu: FunctionComponent<Props> = ({ shipment }) => {
   const [modalIsVisible, showModal, hideModal] = useModalState()