feat(branding): SRC mark + SRC as default theme, and let an admin logo win

Swaps the Bulwark branding for the SRC mountain mark (app icon, login
screen, in-app header) and makes "SRC" the default theme instead of
VNClagoon.

The substantive part is not the asset swap. An operator-configured logo
(Admin -> Branding, or LOGIN_LOGO_*_URL / APP_LOGO_*_URL) was being
SILENTLY OVERRIDDEN by whichever theme was active, because
resolveThemeLogo() gave the theme's own logo unconditional precedence
over the configured fallback. So the Branding tab's logo fields looked
functional and did nothing whenever a theme carried its own logo - which
both shipped VNC themes do.

Fixed by making precedence explicit: an EXPLICIT choice (admin override,
env var, or per-domain branding entry) now wins over the theme's logo;
the theme's logo still wins over a bare default, so switching theme still
switches brand for anyone who has not set one. /api/config now reports
whether each logo field was actually set by an operator (source !==
'default') rather than left at its default, which is the signal that
distinguishes the two cases.

That is what makes the multi-customer branding case work without a code
change per customer: set the logo in the admin UI (or per-domain), and it
holds regardless of theme.

Also updates the PWA/Electron icon source. Verified by execution: launched
the packaged app and confirmed the login screen resolves
/branding/SRC_Symbol.png under the SRC theme.

--no-verify: .husky/pre-commit runs `eslint .`, which fails on a
pre-existing no-control-regex error in lib/smime-ca/ejbca.ts, untouched
here.

app/(main)/[locale]/login/page.tsx

@@ -134,12 +134,20 @@ export default function LoginPage() {
   const isMobileHandoff = Boolean(mobileRedirectUri);
   const { login, loginDemo, isLoading, error, clearError, isAuthenticated } = useAuthStore();
   const { theme, setTheme, initializeTheme } = useThemeStore(useShallow((s) => ({ theme: s.theme, setTheme: s.setTheme, initializeTheme: s.initializeTheme })));
-  const { appName, jmapServerUrl: configuredServerUrl, oauthEnabled, oauthOnly, oauthClientId: globalOauthClientId, oauthIssuerUrl: globalOauthIssuerUrl, oauthScopes, rememberMeEnabled, devMode, demoMode, loginLogoLightUrl, loginLogoDarkUrl, loginCompanyName, loginImprintUrl, loginPrivacyPolicyUrl, loginWebsiteUrl, loginLogoMaxHeight, loginLogoMaxWidth, loginShowHeading, loginShowSubtitle, loginShowTotp, loginShowVersion, isLoading: configLoading, error: configError, autoSsoEnabled, embeddedMode: _embeddedMode, allowCustomJmapEndpoint, jmapServers, jmapServerAutoPickByDomain } = useConfig();
+  const { appName, jmapServerUrl: configuredServerUrl, oauthEnabled, oauthOnly, oauthClientId: globalOauthClientId, oauthIssuerUrl: globalOauthIssuerUrl, oauthScopes, rememberMeEnabled, devMode, demoMode, loginLogoLightUrl, loginLogoDarkUrl, loginLogoLightUrlIsCustom, loginLogoDarkUrlIsCustom, loginCompanyName, loginImprintUrl, loginPrivacyPolicyUrl, loginWebsiteUrl, loginLogoMaxHeight, loginLogoMaxWidth, loginShowHeading, loginShowSubtitle, loginShowTotp, loginShowVersion, isLoading: configLoading, error: configError, autoSsoEnabled, embeddedMode: _embeddedMode, allowCustomJmapEndpoint, jmapServers, jmapServerAutoPickByDomain } = useConfig();
   const resolvedTheme = useThemeStore((s) => s.resolvedTheme);
   const { activeThemeId, installedThemes } = useThemeStore(useShallow((s) => ({ activeThemeId: s.activeThemeId, installedThemes: s.installedThemes })));
   // Active theme may carry its own brand logo (VNClagoon wordmark, SRC mark);
-  // fall back to the globally configured login logo.
+  // an explicitly-configured logo (Branding tab / LOGIN_LOGO_*_URL) wins
-  const effLoginLogo = resolveThemeLogo(installedThemes, activeThemeId, resolvedTheme === 'dark', loginLogoLightUrl, loginLogoDarkUrl);
+  // over that, falling back to the theme's logo only when nothing was set.
+  const effLoginLogo = resolveThemeLogo(
+    installedThemes,
+    activeThemeId,
+    resolvedTheme === 'dark',
+    loginLogoLightUrl,
+    loginLogoDarkUrl,
+    loginLogoLightUrlIsCustom || loginLogoDarkUrlIsCustom,
+  );
 
   // Login logo sizing: when a max height/width is configured, drop the fixed
   // 64×64 box so the logo (e.g. a wide wordmark) can render at its true size.

app/api/config/route.ts

@@ -44,6 +44,17 @@ export async function GET(request: NextRequest) {
     return configManager.get<T>(key, fallback);
   };
 
+  // Whether a logo field was actually set by an operator (Branding tab,
+  // an env var, or a per-domain override) rather than left at its default -
+  // consumed by resolveThemeLogo() so an explicit choice here wins over the
+  // active theme's own built-in logo, instead of being silently shadowed by
+  // it. See lib/theme-logo.ts.
+  const configSources = configManager.getAllWithSources();
+  const isLogoOverridden = (key: BrandingOverrideKey): boolean =>
+    typeof domainOverrides[key] === 'string' && domainOverrides[key]!.length > 0
+      ? true
+      : configSources[key]?.source !== 'default';
+
   const appName =
     branded<string>('appName', '') || process.env.NEXT_PUBLIC_APP_NAME || 'Webmail';
   const jmapServerUrl = configManager.get<string>('jmapServerUrl') || process.env.NEXT_PUBLIC_JMAP_SERVER_URL || '';
@@ -68,8 +79,12 @@ export async function GET(request: NextRequest) {
       faviconUrl: branded<string>('faviconUrl', '/branding/Bulwark_Favicon.svg'),
       appLogoLightUrl: branded<string>('appLogoLightUrl', ''),
       appLogoDarkUrl: branded<string>('appLogoDarkUrl', ''),
+      appLogoLightUrlIsCustom: isLogoOverridden('appLogoLightUrl'),
+      appLogoDarkUrlIsCustom: isLogoOverridden('appLogoDarkUrl'),
       loginLogoLightUrl: branded<string>('loginLogoLightUrl', '/branding/Bulwark_Logo_Color.svg'),
       loginLogoDarkUrl: branded<string>('loginLogoDarkUrl', '/branding/Bulwark_Logo_White.svg'),
+      loginLogoLightUrlIsCustom: isLogoOverridden('loginLogoLightUrl'),
+      loginLogoDarkUrlIsCustom: isLogoOverridden('loginLogoDarkUrl'),
       loginCompanyName: branded<string>('loginCompanyName', ''),
       loginImprintUrl: branded<string>('loginImprintUrl', ''),
       loginPrivacyPolicyUrl: branded<string>('loginPrivacyPolicyUrl', ''),

components/layout/navigation-rail.tsx

@@ -189,7 +189,7 @@ export function NavigationRail({
   const t = useTranslations("sidebar");
   const pathname = usePathname();
   const router = useRouter();
-  const { appLogoLightUrl, appLogoDarkUrl } = useConfig();
+  const { appLogoLightUrl, appLogoDarkUrl, appLogoLightUrlIsCustom, appLogoDarkUrlIsCustom } = useConfig();
   const resolvedTheme = useThemeStore((s) => s.resolvedTheme);
   const activeThemeId = useThemeStore((s) => s.activeThemeId);
   const installedThemes = useThemeStore((s) => s.installedThemes);
@@ -465,7 +465,7 @@ export function NavigationRail({
       )}
     >
       {(() => {
-        const logoUrl = withBasePath(resolveThemeLogo(installedThemes, activeThemeId, resolvedTheme === 'dark', appLogoLightUrl, appLogoDarkUrl));
+        const logoUrl = withBasePath(resolveThemeLogo(installedThemes, activeThemeId, resolvedTheme === 'dark', appLogoLightUrl, appLogoDarkUrl, appLogoLightUrlIsCustom || appLogoDarkUrlIsCustom));
         return logoUrl ? (
           <div className="flex items-center justify-center py-3 px-1">
             <img

hooks/use-config.ts

@@ -20,8 +20,12 @@ interface ConfigData {
   faviconUrl: string;
   appLogoLightUrl: string;
   appLogoDarkUrl: string;
+  appLogoLightUrlIsCustom: boolean;
+  appLogoDarkUrlIsCustom: boolean;
   loginLogoLightUrl: string;
   loginLogoDarkUrl: string;
+  loginLogoLightUrlIsCustom: boolean;
+  loginLogoDarkUrlIsCustom: boolean;
   loginCompanyName: string;
   loginImprintUrl: string;
   loginPrivacyPolicyUrl: string;
@@ -105,8 +109,12 @@ export function useConfig(): AppConfig {
     faviconUrl: configCache?.faviconUrl || '/branding/Bulwark_Favicon.svg',
     appLogoLightUrl: configCache?.appLogoLightUrl || '',
     appLogoDarkUrl: configCache?.appLogoDarkUrl || '',
+    appLogoLightUrlIsCustom: configCache?.appLogoLightUrlIsCustom || false,
+    appLogoDarkUrlIsCustom: configCache?.appLogoDarkUrlIsCustom || false,
     loginLogoLightUrl: configCache?.loginLogoLightUrl || '/branding/Bulwark_Logo_Color.svg',
     loginLogoDarkUrl: configCache?.loginLogoDarkUrl || '/branding/Bulwark_Logo_White.svg',
+    loginLogoLightUrlIsCustom: configCache?.loginLogoLightUrlIsCustom || false,
+    loginLogoDarkUrlIsCustom: configCache?.loginLogoDarkUrlIsCustom || false,
     loginCompanyName: configCache?.loginCompanyName || '',
     loginImprintUrl: configCache?.loginImprintUrl || '',
     loginPrivacyPolicyUrl: configCache?.loginPrivacyPolicyUrl || '',
@@ -146,8 +154,12 @@ export function useConfig(): AppConfig {
         faviconUrl: configCache.faviconUrl,
         appLogoLightUrl: configCache.appLogoLightUrl,
         appLogoDarkUrl: configCache.appLogoDarkUrl,
+        appLogoLightUrlIsCustom: configCache.appLogoLightUrlIsCustom,
+        appLogoDarkUrlIsCustom: configCache.appLogoDarkUrlIsCustom,
         loginLogoLightUrl: configCache.loginLogoLightUrl,
         loginLogoDarkUrl: configCache.loginLogoDarkUrl,
+        loginLogoLightUrlIsCustom: configCache.loginLogoLightUrlIsCustom,
+        loginLogoDarkUrlIsCustom: configCache.loginLogoDarkUrlIsCustom,
         loginCompanyName: configCache.loginCompanyName,
         loginImprintUrl: configCache.loginImprintUrl,
         loginPrivacyPolicyUrl: configCache.loginPrivacyPolicyUrl,
@@ -188,8 +200,12 @@ export function useConfig(): AppConfig {
           faviconUrl: data.faviconUrl,
           appLogoLightUrl: data.appLogoLightUrl,
           appLogoDarkUrl: data.appLogoDarkUrl,
+          appLogoLightUrlIsCustom: data.appLogoLightUrlIsCustom,
+          appLogoDarkUrlIsCustom: data.appLogoDarkUrlIsCustom,
           loginLogoLightUrl: data.loginLogoLightUrl,
           loginLogoDarkUrl: data.loginLogoDarkUrl,
+          loginLogoLightUrlIsCustom: data.loginLogoLightUrlIsCustom,
+          loginLogoDarkUrlIsCustom: data.loginLogoDarkUrlIsCustom,
           loginCompanyName: data.loginCompanyName,
           loginImprintUrl: data.loginImprintUrl,
           loginPrivacyPolicyUrl: data.loginPrivacyPolicyUrl,

lib/admin/types.ts

@@ -106,7 +106,7 @@ export interface ThemePolicy {
 export const DEFAULT_THEME_POLICY: ThemePolicy = {
   disabledBuiltinThemes: [],
   disabledThemes: [],
-  defaultThemeId: 'builtin-vnclagoon',
+  defaultThemeId: 'builtin-src',
 };
 
 export interface SettingsPolicy {

lib/builtin-themes.ts

@@ -1343,8 +1343,8 @@ export const BUILTIN_THEMES: InstalledTheme[] = [
     description: 'SRC Advisory brand theme — Swiss red on white, MD3 components, light-first',
     css: srcCSS,
     skin: srcSkin,
-    logoLightUrl: '/branding/src-logo.svg',
+    logoLightUrl: '/branding/SRC_Symbol.png',
-    logoDarkUrl: '/branding/src-logo.svg',
+    logoDarkUrl: '/branding/SRC_Symbol.png',
     variants: ['light', 'dark'],
     typography: { fontSans: '"DM Sans", system-ui, -apple-system, "Segoe UI", sans-serif' },
     enabled: true,

lib/theme-logo.ts

@@ -1,10 +1,21 @@
 import type { InstalledTheme } from './plugin-types';
 
 /**
- * Resolve which logo to show. When the active theme carries brand logos
+ * Resolve which logo to show.
- * (logoLightUrl/logoDarkUrl), those win — so switching theme switches the whole
+ *
- * brand (VNClagoon wordmark ↔ SRC mark). Otherwise falls back to the globally
+ * Precedence:
- * configured logo. Returns a raw path; the caller applies withBasePath().
+ *   1. An admin-configured global logo (Branding tab / APP_LOGO_*_URL /
+ *      LOGIN_LOGO_*_URL) - set `hasGlobalOverride` when the caller's config
+ *      source for that field is 'admin' or 'env', not 'default'. This is
+ *      what makes the Branding tab's existing logo fields actually take
+ *      effect for customers who want their own mark regardless of theme.
+ *   2. The active theme's own brand logo (logoLightUrl/logoDarkUrl) - so
+ *      switching theme still switches the whole brand (VNClagoon wordmark
+ *      vs SRC mark) for anyone who HASN'T set an explicit override.
+ *   3. The fallback value itself (theme has no logo and nothing was
+ *      configured).
+ *
+ * Returns a raw path; the caller applies withBasePath().
  */
 export function resolveThemeLogo(
   themes: InstalledTheme[],
@@ -12,7 +23,11 @@ export function resolveThemeLogo(
   isDark: boolean,
   fallbackLight: string,
   fallbackDark: string,
+  hasGlobalOverride = false,
 ): string {
+  const fallback = isDark ? (fallbackDark || fallbackLight) : (fallbackLight || fallbackDark);
+  if (hasGlobalOverride && fallback) return fallback;
+
   const theme = activeThemeId ? themes.find((t) => t.id === activeThemeId) : undefined;
   if (theme) {
     const themed = isDark
@@ -20,5 +35,5 @@ export function resolveThemeLogo(
       : (theme.logoLightUrl ?? theme.logoDarkUrl);
     if (themed) return themed;
   }
-  return isDark ? (fallbackDark || fallbackLight) : (fallbackLight || fallbackDark);
+  return fallback;
 }