Env Update
This commit is contained in:
1 parent
f2b9993427
commit
9282777ac9
9 files changed
+60
-21
No files matched your search
@@ -63,8 +63,6 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
context: ./ApiCore-Frontend
|
context: ./ApiCore-Frontend
|
||||||
push: true
|
push: true
|
||||||
build-args: |
|
|
||||||
NEXT_PUBLIC_API_URL=${{ vars.NEXT_PUBLIC_API_URL }}
|
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
cache-from: type=gha
|
cache-from: type=gha
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
# Kopieren nach .env.local und mit echten Werten befuellen. .env* ist gitignored.
|
# Kopieren nach .env.local und mit echten Werten befuellen. .env* ist gitignored.
|
||||||
|
|
||||||
NEXT_PUBLIC_API_URL="http://localhost:3001/api/v1"
|
API_URL="http://localhost:3001/api/v1"
|
||||||
@@ -2,12 +2,6 @@
|
|||||||
|
|
||||||
FROM node:22-alpine AS builder
|
FROM node:22-alpine AS builder
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
# NEXT_PUBLIC_* vars are inlined into the client bundle at build time, so
|
|
||||||
# this must be supplied per-environment via:
|
|
||||||
# docker build --build-arg NEXT_PUBLIC_API_URL=https://api.example.com .
|
|
||||||
# Setting it only in the runtime ConfigMap has no effect on the built bundle.
|
|
||||||
ARG NEXT_PUBLIC_API_URL
|
|
||||||
ENV NEXT_PUBLIC_API_URL=$NEXT_PUBLIC_API_URL
|
|
||||||
COPY package.json package-lock.json ./
|
COPY package.json package-lock.json ./
|
||||||
RUN npm ci
|
RUN npm ci
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
import { NextResponse } from 'next/server';
|
||||||
|
|
||||||
|
// Server-only env var (no NEXT_PUBLIC_ prefix), so it is NOT inlined into the
|
||||||
|
// client bundle at build time. force-dynamic makes Next.js read process.env
|
||||||
|
// fresh on every request instead of caching this route's output, so a single
|
||||||
|
// built image can be promoted across environments and reconfigured purely via
|
||||||
|
// the container's runtime env (e.g. a Kubernetes ConfigMap) without rebuilding.
|
||||||
|
export const dynamic = 'force-dynamic';
|
||||||
|
|
||||||
|
export interface RuntimeConfig {
|
||||||
|
apiUrl: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GET(): NextResponse<RuntimeConfig> {
|
||||||
|
const apiUrl = process.env.API_URL ?? 'http://localhost:3001/api/v1';
|
||||||
|
return NextResponse.json({ apiUrl });
|
||||||
|
}
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
import { getAccessToken, setAccessToken } from './token-store';
|
import { getAccessToken, setAccessToken } from './token-store';
|
||||||
import { refreshRequest } from './api';
|
import { refreshRequest } from './api';
|
||||||
|
import { getApiUrl } from '../config/runtime-config';
|
||||||
const API_URL = process.env.NEXT_PUBLIC_API_URL ?? 'http://localhost:3001/api/v1';
|
|
||||||
|
|
||||||
export class ApiError extends Error {
|
export class ApiError extends Error {
|
||||||
status: number;
|
status: number;
|
||||||
@@ -14,7 +13,8 @@ export class ApiError extends Error {
|
|||||||
|
|
||||||
async function rawFetch(path: string, init: RequestInit): Promise<Response> {
|
async function rawFetch(path: string, init: RequestInit): Promise<Response> {
|
||||||
const token = getAccessToken();
|
const token = getAccessToken();
|
||||||
return fetch(`${API_URL}${path}`, {
|
const apiUrl = await getApiUrl();
|
||||||
|
return fetch(`${apiUrl}${path}`, {
|
||||||
...init,
|
...init,
|
||||||
credentials: 'include',
|
credentials: 'include',
|
||||||
headers: {
|
headers: {
|
||||||
@@ -60,7 +60,8 @@ export async function apiFetchBlob(path: string, fallbackFilename: string): Prom
|
|||||||
|
|
||||||
async function rawFetchFormData(path: string, formData: FormData): Promise<Response> {
|
async function rawFetchFormData(path: string, formData: FormData): Promise<Response> {
|
||||||
const token = getAccessToken();
|
const token = getAccessToken();
|
||||||
return fetch(`${API_URL}${path}`, {
|
const apiUrl = await getApiUrl();
|
||||||
|
return fetch(`${apiUrl}${path}`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
body: formData,
|
body: formData,
|
||||||
credentials: 'include',
|
credentials: 'include',
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
const API_URL = process.env.NEXT_PUBLIC_API_URL ?? 'http://localhost:3001/api/v1';
|
import { getApiUrl } from '../config/runtime-config';
|
||||||
|
|
||||||
export interface AccessTokenResponse {
|
export interface AccessTokenResponse {
|
||||||
accessToken: string;
|
accessToken: string;
|
||||||
@@ -16,7 +16,8 @@ export function isMfaRequired(response: LoginResponse): response is MfaRequiredR
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function loginRequest(email: string, password: string): Promise<LoginResponse> {
|
export async function loginRequest(email: string, password: string): Promise<LoginResponse> {
|
||||||
const response = await fetch(`${API_URL}/auth/login`, {
|
const apiUrl = await getApiUrl();
|
||||||
|
const response = await fetch(`${apiUrl}/auth/login`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
credentials: 'include',
|
credentials: 'include',
|
||||||
headers: { 'Content-Type': 'application/json' },
|
headers: { 'Content-Type': 'application/json' },
|
||||||
@@ -29,7 +30,8 @@ export async function loginRequest(email: string, password: string): Promise<Log
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function verifyMfaRequest(mfaToken: string, code: string): Promise<AccessTokenResponse> {
|
export async function verifyMfaRequest(mfaToken: string, code: string): Promise<AccessTokenResponse> {
|
||||||
const response = await fetch(`${API_URL}/auth/mfa/verify`, {
|
const apiUrl = await getApiUrl();
|
||||||
|
const response = await fetch(`${apiUrl}/auth/mfa/verify`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
credentials: 'include',
|
credentials: 'include',
|
||||||
headers: { 'Content-Type': 'application/json' },
|
headers: { 'Content-Type': 'application/json' },
|
||||||
@@ -50,7 +52,8 @@ export async function verifyMfaRequest(mfaToken: string, code: string): Promise<
|
|||||||
let inFlightRefresh: Promise<AccessTokenResponse | null> | null = null;
|
let inFlightRefresh: Promise<AccessTokenResponse | null> | null = null;
|
||||||
|
|
||||||
async function performRefresh(): Promise<AccessTokenResponse | null> {
|
async function performRefresh(): Promise<AccessTokenResponse | null> {
|
||||||
const response = await fetch(`${API_URL}/auth/refresh`, {
|
const apiUrl = await getApiUrl();
|
||||||
|
const response = await fetch(`${apiUrl}/auth/refresh`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
credentials: 'include',
|
credentials: 'include',
|
||||||
});
|
});
|
||||||
@@ -70,7 +73,8 @@ export function refreshRequest(): Promise<AccessTokenResponse | null> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function logoutRequest(): Promise<void> {
|
export async function logoutRequest(): Promise<void> {
|
||||||
await fetch(`${API_URL}/auth/logout`, { method: 'POST', credentials: 'include' });
|
const apiUrl = await getApiUrl();
|
||||||
|
await fetch(`${apiUrl}/auth/logout`, { method: 'POST', credentials: 'include' });
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface CurrentUserProfile {
|
export interface CurrentUserProfile {
|
||||||
@@ -85,7 +89,8 @@ export interface CurrentUserProfile {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function getCurrentUserRequest(accessToken: string): Promise<CurrentUserProfile> {
|
export async function getCurrentUserRequest(accessToken: string): Promise<CurrentUserProfile> {
|
||||||
const response = await fetch(`${API_URL}/auth/me`, {
|
const apiUrl = await getApiUrl();
|
||||||
|
const response = await fetch(`${apiUrl}/auth/me`, {
|
||||||
credentials: 'include',
|
credentials: 'include',
|
||||||
headers: { Authorization: `Bearer ${accessToken}` },
|
headers: { Authorization: `Bearer ${accessToken}` },
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
import type { RuntimeConfig } from '@/app/api/runtime-config/route';
|
||||||
|
|
||||||
|
let cachedApiUrl: Promise<string> | null = null;
|
||||||
|
|
||||||
|
async function fetchApiUrl(): Promise<string> {
|
||||||
|
const response = await fetch('/api/runtime-config');
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error('Runtime-Konfiguration konnte nicht geladen werden.');
|
||||||
|
}
|
||||||
|
const config = (await response.json()) as RuntimeConfig;
|
||||||
|
return config.apiUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getApiUrl(): Promise<string> {
|
||||||
|
if (!cachedApiUrl) {
|
||||||
|
cachedApiUrl = fetchApiUrl().catch((error: unknown) => {
|
||||||
|
cachedApiUrl = null;
|
||||||
|
throw error;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return cachedApiUrl;
|
||||||
|
}
|
||||||
@@ -39,7 +39,7 @@ npm run start:dev # http://localhost:3001, Swagger unter /api/v1/docs
|
|||||||
# Frontend
|
# Frontend
|
||||||
cd ApiCore-Frontend
|
cd ApiCore-Frontend
|
||||||
npm install
|
npm install
|
||||||
npm run dev # http://localhost:3000, erwartet Backend unter NEXT_PUBLIC_API_URL
|
npm run dev # http://localhost:3000, erwartet Backend unter API_URL (Laufzeit-Env, siehe .env.example)
|
||||||
```
|
```
|
||||||
|
|
||||||
## Lint / Typecheck / Tests / Build
|
## Lint / Typecheck / Tests / Build
|
||||||
|
|||||||
@@ -3,4 +3,6 @@ kind: ConfigMap
|
|||||||
metadata:
|
metadata:
|
||||||
name: apicore-frontend-config
|
name: apicore-frontend-config
|
||||||
data:
|
data:
|
||||||
NEXT_PUBLIC_API_URL: "https://api.apicore.example.com/api/v1"
|
# Server-only env var, read at request time (see src/app/api/runtime-config/route.ts).
|
||||||
|
# Changing this and restarting the pods takes effect immediately - no rebuild needed.
|
||||||
|
API_URL: "https://api.apicore.example.com/api/v1"
|
||||||
Reference in new issue
Block a user