fix: gitpod cors issue (#3616)

dailydotdev · Oct 3, 2024 · f922155 · f922155
1 parent 40460d8
commit f922155
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 20 deletions.
diff --git a/packages/shared/src/lib/config.ts b/packages/shared/src/lib/config.ts
@@ -1,4 +1,7 @@
-export const apiUrl = process.env.NEXT_PUBLIC_API_URL;
+export const apiUrl =
+  process.env.NEXT_PUBLIC_DOMAIN === 'localhost'
+    ? '/api'
+    : process.env.NEXT_PUBLIC_API_URL;
 
 export const graphqlUrl = `${apiUrl}/graphql`;
 

diff --git a/packages/webapp/next.config.js b/packages/webapp/next.config.js
@@ -83,26 +83,38 @@ module.exports = {
       env: {
         CURRENT_VERSION: version,
       },
-      rewrites: () => [
-        {
-          source: '/api/sitemaps/:path*',
-          destination: `${process.env.NEXT_PUBLIC_API_URL}/sitemaps/:path*`,
-        },
-        {
-          source: '/search',
-          destination: '/search/:provider',
-          has: [
-            {
-              type: 'query',
-              key: 'provider'
-            }
-          ]
-        },
-        {
-          source: '/search',
-          destination: '/search/posts'
+      rewrites: () => {
+        const rewrites = [
+          {
+            source: '/api/sitemaps/:path*',
+            destination: `${process.env.NEXT_PUBLIC_API_URL}/sitemaps/:path*`,
+          },
+          {
+            source: '/search',
+            destination: '/search/:provider',
+            has: [
+              {
+                type: 'query',
+                key: 'provider'
+              }
+            ]
+          },
+          {
+            source: '/search',
+            destination: '/search/posts'
+          }
+        ];
+
+        // to support GitPod environment and avoid CORS issues, we need to proxy the API requests
+        if (process.env.NEXT_PUBLIC_DOMAIN === 'localhost') {
+          rewrites.unshift({
+            source: '/api/:path*',
+            destination: `${process.env.NEXT_PUBLIC_API_URL}/:path*`,
+          });
         }
-      ],
+
+        return rewrites;
+      },
       redirects: () => {
         return [
           {