Merge pull request #240 from yoonghan/fix-cors

Allow override api url

.env

@@ -14,7 +14,7 @@ FIREBASE_CLIENT_X509_CERT_URL=""
 
 CORS_ALLOW_ORIGIN="https://localhost:3000"
 NEXT_PUBLIC_SITE_URL=""
-NEXT_PUBLIC_IS_LOCAL_API_SITE_URL="true"
+NEXT_PUBLIC_API_SITE_URL=""
 
 # This was inserted by `prisma init`:
 # Environment variables declared in this file are automatically made available to Prisma.

.github/workflows/merge.yml

@@ -63,8 +63,10 @@ jobs:
         id: env-set
         run: |
           SITE_URL="https://yoonghan.github.io"
-          echo "Change site: $SITE_URL"
+          API_SITE_URL="https://www.walcron.com"
+          echo "Change site: $SITE_URL;$API_SITE_URL"
           echo "siteUrl=$SITE_URL" >> $GITHUB_OUTPUT
+          echo "apiSiteUrl=$API_SITE_URL" >> $GITHUB_OUTPUT
 
       - name: Url replace
         shell: bash
@@ -79,7 +81,7 @@ jobs:
           echo "NEXT_PUBLIC_PUSHER_APP_KEY=${{ secrets.NEXT_PUBLIC_PUSHER_APP_KEY }}" >> .env
           echo "NEXT_PUBLIC_PUSHER_CLUSTER=${{ secrets.NEXT_PUBLIC_PUSHER_CLUSTER }}" >> .env
           echo "NEXT_PUBLIC_SITE_URL=${{ steps.env-set.outputs.siteUrl }}" >> .env
-          echo "NEXT_PUBLIC_IS_LOCAL_API_SITE_URL=false" >> .env
+          echo "NEXT_PUBLIC_API_SITE_URL=${{ steps.env-set.outputs.apiSiteUrl }}" >> .env
 
       - name: Build with Next.js
         run: |

README.md

@@ -59,8 +59,8 @@ npm run backstop:approve // Approve the new website ok
 ## Additional site url
 
 1. CORS_ALLOW_ORIGIN - for whitelisting /api url defined in next.config.js to external apps.
-2. NEXT_PUBLIC_SITE_URL - configure for static site to call api.
-3. NEXT_PUBLIC_IS_LOCAL_API_SITE_URL - Indicate local api is used. Used for variable domain name.
+2. NEXT_PUBLIC_SITE_URL - configure for static site to call api. Overrides blank with https://www.walcron.com.
+3. NEXT_PUBLIC_API_SITE_URL - Indicate local api is url.
 
 ## Run Github workflows
 

src/__tests__/mocks/setEnv.ts

@@ -1,6 +1,6 @@
 const defaultProcessEnv = { ...process.env }
 
-export const setEnv = (environments: { [key: string]: string }) => {
+export const setEnv = (environments: { [key: string]: string | undefined }) => {
   Object.keys(environments).forEach((key: string) => {
     process.env[key] = environments[key]
   })

src/config/site.jest.test.ts

@@ -4,11 +4,10 @@ describe("root-url", () => {
   it("should be default with local website", async () => {
     setEnv({
       NEXT_PUBLIC_SITE_URL: "",
-      NEXT_PUBLIC_IS_LOCAL_API_SITE_URL: "false",
     })
     const { site } = await import("./site")
     expect(site.url).toBe("https://www.walcron.com")
-    expect(site.apiUrl).toBe("https://www.walcron.com/api")
+    expect(site.apiUrl).toBe("/api")
   })
 
   it("should getUrl from env", async () => {
@@ -18,18 +17,14 @@ describe("root-url", () => {
     expect(getUrl()).toBe(url)
   })
 
-  it("should getUrl + getApiUrl from env", async () => {
-    const url = "https://yoonghan.github.io"
-    setEnv({
-      NEXT_PUBLIC_SITE_URL: url,
-      NEXT_PUBLIC_IS_LOCAL_API_SITE_URL: "false",
-    })
+  it("should override local API url from env", async () => {
+    setEnv({ NEXT_PUBLIC_API_SITE_URL: "https://yoonghan.github.io" })
     const { getApiUrl } = await import("./site")
-    expect(getApiUrl()).toBe(url + "/api")
+    expect(getApiUrl()).toBe("https://yoonghan.github.io/api")
   })
 
-  it("should overridde API URL from env", async () => {
-    setEnv({ NEXT_PUBLIC_IS_LOCAL_API_SITE_URL: "true" })
+  it("should use blank API url if undefined", async () => {
+    setEnv({ NEXT_PUBLIC_API_SITE_URL: undefined })
     const { getApiUrl } = await import("./site")
     expect(getApiUrl()).toBe("/api")
   })

src/config/site.ts

@@ -3,8 +3,7 @@ function getUrl() {
 }
 
 function getApiUrl() {
-  const apiUrl =
-    process.env.NEXT_PUBLIC_IS_LOCAL_API_SITE_URL === "true" ? "" : getUrl()
+  const apiUrl = process.env.NEXT_PUBLIC_API_SITE_URL ?? ""
   return `${apiUrl}/api`
 }