refactor: remove API_ORIGIN from env

Dockerfile

@@ -15,7 +15,6 @@ COPY . .
 
 ARG SERVER_PORT=5000
 ARG VERSION
-ARG API_ORIGIN=http://localhost:$SERVER_PORT
 ARG NEXT_PUBLIC_COGNITO_POOL_ENDPOINT=http://localhost:$SERVER_PORT
 ARG NEXT_PUBLIC_COGNITO_POOL_ID=ap-northeast-1_randomPoolId
 ARG NEXT_PUBLIC_COGNITO_CLIENT_ID=random-client-id
@@ -28,12 +27,10 @@ FROM node:20-alpine
 
 WORKDIR /usr/src/app
 
-ARG SERVER_PORT=5000
 ARG CLIENT_PORT=5001
 
-ENV PORT=$SERVER_PORT
+ENV PORT=5000
 ENV CLIENT_PORT=$CLIENT_PORT
-ENV API_ORIGIN=http://localhost:$SERVER_PORT
 ENV CORS_ORIGIN=http://localhost:$CLIENT_PORT
 ENV DATABASE_URL=file:../../data/app.db
 ENV SMTP_HOST=inbucket
@@ -53,9 +50,9 @@ COPY --from=builder /usr/src/app/server/prisma ./server/prisma
 RUN apk --no-cache add curl
 COPY --from=builder /usr/src/app/data ./data
 
-HEALTHCHECK --interval=5s --timeout=5s --retries=3 CMD curl -f $API_ORIGIN/health && curl -f $CORS_ORIGIN || exit 1
+HEALTHCHECK --interval=5s --timeout=5s --retries=3 CMD curl -f http://localhost:$PORT/health && curl -f $CORS_ORIGIN || exit 1
 
-EXPOSE ${SERVER_PORT} ${CLIENT_PORT}
+EXPOSE ${PORT} ${CLIENT_PORT}
 VOLUME ["/usr/src/app/data"]
 
 CMD ["npm", "start"]

client/package.json

@@ -36,7 +36,6 @@
   "devDependencies": {
     "@types/react": "^18.3.1",
     "@types/react-dom": "^18.3.0",
-    "dotenv": "^16.4.5",
     "happy-css-modules": "^2.1.2",
     "notios": "^0.4.1",
     "pathpida": "^0.22.0"

client/utils/apiClient.ts

@@ -1,5 +1,6 @@
 import aspida from '@aspida/axios';
 import api from 'api/$api';
 import axios from 'axios';
+import { NEXT_PUBLIC_COGNITO_POOL_ENDPOINT } from './envValues';
 
-export const apiClient = api(aspida(axios.create({ withCredentials: true })));
+export const apiClient = api(aspida(axios.create({ baseURL: NEXT_PUBLIC_COGNITO_POOL_ENDPOINT })));

server/.env.example

@@ -1,6 +1,5 @@
 PORT=5000
 CLIENT_PORT=
-API_ORIGIN=http://localhost:5000
 CORS_ORIGIN=http://localhost:5001
 DATABASE_URL=file:../../data/app.db
 TEST_DATABASE_URL=file:../../data/test.db