coffey-labs/cairnobs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15 from Coffey-Labs/fix/nav-local-auth-hidden

Browse Source 
Show the account controls the deployment actually has
This commit is contained in:
Coffey Labs
2026-09-04 18:02:31 -07:00
committed by GitHub
parent 81ec542452 dd5d5a77c3
commit 6a45832d80
1 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/lib/components/NavSidebar.svelte
+36 -14
View File
@@ -42,9 +42,27 @@
}); });
let localSession: LocalSession | null = $state(null); let localSession: LocalSession | null = $state(null);
// Whether the server actually serves local auth, which is not the
// same question as whether this bundle was built with it enabled.
// api registers /auth/* only when LOCAL_AUTH_ENABLED is set AND
// ENTERPRISE_AUTH_URL is not (see cmd/api/main.go's authorizer
// switch), so getLocalSession's 'disabled' -- a 404 from
// /auth/session -- is the only trustworthy signal of which mode is
// live. Deciding from enterpriseAuthBase alone got this wrong:
// compose sets VITE_ENTERPRISE_AUTH_BASE_URL unconditionally so the
// tenant picker can exist, so that check was true even on a
// single-tenant deployment whose actual authenticator was local
// login, and the local block below could never render.
//
// null means "not yet known" -- neither block renders until the
// probe lands, rather than flashing the wrong one.
let localAuthAvailable: boolean | null = $state(localAuthEnabled ? null : false);
$effect(() => { $effect(() => {
if (!localAuthEnabled) return; if (!localAuthEnabled) return;
getLocalSession().then((s) => (localSession = s === 'disabled' ? null : s)); getLocalSession().then((s) => {
localAuthAvailable = s !== 'disabled';
localSession = s === 'disabled' ? null : s;
});
}); });
// The Users nav item only ever makes sense for local-auth mode's // The Users nav item only ever makes sense for local-auth mode's
@@ -90,7 +108,23 @@
<button type="button" class="close-mobile" onclick={onCloseMobile} aria-label="Close menu">✕</button> <button type="button" class="close-mobile" onclick={onCloseMobile} aria-label="Close menu">✕</button>
</div> </div>
{#if enterpriseAuthBase} {#if localAuthAvailable}
<div class="tenant">
{#if localSession}
<div class="tenant-pill">
<span class="dot" aria-hidden="true"></span>
<span class="tenant-name">{localSession.username}</span>
<span class="role">{localSession.role}</span>
</div>
<a class="switch" href="/account">Change password</a>
<button type="button" class="switch logout-btn" onclick={handleLogout} disabled={loggingOut}>
{loggingOut ? 'Signing out…' : 'Log out'}
</button>
{:else}
<a class="switch signin" href="/login">Sign in</a>
{/if}
</div>
{:else if localAuthAvailable === false && enterpriseAuthBase}
<div class="tenant"> <div class="tenant">
{#if session} {#if session}
<div class="tenant-pill"> <div class="tenant-pill">
@@ -103,18 +137,6 @@
<a class="switch signin" href="{enterpriseAuthBase}/auth/oidc/login">Sign in</a> <a class="switch signin" href="{enterpriseAuthBase}/auth/oidc/login">Sign in</a>
{/if} {/if}
</div> </div>
{:else if localAuthEnabled && localSession}
<div class="tenant">
<div class="tenant-pill">
<span class="dot" aria-hidden="true"></span>
<span class="tenant-name">{localSession.username}</span>
<span class="role">{localSession.role}</span>
</div>
<a class="switch" href="/account">Change password</a>
<button type="button" class="switch logout-btn" onclick={handleLogout} disabled={loggingOut}>
{loggingOut ? 'Signing out…' : 'Log out'}
</button>
</div>
{/if} {/if}
<nav aria-label="Main"> <nav aria-label="Main">