Rework client OIDC env vars: rename to VITE_OIDC_*, add committed .env
Renames VITE_AUTH_* to VITE_OIDC_* to match the stack convention. Adds a dedicated VITE_OIDC_POST_LOGOUT_REDIRECT_URI instead of deriving it from the redirect URI via string replace. Switches from Dockerfile ARG/ENV to a committed src/Budget.Client/.env so Vite picks up production values at build time without needing build-arg overrides. .env.local is gitignored for localhost dev overrides. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
+2
-4
@@ -5,7 +5,5 @@ POSTGRES_DB=budget
|
|||||||
POSTGRES_USER=budget
|
POSTGRES_USER=budget
|
||||||
POSTGRES_PASSWORD=changeme
|
POSTGRES_PASSWORD=changeme
|
||||||
|
|
||||||
# Client (baked into Vite build)
|
# Note: client OIDC values live in src/Budget.Client/.env (committed).
|
||||||
VITE_AUTH_AUTHORITY=https://auth.stwaddle.com
|
# Override locally in src/Budget.Client/.env.local (gitignored).
|
||||||
VITE_AUTH_CLIENT_ID=budget-client
|
|
||||||
VITE_AUTH_REDIRECT_URI=https://budget.stwaddle.com/callback
|
|
||||||
|
|||||||
+4
-1
@@ -2,4 +2,7 @@ bin/
|
|||||||
obj/
|
obj/
|
||||||
/packages/
|
/packages/
|
||||||
riderModule.iml
|
riderModule.iml
|
||||||
/_ReSharper.Caches/
|
/_ReSharper.Caches/
|
||||||
|
|
||||||
|
# Local dev overrides (contain localhost URLs, not secrets)
|
||||||
|
src/Budget.Client/.env.local
|
||||||
@@ -5,14 +5,6 @@ COPY src/Budget.Client/package*.json ./
|
|||||||
RUN npm ci
|
RUN npm ci
|
||||||
COPY src/Budget.Client/ ./
|
COPY src/Budget.Client/ ./
|
||||||
|
|
||||||
ARG VITE_AUTH_AUTHORITY=https://auth.stwaddle.com/
|
|
||||||
ARG VITE_AUTH_CLIENT_ID=budget-client
|
|
||||||
ARG VITE_AUTH_REDIRECT_URI=https://budget.stwaddle.com/callback
|
|
||||||
|
|
||||||
ENV VITE_AUTH_AUTHORITY=$VITE_AUTH_AUTHORITY
|
|
||||||
ENV VITE_AUTH_CLIENT_ID=$VITE_AUTH_CLIENT_ID
|
|
||||||
ENV VITE_AUTH_REDIRECT_URI=$VITE_AUTH_REDIRECT_URI
|
|
||||||
|
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
# Stage 2: Build and publish ASP.NET app
|
# Stage 2: Build and publish ASP.NET app
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
VITE_OIDC_AUTHORITY=https://auth.stwaddle.com
|
||||||
|
VITE_OIDC_CLIENT_ID=budget-client
|
||||||
|
VITE_OIDC_REDIRECT_URI=https://budget.stwaddle.com/callback
|
||||||
|
VITE_OIDC_POST_LOGOUT_REDIRECT_URI=https://budget.stwaddle.com
|
||||||
@@ -1,11 +1,11 @@
|
|||||||
import type { UserManagerSettings } from 'oidc-client-ts';
|
import type { UserManagerSettings } from 'oidc-client-ts';
|
||||||
|
|
||||||
export const authConfig: UserManagerSettings = {
|
export const authConfig: UserManagerSettings = {
|
||||||
authority: import.meta.env.VITE_AUTH_AUTHORITY,
|
authority: import.meta.env.VITE_OIDC_AUTHORITY,
|
||||||
client_id: import.meta.env.VITE_AUTH_CLIENT_ID,
|
client_id: import.meta.env.VITE_OIDC_CLIENT_ID,
|
||||||
redirect_uri: import.meta.env.VITE_AUTH_REDIRECT_URI,
|
redirect_uri: import.meta.env.VITE_OIDC_REDIRECT_URI,
|
||||||
response_type: 'code',
|
response_type: 'code',
|
||||||
scope: 'openid profile email offline_access budget_api',
|
scope: 'openid profile email offline_access budget_api',
|
||||||
post_logout_redirect_uri: import.meta.env.VITE_AUTH_REDIRECT_URI?.replace('/callback', ''),
|
post_logout_redirect_uri: import.meta.env.VITE_OIDC_POST_LOGOUT_REDIRECT_URI,
|
||||||
automaticSilentRenew: true,
|
automaticSilentRenew: true,
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user