Fix BASE_PATH vs PUBLIC_URL discrepancy

Dockerfile

@@ -8,7 +8,7 @@ ARG GIT_SHA
 ENV REACT_APP_GIT_SHA=$GIT_SHA
 
 ARG BASE_PATH
-ENV PUBLIC_URL=$BASE_PATH
+ENV BASE_PATH=$BASE_PATH
 
 ARG E2E
 ENV REACT_APP_E2E=$E2E

src/client/Router.tsx

@@ -5,7 +5,7 @@ import ThesesPage from './components/ThesisPage/ThesesPage'
 import RootBoundary from './components/Errors/RootBoundary'
 import NotFound from './components/Errors/NotFound'
 
-import { PUBLIC_URL } from '../config'
+import { BASE_PATH } from '../config'
 
 const router = createBrowserRouter(
   [
@@ -27,7 +27,7 @@ const router = createBrowserRouter(
     },
   ],
   {
-    basename: PUBLIC_URL,
+    basename: BASE_PATH,
   }
 )
 

src/client/components/ThesisPage/ThesisEditForm.tsx

@@ -28,6 +28,7 @@ import { useTranslation } from 'react-i18next'
 import programs from '../mockPorgrams'
 import SupervisorSelect from './SupervisorSelect'
 import useUsers from '../../hooks/useUsers'
+import { BASE_PATH } from '../../../config'
 
 const VisuallyHiddenInput = styled('input')({
   clip: 'rect(0 0 0 0)',
@@ -231,7 +232,7 @@ const ThesisEditForm: React.FC<{
               label={
                 'filename' in editedThesis.researchPlan ? (
                   <Link
-                    href={`/api/attachments/${editedThesis.researchPlan.filename}`}
+                    href={`${BASE_PATH}/api/attachments/${editedThesis.researchPlan.filename}`}
                   >
                     {editedThesis.researchPlan.name}
                   </Link>
@@ -274,7 +275,7 @@ const ThesisEditForm: React.FC<{
               label={
                 'filename' in editedThesis.waysOfWorking ? (
                   <Link
-                    href={`/api/attachments/${editedThesis.waysOfWorking.filename}`}
+                    href={`${BASE_PATH}/api/attachments/${editedThesis.waysOfWorking.filename}`}
                   >
                     {editedThesis.waysOfWorking.name}
                   </Link>

src/client/util/apiClient.tsx

@@ -1,8 +1,8 @@
 import axios from 'axios'
 
-import { PUBLIC_URL } from '../../config'
+import { BASE_PATH } from '../../config'
 
-const baseURL = `${PUBLIC_URL}/api`
+const baseURL = `${BASE_PATH}/api`
 
 const apiClient = axios.create({ baseURL })
 

src/config.ts

@@ -8,7 +8,7 @@ export const inE2EMode = process.env.REACT_APP_E2E === 'true'
 
 export const GIT_SHA = process.env.REACT_APP_GIT_SHA || ''
 
-export const PUBLIC_URL = process.env.PUBLIC_URL || ''
+export const BASE_PATH = process.env.BASE_PATH || ''
 
 // eslint-disable-next-line no-nested-ternary
 export const FULL_URL = inProduction

src/server/routes/login.ts

@@ -1,17 +1,17 @@
 import express from 'express'
 import passport from 'passport'
 
-import { PUBLIC_URL } from '../../config'
+import { BASE_PATH } from '../../config'
 
 const loginRouter = express.Router()
 
 loginRouter.get('/', passport.authenticate('oidc'))
 
 loginRouter.get(
   '/callback',
-  passport.authenticate('oidc', { failureRedirect: PUBLIC_URL || '/' }),
+  passport.authenticate('oidc', { failureRedirect: BASE_PATH || '/' }),
   (_, res) => {
-    res.redirect(PUBLIC_URL || '/')
+    res.redirect(BASE_PATH || '/')
   }
 )