Skip to content

admin: show the Microsoft button only when interactive login exists #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
selic merged 1 commit into from
Jul 25, 2026
Merged

admin: show the Microsoft button only when interactive login exists #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified docs/img/admin-signin.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions docs/ui-guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@ credentials are keyed by them.

## `/admin` — operator console

![Admin sign-in](img/admin-signin.png)
![Admin sign-in on a token-only deployment](img/admin-signin.png)

> The Microsoft button is always rendered here; on a deployment without
> interactive login just ignore it and paste an admin token.
As on `/me`, the Microsoft button appears only when interactive login is
configured (the page checks `/health`); on a token-only deployment you get just
the token box, shown above.

### Status

Expand Down
9 changes: 7 additions & 2 deletions packages/gateway/public/admin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ <h1>MSPStack Gateway</h1>
<div id="login" class="panel section">
<section class="panel">
<h2>Admin sign in</h2>
<div class="row">
<div class="row hidden" id="oidc-row">
<a class="btn" id="oidc-btn" href="/auth/login?returnTo=/admin">Sign in with Microsoft</a>
</div>
<p class="muted">Or paste an <b>admin bearer token</b> (a static <code>MCP_TOKENS_ADMIN</code> token or an OIDC access token for this gateway) — break-glass for when interactive login is unavailable.</p>
<p class="muted">Paste an <b>admin bearer token</b> (a static <code>MCP_TOKENS_ADMIN</code> token or an OIDC access token for this gateway) — break-glass for when interactive login is unavailable.</p>
<div class="row">
<input id="token-input" type="password" placeholder="admin token" style="flex:1">
<button class="btn secondary" id="login-btn">Sign in with token</button>
Expand Down Expand Up @@ -619,6 +619,11 @@ <h3>${esc(p.title)}</h3>
roles: renderRoles, users: renderUsers, secrets: renderSecrets };

async function boot() {
// Show the Microsoft button only when interactive login actually exists —
// /health reports it; on failure keep it hidden and rely on the token box.
fetch("/health").then(r => r.json())
.then(h => $("#oidc-row").classList.toggle("hidden", !h.login))
.catch(() => {});
if (TOKEN) { login(TOKEN); return; }
// No pasted token — try an existing cookie session (Sign in with Microsoft).
try {
Expand Down
Loading