Compare commits
2 Commits
4892af55e8
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 607785ac0c | |||
| 92d3b4dc1b |
17
Dockerfile
17
Dockerfile
@@ -5,11 +5,28 @@ COPY package*.json ./
|
||||
RUN npm ci
|
||||
|
||||
COPY . .
|
||||
|
||||
# Brand is baked at build (Vite VITE_* are build-time). Written here, not
|
||||
# via a context .env (.dockerignore excludes .env*). public/brand-logo.svg
|
||||
# ships the Fabric-purple Hangman Lab mark; override args if rebranding.
|
||||
ARG VITE_APP_NAME=Fabric
|
||||
ARG VITE_LOGO_URL=/brand-logo.svg
|
||||
ARG VITE_FAVICON_URL=/brand-logo.svg
|
||||
RUN printf 'VITE_APP_NAME=%s\nVITE_LOGO_URL=%s\nVITE_FAVICON_URL=%s\n' \
|
||||
"$VITE_APP_NAME" "$VITE_LOGO_URL" "$VITE_FAVICON_URL" > .env.production
|
||||
RUN npm run build
|
||||
|
||||
FROM nginx:1.27-alpine AS runtime
|
||||
COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
|
||||
COPY docker/entrypoint.sh /docker-entrypoint-fabric.sh
|
||||
COPY --from=build /app/dist /usr/share/nginx/html
|
||||
RUN chmod +x /docker-entrypoint-fabric.sh
|
||||
|
||||
# Runtime SPA config (see docker/entrypoint.sh). Override at `docker run`
|
||||
# / compose: empty values keep prior behavior.
|
||||
ENV FABRIC_OIDC_ONLY=""
|
||||
ENV FIX_TO_CENTER=""
|
||||
|
||||
EXPOSE 80
|
||||
ENTRYPOINT ["/docker-entrypoint-fabric.sh"]
|
||||
CMD ["nginx", "-g", "daemon off;"]
|
||||
|
||||
20
docker/entrypoint.sh
Normal file
20
docker/entrypoint.sh
Normal file
@@ -0,0 +1,20 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
# Inject container env into the static SPA at runtime. The app loads
|
||||
# /runtime-env.js (see index.html) before its bundle.
|
||||
# FABRIC_OIDC_ONLY - "true" hides the username/password login form
|
||||
# FIX_TO_CENTER - non-empty pins the Center API base + hides its input
|
||||
ONLY="false"
|
||||
case "$(printf '%s' "${FABRIC_OIDC_ONLY:-}" | tr '[:upper:]' '[:lower:]')" in
|
||||
1|true|yes|on) ONLY="true" ;;
|
||||
esac
|
||||
|
||||
# JSON-escape FIX_TO_CENTER (backslash + double-quote)
|
||||
FIX="$(printf '%s' "${FIX_TO_CENTER:-}" | sed 's/\\/\\\\/g; s/"/\\"/g')"
|
||||
|
||||
cat > /usr/share/nginx/html/runtime-env.js <<EOF
|
||||
window.__FABRIC_ENV__ = { oidcOnly: ${ONLY}, fixToCenter: "${FIX}" };
|
||||
EOF
|
||||
|
||||
exec "$@"
|
||||
@@ -19,6 +19,8 @@
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
<!-- runtime container env (generated by docker/entrypoint.sh); absent in dev -->
|
||||
<script src="/runtime-env.js"></script>
|
||||
<script type="module" src="/src/main.tsx"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
44
public/brand-logo.svg
Normal file
44
public/brand-logo.svg
Normal file
@@ -0,0 +1,44 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 733.000000 733.000000" role="img" aria-label="Hangman Lab">
|
||||
<g transform="translate(0.000000,733.000000) scale(0.100000,-0.100000)"
|
||||
fill="#9333ea" stroke="none">
|
||||
<path d="M812 6860 c-66 -40 -73 -66 -70 -242 3 -141 5 -159 24 -185 43 -58
|
||||
63 -63 262 -64 l182 -1 0 -2694 0 -2694 -290 0 c-314 0 -332 -3 -380 -54 -24
|
||||
-27 -25 -32 -28 -199 -3 -195 4 -218 71 -250 32 -16 257 -17 3084 -17 2955 0
|
||||
3049 1 3083 19 65 34 75 66 75 236 0 186 -16 224 -104 254 -25 8 -682 11
|
||||
-2512 11 l-2479 0 0 1998 0 1997 698 697 697 697 670 -3 c369 -2 680 -4 693
|
||||
-5 22 -1 22 -1 22 -269 l0 -268 84 -12 c47 -7 103 -19 125 -27 41 -14 41 -14
|
||||
43 283 l3 297 631 1 c698 2 673 -1 714 67 18 28 20 51 20 187 0 173 -8 201
|
||||
-72 240 -33 20 -56 20 -2623 20 -2567 0 -2590 0 -2623 -20z m1725 -500 c-1 -3
|
||||
-183 -185 -404 -404 l-403 -399 0 405 0 406 405 -1 c223 -1 404 -4 402 -7z
|
||||
M4283 5701 c-459 -125 -690 -624 -483 -1046 67 -138 196 -266 335 -335 281
|
||||
-139 612 -93 837 118 235 219 297 575 152 870 -85 174 -235 306 -427 375 -111
|
||||
40 -302 48 -414 18z m267 -211 c95 -15 201 -70 274 -144 273 -274 173 -723
|
||||
-189 -851 -93 -33 -236 -35 -326 -5 -202 68 -340 249 -356 465 -18 242 153
|
||||
471 394 529 71 18 119 19 203 6z M5945 4716 c-56 -25 -80 -61 -80 -122 0 -48
|
||||
4 -57 36 -90 88 -88 219 -29 219 98 0 45 -34 96 -75 114 -42 17 -61 17 -100 0z
|
||||
M5675 4466 c-60 -26 -73 -109 -26 -157 62 -61 161 -19 161 70 0 74 -68 118
|
||||
-135 87z M3747 4397 c-10 -7 -226 -223 -479 -482 -307 -313 -467 -483 -479
|
||||
-510 -35 -75 -17 -177 38 -227 39 -35 114 -61 160 -54 100 13 104 17 583 554
|
||||
l145 162 3 -404 c3 -455 15 -342 -137 -1186 -76 -423 -101 -587 -101 -664 0
|
||||
-190 182 -307 377 -242 62 21 136 95 152 152 6 22 29 188 52 369 57 466 109
|
||||
839 118 848 4 4 52 6 106 5 l99 -3 67 -210 c38 -115 68 -220 69 -232 0 -12
|
||||
-38 -152 -85 -311 -47 -159 -85 -302 -85 -317 0 -128 109 -225 255 -225 109 1
|
||||
185 42 228 125 26 51 237 683 237 710 0 11 -54 182 -121 380 -121 360 -121
|
||||
360 -134 605 -8 135 -14 292 -14 350 l0 105 152 -158 c84 -87 166 -167 182
|
||||
-177 44 -29 98 -26 135 8 38 35 187 379 173 401 -5 8 -34 20 -64 26 -59 11
|
||||
-38 -8 -393 362 -89 93 -100 97 -174 59 -59 -30 -161 -62 -229 -71 -52 -7 -53
|
||||
-7 -53 -41 0 -44 -21 -84 -61 -118 -38 -32 -41 0 32 -455 l52 -325 -82 -78
|
||||
c-45 -43 -85 -78 -89 -78 -4 0 -42 35 -84 78 l-77 77 34 215 c19 118 46 289
|
||||
61 379 26 164 26 164 -5 188 -42 33 -54 58 -61 121 -5 54 -5 54 -92 87 -98 38
|
||||
-184 89 -243 145 -76 70 -123 87 -168 57z M5504 4170 c-74 -30 -69 -170 6
|
||||
-170 19 0 20 -7 20 -123 0 -122 0 -122 -54 -262 -30 -77 -97 -243 -150 -369
|
||||
-106 -252 -113 -287 -73 -347 46 -70 38 -69 560 -69 327 0 475 3 490 11 69 35
|
||||
107 109 88 172 -5 17 -62 142 -126 277 -225 470 -215 443 -215 586 0 114 2
|
||||
124 18 124 57 0 72 101 23 151 -29 29 -29 29 -298 28 -147 0 -278 -4 -289 -9z
|
||||
m376 -307 c1 -148 1 -148 81 -333 101 -231 98 -222 68 -216 -13 3 -116 22
|
||||
-229 42 -112 19 -208 37 -212 40 -4 2 18 75 48 160 54 156 54 156 54 305 l0
|
||||
149 95 0 95 0 0 -147z m-219 -593 c22 0 49 -42 49 -75 0 -46 -29 -75 -74 -75
|
||||
-37 0 -76 36 -76 71 0 46 45 94 78 83 8 -2 18 -4 23 -4z m327 -126 c53 -59 -7
|
||||
-144 -80 -113 -54 22 -65 83 -22 125 30 31 67 27 102 -12z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 3.0 KiB |
@@ -3,6 +3,7 @@ import ProtectedRoute from './auth/ProtectedRoute'
|
||||
import AppLayout from './layouts/AppLayout'
|
||||
import ChatPage from './pages/ChatPage'
|
||||
import LoginPage from './pages/LoginPage'
|
||||
import OidcCallback from './pages/OidcCallback'
|
||||
|
||||
export default function App() {
|
||||
return (
|
||||
@@ -26,6 +27,7 @@ export default function App() {
|
||||
}
|
||||
/>
|
||||
<Route path="login" element={<LoginPage />} />
|
||||
<Route path="oidc" element={<OidcCallback />} />
|
||||
</Route>
|
||||
<Route path="*" element={<Navigate to="/workspace" replace />} />
|
||||
</Routes>
|
||||
|
||||
@@ -18,6 +18,11 @@ export function AuthProvider({ children }: PropsWithChildren) {
|
||||
setAuthSession(next)
|
||||
setSession(next)
|
||||
},
|
||||
// Adopt a session obtained out-of-band (OIDC ticket exchange).
|
||||
adoptSession: (next: AuthSession) => {
|
||||
setAuthSession(next)
|
||||
setSession(next)
|
||||
},
|
||||
logout: async () => {
|
||||
if (session?.refreshToken) {
|
||||
try {
|
||||
|
||||
@@ -5,6 +5,7 @@ export type AuthContextValue = {
|
||||
session: AuthSession | null
|
||||
isAuthed: boolean
|
||||
login: (centerApiBase: string, email: string, password: string) => Promise<void>
|
||||
adoptSession: (session: AuthSession) => void
|
||||
logout: () => Promise<void>
|
||||
ensureFreshToken: () => Promise<string | null>
|
||||
refreshGuilds: () => Promise<void>
|
||||
|
||||
@@ -215,6 +215,14 @@ button {
|
||||
width: auto;
|
||||
margin-bottom: 18px;
|
||||
}
|
||||
.login-or {
|
||||
text-align: center;
|
||||
color: var(--text-faint);
|
||||
font-size: 11px;
|
||||
letter-spacing: 0.18em;
|
||||
text-transform: uppercase;
|
||||
margin: 14px 0;
|
||||
}
|
||||
.login-card h1 {
|
||||
font-size: 24px;
|
||||
margin-bottom: 4px;
|
||||
|
||||
@@ -82,6 +82,20 @@ export async function guildMembersCenter(
|
||||
return Array.isArray(res.data) ? res.data : []
|
||||
}
|
||||
|
||||
export async function oidcStatusCenter(centerApiBase: string): Promise<{ enabled: boolean }> {
|
||||
try {
|
||||
const res = await centerClient(centerApiBase).get<{ enabled: boolean }>('/auth/oidc/status')
|
||||
return { enabled: !!res.data?.enabled }
|
||||
} catch {
|
||||
return { enabled: false }
|
||||
}
|
||||
}
|
||||
|
||||
export async function oidcExchangeCenter(centerApiBase: string, ticket: string): Promise<AuthSession> {
|
||||
const res = await centerClient(centerApiBase).post<LoginResponse>('/auth/oidc/exchange', { ticket })
|
||||
return { ...res.data, centerApiBase }
|
||||
}
|
||||
|
||||
export async function updateMeNameCenter(
|
||||
centerApiBase: string,
|
||||
accessToken: string,
|
||||
|
||||
37
src/lib/runtime-env.ts
Normal file
37
src/lib/runtime-env.ts
Normal file
@@ -0,0 +1,37 @@
|
||||
// Runtime (container) env, injected by the Docker entrypoint into
|
||||
// /runtime-env.js as window.__FABRIC_ENV__ (NOT build-time). Empty/unset
|
||||
// keeps the prior behavior.
|
||||
type FabricEnv = { oidcOnly?: boolean; fixToCenter?: string }
|
||||
|
||||
const env: FabricEnv =
|
||||
(typeof window !== 'undefined' && (window as unknown as { __FABRIC_ENV__?: FabricEnv }).__FABRIC_ENV__) || {}
|
||||
|
||||
// FABRIC_OIDC_ONLY: hide the username/password form (SSO is the only login).
|
||||
export const OIDC_ONLY = env.oidcOnly === true
|
||||
|
||||
// FIX_TO_CENTER: when non-empty, the Center API base is pinned to this and
|
||||
// the login page no longer shows the "Center API Base" input.
|
||||
export const FIXED_CENTER = (env.fixToCenter ?? '').trim()
|
||||
|
||||
export const DEFAULT_CENTER = 'http://localhost:7001/api'
|
||||
|
||||
// Where OIDC exchange should call back to. FIX_TO_CENTER wins; otherwise
|
||||
// the value the user used to start SSO (persisted before redirect).
|
||||
const OIDC_CENTER_KEY = 'fabric.oidc.center.v1'
|
||||
export function rememberOidcCenter(base: string): void {
|
||||
try {
|
||||
localStorage.setItem(OIDC_CENTER_KEY, base)
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
export function resolveCenterBase(): string {
|
||||
if (FIXED_CENTER) return FIXED_CENTER
|
||||
try {
|
||||
const v = localStorage.getItem(OIDC_CENTER_KEY)
|
||||
if (v) return v
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
return DEFAULT_CENTER
|
||||
}
|
||||
@@ -1,16 +1,29 @@
|
||||
import { useState } from 'react'
|
||||
import { useEffect, useState } from 'react'
|
||||
import type { FormEvent } from 'react'
|
||||
import { useNavigate } from 'react-router-dom'
|
||||
import { useAuth } from '../auth/auth-context'
|
||||
import { APP_NAME, LOGO_URL } from '../lib/brand'
|
||||
import { OIDC_ONLY, FIXED_CENTER, DEFAULT_CENTER, rememberOidcCenter } from '../lib/runtime-env'
|
||||
import { oidcStatusCenter } from '../lib/center-auth-client'
|
||||
|
||||
export default function LoginPage() {
|
||||
const navigate = useNavigate()
|
||||
const { login, isAuthed, session } = useAuth()
|
||||
const [centerApiBase, setCenterApiBase] = useState('http://localhost:7001/api')
|
||||
const [centerApiBase, setCenterApiBase] = useState(FIXED_CENTER || DEFAULT_CENTER)
|
||||
const [email, setEmail] = useState('')
|
||||
const [password, setPassword] = useState('')
|
||||
const [error, setError] = useState('')
|
||||
const [oidcEnabled, setOidcEnabled] = useState(false)
|
||||
|
||||
useEffect(() => {
|
||||
let alive = true
|
||||
oidcStatusCenter(centerApiBase.trim()).then((s) => {
|
||||
if (alive) setOidcEnabled(s.enabled)
|
||||
})
|
||||
return () => {
|
||||
alive = false
|
||||
}
|
||||
}, [centerApiBase])
|
||||
|
||||
async function onSubmit(e: FormEvent) {
|
||||
e.preventDefault()
|
||||
@@ -23,6 +36,15 @@ export default function LoginPage() {
|
||||
}
|
||||
}
|
||||
|
||||
function startOidc() {
|
||||
const base = centerApiBase.trim().replace(/\/$/, '')
|
||||
rememberOidcCenter(base)
|
||||
window.location.href = `${base}/auth/oidc/start`
|
||||
}
|
||||
|
||||
const showPasswordForm = !OIDC_ONLY
|
||||
const showCenterInput = !FIXED_CENTER
|
||||
|
||||
return (
|
||||
<div className="login-screen">
|
||||
<div className="login-card">
|
||||
@@ -35,7 +57,8 @@ export default function LoginPage() {
|
||||
<p className="login-sub">
|
||||
{isAuthed ? `Signed in as ${session?.user.email}` : `Sign in to continue to ${APP_NAME}`}
|
||||
</p>
|
||||
<form onSubmit={onSubmit}>
|
||||
|
||||
{showCenterInput ? (
|
||||
<div className="field">
|
||||
<label>Center API Base</label>
|
||||
<input
|
||||
@@ -45,29 +68,51 @@ export default function LoginPage() {
|
||||
placeholder="http://localhost:7001/api"
|
||||
/>
|
||||
</div>
|
||||
<div className="field">
|
||||
<label>Email</label>
|
||||
<input
|
||||
className="input"
|
||||
value={email}
|
||||
onChange={(e) => setEmail(e.target.value)}
|
||||
placeholder="you@example.com"
|
||||
type="email"
|
||||
/>
|
||||
</div>
|
||||
<div className="field">
|
||||
<label>Password</label>
|
||||
<input
|
||||
className="input"
|
||||
value={password}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
placeholder="••••••••"
|
||||
type="password"
|
||||
/>
|
||||
</div>
|
||||
{error ? <p className="error-text" style={{ marginBottom: 12 }}>{error}</p> : null}
|
||||
<button className="btn" type="submit">Sign in</button>
|
||||
</form>
|
||||
) : null}
|
||||
|
||||
{oidcEnabled ? (
|
||||
<button className="btn" type="button" onClick={startOidc} style={{ width: '100%' }}>
|
||||
Sign in with SSO
|
||||
</button>
|
||||
) : null}
|
||||
|
||||
{OIDC_ONLY && !oidcEnabled ? (
|
||||
<p className="error-text" style={{ marginTop: 12 }}>
|
||||
SSO is not configured on this Center yet.
|
||||
</p>
|
||||
) : null}
|
||||
|
||||
{showPasswordForm ? (
|
||||
<>
|
||||
{oidcEnabled ? <div className="login-or">or</div> : null}
|
||||
<form onSubmit={onSubmit}>
|
||||
<div className="field">
|
||||
<label>Email</label>
|
||||
<input
|
||||
className="input"
|
||||
value={email}
|
||||
onChange={(e) => setEmail(e.target.value)}
|
||||
placeholder="you@example.com"
|
||||
type="email"
|
||||
/>
|
||||
</div>
|
||||
<div className="field">
|
||||
<label>Password</label>
|
||||
<input
|
||||
className="input"
|
||||
value={password}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
placeholder="••••••••"
|
||||
type="password"
|
||||
/>
|
||||
</div>
|
||||
{error ? <p className="error-text" style={{ marginBottom: 12 }}>{error}</p> : null}
|
||||
<button className="btn" type="submit">Sign in</button>
|
||||
</form>
|
||||
</>
|
||||
) : error ? (
|
||||
<p className="error-text" style={{ marginTop: 12 }}>{error}</p>
|
||||
) : null}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
|
||||
66
src/pages/OidcCallback.tsx
Normal file
66
src/pages/OidcCallback.tsx
Normal file
@@ -0,0 +1,66 @@
|
||||
import { useEffect, useRef, useState } from 'react'
|
||||
import { useNavigate } from 'react-router-dom'
|
||||
import { useAuth } from '../auth/auth-context'
|
||||
import { APP_NAME } from '../lib/brand'
|
||||
import { resolveCenterBase } from '../lib/runtime-env'
|
||||
import { oidcExchangeCenter } from '../lib/center-auth-client'
|
||||
|
||||
// Landing route for the OIDC redirect: Center bounces the browser here
|
||||
// with #oidc_ticket=... (or #oidc_error=...). We redeem the one-time
|
||||
// ticket for a full session and adopt it.
|
||||
export default function OidcCallback() {
|
||||
const navigate = useNavigate()
|
||||
const { adoptSession } = useAuth()
|
||||
const [error, setError] = useState('')
|
||||
const ran = useRef(false)
|
||||
|
||||
useEffect(() => {
|
||||
if (ran.current) return
|
||||
ran.current = true
|
||||
|
||||
const hash = window.location.hash.replace(/^#/, '')
|
||||
const params = new URLSearchParams(hash)
|
||||
const ticket = params.get('oidc_ticket')
|
||||
const errParam = params.get('oidc_error')
|
||||
// scrub the fragment so the ticket isn't left in the URL/history
|
||||
window.history.replaceState(null, '', window.location.pathname)
|
||||
|
||||
if (errParam) {
|
||||
setError(decodeURIComponent(errParam))
|
||||
return
|
||||
}
|
||||
if (!ticket) {
|
||||
setError('Missing OIDC ticket.')
|
||||
return
|
||||
}
|
||||
|
||||
oidcExchangeCenter(resolveCenterBase(), ticket)
|
||||
.then((next) => {
|
||||
adoptSession(next)
|
||||
navigate('/workspace', { replace: true })
|
||||
})
|
||||
.catch(() => setError('SSO sign-in failed. The ticket may have expired — please try again.'))
|
||||
}, [adoptSession, navigate])
|
||||
|
||||
return (
|
||||
<div className="login-screen">
|
||||
<div className="login-card">
|
||||
<div className="brand-wordmark">{APP_NAME}</div>
|
||||
{error ? (
|
||||
<>
|
||||
<h1>Sign-in failed</h1>
|
||||
<p className="error-text" style={{ marginBottom: 16 }}>{error}</p>
|
||||
<button className="btn" type="button" onClick={() => navigate('/login', { replace: true })}>
|
||||
Back to sign in
|
||||
</button>
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<h1>Signing you in…</h1>
|
||||
<p className="login-sub">Completing SSO authentication.</p>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
Reference in New Issue
Block a user