ci(env): dont use env for frontend

anteqkois · May 20, 2024 · 957fb68 · 957fb68
1 parent d82cf44
commit 957fb68
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile
@@ -11,20 +11,20 @@ WORKDIR /app/builder
 # COPY .env.${ENVIRONMENT} ./.env
 # COPY /app/builder/apps/web/.env.prod-build /app/builder/apps/web/.env
 # RUN echo "NEXT_PUBLIC_API_HOST=${NEXT_PUBLIC_API_HOST}" >> /app/builder/apps/web/.env
-RUN echo "NEXT_PUBLIC_API_HOST=https://api.linkerry.com" >> /app/builder/apps/web/.env
-RUN echo "NEXT_TELEMETRY_DISABLED=true" >> /app/builder/apps/web/.env
-RUN echo "TEST=true" >> /app/builder/apps/web/.env
-RUN echo "NEXT_PUBLIC_API_HOST=https://api.linkerry.com" >> /app/builder/apps/web/.env.production
-RUN echo "NEXT_TELEMETRY_DISABLED=true" >> /app/builder/apps/web/.env.production
-RUN echo "TEST=true" >> /app/builder/apps/web/.env.production
-RUN cat /app/builder/apps/web/.env
-RUN ls -a /app/builder/apps/web
+# RUN echo "NEXT_PUBLIC_API_HOST=https://api.linkerry.com" >> /app/builder/apps/web/.env
+# RUN echo "NEXT_TELEMETRY_DISABLED=true" >> /app/builder/apps/web/.env
+# RUN echo "TEST=true" >> /app/builder/apps/web/.env
+# RUN echo "NEXT_PUBLIC_API_HOST=https://api.linkerry.com" >> /app/builder/apps/web/.env.production
+# RUN echo "NEXT_TELEMETRY_DISABLED=true" >> /app/builder/apps/web/.env.production
+# RUN echo "TEST=true" >> /app/builder/apps/web/.env.production
+# RUN cat /app/builder/apps/web/.env
+# RUN ls -a /app/builder/apps/web
 
 RUN npx nx run web:build || echo "nx run web:build failed"
 # RUN grep -rn --include="*.js" "process.env.NEXT_PUBLIC_API_HOST" /app/builder/apps/web/.next/standalone
 # RUN grep -rn --include="*.js" "https://api.linkerry.com" /app/builder/apps/web/.next/standalone
-RUN find /app/builder/apps/web/.next/standalone -name "*.js" -exec grep -n "process.env.NEXT_PUBLIC_API_HOST" {} + || true
-RUN find /app/builder/apps/web/.next/standalone -name "*.js" -exec grep -n "https://api.linkerry.com" {} + || true
+# RUN find /app/builder/apps/web/.next/standalone -name "*.js" -exec grep -n "process.env.NEXT_PUBLIC_API_HOST" {} + || true
+# RUN find /app/builder/apps/web/.next/standalone -name "*.js" -exec grep -n "https://api.linkerry.com" {} + || true
 
 FROM node:lts-alpine AS runner
 

diff --git a/apps/web/libs/api-client.ts b/apps/web/libs/api-client.ts
@@ -4,7 +4,8 @@ import { redirect } from 'next/navigation'
 // import { store } from '../../features/common/store';
 // import fingerprint from '../../utils/fingerprint'
 
-export const API_URL = process.env.NEXT_PUBLIC_API_HOST
+// export const API_URL = process.env.NEXT_PUBLIC_API_HOST
+export const API_URL = 'https://api.linkerry.com'
 
 const apiClient = axios.create({
 	withCredentials: true,

diff --git a/apps/web/libs/api-server-client.ts b/apps/web/libs/api-server-client.ts
@@ -5,7 +5,7 @@ import { redirect } from 'next/navigation'
 // import { store } from '../../features/common/store';
 // import fingerprint from '../../utils/fingerprint'
 
-export const API_URL = process.env.NEXT_PUBLIC_API_HOST
+export const API_URL = 'https://api.linkerry.com'
 
 const apiServerClient = axios.create({
   withCredentials: true,

diff --git a/apps/web/modules/editor/app-connections/OAuth2Auth.tsx b/apps/web/modules/editor/app-connections/OAuth2Auth.tsx
@@ -28,6 +28,7 @@ import dayjs from 'dayjs'
 import { nanoid } from 'nanoid'
 import { Dispatch, FormEvent, HTMLAttributes, SetStateAction, useCallback, useEffect, useState } from 'react'
 import { useForm } from 'react-hook-form'
+import { API_URL } from '../../../libs/api-client'
 import { useClientQuery } from '../../../libs/react-query'
 import { ErrorInfo } from '../../../shared/components/ErrorInfo'
 import { MarkdownBase } from '../../../shared/components/Markdown/MarkdownBase'
@@ -56,7 +57,7 @@ export const OAuth2Auth = ({ onCreateAppConnection, auth, connector, setShowDial
 
 		setOAuth2Settings({
 			auth_url: auth.authUrl,
-			redirect_url: `${process.env.NEXT_PUBLIC_API_HOST}/api/v1/oauth2/redirect`,
+			redirect_url: `${API_URL}/api/v1/oauth2/redirect`,
 			scope: auth.scope.join(' '),
 			pkce: auth.pkce ?? false,
 			extraParams: auth.extra || {},